Skip to content

Commit 961c894

Browse files
authored
Merge pull request #1 from Kocal/symfony-8-support
Add support for Symfony 8
2 parents 38cbead + 2bbfd10 commit 961c894

File tree

4 files changed

+33
-14
lines changed

4 files changed

+33
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,34 @@ jobs:
5555
# LTS version of Symfony
5656
- php-version: '8.1'
5757
symfony-version: '6.4.*'
58+
# Explicit Symfony versions
59+
- php-version: '8.1'
60+
symfony-version: '6.4'
61+
- php-version: '8.2'
62+
symfony-version: '7.0'
63+
- php-version: '8.4'
64+
symfony-version: '8.0.x-dev' # TODO: change to '8.0' when Symfony 8.0 is released
65+
minimum-stability: 'dev' # TODO: remove when Symfony 8.0 is released
5866
steps:
5967
- uses: actions/checkout@v4
6068

6169
- name: Install PHP
6270
uses: shivammathur/setup-php@v2
6371
with:
64-
php-version: 8.2
65-
tools: symfony-cli, flex
72+
php-version: ${{ matrix.php-version }}
73+
tools: symfony-cli
74+
75+
- name: Allow Flex Plugin
76+
run: composer global config --no-plugins allow-plugins.symfony/flex true
77+
78+
- name: Configure Composer stability
79+
run: composer config minimum-stability ${{ matrix.minimum-stability }}
6680

6781
- name: Install Composer dependencies
6882
run: |
69-
symfony composer config minimum-stability ${{ matrix.minimum-stability }}
70-
SYMFONY_REQUIRE=${{ matrix.symfony-version || '>=6.4' }} symfony composer update ${{ matrix.dependency-version == 'lowest' && '--prefer-lowest' || '' }}
83+
composer update ${{ matrix.dependency-version == 'lowest' && '--prefer-lowest' || '' }}
84+
env:
85+
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=6.4' }}
7186

7287
- name: Create a new Symfony project
7388
run: |
@@ -77,7 +92,10 @@ jobs:
7792
8.1) symfony new my_app --version="6.4.*" --webapp ;;
7893
8.2) symfony new my_app --version="7.1.*" --webapp ;;
7994
8.3) symfony new my_app --version="7.2.*" --webapp ;;
80-
8.4) symfony new my_app --version="7.3.*" --webapp ;;
95+
8.4) case "${{ matrix.symfony-version }}" in
96+
8.0.x-dev) symfony new my_app --version="8.0.x-dev" --webapp ;;
97+
*) symfony new my_app --version="7.3.*" --webapp ;;
98+
esac ;;
8199
esac
82100
83101
- name: Install kocal/oxlint-bundle

composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
"email": "[email protected]"
1616
}
1717
],
18+
"minimum-stability": "dev",
1819
"require": {
1920
"php": ">=8.1",
20-
"symfony/console": "^6.4|^7.0",
21-
"symfony/filesystem": "^6.4|^7.0",
22-
"symfony/http-client": "^6.4|^7.0",
23-
"symfony/process": "^6.4|^7.0"
21+
"symfony/console": "^6.4|^7.0|^8.0",
22+
"symfony/filesystem": "^6.4|^7.0|^8.0",
23+
"symfony/http-client": "^6.4|^7.0|^8.0",
24+
"symfony/process": "^6.4|^7.0|^8.0"
2425
},
2526
"require-dev": {
26-
"phpstan/phpstan": "^1.11",
27-
"symplify/easy-coding-standard": "^12.1.2",
28-
"symfony/framework-bundle": "^6.4|^7.0"
27+
"phpstan/phpstan": "^2.1.21",
28+
"symplify/easy-coding-standard": "12.5.22",
29+
"symfony/framework-bundle": "^6.4|^7.0|^8.0"
2930
}
3031
}

src/KocalOxlintBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
final class KocalOxlintBundle extends Bundle
1212
{
13-
protected function createContainerExtension(): ?ExtensionInterface
13+
protected function createContainerExtension(): ExtensionInterface
1414
{
1515
return new OxlintExtension();
1616
}

src/OxlintBinary.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static function isMusl(): bool
4242
{
4343
static $isMusl = null;
4444

45-
if (null !== $isMusl) {
45+
if (is_bool($isMusl)) {
4646
return $isMusl;
4747
}
4848

0 commit comments

Comments
 (0)