From 75716f76bc4552645e1d52029bd286ec04623340 Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Wed, 28 Dec 2022 16:03:39 +0900 Subject: [PATCH] test: Add return type declarations to overridden methods of TestCase classes. --- lib/Cake/Test/Case/BasicsTest.php | 2 +- lib/Cake/Test/Case/Cache/CacheTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php | 4 ++-- .../Test/Case/Cache/Engine/MemcachedEngineTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php | 4 ++-- lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php | 4 ++-- lib/Cake/Test/Case/Configure/IniReaderTest.php | 2 +- lib/Cake/Test/Case/Configure/PhpReaderTest.php | 2 +- lib/Cake/Test/Case/Console/Command/AclShellTest.php | 2 +- lib/Cake/Test/Case/Console/Command/ApiShellTest.php | 2 +- lib/Cake/Test/Case/Console/Command/BakeShellTest.php | 4 ++-- .../Test/Case/Console/Command/CommandListShellTest.php | 4 ++-- .../Test/Case/Console/Command/CompletionShellTest.php | 4 ++-- lib/Cake/Test/Case/Console/Command/SchemaShellTest.php | 4 ++-- .../Test/Case/Console/Command/Task/CommandTaskTest.php | 4 ++-- .../Case/Console/Command/Task/ControllerTaskTest.php | 4 ++-- .../Case/Console/Command/Task/DbConfigTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/ExtractTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/FixtureTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/ModelTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/PluginTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/ProjectTaskTest.php | 4 ++-- .../Case/Console/Command/Task/TemplateTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/TestTaskTest.php | 4 ++-- .../Test/Case/Console/Command/Task/ViewTaskTest.php | 4 ++-- lib/Cake/Test/Case/Console/Command/TestShellTest.php | 4 ++-- lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php | 4 ++-- lib/Cake/Test/Case/Console/ConsoleOutputTest.php | 4 ++-- .../Case/Console/Helper/ProgressShellHelperTest.php | 4 ++-- .../Test/Case/Console/Helper/TableShellHelperTest.php | 4 ++-- lib/Cake/Test/Case/Console/ShellDispatcherTest.php | 4 ++-- lib/Cake/Test/Case/Console/ShellTest.php | 2 +- lib/Cake/Test/Case/Console/TaskCollectionTest.php | 4 ++-- .../Test/Case/Controller/ApplicationControllerTest.php | 4 ++-- .../Test/Case/Controller/Component/Acl/DbAclTest.php | 4 ++-- .../Test/Case/Controller/Component/Acl/PhpAclTest.php | 2 +- .../Case/Controller/Component/AclComponentTest.php | 4 ++-- .../Controller/Component/Auth/ActionsAuthorizeTest.php | 2 +- .../Component/Auth/BasicAuthenticateTest.php | 2 +- .../Component/Auth/BlowfishAuthenticateTest.php | 2 +- .../Component/Auth/ControllerAuthorizeTest.php | 2 +- .../Controller/Component/Auth/CrudAuthorizeTest.php | 2 +- .../Component/Auth/DigestAuthenticateTest.php | 4 ++-- .../Controller/Component/Auth/FormAuthenticateTest.php | 2 +- .../Case/Controller/Component/AuthComponentTest.php | 4 ++-- .../Case/Controller/Component/CookieComponentTest.php | 4 ++-- .../Case/Controller/Component/EmailComponentTest.php | 2 +- .../Case/Controller/Component/FlashComponentTest.php | 4 ++-- .../Controller/Component/PaginatorComponentTest.php | 2 +- .../Component/RequestHandlerComponentTest.php | 4 ++-- .../Controller/Component/SecurityComponentTest.php | 4 ++-- .../Case/Controller/Component/SessionComponentTest.php | 8 ++++---- .../Test/Case/Controller/ComponentCollectionTest.php | 4 ++-- lib/Cake/Test/Case/Controller/ComponentTest.php | 2 +- lib/Cake/Test/Case/Controller/ControllerTest.php | 4 ++-- lib/Cake/Test/Case/Controller/ScaffoldTest.php | 4 ++-- lib/Cake/Test/Case/Core/AppTest.php | 4 ++-- lib/Cake/Test/Case/Core/CakeObjectTest.php | 4 ++-- lib/Cake/Test/Case/Core/CakePluginTest.php | 4 ++-- lib/Cake/Test/Case/Core/ConfigureTest.php | 6 +++--- lib/Cake/Test/Case/Error/ErrorHandlerTest.php | 4 ++-- lib/Cake/Test/Case/Error/ExceptionRendererTest.php | 4 ++-- lib/Cake/Test/Case/I18n/I18nTest.php | 4 ++-- lib/Cake/Test/Case/I18n/L10nTest.php | 2 +- lib/Cake/Test/Case/Log/CakeLogTest.php | 2 +- lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php | 4 ++-- lib/Cake/Test/Case/Log/LogEngineCollectionTest.php | 2 +- lib/Cake/Test/Case/Model/AclNodeTest.php | 2 +- lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php | 6 +++--- .../Case/Model/Behavior/ContainableBehaviorTest.php | 4 ++-- lib/Cake/Test/Case/Model/CakeSchemaTest.php | 4 ++-- lib/Cake/Test/Case/Model/ConnectionManagerTest.php | 2 +- .../Test/Case/Model/Datasource/CakeSessionTest.php | 8 ++++---- lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php | 4 ++-- .../Test/Case/Model/Datasource/Database/MysqlTest.php | 4 ++-- .../Case/Model/Datasource/Database/PostgresTest.php | 4 ++-- .../Test/Case/Model/Datasource/Database/SqliteTest.php | 4 ++-- .../Case/Model/Datasource/Database/SqlserverTest.php | 4 ++-- lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php | 4 ++-- .../Case/Model/Datasource/Session/CacheSessionTest.php | 8 ++++---- .../Model/Datasource/Session/DatabaseSessionTest.php | 8 ++++---- lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php | 2 +- lib/Cake/Test/Case/Model/ModelTestBase.php | 4 ++-- lib/Cake/Test/Case/Model/ModelValidationTest.php | 2 +- lib/Cake/Test/Case/Model/ModelWriteTest.php | 2 +- .../Case/Model/Validator/CakeValidationSetTest.php | 2 +- lib/Cake/Test/Case/Network/CakeRequestTest.php | 4 ++-- lib/Cake/Test/Case/Network/CakeResponseTest.php | 4 ++-- lib/Cake/Test/Case/Network/CakeSocketTest.php | 4 ++-- lib/Cake/Test/Case/Network/Email/CakeEmailTest.php | 4 ++-- .../Test/Case/Network/Email/DebugTransportTest.php | 2 +- lib/Cake/Test/Case/Network/Email/MailTransportTest.php | 2 +- lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php | 2 +- .../Case/Network/Http/DigestAuthenticationTest.php | 4 ++-- lib/Cake/Test/Case/Network/Http/HttpResponseTest.php | 2 +- lib/Cake/Test/Case/Network/Http/HttpSocketTest.php | 4 ++-- lib/Cake/Test/Case/Routing/DispatcherTest.php | 4 ++-- .../Test/Case/Routing/Filter/AssetDispatcherTest.php | 2 +- lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php | 2 +- .../Test/Case/Routing/Route/PluginShortRouteTest.php | 2 +- lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php | 2 +- lib/Cake/Test/Case/Routing/RouterTest.php | 4 ++-- lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php | 6 +++--- lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php | 4 ++-- .../Test/Case/TestSuite/ControllerTestCaseTest.php | 4 ++-- .../Case/TestSuite/Fixture/CakeFixtureManagerTest.php | 4 ++-- .../Test/Case/TestSuite/HtmlCoverageReportTest.php | 4 ++-- .../Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php | 4 ++-- lib/Cake/Test/Case/Utility/CakeNumberTest.php | 4 ++-- lib/Cake/Test/Case/Utility/CakeTextTest.php | 4 ++-- lib/Cake/Test/Case/Utility/CakeTimeTest.php | 4 ++-- lib/Cake/Test/Case/Utility/DebuggerTest.php | 4 ++-- lib/Cake/Test/Case/Utility/FileTest.php | 4 ++-- lib/Cake/Test/Case/Utility/FolderTest.php | 6 +++--- lib/Cake/Test/Case/Utility/InflectorTest.php | 2 +- lib/Cake/Test/Case/Utility/ObjectCollectionTest.php | 4 ++-- lib/Cake/Test/Case/Utility/SecurityTest.php | 4 ++-- lib/Cake/Test/Case/Utility/ValidationTest.php | 4 ++-- lib/Cake/Test/Case/Utility/XmlTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/CacheHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/FlashHelperTest.php | 6 +++--- lib/Cake/Test/Case/View/Helper/FormHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php | 4 ++-- .../Test/Case/View/Helper/JqueryEngineHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/JsHelperTest.php | 8 ++++---- .../Test/Case/View/Helper/MootoolsEngineHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/NumberHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php | 4 ++-- .../Case/View/Helper/PrototypeEngineHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/RssHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/SessionHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/TextHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/TimeHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/HelperCollectionTest.php | 4 ++-- lib/Cake/Test/Case/View/HelperTest.php | 4 ++-- lib/Cake/Test/Case/View/JsonViewTest.php | 2 +- lib/Cake/Test/Case/View/MediaViewTest.php | 4 ++-- lib/Cake/Test/Case/View/ScaffoldViewTest.php | 4 ++-- lib/Cake/Test/Case/View/ThemeViewTest.php | 4 ++-- lib/Cake/Test/Case/View/ViewTest.php | 4 ++-- lib/Cake/Test/Case/View/XmlViewTest.php | 2 +- lib/Cake/TestSuite/CakeTestCase.php | 10 +++++----- lib/Cake/TestSuite/ControllerTestCase.php | 2 +- 146 files changed, 273 insertions(+), 273 deletions(-) diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php index 73c3af114..64fa86e9c 100644 --- a/lib/Cake/Test/Case/BasicsTest.php +++ b/lib/Cake/Test/Case/BasicsTest.php @@ -34,7 +34,7 @@ class BasicsTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS) diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php index 0dfd60209..f5374c218 100644 --- a/lib/Cake/Test/Case/Cache/CacheTest.php +++ b/lib/Cake/Test/Case/Cache/CacheTest.php @@ -32,7 +32,7 @@ class CacheTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_cacheDisable = Configure::read('Cache.disable'); Configure::write('Cache.disable', false); @@ -46,7 +46,7 @@ class CacheTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Cache::drop('latest'); Cache::drop('page'); diff --git a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php index 2491db955..038fa6561 100644 --- a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php @@ -37,7 +37,7 @@ class ApcEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $hasApc = extension_loaded('apc') || extension_loaded('apcu'); $this->skipIf(!$hasApc, 'Apc is not installed or configured properly.'); @@ -60,7 +60,7 @@ class ApcEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', $this->_cacheDisable); Cache::drop('apc'); diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php index 895e27f29..e6e056f94 100644 --- a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php @@ -37,7 +37,7 @@ class FileEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Cache.disable', false); Cache::config('file_test', array('engine' => 'File', 'path' => CACHE)); @@ -48,7 +48,7 @@ class FileEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); // Cache::clear(false, 'file_test'); Cache::drop('file_test'); diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index e076c4ef2..938df0916 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -54,7 +54,7 @@ class MemcacheEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->skipIf(!class_exists('Memcache'), 'Memcache is not installed or configured properly.'); @@ -72,7 +72,7 @@ class MemcacheEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', $this->_cacheDisable); Cache::drop('memcache'); diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php index 78647e521..d4e516acc 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php @@ -60,7 +60,7 @@ class MemcachedEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->skipIf(!class_exists('Memcached'), 'Memcached is not installed or configured properly.'); @@ -82,7 +82,7 @@ class MemcachedEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Cache::drop('memcached'); Cache::drop('memcached_groups'); diff --git a/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php index 59e8a11ae..00c5ffb3e 100644 --- a/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php @@ -31,7 +31,7 @@ class RedisEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->skipIf(!class_exists('Redis'), 'Redis is not installed or configured properly.'); @@ -56,7 +56,7 @@ class RedisEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', $this->_cacheDisable); Cache::drop(''); diff --git a/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php index b8eb90d44..ba4b6da18 100644 --- a/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php @@ -30,7 +30,7 @@ class WincacheEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->skipIf(!function_exists('wincache_ucache_set'), 'Wincache is not installed or configured properly.'); $this->_cacheDisable = Configure::read('Cache.disable'); @@ -43,7 +43,7 @@ class WincacheEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', $this->_cacheDisable); Cache::drop('wincache'); diff --git a/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php index a8031dafd..645a7fe02 100644 --- a/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php @@ -30,7 +30,7 @@ class XcacheEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); if (!function_exists('xcache_set')) { $this->markTestSkipped('Xcache is not installed or configured properly'); @@ -45,7 +45,7 @@ class XcacheEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', $this->_cacheDisable); Cache::drop('xcache'); diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php index bce4fc5de..d0ef382cd 100644 --- a/lib/Cake/Test/Case/Configure/IniReaderTest.php +++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php @@ -50,7 +50,7 @@ class IniReaderTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS; } diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php index d9a8bece2..1efca01fe 100644 --- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php @@ -50,7 +50,7 @@ class PhpReaderTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS; } diff --git a/lib/Cake/Test/Case/Console/Command/AclShellTest.php b/lib/Cake/Test/Case/Console/Command/AclShellTest.php index e1132b874..688d3acc3 100644 --- a/lib/Cake/Test/Case/Console/Command/AclShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/AclShellTest.php @@ -42,7 +42,7 @@ class AclShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Acl.database', 'test'); Configure::write('Acl.classname', 'DbAcl'); diff --git a/lib/Cake/Test/Case/Console/Command/ApiShellTest.php b/lib/Cake/Test/Case/Console/Command/ApiShellTest.php index a04b0236e..0d6760814 100644 --- a/lib/Cake/Test/Case/Console/Command/ApiShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/ApiShellTest.php @@ -34,7 +34,7 @@ class ApiShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); diff --git a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php index 9f3cd8bd2..060d6217e 100644 --- a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php @@ -45,7 +45,7 @@ class BakeShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -62,7 +62,7 @@ class BakeShellTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Dispatch, $this->Shell); } diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php index 672cf8c99..401716275 100644 --- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php @@ -49,7 +49,7 @@ class CommandListShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array( @@ -82,7 +82,7 @@ class CommandListShellTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Shell); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php index 9aad98bc1..51a358e68 100644 --- a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php @@ -51,7 +51,7 @@ class CompletionShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array( @@ -84,7 +84,7 @@ class CompletionShellTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Shell); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php index f506ed860..009b61686 100644 --- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php @@ -102,7 +102,7 @@ class SchemaShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); @@ -119,7 +119,7 @@ class SchemaShellTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if (!empty($this->file) && $this->file instanceof File) { $this->file->delete(); diff --git a/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php index f4715b8a4..5dbc7a59d 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php @@ -28,7 +28,7 @@ class CommandTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array( @@ -55,7 +55,7 @@ class CommandTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->CommandTask); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php index 34655d66c..b34ae2b14 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php @@ -69,7 +69,7 @@ class ControllerTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -101,7 +101,7 @@ class ControllerTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->Task); ClassRegistry::flush(); App::build(); diff --git a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php index 98de4a16e..2e1ebe861 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php @@ -34,7 +34,7 @@ class DbConfigTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -52,7 +52,7 @@ class DbConfigTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php index 050985ea2..b82c8ede9 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php @@ -37,7 +37,7 @@ class ExtractTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -56,7 +56,7 @@ class ExtractTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php index 7bace08ef..49e4c5cf7 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php @@ -51,7 +51,7 @@ class FixtureTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -74,7 +74,7 @@ class FixtureTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php index ea0a87f85..923aa6dca 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php @@ -49,7 +49,7 @@ class ModelTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -99,7 +99,7 @@ class ModelTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php index 9b9f67cde..a97e81c3a 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php @@ -39,7 +39,7 @@ class PluginTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->out = $this->getMock('ConsoleOutput', array(), array(), '', false); $this->in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -67,7 +67,7 @@ class PluginTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { if (file_exists($this->Task->bootstrap)) { unlink($this->Task->bootstrap); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php index 04a22b0b6..bc80c25b4 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php @@ -38,7 +38,7 @@ class ProjectTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -55,7 +55,7 @@ class ProjectTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $Folder = new Folder($this->Task->path . 'bake_test_app'); diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php index 84dcbe895..86332f82e 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php @@ -36,7 +36,7 @@ class TemplateTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -52,7 +52,7 @@ class TemplateTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php index b4fcb015d..c7c2b7d2c 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php @@ -191,7 +191,7 @@ class TestTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -209,7 +209,7 @@ class TestTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php index 95fa18211..b686c95a8 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php @@ -184,7 +184,7 @@ class ViewTaskTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -208,7 +208,7 @@ class ViewTaskTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Task, $this->Dispatch); } diff --git a/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/lib/Cake/Test/Case/Console/Command/TestShellTest.php index 7dfe63c27..d9815ed85 100644 --- a/lib/Cake/Test/Case/Console/Command/TestShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/TestShellTest.php @@ -48,7 +48,7 @@ class TestShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -66,7 +66,7 @@ class TestShellTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Dispatch, $this->Shell); } diff --git a/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php b/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php index a160e06d3..dae3907e3 100644 --- a/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php @@ -30,7 +30,7 @@ class ConsoleErrorHandlerTest extends CakeTestCase { * * @return Mock object */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Error = $this->getMock('ConsoleErrorHandler', array('_stop')); ConsoleErrorHandler::$stderr = $this->getMock('ConsoleOutput', array(), array(), '', false); @@ -41,7 +41,7 @@ class ConsoleErrorHandlerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->Error); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php index a378d9952..f6ac6fc31 100644 --- a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php @@ -30,7 +30,7 @@ class ConsoleOutputTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->output = $this->getMock('ConsoleOutput', array('_write')); $this->output->outputAs(ConsoleOutput::COLOR); @@ -41,7 +41,7 @@ class ConsoleOutputTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->output); } diff --git a/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php b/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php index 0bd4ec9a1..bda4a80cd 100644 --- a/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php +++ b/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php @@ -27,7 +27,7 @@ class ProgressShellHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->consoleOutput = new ConsoleOutputStub(); @@ -220,4 +220,4 @@ class ProgressShellHelperTest extends CakeTestCase { ); $this->assertEquals($expected, $this->consoleOutput->messages()); } -} \ No newline at end of file +} diff --git a/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php b/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php index 9eb9988d8..755fcb90a 100644 --- a/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php +++ b/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php @@ -27,7 +27,7 @@ class TableShellHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->consoleOutput = new ConsoleOutputStub(); @@ -198,4 +198,4 @@ class TableShellHelperTest extends CakeTestCase { ); $this->assertEquals($expected, $this->consoleOutput->messages()); } -} \ No newline at end of file +} diff --git a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php index bd0f1a144..eb5edd0da 100644 --- a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php +++ b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php @@ -109,7 +109,7 @@ class ShellDispatcherTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array( @@ -127,7 +127,7 @@ class ShellDispatcherTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); } diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php index 25ddb5857..05e58d8f9 100644 --- a/lib/Cake/Test/Case/Console/ShellTest.php +++ b/lib/Cake/Test/Case/Console/ShellTest.php @@ -137,7 +137,7 @@ class ShellTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $output = $this->getMock('ConsoleOutput', array(), array(), '', false); diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index a14e90f55..34cb734d4 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -37,7 +37,7 @@ class TaskCollectionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $shell = $this->getMock('Shell', array(), array(), '', false); $dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false); @@ -49,7 +49,7 @@ class TaskCollectionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->Tasks); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php b/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php index 2487aa4db..52c7e9108 100644 --- a/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php @@ -56,7 +56,7 @@ class ApplicationControllerTest extends ControllerTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { CakeSession::destroy(); parent::setUp(); } @@ -66,7 +66,7 @@ class ApplicationControllerTest extends ControllerTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { CakeSession::destroy(); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php index 0e93881c1..6654b3228 100644 --- a/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php @@ -188,7 +188,7 @@ class DbAclTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Acl.classname', 'DbAclTwoTest'); Configure::write('Acl.database', 'test'); @@ -201,7 +201,7 @@ class DbAclTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Acl); } diff --git a/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php index a25ea776a..3aa7b3383 100644 --- a/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php @@ -32,7 +32,7 @@ class PhpAclTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Acl.classname', 'PhpAcl'); $Collection = new ComponentCollection(); diff --git a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php index c1eea5408..b72784778 100644 --- a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php @@ -31,7 +31,7 @@ class AclComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); if (!class_exists('MockAclImplementation', false)) { $this->getMock('AclInterface', array(), array(), 'MockAclImplementation'); @@ -46,7 +46,7 @@ class AclComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Acl); } diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php index 5680fb42b..a18a2b9db 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php @@ -34,7 +34,7 @@ class ActionsAuthorizeTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->controller = $this->getMock('Controller', array(), array(), '', false); $this->Acl = $this->getMock('AclComponent', array(), array(), '', false); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php index 91170a081..b9d007da7 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php @@ -41,7 +41,7 @@ class BasicAuthenticateTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Collection = $this->getMock('ComponentCollection'); $this->auth = new BasicAuthenticate($this->Collection, array( diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php index d2ca6eb2f..d62bdee01 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php @@ -39,7 +39,7 @@ class BlowfishAuthenticateTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Collection = $this->getMock('ComponentCollection'); $this->auth = new BlowfishAuthenticate($this->Collection, array( diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php index 7bb0409ce..00766713b 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php @@ -33,7 +33,7 @@ class ControllerAuthorizeTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->controller = $this->getMock('Controller', array('isAuthorized'), array(), '', false); $this->components = $this->getMock('ComponentCollection'); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php index bf13ef403..131f4de19 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php @@ -34,7 +34,7 @@ class CrudAuthorizeTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Routing.prefixes', array()); Router::reload(); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php index b66ba4bb3..1f301a1c4 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php @@ -42,7 +42,7 @@ class DigestAuthenticateTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Collection = $this->getMock('ComponentCollection'); $this->server = $_SERVER; @@ -67,7 +67,7 @@ class DigestAuthenticateTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $_SERVER = $this->server; } diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php index 00ae63666..6480ed3d8 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php @@ -41,7 +41,7 @@ class FormAuthenticateTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Collection = $this->getMock('ComponentCollection'); $this->auth = new FormAuthenticate($this->Collection, array( diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php index 2b25e5827..cab6e0e78 100644 --- a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php @@ -378,7 +378,7 @@ class AuthComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Security.salt', 'YJfIxfs2guVoUubWDYhG93b0qyJfIxfs2guwvniR2G0FgaC9mi'); Configure::write('Security.cipherSeed', 770011223369876); @@ -409,7 +409,7 @@ class AuthComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); TestAuthComponent::clearUser(); diff --git a/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php b/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php index 1620842ac..99fc97b30 100644 --- a/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php @@ -69,7 +69,7 @@ class CookieComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $_COOKIE = array(); $this->Controller = new CookieComponentTestController(new CakeRequest(), new CakeResponse()); @@ -91,7 +91,7 @@ class CookieComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $this->Cookie->destroy(); } diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php index 00948ca56..63a328b4a 100644 --- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php @@ -140,7 +140,7 @@ class EmailComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('App.encoding', 'UTF-8'); diff --git a/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php b/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php index e227241b9..d56d29fdf 100644 --- a/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php @@ -33,7 +33,7 @@ class FlashComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Components = new ComponentCollection(); $this->Flash = new FlashComponent($this->Components); @@ -44,7 +44,7 @@ class FlashComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakeSession::destroy(); } diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php index c2879b39f..2be53d373 100644 --- a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php @@ -298,7 +298,7 @@ class PaginatorComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->request = new CakeRequest('controller_posts/index'); $this->request->params['pass'] = $this->request->params['named'] = array(); diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php index bc0e49cf2..8747aaed3 100644 --- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php @@ -106,7 +106,7 @@ class RequestHandlerComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_init(); } @@ -130,7 +130,7 @@ class RequestHandlerComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->RequestHandler, $this->Controller); if (!headers_sent()) { diff --git a/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php index 4edaf935a..7687857e5 100644 --- a/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php @@ -159,7 +159,7 @@ class SecurityComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $request = $this->getMock('CakeRequest', array('here'), array('posts/index', false)); @@ -183,7 +183,7 @@ class SecurityComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $this->Controller->Session->delete('_Token'); $this->Controller->Session->destroy(); diff --git a/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php index 8814a491f..ef587da27 100644 --- a/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php @@ -90,7 +90,7 @@ class SessionComponentTest extends CakeTestCase { * * @return void */ - public static function setupBeforeClass() { + public static function setupBeforeClass() : void { static::$_sessionBackup = Configure::read('Session'); Configure::write('Session', array( 'defaults' => 'php', @@ -104,7 +104,7 @@ class SessionComponentTest extends CakeTestCase { * * @return void */ - public static function teardownAfterClass() { + public static function teardownAfterClass() : void { Configure::write('Session', static::$_sessionBackup); } @@ -113,7 +113,7 @@ class SessionComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $_SESSION = null; $this->ComponentCollection = new ComponentCollection(); @@ -124,7 +124,7 @@ class SessionComponentTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakeSession::destroy(); } diff --git a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php index a5d349317..da4c499dd 100644 --- a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php @@ -34,7 +34,7 @@ class ComponentCollectionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Components = new ComponentCollection(); } @@ -44,7 +44,7 @@ class ComponentCollectionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Components); } diff --git a/lib/Cake/Test/Case/Controller/ComponentTest.php b/lib/Cake/Test/Case/Controller/ComponentTest.php index caf3e1a86..0686ac335 100644 --- a/lib/Cake/Test/Case/Controller/ComponentTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentTest.php @@ -206,7 +206,7 @@ class ComponentTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_pluginPaths = App::path('plugins'); App::build(array( diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 686520df6..e474e340d 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -390,7 +390,7 @@ class ControllerTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::objects('plugin', null, false); App::build(); @@ -402,7 +402,7 @@ class ControllerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); } diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php index ec6b4eb46..753cbbb80 100644 --- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php +++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php @@ -161,7 +161,7 @@ class ScaffoldTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); $request = new CakeRequest(null, false); @@ -174,7 +174,7 @@ class ScaffoldTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakeSession::destroy(); unset($this->Controller); diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php index ea1feec3e..57c0fbda4 100644 --- a/lib/Cake/Test/Case/Core/AppTest.php +++ b/lib/Cake/Test/Case/Core/AppTest.php @@ -28,7 +28,7 @@ class AppTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); } @@ -848,7 +848,7 @@ class AppTest extends CakeTestCase { } /** - * Data provider function for testIncreaseMemoryLimit + * Data provider function for testIncreaseMemoryLimit * * @return void */ diff --git a/lib/Cake/Test/Case/Core/CakeObjectTest.php b/lib/Cake/Test/Case/Core/CakeObjectTest.php index 9e78411e8..d74d61d0d 100644 --- a/lib/Cake/Test/Case/Core/CakeObjectTest.php +++ b/lib/Cake/Test/Case/Core/CakeObjectTest.php @@ -293,7 +293,7 @@ class ObjectTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->object = new TestCakeObject(); } @@ -303,7 +303,7 @@ class ObjectTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); unset($this->object); diff --git a/lib/Cake/Test/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php index 6a98fbc98..42e0c31a8 100644 --- a/lib/Cake/Test/Case/Core/CakePluginTest.php +++ b/lib/Cake/Test/Case/Core/CakePluginTest.php @@ -28,7 +28,7 @@ class CakePluginTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) @@ -41,7 +41,7 @@ class CakePluginTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); } diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php index 9396e13db..0cb7d1723 100644 --- a/lib/Cake/Test/Case/Core/ConfigureTest.php +++ b/lib/Cake/Test/Case/Core/ConfigureTest.php @@ -32,7 +32,7 @@ class ConfigureTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Cache.disable', true); App::build(); @@ -44,7 +44,7 @@ class ConfigureTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_core_paths')) { unlink(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_core_paths'); @@ -432,7 +432,7 @@ class ConfigureTest extends CakeTestCase { * * @return void */ - public function testReaderSetup() { + public function testReadersetUp() { $reader = new PhpReader(); Configure::config('test', $reader); $configured = Configure::configured(); diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php index 910921eb1..a0dad22a6 100644 --- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php @@ -52,7 +52,7 @@ class ErrorHandlerTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'View' => array( @@ -75,7 +75,7 @@ class ErrorHandlerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if ($this->_restoreError) { restore_error_handler(); diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php index bcdee191f..c61c54256 100644 --- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php +++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php @@ -144,7 +144,7 @@ class ExceptionRendererTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); App::build(array( @@ -165,7 +165,7 @@ class ExceptionRendererTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if ($this->_restoreError) { restore_error_handler(); diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php index 3c3df309d..064320bfa 100644 --- a/lib/Cake/Test/Case/I18n/I18nTest.php +++ b/lib/Cake/Test/Case/I18n/I18nTest.php @@ -31,7 +31,7 @@ class I18nTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Cache::delete('object_map', '_cake_core_'); @@ -47,7 +47,7 @@ class I18nTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Cache::delete('object_map', '_cake_core_'); diff --git a/lib/Cake/Test/Case/I18n/L10nTest.php b/lib/Cake/Test/Case/I18n/L10nTest.php index 62589c3bf..130f91790 100644 --- a/lib/Cake/Test/Case/I18n/L10nTest.php +++ b/lib/Cake/Test/Case/I18n/L10nTest.php @@ -30,7 +30,7 @@ class L10nTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::delete('Config.language'); } diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php index 36641b9cb..0e5bb2d15 100644 --- a/lib/Cake/Test/Case/Log/CakeLogTest.php +++ b/lib/Cake/Test/Case/Log/CakeLogTest.php @@ -31,7 +31,7 @@ class CakeLogTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $streams = CakeLog::configured(); foreach ($streams as $stream) { diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php index 56377d988..ab3f14590 100644 --- a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php +++ b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php @@ -47,7 +47,7 @@ class TestCakeLog extends CakeLog { */ class ConsoleLogTest extends CakeTestCase { - public function setUp() { + public function setUp() : void { parent::setUp(); CakeLog::config('debug', array( 'engine' => 'File', @@ -61,7 +61,7 @@ class ConsoleLogTest extends CakeTestCase { )); } - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if (file_exists(LOGS . 'error.log')) { unlink(LOGS . 'error.log'); diff --git a/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php b/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php index 3c30efc4f..5e89c6f52 100644 --- a/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php +++ b/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php @@ -39,7 +39,7 @@ class LogEngineCollectionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Collection = new LogEngineCollection(); diff --git a/lib/Cake/Test/Case/Model/AclNodeTest.php b/lib/Cake/Test/Case/Model/AclNodeTest.php index fb67696c9..7041567a8 100644 --- a/lib/Cake/Test/Case/Model/AclNodeTest.php +++ b/lib/Cake/Test/Case/Model/AclNodeTest.php @@ -211,7 +211,7 @@ class AclNodeTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Acl.classname', 'TestDbAcl'); Configure::write('Acl.database', 'test'); diff --git a/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php index bd63d7320..f963a8870 100644 --- a/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php @@ -202,7 +202,7 @@ class AclBehaviorTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Acl.database', 'test'); @@ -215,7 +215,7 @@ class AclBehaviorTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Aro, $this->Aco); } @@ -225,7 +225,7 @@ class AclBehaviorTest extends CakeTestCase { * * @return void */ - public function testSetup() { + public function testsetUp() { parent::setUp(); $User = new AclUser(); $this->assertTrue(isset($User->Behaviors->Acl->settings['User'])); diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php index 11e3b83d8..48a8731ae 100644 --- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php @@ -45,7 +45,7 @@ class ContainableBehaviorTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->User = ClassRegistry::init('User'); $this->Article = ClassRegistry::init('Article'); @@ -71,7 +71,7 @@ class ContainableBehaviorTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->Article); unset($this->User); unset($this->Tag); diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php index bdcaf2440..ca1f03a45 100644 --- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php +++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php @@ -452,7 +452,7 @@ class CakeSchemaTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); ConnectionManager::getDataSource('test')->cacheSources = false; $this->Schema = new TestAppSchema(); @@ -463,7 +463,7 @@ class CakeSchemaTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if (file_exists(TMP . 'tests' . DS . 'schema.php')) { unlink(TMP . 'tests' . DS . 'schema.php'); diff --git a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php index 5181842ad..cab41d425 100644 --- a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php +++ b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php @@ -29,7 +29,7 @@ class ConnectionManagerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); } diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 8013bd8fd..98e54a091 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -84,7 +84,7 @@ class CakeSessionTest extends CakeTestCase { * * @return void */ - public static function setupBeforeClass() { + public static function setupBeforeClass() : void { // Make sure garbage colector will be called static::$_gcDivisor = ini_get('session.gc_divisor'); ini_set('session.gc_divisor', '1'); @@ -95,7 +95,7 @@ class CakeSessionTest extends CakeTestCase { * * @return void */ - public static function teardownAfterClass() { + public static function teardownAfterClass() : void { // Revert to the default setting ini_set('session.gc_divisor', static::$_gcDivisor); } @@ -105,7 +105,7 @@ class CakeSessionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Session', array( 'defaults' => 'php', @@ -121,7 +121,7 @@ class CakeSessionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { if (TestCakeSession::started()) { session_write_close(); } diff --git a/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php index 853852936..846be3d87 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php @@ -107,7 +107,7 @@ class DataSourceTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Source = $this->getMock( 'TestSource', @@ -132,7 +132,7 @@ class DataSourceTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Model, $this->Source); ConnectionManager::drop($this->sourceName); diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php index f569d3627..b8806d26f 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php @@ -60,7 +60,7 @@ class MysqlTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Dbo = ConnectionManager::getDataSource('test'); if (!($this->Dbo instanceof Mysql)) { @@ -76,7 +76,7 @@ class MysqlTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->model); ClassRegistry::flush(); diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index 701865c44..5e34c6bbb 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -214,7 +214,7 @@ class PostgresTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Cache.disable', true); $this->Dbo = ConnectionManager::getDataSource('test'); @@ -228,7 +228,7 @@ class PostgresTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', false); unset($this->Dbo2); diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php index ad365cb6c..ad2054343 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php @@ -91,7 +91,7 @@ class SqliteTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Cache.disable', true); $this->Dbo = ConnectionManager::getDataSource('test'); @@ -105,7 +105,7 @@ class SqliteTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Cache.disable', false); } diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php index 622992ab1..197ce145e 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php @@ -264,7 +264,7 @@ class SqlserverTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Dbo = ConnectionManager::getDataSource('test'); if (!($this->Dbo instanceof Sqlserver)) { @@ -279,7 +279,7 @@ class SqlserverTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Dbo); unset($this->model); diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php index c8df92dc3..88623a182 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php @@ -184,7 +184,7 @@ class DboSourceTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->testDb = new DboTestSource(); @@ -200,7 +200,7 @@ class DboSourceTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Model); } diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php index 61fe27bca..d3e1c6738 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php @@ -34,7 +34,7 @@ class CacheSessionTest extends CakeTestCase { * * @return void */ - public static function setupBeforeClass() { + public static function setupBeforeClass() : void { Cache::config('session_test', array( 'engine' => 'File', 'prefix' => 'session_test_' @@ -49,7 +49,7 @@ class CacheSessionTest extends CakeTestCase { * * @return void */ - public static function teardownAfterClass() { + public static function teardownAfterClass() : void { Cache::clear(false, 'session_test'); Cache::drop('session_test'); @@ -61,7 +61,7 @@ class CacheSessionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->storage = new CacheSession(); } @@ -71,7 +71,7 @@ class CacheSessionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->storage); } diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php index a93a9fa61..231fa3332 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php @@ -53,7 +53,7 @@ class DatabaseSessionTest extends CakeTestCase { * * @return void */ - public static function setupBeforeClass() { + public static function setupBeforeClass() : void { static::$_sessionBackup = Configure::read('Session'); Configure::write('Session.handler', array( 'model' => 'SessionTestModel', @@ -66,7 +66,7 @@ class DatabaseSessionTest extends CakeTestCase { * * @return void */ - public static function teardownAfterClass() { + public static function teardownAfterClass() : void { Configure::write('Session', static::$_sessionBackup); } @@ -75,7 +75,7 @@ class DatabaseSessionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->storage = new DatabaseSession(); } @@ -85,7 +85,7 @@ class DatabaseSessionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->storage); ClassRegistry::flush(); parent::tearDown(); diff --git a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php index 541d71807..0b445ab0f 100644 --- a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php +++ b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php @@ -56,7 +56,7 @@ class ModelCrossSchemaHabtmTest extends BaseModelTest { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_checkConfigs(); } diff --git a/lib/Cake/Test/Case/Model/ModelTestBase.php b/lib/Cake/Test/Case/Model/ModelTestBase.php index f0f75a912..30f7efe3c 100644 --- a/lib/Cake/Test/Case/Model/ModelTestBase.php +++ b/lib/Cake/Test/Case/Model/ModelTestBase.php @@ -81,7 +81,7 @@ abstract class BaseModelTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->debug = Configure::read('debug'); } @@ -91,7 +91,7 @@ abstract class BaseModelTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('debug', $this->debug); ClassRegistry::flush(); diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php index 7886fdd75..51d1f3431 100644 --- a/lib/Cake/Test/Case/Model/ModelValidationTest.php +++ b/lib/Cake/Test/Case/Model/ModelValidationTest.php @@ -30,7 +30,7 @@ class ModelValidationTest extends BaseModelTest { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); } diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index d0ea8fddd..85c4d737e 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -115,7 +115,7 @@ class ModelWriteTest extends BaseModelTest { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); } diff --git a/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php b/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php index b9c17a0a4..73a2a2da3 100644 --- a/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php +++ b/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php @@ -30,7 +30,7 @@ class CakeValidationSetTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); } diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php index 7cad7a43d..3a1fb082f 100644 --- a/lib/Cake/Test/Case/Network/CakeRequestTest.php +++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php @@ -64,7 +64,7 @@ class CakeRequestTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_app = Configure::read('App'); $this->_case = null; @@ -81,7 +81,7 @@ class CakeRequestTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); if (!empty($this->_case)) { $_GET['case'] = $this->_case; diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php index cfb0e9639..6ad9f9950 100644 --- a/lib/Cake/Test/Case/Network/CakeResponseTest.php +++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php @@ -29,7 +29,7 @@ class CakeResponseTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); ob_start(); } @@ -39,7 +39,7 @@ class CakeResponseTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); ob_end_clean(); } diff --git a/lib/Cake/Test/Case/Network/CakeSocketTest.php b/lib/Cake/Test/Case/Network/CakeSocketTest.php index 17ec0f5ba..557c1a8b0 100644 --- a/lib/Cake/Test/Case/Network/CakeSocketTest.php +++ b/lib/Cake/Test/Case/Network/CakeSocketTest.php @@ -30,7 +30,7 @@ class CakeSocketTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Socket = new CakeSocket(array('timeout' => 1)); } @@ -40,7 +40,7 @@ class CakeSocketTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Socket); } diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index ca7ae2a38..d4f939fe3 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -149,7 +149,7 @@ class CakeEmailTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_configFileExists = true; @@ -171,7 +171,7 @@ class CakeEmailTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); App::build(); diff --git a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php index b45b644a4..4f5386883 100644 --- a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php @@ -30,7 +30,7 @@ class DebugTransportTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->DebugTransport = new DebugTransport(); } diff --git a/lib/Cake/Test/Case/Network/Email/MailTransportTest.php b/lib/Cake/Test/Case/Network/Email/MailTransportTest.php index 49ddffcbf..6019b960c 100644 --- a/lib/Cake/Test/Case/Network/Email/MailTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/MailTransportTest.php @@ -30,7 +30,7 @@ class MailTransportTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->MailTransport = $this->getMock('MailTransport', array('_mail')); $this->MailTransport->config(array('additionalParameters' => '-f')); diff --git a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php index d4e829a77..307b86c91 100644 --- a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php @@ -67,7 +67,7 @@ class SmtpTransportTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->socket = $this->getMock('CakeSocket', array('read', 'write', 'connect', 'enableCrypto')); diff --git a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php index da8cdc2f8..b61ad6970 100644 --- a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php +++ b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php @@ -70,7 +70,7 @@ class DigestAuthenticationTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->HttpSocket = new DigestHttpSocket(); $this->HttpSocket->request['method'] = 'GET'; @@ -82,7 +82,7 @@ class DigestAuthenticationTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->HttpSocket); } diff --git a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php index 1764a50db..bfed552d9 100644 --- a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php +++ b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php @@ -89,7 +89,7 @@ class HttpResponseTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->HttpResponse = new TestHttpResponse(); } diff --git a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php index 3ac6682f9..054a6db6e 100644 --- a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php +++ b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php @@ -188,7 +188,7 @@ class HttpSocketTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Socket = $this->getMock('TestHttpSocket', array('read', 'write', 'connect')); $this->RequestSocket = $this->getMock('TestHttpSocket', array('read', 'write', 'connect', 'request')); @@ -199,7 +199,7 @@ class HttpSocketTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Socket, $this->RequestSocket); } diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php index 05c12c532..aab7eef2b 100644 --- a/lib/Cake/Test/Case/Routing/DispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php @@ -543,7 +543,7 @@ class DispatcherTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_get = $_GET; $_GET = array(); @@ -571,7 +571,7 @@ class DispatcherTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $_GET = $this->_get; $_POST = $this->_post; diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php index 222b39813..5d1c40813 100644 --- a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php @@ -30,7 +30,7 @@ class AssetDispatcherTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('Dispatcher.filters', array()); } diff --git a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php index aa4e1abee..5e6b99097 100644 --- a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php +++ b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php @@ -31,7 +31,7 @@ class CakeRouteTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Routing', array('admin' => null, 'prefixes' => array())); } diff --git a/lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php b/lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php index 2b4951709..61728cc6d 100644 --- a/lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php +++ b/lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php @@ -31,7 +31,7 @@ class PluginShortRouteTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Routing', array('admin' => null, 'prefixes' => array())); Router::reload(); diff --git a/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php index 3e760d900..3ba37a562 100644 --- a/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php +++ b/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php @@ -32,7 +32,7 @@ class RedirectRouteTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Routing', array('admin' => null, 'prefixes' => array())); Router::reload(); diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index d4da7a6ee..6f5191326 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -35,7 +35,7 @@ class RouterTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Routing', array('admin' => null, 'prefixes' => array())); } @@ -45,7 +45,7 @@ class RouterTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); Router::fullBaseUrl(''); diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php index 43b9391c1..e207bdcec 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php @@ -75,7 +75,7 @@ class CakeTestCaseTest extends CakeTestCase { * * @return void */ - public static function setUpBeforeClass() { + public static function setUpBeforeClass() : void { require_once CAKE . 'Test' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php'; require_once CAKE . 'Test' . DS . 'Fixture' . DS . 'FixturizedTestCase.php'; } @@ -85,7 +85,7 @@ class CakeTestCaseTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Reporter = $this->getMock('CakeHtmlReporter'); } @@ -95,7 +95,7 @@ class CakeTestCaseTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Result); unset($this->Reporter); diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php index 379d1a472..ad522f3a3 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php @@ -228,7 +228,7 @@ class CakeTestFixtureTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $methods = array_diff(get_class_methods('DboSource'), array('enabled')); @@ -243,7 +243,7 @@ class CakeTestFixtureTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->criticDb); $this->db->config = $this->_backupConfig; diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index c914e9180..09a1933ab 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -125,7 +125,7 @@ class ControllerTestCaseTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), @@ -143,7 +143,7 @@ class ControllerTestCaseTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); $this->Case->controller = null; diff --git a/lib/Cake/Test/Case/TestSuite/Fixture/CakeFixtureManagerTest.php b/lib/Cake/Test/Case/TestSuite/Fixture/CakeFixtureManagerTest.php index 5a23f7f94..433065bab 100644 --- a/lib/Cake/Test/Case/TestSuite/Fixture/CakeFixtureManagerTest.php +++ b/lib/Cake/Test/Case/TestSuite/Fixture/CakeFixtureManagerTest.php @@ -32,7 +32,7 @@ class CakeFixtureManagerTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->fixtureManager = new CakeFixtureManager(); } @@ -42,7 +42,7 @@ class CakeFixtureManagerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->fixtureManager); } diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php index ad013024a..74529f03a 100644 --- a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php +++ b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php @@ -33,7 +33,7 @@ class HtmlCoverageReportTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) @@ -229,7 +229,7 @@ class HtmlCoverageReportTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { CakePlugin::unload(); unset($this->Coverage); parent::tearDown(); diff --git a/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php b/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php index da44469a2..95e90f971 100644 --- a/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php +++ b/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php @@ -24,7 +24,7 @@ class ConsoleOutputStubTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->stub = new ConsoleOutputStub(); @@ -59,4 +59,4 @@ class ConsoleOutputStubTest extends CakeTestCase { $this->stub->overwrite("bat"); $this->assertEquals(array("foo", "bar", "baz", "", "bat"), $this->stub->messages()); } -} \ No newline at end of file +} diff --git a/lib/Cake/Test/Case/Utility/CakeNumberTest.php b/lib/Cake/Test/Case/Utility/CakeNumberTest.php index 4b4d52c62..a9928aa06 100644 --- a/lib/Cake/Test/Case/Utility/CakeNumberTest.php +++ b/lib/Cake/Test/Case/Utility/CakeNumberTest.php @@ -31,7 +31,7 @@ class CakeNumberTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Number = new CakeNumber(); } @@ -41,7 +41,7 @@ class CakeNumberTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Number); } diff --git a/lib/Cake/Test/Case/Utility/CakeTextTest.php b/lib/Cake/Test/Case/Utility/CakeTextTest.php index ab19836c7..185ade4e7 100644 --- a/lib/Cake/Test/Case/Utility/CakeTextTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTextTest.php @@ -31,7 +31,7 @@ class CakeTextTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Text = new CakeText(); } @@ -41,7 +41,7 @@ class CakeTextTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Text); } diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index 4bc9f8a62..33d9189a6 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -37,7 +37,7 @@ class CakeTimeTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Time = new CakeTime(); $this->_systemTimezoneIdentifier = date_default_timezone_get(); @@ -49,7 +49,7 @@ class CakeTimeTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Time); $this->_restoreSystemTimezone(); diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php index 97d3bdf5e..5f1e02647 100644 --- a/lib/Cake/Test/Case/Utility/DebuggerTest.php +++ b/lib/Cake/Test/Case/Utility/DebuggerTest.php @@ -40,7 +40,7 @@ class DebuggerTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('debug', 2); Configure::write('log', false); @@ -51,7 +51,7 @@ class DebuggerTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('log', true); if ($this->_restoreError) { diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php index 20a464da1..c10dae1ce 100644 --- a/lib/Cake/Test/Case/Utility/FileTest.php +++ b/lib/Cake/Test/Case/Utility/FileTest.php @@ -39,7 +39,7 @@ class FileTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $file = __FILE__; $this->File = new File($file); @@ -50,7 +50,7 @@ class FileTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); $this->File->close(); unset($this->File); diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php index 224f7a9fc..29419ac00 100644 --- a/lib/Cake/Test/Case/Utility/FolderTest.php +++ b/lib/Cake/Test/Case/Utility/FolderTest.php @@ -33,7 +33,7 @@ class FolderTest extends CakeTestCase { * * @return void */ - public static function setUpBeforeClass() { + public static function setUpBeforeClass() : void { $dirs = array('cache', 'logs', 'sessions', 'tests'); foreach ($dirs as $dir) { new Folder(TMP . $dir, true); @@ -51,7 +51,7 @@ class FolderTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); clearstatcache(); } @@ -61,7 +61,7 @@ class FolderTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { $exclude = array_merge(static::$_tmp, array('.', '..')); foreach (scandir(TMP) as $dir) { if (is_dir(TMP . $dir) && !in_array($dir, $exclude)) { diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index 60d34816c..22029d224 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -86,7 +86,7 @@ class InflectorTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Inflector::reset(); } diff --git a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php index 1fe8e7adb..0624580e3 100644 --- a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php +++ b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php @@ -134,7 +134,7 @@ class ObjectCollectionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->Objects = new GenericObjectCollection(); } @@ -144,7 +144,7 @@ class ObjectCollectionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Objects); } diff --git a/lib/Cake/Test/Case/Utility/SecurityTest.php b/lib/Cake/Test/Case/Utility/SecurityTest.php index 8fc79e51c..13327b48c 100644 --- a/lib/Cake/Test/Case/Utility/SecurityTest.php +++ b/lib/Cake/Test/Case/Utility/SecurityTest.php @@ -34,7 +34,7 @@ class SecurityTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::delete('Security.useOpenSsl'); } @@ -44,7 +44,7 @@ class SecurityTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::delete('Security.useOpenSsl'); } diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index de3b01e52..b88a7b994 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -119,7 +119,7 @@ class ValidationTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_appEncoding = Configure::read('App.encoding'); $this->_appLocale = array(); @@ -134,7 +134,7 @@ class ValidationTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('App.encoding', $this->_appEncoding); foreach ($this->_appLocale as $category => $locale) { diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php index 8be42a347..48bf69089 100644 --- a/lib/Cake/Test/Case/Utility/XmlTest.php +++ b/lib/Cake/Test/Case/Utility/XmlTest.php @@ -99,7 +99,7 @@ class XmlTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->_appEncoding = Configure::read('App.encoding'); Configure::write('App.encoding', 'UTF-8'); @@ -110,7 +110,7 @@ class XmlTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::write('App.encoding', $this->_appEncoding); } diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php index 29bfcf401..d9ba88c0c 100644 --- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php @@ -74,7 +74,7 @@ class CacheHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $_GET = array(); $request = new CakeRequest(); @@ -93,7 +93,7 @@ class CacheHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { clearCache(); unset($this->Cache); parent::tearDown(); diff --git a/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php b/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php index ca9fde87b..316a20c0d 100644 --- a/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php @@ -34,7 +34,7 @@ class FlashHelperTest extends CakeTestCase { * * @return void */ - public static function setupBeforeClass() { + public static function setupBeforeClass() : void { App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS) )); @@ -45,7 +45,7 @@ class FlashHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = new View($controller); @@ -106,7 +106,7 @@ class FlashHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->View, $this->Flash); CakeSession::destroy(); diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index eab4b0bd5..e688a0552 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -525,7 +525,7 @@ class FormHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); @@ -570,7 +570,7 @@ class FormHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Form->Html, $this->Form, $this->Controller, $this->View); Configure::write('Security.salt', $this->oldSalt); diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php index 1c18ea562..67176ae9e 100644 --- a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php @@ -143,7 +143,7 @@ class HtmlHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->View = $this->getMock('View', array('append'), array(new TheHtmlTestController())); $this->Html = new TestHtmlHelper($this->View); @@ -162,7 +162,7 @@ class HtmlHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Html, $this->View); } diff --git a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php index 28b805b15..671822e6d 100644 --- a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php @@ -32,7 +32,7 @@ class JqueryEngineHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = $this->getMock('View', array('addScript'), array(&$controller)); @@ -44,7 +44,7 @@ class JqueryEngineHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Jquery); } diff --git a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php index 84a71b260..e63d63c12 100644 --- a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php @@ -137,7 +137,7 @@ class JsHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Asset.timestamp', false); @@ -161,7 +161,7 @@ class JsHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Js); } @@ -749,7 +749,7 @@ class JsBaseEngineTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = $this->getMock('View', array('append'), array(&$controller)); @@ -761,7 +761,7 @@ class JsBaseEngineTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->JsEngine); } diff --git a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php index 51c864610..ead1bc379 100644 --- a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php @@ -32,7 +32,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = $this->getMock('View', array('addScript'), array(&$controller)); @@ -44,7 +44,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Moo); } diff --git a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php index 53759f078..f5074258e 100644 --- a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php @@ -52,7 +52,7 @@ class NumberHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->View = new View(null); } @@ -62,7 +62,7 @@ class NumberHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->View); } diff --git a/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php b/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php index 848398fa9..44c973162 100644 --- a/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php @@ -38,7 +38,7 @@ class PaginatorHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('Config.language', 'eng'); $controller = null; @@ -76,7 +76,7 @@ class PaginatorHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->View, $this->Paginator); } diff --git a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php index 37c66cda7..3808cfd41 100644 --- a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php @@ -32,7 +32,7 @@ class PrototypeEngineHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = $this->getMock('View', array('addScript'), array(&$controller)); @@ -44,7 +44,7 @@ class PrototypeEngineHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Proto); } diff --git a/lib/Cake/Test/Case/View/Helper/RssHelperTest.php b/lib/Cake/Test/Case/View/Helper/RssHelperTest.php index 0deae0d90..f8f1b6f75 100644 --- a/lib/Cake/Test/Case/View/Helper/RssHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/RssHelperTest.php @@ -33,7 +33,7 @@ class RssHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = new View($controller); @@ -45,7 +45,7 @@ class RssHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->Rss); } diff --git a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php index 99b807d01..c998e7c6f 100644 --- a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php @@ -32,7 +32,7 @@ class SessionHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $controller = null; $this->View = new View($controller); @@ -84,7 +84,7 @@ class SessionHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { $_SESSION = array(); unset($this->View, $this->Session); CakeSession::destroy(); diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php index 6cc6d073d..e238d7c28 100644 --- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php @@ -56,7 +56,7 @@ class TextHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->View = new View(null); $this->Text = new TextHelper($this->View); @@ -67,7 +67,7 @@ class TextHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->View); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php index c9fdf7bab..109789d2f 100644 --- a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php @@ -61,7 +61,7 @@ class TimeHelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->View = new View(null); } @@ -71,7 +71,7 @@ class TimeHelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->View); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php index 1632a5a6c..da9d5de5b 100644 --- a/lib/Cake/Test/Case/View/HelperCollectionTest.php +++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php @@ -38,7 +38,7 @@ class HelperCollectionTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->View = $this->getMock('View', array(), array(null)); $this->Helpers = new HelperCollection($this->View); @@ -49,7 +49,7 @@ class HelperCollectionTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { CakePlugin::unload(); unset($this->Helpers, $this->View); parent::tearDown(); diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php index cd17a3ccd..d0efbfa42 100644 --- a/lib/Cake/Test/Case/View/HelperTest.php +++ b/lib/Cake/Test/Case/View/HelperTest.php @@ -201,7 +201,7 @@ class HelperTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); ClassRegistry::flush(); @@ -225,7 +225,7 @@ class HelperTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); Configure::delete('Asset'); diff --git a/lib/Cake/Test/Case/View/JsonViewTest.php b/lib/Cake/Test/Case/View/JsonViewTest.php index 72d818938..e1dcec233 100644 --- a/lib/Cake/Test/Case/View/JsonViewTest.php +++ b/lib/Cake/Test/Case/View/JsonViewTest.php @@ -33,7 +33,7 @@ class JsonViewTest extends CakeTestCase { * * @return void **/ - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('debug', 0); } diff --git a/lib/Cake/Test/Case/View/MediaViewTest.php b/lib/Cake/Test/Case/View/MediaViewTest.php index 3200ebde4..1ba2af21e 100644 --- a/lib/Cake/Test/Case/View/MediaViewTest.php +++ b/lib/Cake/Test/Case/View/MediaViewTest.php @@ -32,7 +32,7 @@ class MediaViewTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->MediaView = new MediaView(); $this->MediaView->response = $this->getMock('CakeResponse', array( @@ -50,7 +50,7 @@ class MediaViewTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->MediaView); } diff --git a/lib/Cake/Test/Case/View/ScaffoldViewTest.php b/lib/Cake/Test/Case/View/ScaffoldViewTest.php index b4cb6871f..840e70420 100644 --- a/lib/Cake/Test/Case/View/ScaffoldViewTest.php +++ b/lib/Cake/Test/Case/View/ScaffoldViewTest.php @@ -83,7 +83,7 @@ class ScaffoldViewTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $this->request = new CakeRequest(null, false); $this->Controller = new ScaffoldViewMockController($this->request); @@ -101,7 +101,7 @@ class ScaffoldViewTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { unset($this->Controller, $this->request); parent::tearDown(); } diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php index 06b7fe57c..9b05f717b 100644 --- a/lib/Cake/Test/Case/View/ThemeViewTest.php +++ b/lib/Cake/Test/Case/View/ThemeViewTest.php @@ -103,7 +103,7 @@ class ThemeViewTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $request = new CakeRequest('posts/index'); $this->Controller = new Controller($request); @@ -124,7 +124,7 @@ class ThemeViewTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset($this->ThemeView); unset($this->PostsController); diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index 3ceccdd5a..6dbcd1e82 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -314,7 +314,7 @@ class ViewTest extends CakeTestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); $request = $this->getMock('CakeRequest'); @@ -346,7 +346,7 @@ class ViewTest extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); CakePlugin::unload(); unset($this->View); diff --git a/lib/Cake/Test/Case/View/XmlViewTest.php b/lib/Cake/Test/Case/View/XmlViewTest.php index 7bd6d8102..e1f3ad5d5 100644 --- a/lib/Cake/Test/Case/View/XmlViewTest.php +++ b/lib/Cake/Test/Case/View/XmlViewTest.php @@ -28,7 +28,7 @@ App::uses('XmlView', 'View'); */ class XmlViewTest extends CakeTestCase { - public function setUp() { + public function setUp() : void { parent::setUp(); Configure::write('debug', 0); } diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php index 11e022052..c9512f420 100644 --- a/lib/Cake/TestSuite/CakeTestCase.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -24,7 +24,7 @@ App::uses('CakeTestFixture', 'TestSuite/Fixture'); * * @package Cake.TestSuite */ -abstract class CakeTestCase extends PHPUnit_Framework_TestCase { +abstract class CakeTestCase extends \PHPUnit\Framework\TestCase { /** * The class responsible for managing the creation, loading and removing of fixtures @@ -133,7 +133,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase { * * @return void */ - public function setUp() { + public function setUp() : void { parent::setUp(); if (empty($this->_configure)) { @@ -152,7 +152,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); App::build($this->_pathRestore, App::RESET); if (class_exists('ClassRegistry', false)) { @@ -185,7 +185,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase { * * @return void */ - protected function assertPreConditions() { + protected function assertPreConditions(): void { parent::assertPreConditions(); $this->startTest($this->getName()); } @@ -195,7 +195,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase { * * @return void */ - protected function assertPostConditions() { + protected function assertPostConditions(): void { parent::assertPostConditions(); $this->endTest($this->getName()); } diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php index b13ce7df3..8d8f7bd3a 100644 --- a/lib/Cake/TestSuite/ControllerTestCase.php +++ b/lib/Cake/TestSuite/ControllerTestCase.php @@ -432,7 +432,7 @@ abstract class ControllerTestCase extends CakeTestCase { * * @return void */ - public function tearDown() { + public function tearDown() : void { parent::tearDown(); unset( $this->contents,