Skip to content

Commit 25c7914

Browse files
committed
Fix CI
1 parent f6e787f commit 25c7914

File tree

8 files changed

+995
-1875
lines changed

8 files changed

+995
-1875
lines changed

.github/workflows/symfony.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ env:
1313

1414
jobs:
1515
symfony:
16-
name: Symfony 5.4 (PHP ${{ matrix.php-versions }})
16+
name: Symfony 6.0 (PHP ${{ matrix.php-versions }})
1717
runs-on: ubuntu-latest
1818
strategy:
1919
fail-fast: true
2020
matrix:
21-
php-versions: ['8.0', '8.1']
21+
php-versions: ['8.0', '8.1', '8.2', '8.3']
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v3

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"ext-ctype": "*",
1616
"ext-iconv": "*",
1717
"doctrine/doctrine-bundle": "2.6",
18-
"sensio/framework-extra-bundle": "^6.2",
1918
"symfony/apache-pack": "^1.0",
19+
"symfony/cache": "5.4.*",
2020
"symfony/console": "6.0.*",
2121
"symfony/dotenv": "6.0.*",
2222
"symfony/flex": "^2.1",
@@ -40,7 +40,6 @@
4040
"friendsofphp/php-cs-fixer": "^3.3",
4141
"phpmd/phpmd": "^2.11",
4242
"rector/rector": "^0.12.5",
43-
"roave/security-advisories": "dev-latest",
4443
"squizlabs/php_codesniffer": "^3.6",
4544
"symfony/debug-bundle": "6.0.*",
4645
"symfony/maker-bundle": "^1.41",

composer.lock

Lines changed: 990 additions & 1843 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/bundles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
55
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
66
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
7-
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
87
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
98
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
109
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],

config/packages/sensio_framework_extra.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

public/.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ DirectoryIndex index.php
1818
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
1919

2020
RewriteCond %{REQUEST_FILENAME} !-f
21-
RewriteRule ^ %{ENV:BASE}/index.php [L]
21+
RewriteRule ^(.*)$ %{ENV:BASE}/index.php [QSA,L]
2222
</IfModule>
2323

2424
<IfModule !mod_rewrite.c>

symfony.lock

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,18 +297,6 @@
297297
"sebastian/version": {
298298
"version": "3.0.x-dev"
299299
},
300-
"sensio/framework-extra-bundle": {
301-
"version": "6.2",
302-
"recipe": {
303-
"repo": "github.com/symfony/recipes",
304-
"branch": "main",
305-
"version": "5.2",
306-
"ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
307-
},
308-
"files": [
309-
"./config/packages/sensio_framework_extra.yaml"
310-
]
311-
},
312300
"squizlabs/php_codesniffer": {
313301
"version": "4.0",
314302
"recipe": {

tests/Functional/EventsCest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ public function dontSeeOrphanEvent(FunctionalTester $I)
3333
public function seeEventTriggered(FunctionalTester $I)
3434
{
3535
$I->amOnPage('/');
36-
$I->seeEventTriggered(SecurityListener::class);
3736
$I->seeEventTriggered(new RouterDataCollector());
38-
$I->seeEventTriggered([SecurityListener::class, RouterDataCollector::class]);
37+
$I->seeEventTriggered([RouterDataCollector::class]);
3938
}
4039

4140
public function seeOrphanEvent(FunctionalTester $I)

0 commit comments

Comments
 (0)