Revert BC breaking changes

Author: j4nr6n

Controller/AuthorizeController.php

@@ -17,6 +17,8 @@
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
 use OAuth2\OAuth2;
 use OAuth2\OAuth2ServerException;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Form;
@@ -35,13 +37,18 @@
  *
  * @author Chris Jones <[email protected]>
  */
-class AuthorizeController
+class AuthorizeController implements ContainerAwareInterface
 {
     /**
      * @var ClientInterface
      */
     private $client;
 
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
     /**
      * @var SessionInterface
      */
@@ -97,6 +104,16 @@ class AuthorizeController
      */
     private $eventDispatcher;
 
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
      * This controller had been made as a service due to support symfony 4 where all* services are private by default.
      * Thus, there is considered a bad practice to fetch services directly from container.

Form/Handler/AuthorizeFormHandler.php

@@ -51,6 +51,16 @@ public function __construct(FormInterface $form, $requestStack = null)
         $this->requestStack = $requestStack;
     }
 
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     public function isAccepted()
     {
         return $this->form->getData()->accepted;
@@ -123,5 +133,7 @@ private function getCurrentRequest()
                 return $this->requestStack->getCurrentRequest();
             }
         }
+
+        return $this->container->get('request');
     }
 }