Implemented requested changes

Arachne · Jul 16, 2018 · bcbd068 · bcbd068
1 parent 11c1e68
commit bcbd068
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/src/Annotations/AnnotationsRuleProvider.php b/src/Annotations/AnnotationsRuleProvider.php
@@ -29,8 +29,6 @@ public function __construct(Reader $reader)
     }
 
     /**
-     * @param Reflector $reflection
-     *
      * @return RuleInterface[]
      */
     public function getRules(Reflector $reflection): array

diff --git a/src/Application/VerifierControlTrait.php b/src/Application/VerifierControlTrait.php
@@ -34,7 +34,7 @@ public function checkRequirements($reflection): void
      *
      * @param int|string   $code
      * @param string|array $destination
-     * @param mixed[]      $parameters
+     * @param mixed        $parameters
      */
     public function redirectVerified($code, $destination = null, $parameters = []): void
     {
@@ -43,6 +43,8 @@ public function redirectVerified($code, $destination = null, $parameters = []):
             $parameters = is_array($destination) ? $destination : array_slice(func_get_args(), 1);
             $destination = $code;
             $code = null;
+        } elseif (!is_array($parameters)) {
+            $parameters = array_slice(func_get_args(), 2);
         }
 
         /** @var Presenter $presenter */

diff --git a/src/Application/VerifierPresenterTrait.php b/src/Application/VerifierPresenterTrait.php
@@ -56,13 +56,6 @@ public function getVerifier(): Verifier
 
     /**
      * Ensures that the action method exists.
-     *
-     * @param string $method
-     * @param array  $parameters
-     *
-     * @throws BadRequestException
-     *
-     * @return bool
      */
     protected function tryCall($method, array $parameters): bool
     {

diff --git a/src/Verifier.php b/src/Verifier.php
@@ -52,8 +52,6 @@ public function __construct(RuleProviderInterface $ruleProvider, callable $handl
     /**
      * Returns rules that are required for given reflection.
      *
-     * @param ReflectionClass|ReflectionMethod|ReflectionProperty $reflection
-     *
      * @return RuleInterface[]
      */
     public function getRules(Reflector $reflection): array
@@ -175,7 +173,7 @@ public function isComponentVerified(string $name, Request $request, Component $p
         if ($reflection->hasMethod($method)) {
             $factory = $reflection->getMethod($method);
             try {
-                $this->checkReflection($factory, $request, (bool) $parent->getParent() ? $parent->getUniqueId() : null);
+                $this->checkReflection($factory, $request, $parent->getParent() !== null ? $parent->getUniqueId() : null);
             } catch (VerificationException $e) {
                 return false;
             }
@@ -190,11 +188,11 @@ public function isComponentVerified(string $name, Request $request, Component $p
     public function verifyProperties(Request $request, Component $component): void
     {
         $reflection = new ReflectionClass($component);
-        $id = (bool) $component->getParent() ? $component->getUniqueId() : null;
+        $id = $component->getParent() !== null ? $component->getUniqueId() : null;
 
         foreach ($reflection->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
             $rules = $this->getRules($property);
-            if (!(bool) $rules) {
+            if ($rules === []) {
                 continue;
             }
 

diff --git a/tests/functional/src/Classes/EnabledRuleHandler.php b/tests/functional/src/Classes/EnabledRuleHandler.php
@@ -25,7 +25,7 @@ public function checkRule(RuleInterface $rule, Request $request, ?string $compon
 
         if (is_string($rule->value)) {
             $parameters = $request->getParameters();
-            $parameter = ($component ? $component.'-' : '').ltrim($rule->value, '$');
+            $parameter = ($component !== null ? $component.'-' : '').ltrim($rule->value, '$');
             $enabled = isset($parameters[$parameter]) && (bool) $parameters[$parameter];
         } else {
             $enabled = $rule->value;

diff --git a/tests/functional/src/RuleHandlersTest.php b/tests/functional/src/RuleHandlersTest.php
@@ -41,7 +41,7 @@ public function testEitherFirst(): void
             ]
         );
 
-        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherSecond(): void
@@ -54,7 +54,7 @@ public function testEitherSecond(): void
             ]
         );
 
-        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherFalse(): void
@@ -67,7 +67,7 @@ public function testEitherFalse(): void
             ]
         );
 
-        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherInner(): void
@@ -80,7 +80,7 @@ public function testEitherInner(): void
             ]
         );
 
-        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllTrue(): void
@@ -93,7 +93,7 @@ public function testAllTrue(): void
             ]
         );
 
-        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllFalse(): void
@@ -106,7 +106,7 @@ public function testAllFalse(): void
             ]
         );
 
-        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllInner(): void
@@ -119,6 +119,6 @@ public function testAllInner(): void
             ]
         );
 
-        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 }
diff --git a/tests/unit/src/VerifierTest.php b/tests/unit/src/VerifierTest.php
@@ -250,7 +250,7 @@ public function testInvalidRule(): void
 
         try {
             $this->verifier->isLinkVerified($request, $component);
-            $this->fail();
+            self::fail();
         } catch (UnexpectedTypeException $e) {
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,8 +29,6 @@ public function __construct(Reader $reader) @@
         }
         /**
-         * @param Reflector $reflection
-         *
          * @return RuleInterface[]
          */
         public function getRules(Reflector $reflection): array
@@ Expand Down @@