Fix CI

.github/workflows/symfony.yml

@@ -3,17 +3,17 @@ name: CI
 on:
   push:
     branches:
-      - '6.0'
+      - '6.1'
   pull_request:
     branches:
-      - '6.0'
+      - '6.1'
 
 env:
   APP_ENV: test
 
 jobs:
   symfony:
-    name: Symfony 5.4 (PHP ${{ matrix.php-versions }})
+    name: Symfony 6.1 (PHP ${{ matrix.php-versions }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true

composer.json

@@ -15,10 +15,10 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "doctrine/doctrine-bundle": "2.6",
-        "sensio/framework-extra-bundle": "^6.2",
         "symfony/apache-pack": "^1.0",
         "symfony/console": "6.1.*",
         "symfony/dotenv": "6.1.*",
+        "symfony/cache": "5.4.*",
         "symfony/flex": "^2.1",
         "symfony/form": "6.1.*",
         "symfony/framework-bundle": "6.1.*",

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],

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>

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": {

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)