Merge pull request #527 from dkarlovi/rebase-1.6

Merge 1.6

Author: dkarlovi

Controller/AuthorizeController.php

@@ -29,7 +29,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Routing\Router;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -86,7 +86,7 @@ class AuthorizeController implements ContainerAwareInterface
     private $tokenStorage;
 
     /**
-     * @var Router
+     * @var UrlGeneratorInterface
      */
     private $router;
 
@@ -118,7 +118,7 @@ class AuthorizeController implements ContainerAwareInterface
      * @param OAuth2                 $oAuth2Server
      * @param EngineInterface        $templating
      * @param TokenStorageInterface  $tokenStorage
-     * @param Router                 $router
+     * @param UrlGeneratorInterface  $router
      * @param ClientManagerInterface $clientManager
      * @param EventDispatcher        $eventDispatcher
      * @param string                 $templateEngineType
@@ -131,7 +131,7 @@ public function __construct(
         OAuth2 $oAuth2Server,
         EngineInterface $templating,
         TokenStorageInterface $tokenStorage,
-        Router $router,
+        UrlGeneratorInterface $router,
         ClientManagerInterface $clientManager,
         EventDispatcher $eventDispatcher,
         $templateEngineType = 'twig'
@@ -253,25 +253,23 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function getClient()
     {
-        if (null === $this->client) {
-            $request = $this->getCurrentRequest();
+        if (null !== $this->client) {
+            return $this->client;
+        }
 
-            $client = null;
-            if (null !== $request) {
-                if (null === $clientId = $request->get('client_id')) {
-                    $form = $this->authorizeForm;
-                    $formData = $request->get($form->getName(), []);
-                    $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
-                }
+        if (null === $request = $this->getCurrentRequest()) {
+            throw new NotFoundHttpException('Client not found.');
+        }
 
-                $client = $this->clientManager->findClientByPublicId($clientId);
-            }
+        if (null === $clientId = $request->get('client_id')) {
+            $formData = $request->get($this->authorizeForm->getName(), []);
+            $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
+        }
 
-            if (null === $client) {
-                throw new NotFoundHttpException('Client not found.');
-            }
+        $this->client = $this->clientManager->findClientByPublicId($clientId);
 
-            $this->client = $client;
+        if (null === $this->client) {
+            throw new NotFoundHttpException('Client not found.');
         }
 
         return $this->client;

Entity/AuthCodeManager.php

@@ -13,14 +13,14 @@
 
 namespace FOS\OAuthServerBundle\Entity;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use FOS\OAuthServerBundle\Model\AuthCodeInterface;
 use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
 
 class AuthCodeManager extends BaseAuthCodeManager
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $em;
 
@@ -30,10 +30,10 @@ class AuthCodeManager extends BaseAuthCodeManager
     protected $class;
 
     /**
-     * @param EntityManager $em
-     * @param string        $class
+     * @param EntityManagerInterface $em
+     * @param string                 $class
      */
-    public function __construct(EntityManager $em, $class)
+    public function __construct(EntityManagerInterface $em, $class)
     {
         $this->em = $em;
         $this->class = $class;

Form/Handler/AuthorizeFormHandler.php

@@ -73,26 +73,34 @@ public function isRejected()
         return !$this->form->getData()->accepted;
     }
 
+    /**
+     * @return bool
+     */
     public function process()
     {
         $request = $this->getCurrentRequest();
-        if (null !== $request) {
-            $this->form->setData(new Authorize(
-                $request->request->has('accepted'),
-                $request->query->all()
-            ));
-
-            if ('POST' === $request->getMethod()) {
-                $this->form->handleRequest($request);
-                if ($this->form->isValid()) {
-                    $this->onSuccess();
-
-                    return true;
-                }
-            }
+
+        if (null === $request) {
+            return false;
+        }
+
+        $this->form->setData(new Authorize(
+            $request->request->has('accepted'),
+            $request->query->all()
+        ));
+
+        if ('POST' !== $request->getMethod()) {
+            return false;
+        }
+
+        $this->form->handleRequest($request);
+        if (!$this->form->isValid()) {
+            return false;
         }
 
-        return false;
+        $this->onSuccess();
+
+        return true;
     }
 
     public function getScope()
@@ -119,14 +127,14 @@ protected function onSuccess()
 
     private function getCurrentRequest()
     {
-        if (null !== $this->requestStack) {
-            if ($this->requestStack instanceof Request) {
-                return $this->requestStack;
-            }
+        if (null === $this->requestStack) {
+            return $this->container->get('request');
+        }
 
-            return $this->requestStack->getCurrentRequest();
+        if ($this->requestStack instanceof Request) {
+            return $this->requestStack;
         }
 
-        return $this->container->get('request');
+        return $this->requestStack->getCurrentRequest();
     }
 }