Dropped symfony/framework-extra-bundle usage

prestaconcept · Dec 13, 2023 · 08806d3 · 08806d3
1 parent 1315b07
commit 08806d3
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
         "doctrine/annotations": "^1.0",
         "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "^7.5|^8.0",
-        "sensio/framework-extra-bundle": "^5.5|^6.1",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/messenger": "^5.4|^6.0|^7.0",
         "symfony/browser-kit": "^5.4|^6.0|^7.0",

diff --git a/tests/Integration/config/5.4/routes/annotations.yaml b/tests/Integration/config/5.4/routes/annotations.yaml
diff --git a/tests/Integration/config/5.4/routes/controllers.yaml b/tests/Integration/config/5.4/routes/controllers.yaml
@@ -0,0 +1,26 @@
+archive:
+    path: /archive
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\ArchivesController::archive
+
+blog_read:
+    path: /blog
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::read
+    options:
+        sitemap:
+            section: blog
+
+blog_post:
+    path: /blog/{slug}
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::post
+
+dispatch_message:
+    path: /dispatch-message
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\MessengerController::dispatch
+
+home:
+    path: /
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\StaticController::home
+    options:
+        sitemap:
+            section: static
+
diff --git a/tests/Integration/config/5.4/special/annotations.yaml b/tests/Integration/config/5.4/special/annotations.yaml
diff --git a/tests/Integration/config/6.1/routes/annotations.yaml b/tests/Integration/config/6.1/routes/annotations.yaml
diff --git a/tests/Integration/config/6.1/routes/controllers.yaml b/tests/Integration/config/6.1/routes/controllers.yaml
@@ -0,0 +1,25 @@
+archive:
+    path: /archive
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\ArchivesController::archive
+
+blog_read:
+    path: /blog
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::read
+    options:
+        sitemap:
+            section: blog
+
+blog_post:
+    path: /blog/{slug}
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::post
+
+dispatch_message:
+    path: /dispatch-message
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\MessengerController::dispatch
+
+home:
+    path: /
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\StaticController::home
+    options:
+        sitemap:
+            section: static
diff --git a/tests/Integration/config/6.3/routes/annotations.yaml b/tests/Integration/config/6.3/routes/annotations.yaml
diff --git a/tests/Integration/config/6.3/routes/controllers.yaml b/tests/Integration/config/6.3/routes/controllers.yaml
@@ -0,0 +1,26 @@
+archive:
+    path: /archive
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\ArchivesController::archive
+
+blog_read:
+    path: /blog
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::read
+    options:
+        sitemap:
+            section: blog
+
+blog_post:
+    path: /blog/{slug}
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\BlogController::post
+
+dispatch_message:
+    path: /dispatch-message
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\MessengerController::dispatch
+
+home:
+    path: /
+    controller: Presta\SitemapBundle\Tests\Integration\Controller\StaticController::home
+    options:
+        sitemap:
+            section: static
+
diff --git a/tests/Integration/config/6.4/routes/annotations.yaml b/tests/Integration/config/6.4/routes/annotations.yaml
@@ -1,3 +1,3 @@
 controllers:
     resource: ../../../src/Controller/
-    type: 'attribute'
+    type: attribute
diff --git a/tests/Integration/src/Controller/ArchivesController.php b/tests/Integration/src/Controller/ArchivesController.php
@@ -16,9 +16,6 @@
 
 final class ArchivesController
 {
-    /**
-     * @Route("/archive", name="archive")
-     */
     #[Route(path: '/archive', name: 'archive')]
     public function archive(): Response
     {

diff --git a/tests/Integration/src/Controller/BlogController.php b/tests/Integration/src/Controller/BlogController.php
@@ -16,18 +16,12 @@
 
 final class BlogController
 {
-    /**
-     * @Route("/blog", name="blog_read", options={"sitemap"={"section"="blog"}})
-     */
     #[Route(path: '/blog', name: 'blog_read', options: ['sitemap' => ['section' => 'blog']])]
     public function read(): Response
     {
         return new Response(__FUNCTION__);
     }
 
-    /**
-     * @Route("/blog/{slug}", name="blog_post")
-     */
     #[Route(path: '/blog/{slug}', name: 'blog_post')]
     public function post(string $slug): Response
     {

diff --git a/tests/Integration/src/Controller/MessengerController.php b/tests/Integration/src/Controller/MessengerController.php
@@ -19,9 +19,6 @@
 
 final class MessengerController
 {
-    /**
-     * @Route("/dispatch-message", name="dispatch_message")
-     */
     #[Route(path: '/dispatch-message', name: 'dispatch_message')]
     public function dispatch(Request $request, MessageBusInterface $bus): Response
     {

diff --git a/tests/Integration/src/Controller/StaticController.php b/tests/Integration/src/Controller/StaticController.php
@@ -16,9 +16,6 @@
 
 final class StaticController
 {
-    /**
-     * @Route("", name="home", options={"sitemap"={"section"="static"}})
-     */
     #[Route(path: '', name: 'home', options: ['sitemap' => ['section' => 'static']])]
     public function home(): Response
     {

diff --git a/tests/Integration/src/Kernel.php b/tests/Integration/src/Kernel.php
@@ -48,9 +48,6 @@ private function configureContainer(
             $version = sprintf('%s.%s', BaseKernel::MAJOR_VERSION, BaseKernel::MINOR_VERSION);
             $container->import('../config/' . $version . '/*.yaml');
             $container->import('../config/services.yaml');
-            if (\PHP_VERSION_ID < 80000) {
-                $container->import('../config/' . $version . '/special/annotations.yaml');
-            }
         }
 
         private function configureRoutes(RoutingConfigurator $routes): void
@@ -63,9 +60,6 @@ public function registerBundles(): iterable
         {
             yield new \Symfony\Bundle\FrameworkBundle\FrameworkBundle();
             yield new \Presta\SitemapBundle\PrestaSitemapBundle();
-            if (\PHP_VERSION_ID < 80000) {
-                yield new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle();
-            }
         }
 
         public function boot()
@@ -123,9 +117,6 @@ public function registerBundles(): iterable
         {
             yield new \Symfony\Bundle\FrameworkBundle\FrameworkBundle();
             yield new \Presta\SitemapBundle\PrestaSitemapBundle();
-            if (\PHP_VERSION_ID < 80000) {
-                yield new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle();
-            }
         }
 
         public function boot()