Skip to content

Commit 0610d02

Browse files
authored
bug #1 Allow Symfony 7 (sstok)
This PR was merged into the 1.0-dev branch. Discussion ---------- | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | | License | MIT Commits ------- 66a13f3 Allow Symfony 7 c4175bf Correct workflow
2 parents 71b2194 + c4175bf commit 0610d02

File tree

3 files changed

+14
-29
lines changed

3 files changed

+14
-29
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ jobs:
3434
-
3535
name: 'Get Composer cache directory'
3636
id: 'composer-cache'
37-
run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
37+
run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
3838

3939
-
4040
name: 'Cache dependencies'
4141
uses: 'actions/cache@v2'
4242
with:
43-
path: '${{ steps.composer-cache.outputs.cache-dir }}'
43+
path: '${{ steps.composer-cache.outputs.cache_dir }}'
4444
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
4545
restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
4646

4747
-
4848
name: 'Install dependencies'
49-
run: 'composer update --no-progress --prefer-stable'
49+
run: 'composer install --no-progress'
5050

5151
-
5252
name: 'Check the code style'
53-
run: 'make cs-full'
53+
run: 'make cs'
5454

5555
phpstan:
5656
name: 'PhpStan'
@@ -77,19 +77,19 @@ jobs:
7777
-
7878
name: 'Get Composer cache directory'
7979
id: 'composer-cache'
80-
run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
80+
run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
8181

8282
-
8383
name: 'Cache dependencies'
8484
uses: 'actions/cache@v2'
8585
with:
86-
path: '${{ steps.composer-cache.outputs.cache-dir }}'
86+
path: '${{ steps.composer-cache.outputs.cache_dir }}'
8787
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
8888
restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
8989

9090
-
9191
name: 'Install dependencies'
92-
run: 'composer update --no-progress --prefer-stable'
92+
run: 'composer install --no-progress'
9393

9494
-
9595
name: 'Run PhpStan'
@@ -112,12 +112,6 @@ jobs:
112112
composer-options: '--prefer-stable'
113113
symfony-version: '^6.4'
114114

115-
-
116-
php-version: '8.2'
117-
composer-options: '--prefer-stable'
118-
symfony-version: '^6.4'
119-
remove-http-client: 'yes'
120-
121115
-
122116
php-version: '8.2'
123117
composer-options: '--prefer-stable'
@@ -138,13 +132,13 @@ jobs:
138132
-
139133
name: 'Get Composer cache directory'
140134
id: 'composer-cache'
141-
run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
135+
run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
142136

143137
-
144138
name: 'Cache dependencies'
145139
uses: 'actions/cache@v2'
146140
with:
147-
path: '${{ steps.composer-cache.outputs.cache-dir }}'
141+
path: '${{ steps.composer-cache.outputs.cache_dir }}'
148142
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
149143
restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
150144

@@ -153,21 +147,11 @@ jobs:
153147
env:
154148
COMPOSER_OPTIONS: '${{ matrix.composer-options }}'
155149
SYMFONY_REQUIRE: '${{ matrix.symfony-version }}'
156-
REMOVE_HTTP_CLIENT: '${{ matrix.remove-http-client }}'
157150
run: |
158-
if [ "$REMOVE_HTTP_CLIENT" == "yes" ]; then
159-
composer remove --dev symfony/http-client
160-
fi
161-
162151
composer global config --no-plugins allow-plugins.symfony/flex true
163152
composer global require --no-progress --no-scripts --no-plugins symfony/flex
164153
composer update --no-progress $COMPOSER_OPTIONS
165154
166-
-
167-
name: 'Install PHPUnit'
168-
run: 'vendor/bin/simple-phpunit install'
169-
170155
-
171156
name: 'Run tests'
172-
run: |
173-
vendor/bin/simple-phpunit
157+
run: make phpunit

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include vendor/rollerscapes/standards/Makefile
22

33
phpunit:
4+
#./vendor/bin/simple-phpunit install
45
./vendor/bin/phpunit

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"require": {
1919
"php": "^8.1",
2020
"rollerworks/pdb-symfony-bridge": "^1.0",
21-
"symfony/validator": "^6.3"
21+
"symfony/validator": "^6.3 || ^7.0"
2222
},
2323
"require-dev": {
2424
"phpunit/phpunit": "^10.4.2",
2525
"rollerscapes/standards": "^1.0",
26-
"symfony/framework-bundle": "^6.3",
27-
"symfony/phpunit-bridge": "^7.0 || ^v6.3"
26+
"symfony/framework-bundle": "^6.3 || ^7.0",
27+
"symfony/phpunit-bridge": "^6.3 || ^7.0"
2828
},
2929
"minimum-stability": "dev",
3030
"prefer-stable": true,

0 commit comments

Comments
 (0)