Skip to content

Commit 9597d9b

Browse files
pavelmaksimov25pavelmaksimov25
authored
Merge pull request #167 from spryker-sdk/feature/integrator-with-lock-file
Add composer.lock file to the project
2 parents 322cd1a + adef20e commit 9597d9b

File tree

4 files changed

+5424
-136
lines changed

4 files changed

+5424
-136
lines changed

‎.github/workflows/ci.yml

Lines changed: 34 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,6 @@ on:
99

1010
jobs:
1111
validation:
12-
runs-on: ubuntu-20.04
13-
strategy:
14-
fail-fast: false
15-
matrix:
16-
php-version: [
17-
'7.4',
18-
'8.2',
19-
]
20-
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v2
23-
24-
- name: Setup PHP
25-
uses: shivammathur/setup-php@v2
26-
with:
27-
php-version: ${{ matrix.php-version }}
28-
extensions: mbstring, intl, pdo_mysql
29-
30-
- name: Validate composer.json and composer.lock
31-
run: composer validate
32-
33-
- name: Get Composer Cache Directory
34-
id: composer-cache
35-
run: |
36-
echo "::set-output name=dir::$(composer config cache-files-dir)"
37-
38-
- name: Composer cache
39-
uses: actions/cache@v2
40-
with:
41-
path: ${{ steps.composer-cache.outputs.dir }}
42-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
43-
restore-keys: ${{ runner.os }}-composer-
44-
45-
- name: Composer install
46-
run: composer install --prefer-dist --no-interaction --optimize-autoloader
47-
48-
- name: Check PHP for syntax errors
49-
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
50-
51-
- name: PHPStan checks
52-
run: composer stan
53-
54-
cs-check:
5512
runs-on: ubuntu-20.04
5613
strategy:
5714
fail-fast: false
@@ -70,6 +27,9 @@ jobs:
7027
php-version: ${{ matrix.php-version }}
7128
extensions: mbstring, intl, pdo_mysql
7229

30+
- name: Validate composer.json and composer.lock
31+
run: composer validate
32+
7333
- name: Get Composer Cache Directory
7434
id: composer-cache
7535
run: |
@@ -83,99 +43,43 @@ jobs:
8343
restore-keys: ${{ runner.os }}-composer-
8444

8545
- name: Composer install
86-
run: composer install --prefer-dist --no-interaction --optimize-autoloader
87-
88-
- name: CodeStyle checks
89-
run: composer cs-check
90-
91-
prefer-lowest:
92-
runs-on: ubuntu-20.04
93-
strategy:
94-
fail-fast: false
95-
matrix:
96-
php-version: [
97-
'7.4'
98-
]
46+
run: |
47+
composer --version
48+
if [[ ${{ matrix.php-version }} == '8.2' ]]; then
49+
composer update laminas/laminas-servicemanager laminas/laminas-stdlib laminas/laminas-filter --prefer-stable --optimize-autoloader
50+
else
51+
composer install --prefer-dist --no-interaction --optimize-autoloader
52+
fi
9953
100-
steps:
101-
- name: Checkout
102-
uses: actions/checkout@v2
54+
- name: Check PHP for syntax errors
55+
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
10356

104-
- name: Setup PHP
105-
uses: shivammathur/setup-php@v2
106-
with:
107-
php-version: ${{ matrix.php-version }}
108-
extensions: mbstring, intl, pdo_mysql
57+
- name: PHPStan checks
58+
run: composer stan
10959

110-
- name: Get Composer Cache Directory
111-
id: composer-cache
112-
run: |
113-
echo "::set-output name=dir::$(composer config cache-files-dir)"
60+
- name: CodeStyle checks
61+
run: composer cs-check
11462

115-
- name: Composer cache
116-
uses: actions/cache@v2
117-
with:
118-
path: ${{ steps.composer-cache.outputs.dir }}
119-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
120-
restore-keys: ${{ runner.os }}-composer-
63+
- name: Run tests
64+
run: |
65+
if [[ ${{ matrix.php-version }} == '7.4' ]]; then
66+
XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover coverage.xml
67+
else
68+
composer test
69+
fi
12170
122-
- name: Composer require spryker-sdk/composer-prefer-lowest package
123-
run: composer require --dev spryker-sdk/composer-prefer-lowest
71+
- name: Code Coverage Report
72+
if: success() && matrix.php-version == '7.4'
73+
uses: codecov/codecov-action@v1
12474

125-
- name: Composer prefer-lowest
126-
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
75+
- name: Composer require spryker-sdk/composer-prefer-lowest package
76+
run: composer require --dev spryker-sdk/composer-prefer-lowest
12777

128-
- name: Check PHP for syntax errors
129-
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
78+
- name: Composer prefer-lowest
79+
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
13080

131-
- name: Validate prefer lowest
132-
run: vendor/bin/validate-prefer-lowest -m
81+
- name: Check PHP for syntax errors
82+
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
13383

134-
tests:
135-
runs-on: ubuntu-20.04
136-
strategy:
137-
fail-fast: false
138-
matrix:
139-
php-version: [
140-
'7.4',
141-
'8.2',
142-
]
143-
steps:
144-
- name: Checkout
145-
uses: actions/checkout@v2
146-
147-
- name: Setup PHP
148-
uses: shivammathur/setup-php@v2
149-
with:
150-
php-version: ${{ matrix.php-version }}
151-
extensions: mbstring, intl, pdo_mysql
152-
153-
- name: Validate composer.json and composer.lock
154-
run: composer validate
155-
156-
- name: Get Composer Cache Directory
157-
id: composer-cache
158-
run: |
159-
echo "::set-output name=dir::$(composer config cache-files-dir)"
160-
161-
- name: Composer cache
162-
uses: actions/cache@v2
163-
with:
164-
path: ${{ steps.composer-cache.outputs.dir }}
165-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
166-
restore-keys: ${{ runner.os }}-composer-
167-
168-
- name: Composer install
169-
run: composer install --prefer-dist --no-interaction --optimize-autoloader
170-
171-
- name: Run tests
172-
run: |
173-
if [[ ${{ matrix.php-version }} == '7.4' ]]; then
174-
XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover coverage.xml
175-
else
176-
composer test
177-
fi
178-
179-
- name: Code Coverage Report
180-
if: success() && matrix.php-version == '7.4'
181-
uses: codecov/codecov-action@v1
84+
- name: Validate prefer lowest
85+
run: vendor/bin/validate-prefer-lowest -m

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ nbproject/
2020
# tooling
2121
vendor/
2222
!tests/_data/project_mock/vendor/
23-
composer.lock
2423
!tests/_data/project_mock/composer.lock
2524
!tests/_data/composer/composer.lock
2625
.phpunit.result.cache

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"ext-simplexml": "*",
1111
"composer-plugin-api": "^1.0.0 || ^2.0.0",
1212
"aws/aws-sdk-php": "^3.257",
13-
"composer/composer": "^2.1.0",
13+
"composer/composer": "^2.6.0",
1414
"czproject/git-php": "^4.1",
1515
"guzzlehttp/guzzle": "^7.4",
16-
"nikic/php-parser": "^4.3.0",
16+
"nikic/php-parser": "^4.13.0",
1717
"sebastian/diff": "^4.0.0",
1818
"spryker-sdk/utils": "^0.1.2",
19-
"symfony/console": "^5.3.0 || ^6.0",
20-
"symfony/finder": "^5.3.0 || ^6.0",
19+
"symfony/console": "^5.4 || ^6.0",
20+
"symfony/finder": "^5.4 || ^6.0",
2121
"symfony/process": "^5.4 || ^6.0"
2222
},
2323
"require-dev": {
@@ -26,7 +26,7 @@
2626
"phpunit/phpunit": "^9.5.0",
2727
"spryker-sdk/manifest-test-data-provider": "dev-master",
2828
"spryker/code-sniffer": "0.17.18",
29-
"symfony/filesystem": "^5.3.0 || ^6.0"
29+
"symfony/filesystem": "^5.4 || ^6.0"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)