BUGFIX: Fix type hint in Signal method.

sandstorm · Jul 5, 2017 · b0a5acb · b0a5acb
1 parent 4800956
commit b0a5acb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Classes/Controller/LoginController.php b/Classes/Controller/LoginController.php
@@ -2,7 +2,6 @@
 namespace Sandstorm\UserManagement\Controller;
 
 use Neos\Error\Messages\Error;
-use Neos\Flow\Http\Request;
 use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Security\Exception\AuthenticationRequiredException;
 use Sandstorm\UserManagement\Domain\Service\RedirectTargetServiceInterface;
@@ -135,10 +134,10 @@ protected function getErrorFlashMessage()
 
     /**
      * @param ControllerContext $controllerContext
-     * @param Request $originalRequest
+     * @param ActionRequest $originalRequest
      * @Flow\Signal
      */
-    protected function emitAuthenticationSuccess(ControllerContext $controllerContext, Request $originalRequest = null)
+    protected function emitAuthenticationSuccess(ControllerContext $controllerContext, ActionRequest $originalRequest = null)
     {
     }
 

diff --git a/Classes/Domain/Service/Flow/FlowRedirectTargetService.php b/Classes/Domain/Service/Flow/FlowRedirectTargetService.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Sandstorm\UserManagement\Domain\Service\Flow;
 
 use Sandstorm\UserManagement\Domain\Service\RedirectTargetServiceInterface;
@@ -34,9 +35,7 @@ public function onAuthenticationSuccess(ControllerContext $controllerContext, Ac
             && array_key_exists('package', $this->redirectAfterLogin)
         ) {
             $controllerArguments = [];
-            if (array_key_exists('controllerArguments', $this->redirectAfterLogin) &&
-                is_array($this->redirectAfterLogin['controllerArguments'])
-            ) {
+            if (array_key_exists('controllerArguments', $this->redirectAfterLogin) && is_array($this->redirectAfterLogin['controllerArguments'])) {
                 $controllerArguments = $this->redirectAfterLogin['controllerArguments'];
             }
 
@@ -60,9 +59,7 @@ public function onLogout(ControllerContext $controllerContext)
             && array_key_exists('package', $this->redirectAfterLogout)
         ) {
             $controllerArguments = [];
-            if (array_key_exists('controllerArguments', $this->redirectAfterLogout) &&
-                is_array($this->redirectAfterLogout['controllerArguments'])
-            ) {
+            if (array_key_exists('controllerArguments', $this->redirectAfterLogout) && is_array($this->redirectAfterLogout['controllerArguments'])) {
                 $controllerArguments = $this->redirectAfterLogout['controllerArguments'];
             }
 

diff --git a/README.md b/README.md
@@ -294,13 +294,13 @@ Your example service could then look like this:
 ```PHP
 namespace Your\Package\Domain\Service;
 
-use Neos\Flow\Http\Request;
+use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Security\Exception\AuthenticationRequiredException;
 
 class ExampleService
 {
-    public function onAuthenticationSuccess(ControllerContext $controllerContext, Request $originalRequest = null)
+    public function onAuthenticationSuccess(ControllerContext $controllerContext, ActionRequest $originalRequest = null)
     {
         // Do custom stuff here
     }