Merge pull request #2267 from MGatner/tests-void

Tests setUp and tearDown: void
codeigniter4 · Sep 26, 2019 · 56717ad · 56717ad
2 parents 3dfedfe + 8f71991
commit 56717ad
Show file tree

Hide file tree

Showing 128 changed files with 161 additions and 161 deletions.
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
@@ -158,7 +158,7 @@ public function loadDependencies()
 	 *
 	 * @throws ConfigException
 	 */
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -213,7 +213,7 @@ protected function setUp()
 	 * Takes care of any required cleanup after the test, like
 	 * removing any rows inserted via $this->hasInDatabase()
 	 */
-	public function tearDown()
+	public function tearDown(): void
 	{
 		if (! empty($this->insertCache))
 		{

diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
@@ -56,7 +56,7 @@ class CIUnitTestCase extends TestCase
 	 */
 	protected $app;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
@@ -19,7 +19,7 @@ class ResponseTraitTest extends \CIUnitTestCase
 	 */
 	protected $formatter;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
@@ -14,7 +14,7 @@ class AutoloaderTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
@@ -11,7 +11,7 @@ class FileLocatorTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
@@ -7,15 +7,15 @@ class CLITest extends \CIUnitTestCase
 
 	private $stream_filter;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		stream_filter_remove($this->stream_filter);
 	}

diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
@@ -17,7 +17,7 @@ class CommandRunnerTest extends \CIUnitTestCase
 	protected $logger;
 	protected $runner;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -48,7 +48,7 @@ protected function setUp()
 		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		stream_filter_remove($this->stream_filter);
 	}

diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
@@ -10,7 +10,7 @@ class ConsoleTest extends \CIUnitTestCase
 
 	private $stream_filter;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -36,7 +36,7 @@ protected function setUp()
 		$this->app = new MockCodeIgniter(new MockCLIConfig());
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		stream_filter_remove($this->stream_filter);
 	}

diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
@@ -8,7 +8,7 @@ class CacheFactoryTest extends \CIUnitTestCase
 	private $cacheFactory;
 	private $config;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -19,7 +19,7 @@ protected function setUp()
 		$this->config->storePath .= self::$directory;
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		if (is_dir($this->config->storePath))
 		{

diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -4,7 +4,7 @@ class DummyHandlerTest extends \CIUnitTestCase
 {
 	private $dummyHandler;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		$this->dummyHandler = new DummyHandler();
 		$this->dummyHandler->initialize();

diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -26,7 +26,7 @@ private static function getKeyArray()
 	private $fileHandler;
 	private $config;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -43,7 +43,7 @@ protected function setUp()
 		$this->fileHandler->initialize();
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		if (is_dir($this->config->storePath))
 		{

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -18,7 +18,7 @@ private static function getKeyArray()
 	private static $dummy = 'dymmy';
 	private $config;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -33,7 +33,7 @@ protected function setUp()
 		$this->memcachedHandler->initialize();
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		foreach (self::getKeyArray() as $key)
 		{

diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -54,7 +54,7 @@ private static function getKeyArray()
 	private static $dummy = 'dymmy';
 	private $config;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -69,7 +69,7 @@ protected function setUp()
 		$this->redisHandler->initialize();
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		foreach (self::getKeyArray() as $key)
 		{

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
@@ -19,7 +19,7 @@ class CodeIgniterTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -31,7 +31,7 @@ protected function setUp()
 		$this->codeigniter = new MockCodeIgniter($config);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		parent::tearDown();
 

diff --git a/tests/system/Commands/CommandClassTest.php b/tests/system/Commands/CommandClassTest.php
@@ -9,7 +9,7 @@ class BaseCommandTest extends \CIUnitTestCase
 	protected $logger;
 	protected $runner;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->logger   = Services::logger();

diff --git a/tests/system/Commands/CommandsTest.php b/tests/system/Commands/CommandsTest.php
@@ -19,7 +19,7 @@ class CommandsTest extends \CIUnitTestCase
 	protected $logger;
 	protected $runner;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -50,7 +50,7 @@ protected function setUp()
 		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		stream_filter_remove($this->stream_filter);
 	}

diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
@@ -18,7 +18,7 @@ class SessionsCommandsTest extends \CIUnitTestCase
 	protected $runner;
 	private $result;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -49,7 +49,7 @@ protected function setUp()
 		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		stream_filter_remove($this->stream_filter);
 

diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
@@ -4,7 +4,7 @@
 class CommonFunctionsSendTest extends \CIUnitTestCase
 {
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -21,7 +21,7 @@ class CommonFunctionsTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
@@ -10,7 +10,7 @@ class BaseConfigTest extends CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
@@ -15,7 +15,7 @@ class DotEnvTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -29,7 +29,7 @@ protected function setUp()
 		chmod($path, 0644);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		parent::tearDown();
 

diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
@@ -9,7 +9,7 @@ class ServicesTest extends \CIUnitTestCase
 	protected $config;
 	protected $original;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -20,7 +20,7 @@ protected function setUp()
 		//      $this->config->supportedLocales = ['en', 'es'];
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		$_SERVER = $this->original;
 	}

diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
@@ -45,7 +45,7 @@ class ControllerTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
@@ -8,7 +8,7 @@ class QueryTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
@@ -8,7 +8,7 @@ class AliasTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
@@ -9,7 +9,7 @@ class CountTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
@@ -8,7 +8,7 @@ class DeleteTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
@@ -9,7 +9,7 @@ class DistinctTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
@@ -9,7 +9,7 @@ class EmptyTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
@@ -9,7 +9,7 @@ class FromTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
@@ -8,7 +8,7 @@ class GetTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();