~ slightly refactored AuthorizeFormHandler

Author: dinamic

Form/Handler/AuthorizeFormHandler.php

@@ -71,26 +71,34 @@ public function isRejected()
         return !$this->form->getData()->accepted;
     }
 
+    /**
+     * @return bool|void
+     */
     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;
         }
 
-        return false;
+        $this->form->handleRequest($request);
+        if (!$this->form->isValid()) {
+            return;
+        }
+
+        $this->onSuccess();
+
+        return true;
     }
 
     public function getScope()
@@ -126,14 +134,14 @@ protected function onSuccess()
 
     private function getCurrentRequest()
     {
-        if (null !== $this->requestStack) {
-            if ($this->requestStack instanceof Request) {
-                return $this->requestStack;
-            } else {
-                return $this->requestStack->getCurrentRequest();
-            }
+        if (null === $this->requestStack) {
+            return $this->container->get('request');
+        }
+
+        if ($this->requestStack instanceof Request) {
+            return $this->requestStack;
         }
 
-        return $this->container->get('request');
+        return $this->requestStack->getCurrentRequest();
     }
 }