Add type hints

src/Application/ApplicationSubscriber.php

@@ -30,7 +30,7 @@ public function __construct(RequestEntityLoader $loader)
     /**
      * @return array
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             ApplicationEvents::REQUEST => 'requestHandler',
@@ -40,7 +40,7 @@ public static function getSubscribedEvents()
     /**
      * @throws BadRequestException
      */
-    public function requestHandler(ApplicationRequestEvent $event)
+    public function requestHandler(ApplicationRequestEvent $event): void
     {
         try {
             $this->loader->filterIn($event->getRequest());

src/Application/EntityLoaderPresenterTrait.php

@@ -30,7 +30,7 @@ trait EntityLoaderPresenterTrait
      */
     private $user;
 
-    final public function injectEntityLoader(RequestEntityLoader $loader, RequestEntityUnloader $unloader, User $user = null)
+    final public function injectEntityLoader(RequestEntityLoader $loader, RequestEntityUnloader $unloader, User $user = null): void
     {
         $this->loader = $loader;
         $this->unloader = $unloader;
@@ -45,7 +45,7 @@ final public function injectEntityLoader(RequestEntityLoader $loader, RequestEnt
      *
      * @return string
      */
-    public function storeRequest($request = null, $expiration = '+ 10 minutes')
+    public function storeRequest($request = null, $expiration = '+ 10 minutes'): string
     {
         // both parameters are optional
         if ($request === null) {
@@ -74,7 +74,7 @@ public function storeRequest($request = null, $expiration = '+ 10 minutes')
      *
      * @param string $key
      */
-    public function restoreRequest($key)
+    public function restoreRequest($key): void
     {
         $session = $this->getSession('Arachne.Application/requests');
         if (!isset($session[$key]) || ($this->user && $session[$key][0] !== null && $session[$key][0] !== $this->user->getId())) {

src/Application/ParameterFinder.php

@@ -145,7 +145,7 @@ private function loadMapping(string $presenter, array $parameters, array &$depen
     /**
      * @return ComponentReflection|null
      */
-    private function createReflection(ReflectionClass $reflection, string $component)
+    private function createReflection(ReflectionClass $reflection, string $component): ?ComponentReflection
     {
         $pos = strpos($component, IComponent::NAME_SEPARATOR);
         if ($pos !== false) {

src/Application/SecuredLinksPresenterTrait.php

@@ -13,15 +13,15 @@
 trait SecuredLinksPresenterTrait
 {
     use BaseSecuredLinksPresenterTrait {
-        getCsrfToken as private parentGetCsrfToken;
+        getCsrfToken as private nextrasGetCsrfToken;
     }
 
     /**
      * @var EntityUnloader
      */
     private $entityUnloader;
 
-    public function injectEntityUnloader(EntityUnloader $entityUnloader)
+    public function injectEntityUnloader(EntityUnloader $entityUnloader): void
     {
         $this->entityUnloader = $entityUnloader;
     }
@@ -33,7 +33,7 @@ public function injectEntityUnloader(EntityUnloader $entityUnloader)
      *
      * @return string
      */
-    public function getCsrfToken($control, $method, $params)
+    public function getCsrfToken($control, $method, $params): string
     {
         array_walk(
             $params,
@@ -44,6 +44,6 @@ function (&$value) {
             }
         );
 
-        return $this->parentGetCsrfToken($control, $method, $params);
+        return $this->nextrasGetCsrfToken($control, $method, $params);
     }
 }

src/DI/EntityLoaderExtension.php

@@ -58,7 +58,7 @@ class EntityLoaderExtension extends CompilerExtension
         StringFilterIn::class => 'string',
     ];
 
-    public function loadConfiguration()
+    public function loadConfiguration(): void
     {
         $this->validateConfig($this->defaults);
         $builder = $this->getContainerBuilder();
@@ -114,7 +114,7 @@ public function loadConfiguration()
             ->addTag(EventDispatcherExtension::TAG_SUBSCRIBER);
     }
 
-    public function beforeCompile()
+    public function beforeCompile(): void
     {
         $builder = $this->getContainerBuilder();
 

src/Routing/RouterWrapper.php

@@ -40,15 +40,15 @@ public function __construct(IRouter $router, RequestEntityUnloader $unloader, bo
     /**
      * {@inheritdoc}
      */
-    public function match(IRequest $httpRequest)
+    public function match(IRequest $httpRequest): ?Request
     {
         return $this->router->match($httpRequest);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function constructUrl(Request $request, Url $refUrl)
+    public function constructUrl(Request $request, Url $refUrl): ?string
     {
         $request = clone $request;
         $this->unloader->filterOut($request, $this->envelopes);

tests/functional/src/EntityLoaderPresenterTraitTest.php

@@ -6,6 +6,7 @@
 
 use Arachne\Codeception\Module\NetteApplicationModule;
 use Arachne\Codeception\Module\NetteDIModule;
+use Arachne\EntityLoader\Application\EntityLoaderPresenterTrait;
 use Codeception\Test\Unit;
 use Nette\Application\AbortException;
 use Nette\Application\Application;
@@ -20,9 +21,10 @@ class EntityLoaderPresenterTraitTest extends Unit
      */
     protected $tester;
 
-    public function testStoreRestoreRequest()
+    public function testStoreRestoreRequest(): void
     {
         $this->tester->amOnPage('/entity?parameter=5');
+        /** @var EntityLoaderPresenterTrait $presenter */
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
         $key = $presenter->storeRequest();
         try {

tests/functional/src/Fixtures/ArticlePresenter.php

@@ -16,39 +16,39 @@ class ArticlePresenter extends Presenter
     use EntityLoaderPresenterTrait;
     use SecuredLinksPresenterTrait;
 
-    public function startup()
+    public function startup(): void
     {
         $this->terminate();
     }
 
-    public function actionUntyped($parameter)
+    public function actionUntyped($parameter): void
     {
     }
 
-    public function actionEntity(Article $parameter)
+    public function actionEntity(Article $parameter): void
     {
     }
 
-    public function actionInt(int $parameter = 1)
+    public function actionInt(int $parameter = 1): void
     {
     }
 
-    public function actionBool(bool $parameter)
+    public function actionBool(bool $parameter): void
     {
     }
 
-    public function actionFloat(float $parameter)
+    public function actionFloat(float $parameter): void
     {
     }
 
-    public function actionString(string $parameter)
+    public function actionString(string $parameter): void
     {
     }
 
     /**
      * @secured
      */
-    public function handleSignal(Article $parameter)
+    public function handleSignal(Article $parameter): void
     {
     }
 }

tests/functional/src/RequestEntityLoaderTest.php

@@ -22,7 +22,7 @@ class RequestEntityLoaderTest extends Unit
      */
     protected $tester;
 
-    public function testUntyped()
+    public function testUntyped(): void
     {
         $this->tester->amOnPage('/untyped?parameter=5');
         $request = $this->tester->grabService(Application::class)->getPresenter()->getRequest();
@@ -35,7 +35,7 @@ public function testUntyped()
         );
     }
 
-    public function testEntity()
+    public function testEntity(): void
     {
         $this->tester->amOnPage('/entity?parameter=5');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -50,7 +50,7 @@ public function testEntity()
         );
     }
 
-    public function testInt()
+    public function testInt(): void
     {
         $this->tester->amOnPage('/int?parameter=5');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -65,7 +65,7 @@ public function testInt()
         );
     }
 
-    public function testIntWithDefault()
+    public function testIntWithDefault(): void
     {
         $this->tester->amOnPage('/int');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -79,7 +79,7 @@ public function testIntWithDefault()
         );
     }
 
-    public function testIntError()
+    public function testIntError(): void
     {
         try {
             $this->tester->amOnPage('/int?parameter[]=0');
@@ -88,7 +88,7 @@ public function testIntError()
         }
     }
 
-    public function testBool()
+    public function testBool(): void
     {
         $this->tester->amOnPage('/bool?parameter=1');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -103,7 +103,7 @@ public function testBool()
         );
     }
 
-    public function testBoolError()
+    public function testBoolError(): void
     {
         try {
             $this->tester->amOnPage('/bool?parameter[]=0');
@@ -112,7 +112,7 @@ public function testBoolError()
         }
     }
 
-    public function testFloat()
+    public function testFloat(): void
     {
         $this->tester->amOnPage('/float?parameter=1');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -127,7 +127,7 @@ public function testFloat()
         );
     }
 
-    public function testFloatError()
+    public function testFloatError(): void
     {
         try {
             $this->tester->amOnPage('/float?parameter[]=0');
@@ -136,7 +136,7 @@ public function testFloatError()
         }
     }
 
-    public function testString()
+    public function testString(): void
     {
         $this->tester->amOnPage('/string?parameter=1');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();
@@ -151,7 +151,7 @@ public function testString()
         );
     }
 
-    public function testStringError()
+    public function testStringError(): void
     {
         try {
             $this->tester->amOnPage('/string?parameter[]=0');

tests/functional/src/RequestEntityUnloaderTest.php

@@ -20,7 +20,7 @@ class RequestEntityUnloaderTest extends Unit
      */
     protected $tester;
 
-    public function testLink()
+    public function testLink(): void
     {
         $this->tester->amOnPage('/default');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();

tests/functional/src/SecuredLinksPresenterTraitTest.php

@@ -20,7 +20,7 @@ class SecuredLinksPresenterTraitTest extends Unit
      */
     protected $tester;
 
-    public function testLink()
+    public function testLink(): void
     {
         $this->tester->amOnPage('/default');
         $presenter = $this->tester->grabService(Application::class)->getPresenter();

tests/unit/src/Classes/TestComponent.php

@@ -18,7 +18,7 @@ class TestComponent extends PresenterComponent
      */
     public $persistent;
 
-    public function handleTestHandle(Class6 $handleEntity)
+    public function handleTestHandle(Class6 $handleEntity): void
     {
     }
 

tests/unit/src/Classes/TestPresenter.php

@@ -25,23 +25,23 @@ class TestPresenter extends Presenter
      */
     public $persistent2;
 
-    public function actionTestAction(Class2 $actionEntity)
+    public function actionTestAction(Class2 $actionEntity): void
     {
     }
 
-    public function renderTestRender(Class3 $renderEntity)
+    public function renderTestRender(Class3 $renderEntity): void
     {
     }
 
-    public function handleTestHandle(Class4 $handleEntity)
+    public function handleTestHandle(Class4 $handleEntity): void
     {
     }
 
-    public function handleNoTypehintHandle($handleEntity)
+    public function handleNoTypehintHandle($handleEntity): void
     {
     }
 
-    public function actionNonexistentParameter($entity)
+    public function actionNonexistentParameter($entity): void
     {
     }
 

tests/unit/src/EntityLoaderTest.php

@@ -33,14 +33,14 @@ class EntityLoaderTest extends Unit
      */
     private $filterIterator;
 
-    protected function _before()
+    protected function _before(): void
     {
         $this->filterHandle = Phony::mock(FilterInInterface::class);
         $this->filterIterator = new ArrayObject();
         $this->entityLoader = new EntityLoader($this->filterIterator);
     }
 
-    public function testFilterIn()
+    public function testFilterIn(): void
     {
         $this->filterIterator[] = $this->filterHandle->get();
 
@@ -62,7 +62,7 @@ public function testFilterIn()
             ->calledWith(1, DateTime::class);
     }
 
-    public function testFilterInFail()
+    public function testFilterInFail(): void
     {
         $this->filterIterator[] = $this->filterHandle->get();
 
@@ -83,14 +83,14 @@ public function testFilterInFail()
         }
     }
 
-    public function testFilterInIgnore()
+    public function testFilterInIgnore(): void
     {
         // Make sure that the converter is not called at all if the parameter already has the desired type.
         $mock1 = Phony::mock(DateTime::class)->get();
         self::assertSame($mock1, $this->entityLoader->filterIn(DateTime::class, $mock1));
     }
 
-    public function testFilterNotFound()
+    public function testFilterNotFound(): void
     {
         $parameters = [
             'entity' => 'value1',