Fix php linting errors

ministryofjustice · Dec 7, 2023 · aa6772b · aa6772b
1 parent 25900b4
commit aa6772b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/service-front/app/src/Common/src/Handler/AbstractHandler.php b/service-front/app/src/Common/src/Handler/AbstractHandler.php
@@ -34,19 +34,19 @@ abstract public function handle(ServerRequestInterface $request): ResponseInterf
 
     /**
      * Handles a redirect to route
-     * localeOverride used to override from English to Welsh only
+     * $basePathOverride used to override from English to Welsh only
      *
      * @param $route
      * @param $routeParams
      * @param $queryParams
-     * @param string|null $localeOverride
+     * @param string|null $basePathOverride
      * @return RedirectResponse
      */
-    public function redirectToRoute($route, $routeParams = [], $queryParams = [], ?string $localeOverride = null): RedirectResponse
+    public function redirectToRoute($route, $routeParams = [], $queryParams = [], ?string $basePathOverride = null): RedirectResponse
     {
         //TODO: UML-3203 Identify if OneLogin can handle multiple redirect urls, then remove
-        if ($localeOverride !== null) {
-            $this->urlHelper->setBasePath($localeOverride);
+        if ($basePathOverride !== null) {
+            $this->urlHelper->setBasePath($basePathOverride);
         }
         return new RedirectResponse($this->urlHelper->generate($route, $routeParams, $queryParams));
     }

diff --git a/service-front/app/test/CommonTest/Handler/AbstractHandlerTest.php b/service-front/app/test/CommonTest/Handler/AbstractHandlerTest.php
@@ -4,23 +4,13 @@
 
 namespace CommonTest\Handler;
 
-use Common\Handler\AbstractHandler;
-use Exception;
+use CommonTest\Handler\TestableAbstractHandler;
 use Mezzio\Helper\UrlHelper;
 use Mezzio\Template\TemplateRendererInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-class TestableAbstractHandler extends AbstractHandler {
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        throw new Exception('Not implemented');
-    }
-}
 
 class AbstractHandlerTest extends TestCase
 {
@@ -44,7 +34,7 @@ public function testRedirectToRouteWithOverride(): void
         $renderer = $this->prophesize(TemplateRendererInterface::class);
 
         $abstractHandler = new TestableAbstractHandler($renderer->reveal(), $urlHelperMock->reveal());
-        $response = $abstractHandler->redirectToRoute(
+        $response        = $abstractHandler->redirectToRoute(
             'fake-route',
             ['fake-route-parameters'],
             ['fake-query-parameters'],
@@ -66,7 +56,7 @@ public function testRedirectToRouteOverrideSetToNull(): void
         $renderer = $this->prophesize(TemplateRendererInterface::class);
 
         $abstractHandler = new TestableAbstractHandler($renderer->reveal(), $urlHelperMock->reveal());
-        $response = $abstractHandler->redirectToRoute('fake-route');
+        $response        = $abstractHandler->redirectToRoute('fake-route');
         $this->assertEquals('/fake-route', $response->getHeader('location')[0]);
     }
 }
diff --git a/service-front/app/test/CommonTest/Handler/TestableAbstractHandler.php b/service-front/app/test/CommonTest/Handler/TestableAbstractHandler.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommonTest\Handler;
+
+use Common\Handler\AbstractHandler;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class TestableAbstractHandler extends AbstractHandler
+{
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        throw new Exception('Not implemented');
+    }
+}