Skip to content

Commit f977bfe

Browse files
authored
Merge pull request #3 from magento-commerce/master
master >> develop
2 parents 24d2501 + 4b4974d commit f977bfe

File tree

306 files changed

+10281
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+10281
-167
lines changed

.github/workflows/php.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- name: Validate composer
18+
run: composer validate
19+
20+
- name: Cache Composer packages
21+
id: composer-cache
22+
uses: actions/cache@v2
23+
with:
24+
path: vendor
25+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
26+
restore-keys: |
27+
${{ runner.os }}-php-
28+
29+
- name: Install dependencies
30+
if: steps.composer-cache.outputs.cache-hit != 'true'
31+
run: composer install --prefer-source --no-interaction
32+
33+
- name: Run unit tests suite
34+
run: php vendor/bin/phpunit --configuration tests/Unit/phpunit.xml.dist
35+
36+
- name: Run code style suite
37+
run: php vendor/bin/phpcs --standard=psr12 src/ --ignore=*.min.css
38+
39+
- name: Run tests code style
40+
run: php vendor/bin/phpcs --standard=psr12 tests/ --ignore=/_files/ -n

.travis.yml

-20
This file was deleted.

bin/svc

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ if (PHP_SAPI !== 'cli') {
2121
}
2222

2323
try {
24-
$application = new Application();
24+
$composerContents = json_decode(file_get_contents(__DIR__ . '/../composer.json'), true);
25+
$application = new Symfony\Component\Console\Application(
26+
$composerContents['description'],
27+
$composerContents['version']
28+
);
2529
$application->add(new CompareSourceCommand());
2630
$application->run();
2731
} catch (\Exception $e) {

composer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
{
22
"name": "magento/magento-semver",
3-
"description": "Magento semantic version checker",
4-
"version": "6.0.0",
3+
"description": "Magento Semantic Version Checker",
4+
"version": "8.0.0",
55
"license": [
66
"OSL-3.0",
77
"AFL-3.0"
88
],
99
"bin": ["bin/svc"],
1010
"require": {
1111
"php": "~7.2.29||~7.3.0||~7.4.0",
12+
"ext-json": "*",
1213
"phpstan/phpdoc-parser": "^0.3.5",
1314
"symfony/console": "~4.1.0||~4.4.0",
1415
"tomzx/php-semver-checker": "^0.14.0",
1516
"wikimedia/less.php": "~1.8.0",
1617
"zendframework/zend-stdlib": "^3.2.1",
17-
"nikic/php-parser": "^4.4"
18+
"nikic/php-parser": "~4.4.0||~4.5.0||~4.6.0",
19+
"sabre/xml": "^2.1"
1820
},
1921
"require-dev": {
2022
"phpunit/phpunit": "^6.5.0",

composer.lock

+123-77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)