Ensure PHP 5.3 and Symfony 2.3 compat

Author: Luis Pabon

.travis.yml

@@ -5,7 +5,6 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - 7.0
   - hhvm
   - nightly
 
@@ -24,12 +23,8 @@ matrix:
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
-    - php: 7.0
-      env: SYMFONY_VERSION=2.8.*
     - php: 5.6
       env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
   allow_failures:
     - php: hhvm
     - php: nightly

Controller/AuthorizeController.php

@@ -13,10 +13,13 @@
 
 use FOS\OAuthServerBundle\Event\OAuthEvent;
 use FOS\OAuthServerBundle\Form\Handler\AuthorizeFormHandler;
-use OAuth2\OAuth2;
+use FOS\OAuthServerBundle\Model\ClientInterface;
 use OAuth2\OAuth2ServerException;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -26,15 +29,28 @@
  *
  * @author Chris Jones <[email protected]>
  */
-class AuthorizeController
+class AuthorizeController implements ContainerAwareInterface
 {
-    use ContainerAwareTrait;
-
     /**
      * @var \FOS\OAuthServerBundle\Model\ClientInterface
      */
     private $client;
 
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
      * Authorize
      */
@@ -129,8 +145,13 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function getClient()
     {
-        $request = $this->container->get('request_stack')->getCurrentRequest();
         if (null === $this->client) {
+            try {
+                $request = $this->container->get('request_stack')->getCurrentRequest();
+            } catch (ServiceNotFoundException $e) {
+                $request = $this->container->get('request');
+            }
+
             if (null === $clientId = $request->get('client_id')) {
                 $form = $this->container->get('fos_oauth_server.authorize.form');
                 $clientId = $request->get(sprintf('%s[client_id]', $form->getName()), null, true);

DependencyInjection/Compiler/TokenStorageCompilerPass.php

@@ -20,7 +20,6 @@
  */
 class TokenStorageCompilerPass implements CompilerPassInterface
 {
-
     /**
      * {@inheritdoc}
      */
@@ -35,5 +34,4 @@ public function process(ContainerBuilder $container)
         }
         $definition->replaceArgument(0, $tokenStorageReference);
     }
-
 }

Form/Handler/AuthorizeFormHandler.php

@@ -11,28 +11,40 @@
 
 namespace FOS\OAuthServerBundle\Form\Handler;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Request;
 use FOS\OAuthServerBundle\Form\Model\Authorize;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @author Chris Jones <[email protected]>
  */
-class AuthorizeFormHandler
+class AuthorizeFormHandler implements ContainerAwareInterface
 {
-    protected $request;
+    /**
+     * @var FormInterface
+     */
     protected $form;
 
     /**
-     * @var RequestStack
+     * @var ContainerInterface
      */
-    private $requestStack;
+    protected $container;
 
-    public function __construct(FormInterface $form, 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 __construct(FormInterface $form)
     {
         $this->form = $form;
-        $this->requestStack = $requestStack;
     }
 
     public function isAccepted()
@@ -47,15 +59,19 @@ public function isRejected()
 
     public function process()
     {
-        $this->request = $this->requestStack->getCurrentRequest();
+        try {
+            $request = $this->container->get('request_stack')->getCurrentRequest();
+        } catch (ServiceNotFoundException $e) {
+            $request = $this->container->get('request');
+        }
 
         $this->form->setData(new Authorize(
-            $this->request->request->has('accepted'),
-            $this->request->query->all()
+            $request->request->has('accepted'),
+            $request->query->all()
         ));
 
-        if ('POST' === $this->request->getMethod()) {
-            $this->form->handleRequest($this->request);
+        if ('POST' === $request->getMethod()) {
+            $this->form->handleRequest($request);
             if ($this->form->isValid()) {
                 $this->onSuccess();
 

Resources/config/authorize.xml

@@ -20,7 +20,6 @@
 
         <service id="fos_oauth_server.authorize.form.handler.default" class="FOS\OAuthServerBundle\Form\Handler\AuthorizeFormHandler">
             <argument type="service" id="fos_oauth_server.authorize.form" />
-            <argument type="service" id="request_stack" />
         </service>
     </services>
 

Tests/Security/Firewall/OAuthListenerTest.php

@@ -102,11 +102,4 @@ public function testHandleResponse()
 
         $this->assertEquals($response, $ret);
     }
-
-    public function testWrongTypeForOAuthListener()
-    {
-        $this->setExpectedException('InvalidArgumentException');
-        $listener = new OAuthListener($this->event, $this->authManager, $this->serverService);
-    }
-
 }