Controller fixes for symfony 5

Author: sinamt

Command/GraphQLConfigureCommand.php

@@ -8,14 +8,20 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class GraphQLConfigureCommand extends Command
 {
     const PROJECT_NAMESPACE = 'App';
 
-    public function __construct(private ContainerInterface $container)
+    /** @var Container */
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
     {
+        $this->container = $container;
+
         parent::__construct();
     }
 
@@ -140,7 +146,6 @@ protected function graphQLRouteExists()
 
     protected function generateRoutes()
     {
-
     }
 
     protected function getSchemaClassTemplate($nameSpace, $className = 'Schema')

Controller/GraphQLController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Date: 25.11.15
  *
@@ -7,16 +8,26 @@
 
 namespace Youshido\GraphQLBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\Annotation\Route;
-use Youshido\GraphQL\Exception\ConfigurationException;
 use Youshido\GraphQLBundle\Exception\UnableToInitializeSchemaServiceException;
 use Youshido\GraphQLBundle\Execution\Processor;
 
-class GraphQLController extends Controller
+class GraphQLController extends AbstractController
 {
+    protected $container;
+    protected $params;
+
+    public function __construct(ContainerInterface $container, ParameterBagInterface $params)
+    {
+        $this->container = $container;
+        $this->params = $params;
+    }
+
     /**
      * @Route("/graphql")
      *
@@ -36,13 +47,13 @@ public function defaultAction()
             );
         }
 
-        if ($this->get('request_stack')->getCurrentRequest()->getMethod() == 'OPTIONS') {
+        if ($this->container->get('request_stack')->getCurrentRequest()->getMethod() == 'OPTIONS') {
             return $this->createEmptyResponse();
         }
 
         list($queries, $isMultiQueryRequest) = $this->getPayload();
 
-        $queryResponses = array_map(function($queryData) {
+        $queryResponses = array_map(function ($queryData) {
             return $this->executeQuery($queryData['query'], $queryData['variables']);
         }, $queries);
 
@@ -55,15 +66,15 @@ public function defaultAction()
         return $response;
     }
 
-    private function createEmptyResponse()
+    protected function createEmptyResponse()
     {
         return new JsonResponse([], 200, $this->getResponseHeaders());
     }
 
-    private function executeQuery($query, $variables)
+    protected function executeQuery($query, $variables)
     {
         /** @var Processor $processor */
-        $processor = $this->get('graphql.processor');
+        $processor = $this->container->get('graphql.processor');
         $processor->processPayload($query, $variables);
 
         return $processor->getResponseData();
@@ -74,9 +85,9 @@ private function executeQuery($query, $variables)
      *
      * @throws \Exception
      */
-    private function getPayload()
+    protected function getPayload()
     {
-        $request = $this->get('request_stack')->getCurrentRequest();
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         $query = $request->get('query', null);
         $variables = $request->get('variables', []);
         $isMultiQueryRequest = false;
@@ -135,7 +146,7 @@ private function getPayload()
     /**
      * @throws \Exception
      */
-    private function initializeSchemaService()
+    protected function initializeSchemaService()
     {
         if ($this->container->initialized('graphql.schema')) {
             return;
@@ -149,9 +160,9 @@ private function initializeSchemaService()
      *
      * @throws \Exception
      */
-    private function makeSchemaService()
+    protected function makeSchemaService()
     {
-        if ($this->container->has($this->getSchemaService())) {
+        if ($this->getSchemaService() && $this->container->has($this->getSchemaService())) {
             return $this->container->get($this->getSchemaService());
         }
 
@@ -175,27 +186,32 @@ private function makeSchemaService()
     /**
      * @return string
      */
-    private function getSchemaClass()
+    protected function getSchemaClass()
     {
         return $this->getParameter('graphql.schema_class');
     }
 
     /**
      * @return string
      */
-    private function getSchemaService()
+    protected function getSchemaService()
     {
         $serviceName = $this->getParameter('graphql.schema_service');
 
-        if (substr($serviceName, 0, 1) === '@') {
+        if (substr($serviceName ?: '', 0, 1) === '@') {
             return substr($serviceName, 1, strlen($serviceName) - 1);
         }
 
         return $serviceName;
     }
 
-    private function getResponseHeaders()
+    protected function getResponseHeaders()
     {
         return $this->getParameter('graphql.response.headers');
     }
+
+    protected function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
+    {
+        return $this->params->get($name);
+    }
 }

GraphQLBundle.php

@@ -27,7 +27,7 @@ public function build(ContainerBuilder $container)
     }
 
 
-    public function getContainerExtension()
+    public function getContainerExtension(): GraphQLExtension
     {
         if (null === $this->extension) {
             $this->extension = new GraphQLExtension();

Resources/config/services.xml

@@ -53,5 +53,10 @@
             <tag name="console.command" command="graphql:configure"/>
             <argument type="service" id="service_container"/>
         </service>
+
+        <service id="Youshido\GraphQLBundle\Controller\GraphQLController" public="true" >
+            <argument type="service" id="service_container" />
+            <argument type="service" id="parameter_bag" />
+        </service>
     </services>
 </container>