Broken tests

Reverted changes in tests and will try again
Arachne · Jul 16, 2018 · 11c1e68 · 11c1e68
1 parent 26ef015
commit 11c1e68
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/src/Application/VerifierPresenterTrait.php b/src/Application/VerifierPresenterTrait.php
@@ -64,7 +64,7 @@ public function getVerifier(): Verifier
      *
      * @return bool
      */
-    protected function tryCall(string $method, array $parameters): bool
+    protected function tryCall($method, array $parameters): bool
     {
         $called = parent::tryCall($method, $parameters);
         if (!$called && substr($method, 0, 6) === 'action') {

diff --git a/tests/functional/src/Classes/BlockControl.php b/tests/functional/src/Classes/BlockControl.php
@@ -32,10 +32,8 @@ public function render(): void
 
     /**
      * @Enabled( "$parameter" )
-     *
-     * @param string $parameter
      */
-    public function handleSignal(string $parameter): void
+    public function handleSignal($parameter): void
     {
         $this->template->message = 'Signal called!';
     }

diff --git a/tests/functional/src/Classes/ChildControl.php b/tests/functional/src/Classes/ChildControl.php
@@ -16,10 +16,8 @@ class ChildControl extends Control
 
     /**
      * @Enabled( "$parameter" )
-     *
-     * @param string $parameter
      */
-    public function handleSignal1(string $parameter): void
+    public function handleSignal1($parameter): void
     {
         $this->redirectVerified('signal2!');
     }

diff --git a/tests/functional/src/Classes/Enabled.php b/tests/functional/src/Classes/Enabled.php
@@ -13,6 +13,5 @@
  */
 class Enabled extends SecurityRule
 {
-    /** @var string|bool */
     public $value;
 }
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 = ((bool) $component ? $component.'-' : '').ltrim($rule->value, '$');
+            $parameter = ($component ? $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
             ]
         );
 
-        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherSecond(): void
@@ -54,7 +54,7 @@ public function testEitherSecond(): void
             ]
         );
 
-        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherFalse(): void
@@ -67,7 +67,7 @@ public function testEitherFalse(): void
             ]
         );
 
-        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testEitherInner(): void
@@ -80,7 +80,7 @@ public function testEitherInner(): void
             ]
         );
 
-        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllTrue(): void
@@ -93,7 +93,7 @@ public function testAllTrue(): void
             ]
         );
 
-        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllFalse(): void
@@ -106,7 +106,7 @@ public function testAllFalse(): void
             ]
         );
 
-        self::assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertFalse($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 
     public function testAllInner(): void
@@ -119,6 +119,6 @@ public function testAllInner(): void
             ]
         );
 
-        self::assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
+        $this->assertTrue($this->verifier->isLinkVerified($request, new TestPresenter()));
     }
 }
diff --git a/tests/unit/src/Classes/TestPresenter.php b/tests/unit/src/Classes/TestPresenter.php
@@ -14,7 +14,6 @@
 class TestPresenter extends Presenter
 {
     /**
-     * @var string
      * @TestRule
      */
     public $property;

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);
-            self::fail();
+            $this->fail();
         } catch (UnexpectedTypeException $e) {
         }