fix block tests

concretecms · Aug 14, 2018 · 070a68c · 070a68c
1 parent be6a86a
commit 070a68c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/concrete/src/Block/BlockController.php b/concrete/src/Block/BlockController.php
@@ -499,7 +499,7 @@ public function validateComposerAddBlockPassThruAction(Type $type)
     /**
      * @return int|null
      */
-    public function getBlockTypeID(): ?int
+    public function getBlockTypeID()
     {
         return $this->btID;
     }

diff --git a/tests/tests/Block/BlockActionTest.php b/tests/tests/Block/BlockActionTest.php
@@ -71,8 +71,13 @@ public function testBlockAddAction()
         $url = $controller->getActionURL('delete_form', 'token');
 
         $this->assertEquals('http://www.dummyco.com/path/to/server/index.php/ccm/system/block/action/add/123/Main/4/delete_form/token', (string)$url);
+    }
 
+    protected function tearDown()
+    {
+        $req = Request::getInstance();
         $req->clearcurrentPage();
+        parent::tearDown();
     }
 
     protected function getTestBlockViewEditObject()