Updated tests for new version of the PHPUnit

Anton Shevchuk · Anton Shevchuk · commit 0b1b9e2657b3 · 2021-07-01T17:25:34.000+03:00
diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -1,12 +1,12 @@
 actor: Tester
+bootstrap: _bootstrap.php
 paths:
     tests: tests
     log: tests/_output
     data: tests/_data
     support: tests/_support
     envs: tests/_envs
 settings:
-    bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
 extensions:
diff --git a/composer.json b/composer.json
@@ -10,15 +10,17 @@
         "ext-ctype": "*",
         "bluzphp/collection": "~1.0",
         "cache/cache": "~1.0",
-        "psr/log": "~1.0",
-        "laminas/laminas-diactoros": "~2.5",
-        "laminas/laminas-httphandlerrunner": "~1.3"
+        "psr/log": "~1.1",
+        "laminas/laminas-diactoros": "~2.6",
+        "laminas/laminas-httphandlerrunner": "~1.4"
     },
     "require-dev": {
-        "codeception/codeception": "~2.5.3",
-        "php-coveralls/php-coveralls": "~2.1",
-        "squizlabs/php_codesniffer": "~3.3",
-        "phploc/phploc": "~4.0"
+        "codeception/codeception": "~4.1",
+        "codeception/module-asserts": "~1.3",
+        "codeception/module-phpbrowser": "~1.0",
+        "php-coveralls/php-coveralls": "~2.4",
+        "squizlabs/php_codesniffer": "~3.6",
+        "phploc/phploc": "~7.0"
     },
     "suggest": {
         "ext-gettext": "required by Bluz\\Translator (https://github.com/bluzphp/framework/wiki/Translator)",
diff --git a/tests/src/FrameworkTestCase.php b/tests/src/FrameworkTestCase.php
@@ -37,15 +37,15 @@ class FrameworkTestCase extends Unit
     /**
      * Setup TestCase
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         self::getApp();
     }
 
     /**
      * Tear Down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         self::resetApp();
     }
diff --git a/tests/unit/Common/ContainerTest.php b/tests/unit/Common/ContainerTest.php
@@ -34,7 +34,7 @@ class ContainerTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->class = new ConcreteContainer();
     }
diff --git a/tests/unit/Common/HelperTest.php b/tests/unit/Common/HelperTest.php
@@ -32,7 +32,7 @@ class HelperTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->class = new ConcreteHelpers();
     }
diff --git a/tests/unit/Common/NilTest.php b/tests/unit/Common/NilTest.php
@@ -29,7 +29,7 @@ class NilTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nil = new Nil();
     }
diff --git a/tests/unit/Common/OptionsTest.php b/tests/unit/Common/OptionsTest.php
@@ -34,7 +34,7 @@ class OptionsTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->class = new ConcreteOptions();
         $this->options = ['foo' => 'bar', 'foo bar' => 'qux', 'baz' => ['foo' => 'bar'], 'moo' => 'Moo'];
diff --git a/tests/unit/Controller/ControllerTest.php b/tests/unit/Controller/ControllerTest.php
@@ -27,7 +27,7 @@ class ControllerTest extends FrameworkTestCase
     /**
      * Create `index/index` controller
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->controller = self::getApp()->dispatch('index', 'index');
     }
diff --git a/tests/unit/Controller/Mapper/CrudTest.php b/tests/unit/Controller/Mapper/CrudTest.php
@@ -28,15 +28,15 @@ class CrudTest extends FrameworkTestCase
      */
     protected $mapper;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $crudTable = TableCrud::getInstance();
         $crudTable->setTable(Table::getInstance());
         $this->mapper = new Crud($crudTable);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         TableCrud::getInstance()->resetTable();
diff --git a/tests/unit/Controller/Mapper/RestTest.php b/tests/unit/Controller/Mapper/RestTest.php
@@ -29,15 +29,15 @@ class RestTest extends FrameworkTestCase
      */
     protected $mapper;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $crudTable = TableCrud::getInstance();
         $crudTable->setTable(Table::getInstance());
         $this->mapper = new Rest($crudTable);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         TableCrud::getInstance()->resetTable();
diff --git a/tests/unit/Crud/TableTest.php b/tests/unit/Crud/TableTest.php
@@ -32,7 +32,7 @@ class TableTest extends FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->crudTable = TableCrud::getInstance();
@@ -47,7 +47,7 @@ public function setUp()
     /**
      * tearDown
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         Db::query(
             'DELETE FROM `test` WHERE `name` = "CrudTestTable"'
diff --git a/tests/unit/Db/DbTest.php b/tests/unit/Db/DbTest.php
@@ -30,7 +30,7 @@ class DbTest extends Bluz\Tests\FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -41,7 +41,7 @@ public function setUp()
     /**
      * tearDown
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/unit/Db/QueryTest.php b/tests/unit/Db/QueryTest.php
@@ -26,7 +26,7 @@ class QueryTest extends FrameworkTestCase
     /**
      * tearDown
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         Proxy\Db::delete('test')->where('email = ?', 'example@domain.com')->execute();
         parent::tearDown();
diff --git a/tests/unit/Db/RelationTest.php b/tests/unit/Db/RelationTest.php
@@ -17,14 +17,14 @@ class RelationTest extends FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * tearDown
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
diff --git a/tests/unit/Db/RowTest.php b/tests/unit/Db/RowTest.php
@@ -31,7 +31,7 @@ class RowTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         self::getApp();
         $this->row = new Db\ConcreteRow();
diff --git a/tests/unit/Db/TableTest.php b/tests/unit/Db/TableTest.php
@@ -28,7 +28,7 @@ class TableTest extends FrameworkTestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         self::getApp();
         $this->table = Db\ConcreteTable::getInstance();
diff --git a/tests/unit/EventManager/EventManagerTest.php b/tests/unit/EventManager/EventManagerTest.php
@@ -30,7 +30,7 @@ class EventManagerTest extends Bluz\Tests\FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->eventManager = new EventManager();
     }
diff --git a/tests/unit/Grid/GridTest.php b/tests/unit/Grid/GridTest.php
@@ -23,7 +23,7 @@ class GridTest extends FrameworkTestCase
     /**
      * Reset application
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         self::resetApp();
     }
diff --git a/tests/unit/Http/CacheControlTest.php b/tests/unit/Http/CacheControlTest.php
@@ -34,7 +34,7 @@ class CacheControlTest extends FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->response = new Response();
         $this->cacheControl = new CacheControl($this->response);
diff --git a/tests/unit/Messages/MessagesTest.php b/tests/unit/Messages/MessagesTest.php
@@ -27,7 +27,7 @@ class MessagesTest extends FrameworkTestCase
      * @return void
      * @throws \Bluz\Application\Exception\ApplicationException
      */
-    public function setUp()
+    public function setUp(): void
     {
         // initialize application
         self::getApp();
diff --git a/tests/unit/Registry/RegistryTest.php b/tests/unit/Registry/RegistryTest.php
@@ -29,7 +29,7 @@ class RegistryTest extends FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Response/ResponseTest.php b/tests/unit/Response/ResponseTest.php
@@ -26,7 +26,7 @@ class ResponseTest extends FrameworkTestCase
     /**
      * SetUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->response = new Response();
     }
diff --git a/tests/unit/Session/SessionTest.php b/tests/unit/Session/SessionTest.php
@@ -28,7 +28,7 @@ class SessionTest extends FrameworkTestCase
     /**
      * setUp
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Validator/Rule/ArrayInputTest.php b/tests/unit/Validator/Rule/ArrayInputTest.php
@@ -22,7 +22,7 @@ class ArrayInputTest extends Tests\FrameworkTestCase
      */
     protected $rule;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule('is_numeric');
     }
diff --git a/tests/unit/Validator/Rule/CallbackTest.php b/tests/unit/Validator/Rule/CallbackTest.php
@@ -30,7 +30,7 @@ class CallbackTest extends Tests\FrameworkTestCase
     /**
      * Setup Callbacks
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->alwaysTrue = new Rule(
             function () {
diff --git a/tests/unit/Validator/Rule/CountryCodeTest.php b/tests/unit/Validator/Rule/CountryCodeTest.php
@@ -25,7 +25,7 @@ class CountryCodeTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/CreditCardTest.php b/tests/unit/Validator/Rule/CreditCardTest.php
@@ -25,7 +25,7 @@ class CreditCardTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/DateTest.php b/tests/unit/Validator/Rule/DateTest.php
@@ -25,7 +25,7 @@ class DateTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/FloatInputTest.php b/tests/unit/Validator/Rule/FloatInputTest.php
@@ -25,7 +25,7 @@ class FloatInputTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/IntegerTest.php b/tests/unit/Validator/Rule/IntegerTest.php
@@ -25,7 +25,7 @@ class IntegerTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/JsonTest.php b/tests/unit/Validator/Rule/JsonTest.php
@@ -25,7 +25,7 @@ class JsonTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/NegativeTest.php b/tests/unit/Validator/Rule/NegativeTest.php
@@ -25,7 +25,7 @@ class NegativeTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/NoWhitespaceTest.php b/tests/unit/Validator/Rule/NoWhitespaceTest.php
@@ -25,7 +25,7 @@ class NoWhitespaceTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/NotEmptyTest.php b/tests/unit/Validator/Rule/NotEmptyTest.php
@@ -25,7 +25,7 @@ class NotEmptyTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/NumericTest.php b/tests/unit/Validator/Rule/NumericTest.php
@@ -25,7 +25,7 @@ class NumericTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/PositiveTest.php b/tests/unit/Validator/Rule/PositiveTest.php
@@ -25,7 +25,7 @@ class PositiveTest extends Tests\FrameworkTestCase
     /**
      * Setup validator instance
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rule = new Rule();
     }
diff --git a/tests/unit/Validator/Rule/RequiredTest.php b/tests/unit/Validator/Rule/RequiredTest.php
diff --git a/tests/unit/Validator/Rule/SlugTest.php b/tests/unit/Validator/Rule/SlugTest.php
diff --git a/tests/unit/Validator/Rule/StringInputTest.php b/tests/unit/Validator/Rule/StringInputTest.php
diff --git a/tests/unit/Validator/Rule/VersionTest.php b/tests/unit/Validator/Rule/VersionTest.php
diff --git a/tests/unit/View/ViewTest.php b/tests/unit/View/ViewTest.php

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ class FrameworkTestCase extends Unit`
`37`	`37`	`/**`
`38`	`38`	`* Setup TestCase`
`39`	`39`	`*/`
`40`		`- protected function setUp()`
	`40`	`+ protected function setUp(): void`
`41`	`41`	`{`
`42`	`42`	`self::getApp();`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Tear Down`
`47`	`47`	`*/`
`48`		`- protected function tearDown()`
	`48`	`+ protected function tearDown(): void`
`49`	`49`	`{`
`50`	`50`	`self::resetApp();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ContainerTest extends FrameworkTestCase`
`34`	`34`	`* Sets up the fixture, for example, opens a network connection.`
`35`	`35`	`* This method is called before a test is executed.`
`36`	`36`	`*/`
`37`		`- protected function setUp()`
	`37`	`+ protected function setUp(): void`
`38`	`38`	`{`
`39`	`39`	`$this->class = new ConcreteContainer();`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class HelperTest extends FrameworkTestCase`
`32`	`32`	`* Sets up the fixture, for example, opens a network connection.`
`33`	`33`	`* This method is called before a test is executed.`
`34`	`34`	`*/`
`35`		`- protected function setUp()`
	`35`	`+ protected function setUp(): void`
`36`	`36`	`{`
`37`	`37`	`$this->class = new ConcreteHelpers();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class NilTest extends FrameworkTestCase`
`29`	`29`	`* Sets up the fixture, for example, opens a network connection.`
`30`	`30`	`* This method is called before a test is executed.`
`31`	`31`	`*/`
`32`		`- protected function setUp()`
	`32`	`+ protected function setUp(): void`
`33`	`33`	`{`
`34`	`34`	`$this->nil = new Nil();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class OptionsTest extends FrameworkTestCase`
`34`	`34`	`* Sets up the fixture, for example, opens a network connection.`
`35`	`35`	`* This method is called before a test is executed.`
`36`	`36`	`*/`
`37`		`- protected function setUp()`
	`37`	`+ protected function setUp(): void`
`38`	`38`	`{`
`39`	`39`	`$this->class = new ConcreteOptions();`
`40`	`40`	`$this->options = ['foo' => 'bar', 'foo bar' => 'qux', 'baz' => ['foo' => 'bar'], 'moo' => 'Moo'];`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class ControllerTest extends FrameworkTestCase`
`27`	`27`	`/**`
`28`	`28`	* Create `index/index` controller
`29`	`29`	`*/`
`30`		`- public function setUp()`
	`30`	`+ public function setUp(): void`
`31`	`31`	`{`
`32`	`32`	`$this->controller = self::getApp()->dispatch('index', 'index');`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ class CrudTest extends FrameworkTestCase`
`28`	`28`	`*/`
`29`	`29`	`protected $mapper;`
`30`	`30`
`31`		`- public function setUp()`
	`31`	`+ public function setUp(): void`
`32`	`32`	`{`
`33`	`33`	`parent::setUp();`
`34`	`34`	`$crudTable = TableCrud::getInstance();`
`35`	`35`	`$crudTable->setTable(Table::getInstance());`
`36`	`36`	`$this->mapper = new Crud($crudTable);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function tearDown()`
	`39`	`+ public function tearDown(): void`
`40`	`40`	`{`
`41`	`41`	`parent::tearDown();`
`42`	`42`	`TableCrud::getInstance()->resetTable();`
Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ class RestTest extends FrameworkTestCase`
`29`	`29`	`*/`
`30`	`30`	`protected $mapper;`
`31`	`31`
`32`		`- public function setUp()`
	`32`	`+ public function setUp(): void`
`33`	`33`	`{`
`34`	`34`	`parent::setUp();`
`35`	`35`	`$crudTable = TableCrud::getInstance();`
`36`	`36`	`$crudTable->setTable(Table::getInstance());`
`37`	`37`	`$this->mapper = new Rest($crudTable);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function tearDown()`
	`40`	`+ public function tearDown(): void`
`41`	`41`	`{`
`42`	`42`	`parent::tearDown();`
`43`	`43`	`TableCrud::getInstance()->resetTable();`