Add deprecated warning for deprecated method.

Fix failing tests.
cakephp · Sep 15, 2014 · 5d203b4 · 5d203b4
1 parent 3f110d0
commit 5d203b4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -454,6 +454,10 @@ public function implementedEvents() {
  * @return void
  */
 	public function constructClasses() {
+		trigger_error(
+			'Controller::constructClasses() is deprecated and will be removed in the first RC release',
+			E_USER_DEPRECATED
+		);
 	}
 
 /**

diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -819,7 +819,7 @@ public function testForbiddenException() {
  */
 	public function testNoRedirectOnLoginAction() {
 		$event = new Event('Controller.startup', $this->Controller);
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->methods = array('login');
 
 		$url = '/AuthTest/login';

diff --git a/tests/TestCase/Controller/Component/CsrfComponentTest.php b/tests/TestCase/Controller/Component/CsrfComponentTest.php
@@ -34,7 +34,7 @@ class CsrfComponentTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$this->registry = new ComponentRegistry($controller);
 		$this->component = new CsrfComponent($this->registry);
 	}
@@ -57,7 +57,7 @@ public function tearDown() {
 	public function testSettingCookie() {
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request(['base' => '/dir']);
 		$controller->response = new Response();
 
@@ -94,7 +94,7 @@ public function testValidTokenInHeader($method) {
 		$_SERVER['REQUEST_METHOD'] = $method;
 		$_SERVER['HTTP_X_CSRF_TOKEN'] = 'testing123';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request(['cookies' => ['csrfToken' => 'testing123']]);
 		$controller->response = new Response();
 
@@ -114,7 +114,7 @@ public function testInvalidTokenInHeader($method) {
 		$_SERVER['REQUEST_METHOD'] = $method;
 		$_SERVER['HTTP_X_CSRF_TOKEN'] = 'nope';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request([
 			'cookies' => ['csrfToken' => 'testing123']
 		]);
@@ -133,7 +133,7 @@ public function testInvalidTokenInHeader($method) {
 	public function testValidTokenRequestData($method) {
 		$_SERVER['REQUEST_METHOD'] = $method;
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request([
 			'post' => ['_csrfToken' => 'testing123'],
 			'cookies' => ['csrfToken' => 'testing123']
@@ -155,7 +155,7 @@ public function testValidTokenRequestData($method) {
 	public function testInvalidTokenRequestData($method) {
 		$_SERVER['REQUEST_METHOD'] = $method;
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request([
 			'post' => ['_csrfToken' => 'nope'],
 			'cookies' => ['csrfToken' => 'testing123']
@@ -174,7 +174,7 @@ public function testInvalidTokenRequestData($method) {
 	public function testCsrfValidationSkipsRequestAction() {
 		$_SERVER['REQUEST_METHOD'] = 'POST';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request([
 			'params' => ['requested' => 1],
 			'post' => ['_csrfToken' => 'nope'],
@@ -196,7 +196,7 @@ public function testCsrfValidationSkipsRequestAction() {
 	public function testConfigurationCookieCreate() {
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request(['base' => '/dir']);
 		$controller->response = new Response();
 
@@ -226,7 +226,7 @@ public function testConfigurationCookieCreate() {
 	public function testConfigurationValidate() {
 		$_SERVER['REQUEST_METHOD'] = 'POST';
 
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$controller->request = new Request([
 			'cookies' => ['csrfToken' => 'nope', 'token' => 'yes'],
 			'post' => ['_csrfToken' => 'no match', 'token' => 'yes'],

diff --git a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php
@@ -97,7 +97,7 @@ public function testConstructorConfig() {
 		$config = array(
 			'viewClassMap' => array('json' => 'MyPlugin.MyJson')
 		);
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$collection = new ComponentRegistry($controller);
 		$requestHandler = new RequestHandlerComponent($collection, $config);
 		$this->assertEquals(array('json' => 'MyPlugin.MyJson'), $requestHandler->config('viewClassMap'));

diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php
@@ -63,7 +63,7 @@ class HtmlHelperTest extends TestCase {
  */
 	public function setUp() {
 		parent::setUp();
-		$controller = $this->getMock('Cake\Controller\Controller');
+		$controller = $this->getMock('Cake\Controller\Controller', ['redirect']);
 		$this->View = $this->getMock('Cake\View\View', array('append'));
 		$this->Html = new HtmlHelper($this->View);
 		$this->Html->request = new Request();