Merge pull request #88 from zicht/remove-sensio-framework-extra-bundle

Remove Sensio Framework Extra Bundle

Author: 7ochem

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added|Changed|Deprecated|Removed|Fixed|Security
 Nothing so far
 
+## 6.3.8 - 2024-02-27
+### Removed
+- Removed usage of Sensio Framework Extra Bundle features and thus the dependency
+  on the `sensio/framework-extra-bundle` package.
+
 ## 6.3.7 - 2023-05-22
 ### Fixed
 - Attribute check in button form template.

composer.json

@@ -14,7 +14,6 @@
         "symfony/console": "^4.4",
         "sonata-project/doctrine-orm-admin-bundle": "^3.15",
         "zicht/framework-extra-bundle": "^9",
-        "sensio/framework-extra-bundle": "^5",
         "twig/twig": "^2.9 || ^3"
     },
     "require-dev": {
@@ -23,16 +22,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Zicht\\Bundle\\AdminBundle\\": [
-                "src/"
-            ]
+            "Zicht\\Bundle\\AdminBundle\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ZichtTest\\Bundle\\AdminBundle\\": [
-                "tests/"
-            ]
+            "ZichtTest\\Bundle\\AdminBundle\\": "tests/"
         }
     },
     "minimum-stability": "stable",

src/Controller/QuicklistController.php

@@ -5,10 +5,9 @@
 
 namespace Zicht\Bundle\AdminBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
@@ -19,9 +18,7 @@ class QuicklistController extends AbstractController
     /**
      * Displays a quick list control for jumping to entries registered in the quick list service
      *
-     * @return array|JsonResponse
-     *
-     * @Template("@ZichtAdmin/Quicklist/quicklist.html.twig")
+     * @return Response
      * @Route("quick-list")
      */
     public function quicklistAction(Request $request)
@@ -36,8 +33,6 @@ public function quicklistAction(Request $request)
             return new JsonResponse($quicklist->getResults($request->get('repo'), $request->get('pattern'), $language));
         }
 
-        return [
-            'repos' => $quicklist->getRepositoryConfigs(),
-        ];
+        return $this->render('@ZichtAdmin/Quicklist/quicklist.html.twig', ['repos' => $quicklist->getRepositoryConfigs()]);
     }
 }

src/Controller/RcController.php

@@ -5,29 +5,30 @@
 
 namespace Zicht\Bundle\AdminBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment as TwigEnvironment;
 
 class RcController
 {
+    /** @var TwigEnvironment */
+    private $twig;
+
     /**
      * @param array $configs
      */
-    public function __construct($configs)
+    public function __construct(TwigEnvironment $twig, $configs)
     {
+        $this->twig = $twig;
         $this->configs = $configs;
     }
 
     /**
      * Renders all RC controls
      *
-     * @return array
-     *
-     * @Template("@ZichtAdmin/Rc/controls.html.twig")
+     * @return Response
      */
     public function controlsAction()
     {
-        return [
-            'configs' => $this->configs,
-        ];
+        return $this->twig->render('@ZichtAdmin/Rc/controls.html.twig', ['configs' => $this->configs]);
     }
 }

src/DependencyInjection/ZichtAdminExtension.php

@@ -44,7 +44,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if (isset($config['rc'])) {
             $loader->load('rc.xml');
-            $container->getDefinition('zicht_admin.controller.rc')->replaceArgument(0, $config['rc']);
+            $container->getDefinition('zicht_admin.controller.rc')->replaceArgument(1, $config['rc']);
         }
 
         $container->getDefinition('zicht_admin.security.authorization.voter.admin_voter')

src/Resources/config/rc.xml

@@ -6,6 +6,7 @@
 
     <services>
         <service id="zicht_admin.controller.rc" class="Zicht\Bundle\AdminBundle\Controller\RcController" public="true">
+            <argument type="service" id="twig" />
             <argument /><!-- replaced by extension -->
         </service>
     </services>

tests/Controller/QuicklistControllerTest.php

@@ -34,14 +34,6 @@ public function setUp(): void
         $this->ql = $ql;
     }
 
-    public function testQuickListAction()
-    {
-        $req = new Request();
-        $res = $this->controller->quicklistAction($req);
-
-        $this->assertEquals(['repos' => ['foo' => 'bar']], $res);
-    }
-
     public function testQuickListActionJson()
     {
         $req2 = new Request([