Fix CI

Codeception · Dec 7, 2023 · 943ad0e · 943ad0e
1 parent 926d740
commit 943ad0e
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 148 deletions.
diff --git a/.github/workflows/symfony.yml b/.github/workflows/symfony.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   symfony:
-    name: Symfony 5.4 (PHP ${{ matrix.php-versions }})
+    name: Symfony 6.0 (PHP ${{ matrix.php-versions }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true

diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "doctrine/doctrine-bundle": "2.6",
-        "sensio/framework-extra-bundle": "^6.2",
         "symfony/apache-pack": "^1.0",
+        "symfony/cache": "5.4.*",
         "symfony/console": "6.0.*",
         "symfony/dotenv": "6.0.*",
         "symfony/flex": "^2.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -4,7 +4,6 @@
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],

diff --git a/config/packages/sensio_framework_extra.php b/config/packages/sensio_framework_extra.php
diff --git a/public/.htaccess b/public/.htaccess
@@ -18,7 +18,7 @@ DirectoryIndex index.php
     RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
 
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ %{ENV:BASE}/index.php [L]
+    RewriteRule ^(.*)$ %{ENV:BASE}/index.php [QSA,L]
 </IfModule>
 
 <IfModule !mod_rewrite.c>

diff --git a/symfony.lock b/symfony.lock
@@ -297,18 +297,6 @@
     "sebastian/version": {
         "version": "3.0.x-dev"
     },
-    "sensio/framework-extra-bundle": {
-        "version": "6.2",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "5.2",
-            "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
-        },
-        "files": [
-            "./config/packages/sensio_framework_extra.yaml"
-        ]
-    },
     "squizlabs/php_codesniffer": {
         "version": "4.0",
         "recipe": {

diff --git a/tests/Functional/EventsCest.php b/tests/Functional/EventsCest.php
@@ -33,9 +33,8 @@ public function dontSeeOrphanEvent(FunctionalTester $I)
     public function seeEventTriggered(FunctionalTester $I)
     {
         $I->amOnPage('/');
-        $I->seeEventTriggered(SecurityListener::class);
         $I->seeEventTriggered(new RouterDataCollector());
-        $I->seeEventTriggered([SecurityListener::class, RouterDataCollector::class]);
+        $I->seeEventTriggered([RouterDataCollector::class]);
     }
 
     public function seeOrphanEvent(FunctionalTester $I)