Remove deprecations.

tests/TestApp/Controller/CommonComponentTestController.php

@@ -0,0 +1,26 @@
+<?php
+namespace TestApp\Controller;
+
+use Tools\Controller\Controller;
+
+/**
+ * Use Controller instead of AppController to avoid conflicts
+ */
+class CommonComponentTestController extends Controller {
+
+    /**
+     * @var string
+     */
+    public $name = 'MyController';
+
+    /**
+     * @var array
+     */
+    public $components = ['Tools.Common'];
+
+    /**
+     * @var array
+     */
+    public $autoRedirectActions = ['allowed'];
+
+}

tests/TestApp/Controller/FlashComponentTestController.php

@@ -0,0 +1,38 @@
+<?php
+namespace TestApp\Controller;
+
+use Tools\Controller\Controller;
+
+/**
+ * Use Controller instead of AppController to avoid conflicts
+ */
+class FlashComponentTestController extends Controller {
+
+    /**
+     * @var array
+     */
+    public $components = ['Tools.Flash'];
+
+    /**
+     * @var bool
+     */
+    public $failed = false;
+
+    /**
+     * @var array
+     */
+    public $testHeaders = [];
+
+    public function fail() {
+        $this->failed = true;
+    }
+
+    public function redirect($url, $status = null, $exit = true) {
+        return $status;
+    }
+
+    public function header($status) {
+        $this->testHeaders[] = $status;
+    }
+
+}

tests/TestApp/Controller/MobileComponentTestController.php

@@ -0,0 +1,15 @@
+<?php
+namespace TestApp\Controller;
+
+use Tools\Controller\Controller;
+
+class MobileComponentTestController extends Controller {
+
+    /**
+     * Components property
+     *
+     * @var array
+     */
+    public $components = ['RequestHandler', 'Tools.Mobile'];
+
+}

tests/TestCase/Controller/Component/AuthUserComponentTest.php

@@ -2,6 +2,7 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
+use Cake\Controller\Component\AuthComponent;
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
 use Cake\Network\Request;
@@ -14,8 +15,6 @@ use Tools\TestSuite\TestCase;
 class AuthUserComponentTest extends TestCase {
 
 	/**
-	 * fixtures
-	 *
 	 * @var array
 	 */
 	public $fixtures = ['core.sessions'];
@@ -26,8 +25,11 @@ class AuthUserComponentTest extends TestCase {
 	public $AuthUser;
 
 	/**
-	 * setUp method
-	 *
+	 * @var \Cake\Controller\ComponentRegistry
+	 */
+	public $ComponentRegistry;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {
@@ -36,12 +38,13 @@ class AuthUserComponentTest extends TestCase {
 		$controller = new Controller(new Request());
 		$this->ComponentRegistry = new ComponentRegistry($controller);
 		$this->AuthUser = new AuthUserComponent($this->ComponentRegistry);
-		$this->AuthUser->Auth = $this->getMock('Cake\Controller\Component\AuthComponent', ['user'], [$this->ComponentRegistry]);
+		$this->AuthUser->Auth = $this->getMockBuilder(AuthComponent::class)
+			->setMethods(['user'])
+			->setConstructorArgs([$this->ComponentRegistry])
+			->getMock();
 	}
 
 	/**
-	 * tearDown method
-	 *
 	 * @return void
 	 */
 	public function tearDown() {
@@ -63,8 +66,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testId()
-	 *
 	 * @return void
 	 */
 	public function testId() {
@@ -77,8 +78,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testId()
-	 *
 	 * @return void
 	 */
 	public function testIsMe() {
@@ -96,8 +95,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testUser()
-	 *
 	 * @return void
 	 */
 	public function testUser() {
@@ -112,8 +109,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testRoles()
-	 *
 	 * @return void
 	 */
 	public function testRoles() {
@@ -126,8 +121,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testRolesDeep()
-	 *
 	 * @return void
 	 */
 	public function testRolesDeep() {
@@ -140,8 +133,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testHasRole()
-	 *
 	 * @return void
 	 */
 	public function testHasRole() {
@@ -159,8 +150,6 @@ class AuthUserComponentTest extends TestCase {
 	}
 
 	/**
-	 * AuthUserComponentTest::testHasRoles()
-	 *
 	 * @return void
 	 */
 	public function testHasRoles() {

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -6,6 +6,7 @@ use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
+use TestApp\Controller\CommonComponentTestController;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -13,6 +14,11 @@ use Tools\TestSuite\TestCase;
 class CommonComponentTest extends TestCase {
 
 	/**
+	 * @var \TestApp\Controller\CommonComponentTestController
+	 */
+	public $Controller;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {
@@ -191,25 +197,3 @@ class CommonComponentTest extends TestCase {
 	}
 
 }
-
-/**
- * Use Controller instead of AppController to avoid conflicts
- */
-class CommonComponentTestController extends Controller {
-
-	/**
-	 * @var string
-	 */
-	public $name = 'MyController';
-
-	/**
-	 * @var array
-	 */
-	public $components = ['Tools.Common'];
-
-	/**
-	 * @var array
-	 */
-	public $autoRedirectActions = ['allowed'];
-
-}

tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -2,9 +2,10 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
+use Cake\Network\Request;
+use TestApp\Controller\FlashComponentTestController;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -13,6 +14,14 @@ class FlashComponentTest extends TestCase {
 
 	//public $fixtures = array('core.sessions', 'plugin.tools.tools_users', 'plugin.tools.roles');
 
+	/**
+	 * @var \TestApp\Controller\FlashComponentTestController
+	 */
+	public $Controller;
+
+	/**
+	 * @return void
+	 */
 	public function setUp() {
 		parent::setUp();
 
@@ -24,6 +33,9 @@ class FlashComponentTest extends TestCase {
 		$this->Controller->request->session()->delete('FlashMessage');
 	}
 
+	/**
+	 * @return void
+	 */
 	public function tearDown() {
 		parent::tearDown();
 
@@ -32,12 +44,10 @@ class FlashComponentTest extends TestCase {
 	}
 
 	/**
-	 * FlashComponentTest::testTransientMessage()
-	 *
 	 * @return void
 	 */
 	public function testTransientMessage() {
-		$is = $this->Controller->Flash->transientMessage('xyz', 'success');
+		$this->Controller->Flash->transientMessage('xyz', 'success');
 
 		$res = Configure::read('FlashMessage');
 		$this->assertTrue(!empty($res));
@@ -45,12 +55,10 @@ class FlashComponentTest extends TestCase {
 	}
 
 	/**
-	 * FlashComponentTest::testMessage()
-	 *
 	 * @return void
 	 */
 	public function testMessage() {
-		$is = $this->Controller->Flash->message('efg');
+		$this->Controller->Flash->message('efg');
 
 		$res = $this->Controller->request->session()->read('FlashMessage');
 		$this->assertTrue(!empty($res));
@@ -59,12 +67,10 @@ class FlashComponentTest extends TestCase {
 	}
 
 	/**
-	 * FlashComponentTest::testMagic()
-	 *
 	 * @return void
 	 */
 	public function testMagic() {
-		$is = $this->Controller->Flash->error('Some Error Message');
+		$this->Controller->Flash->error('Some Error Message');
 
 		$res = $this->Controller->request->session()->read('FlashMessage');
 		$this->assertTrue(!empty($res));
@@ -73,12 +79,10 @@ class FlashComponentTest extends TestCase {
 	}
 
 	/**
-	 * FlashComponentTest::testCoreHook()
-	 *
 	 * @return void
 	 */
 	public function testCoreHook() {
-		$is = $this->Controller->Flash->set('Some Message');
+		$this->Controller->Flash->set('Some Message');
 
 		$res = $this->Controller->request->session()->read('FlashMessage');
 		$this->assertTrue(!empty($res));
@@ -87,12 +91,10 @@ class FlashComponentTest extends TestCase {
 	}
 
 	/**
-	 * FlashComponentTest::testAjax()
-	 *
 	 * @return void
 	 */
 	public function testAjax() {
-		$this->Controller->request = $this->getMock('Cake\Network\Request', ['is']);
+		$this->Controller->request = $this->getMockBuilder(Request::class)->setMethods(['is'])->getMock();
 		$this->Controller->Flash->success('yeah');
 		$this->Controller->Flash->transientMessage('xyz', 'warning');
 
@@ -110,37 +112,3 @@ class FlashComponentTest extends TestCase {
 	}
 
 }
-
-/**
- * Use Controller instead of AppController to avoid conflicts
- */
-class FlashComponentTestController extends Controller {
-
-	/**
-	 * @var array
-	 */
-	public $components = ['Tools.Flash'];
-
-	/**
-	 * @var bool
-	 */
-	public $failed = false;
-
-	/**
-	 * @var array
-	 */
-	public $testHeaders = [];
-
-	public function fail() {
-		$this->failed = true;
-	}
-
-	public function redirect($url, $status = null, $exit = true) {
-		return $status;
-	}
-
-	public function header($status) {
-		$this->testHeaders[] = $status;
-	}
-
-}

tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -6,7 +6,7 @@ use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Network\Request;
 use Detection\MobileDetect;
-use Tools\Controller\Controller;
+use TestApp\Controller\MobileComponentTestController;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -20,6 +20,16 @@ class MobileComponentTest extends TestCase {
 	public $fixtures = ['core.sessions'];
 
 	/**
+	 * @var \Cake\Event\Event
+	 */
+	public $event;
+
+	/**
+	 * @var \TestApp\Controller\MobileComponentTestController
+	 */
+	public $Controller;
+
+	/**
 	 * SetUp method
 	 *
 	 * @return void
@@ -181,14 +191,3 @@ class MobileComponentTest extends TestCase {
 	}
 
 }
-
-class MobileComponentTestController extends Controller {
-
-	/**
-	 * Components property
-	 *
-	 * @var array
-	 */
-	public $components = ['RequestHandler', 'Tools.Mobile'];
-
-}

tests/TestCase/Utility/UtilityTest.php

@@ -462,7 +462,7 @@ class UtilityTest extends TestCase {
 	/**
 	 * UtilityTest::testExpandListWithKeyLessListInvalid()
 	 *
-	 * @expectedException RuntimeException
+	 * @expectedException \RuntimeException
 	 * @return void
 	 */
 	public function testExpandListWithKeyLessListInvalid() {

tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
+use Cake\Network\Request;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\AuthUserHelper;
@@ -31,7 +32,7 @@ class AuthUserHelperTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->request = $this->getMock('Cake\Network\Request', ['cookie']);
+		$this->request = $this->getMockBuilder(Request::class)->setMethods(['cookie'])->getMock();
 		$this->view = new View($this->request);
 		$this->AuthUser = new AuthUserHelper($this->view);
 	}
@@ -49,7 +50,7 @@ class AuthUserHelperTest extends TestCase {
 	 * testSessionReadWrite method
 	 *
 	 * @return void
-	 * @expectedException RuntimeException
+	 * @expectedException \RuntimeException
 	 */
 	public function testEmptyAuthSessionDueToMissing() {
 		$this->AuthUser->id();

tests/TestCase/View/Helper/CookieHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
+use Cake\Network\Request;
 use Cake\ORM\Table;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
@@ -21,7 +22,7 @@ class CookieHelperTest extends TestCase {
 		parent::setUp();
 
 		$this->Cookie = new CookieHelper(new View(null));
-		$this->Cookie->request = $this->getMock('Cake\Network\Request', ['cookie']);
+		$this->Cookie->request = $this->getMockBuilder(Request::class)->setMethods(['cookie'])->getMock();
 	}
 
 	/**