浏览代码

Fix tests

euromark 11 年之前
父节点
当前提交
48823c14d4

+ 1 - 1
src/Controller/Component/AuthUserComponent.php

@@ -2,7 +2,7 @@
 
 namespace Tools\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Event\Event;
 use Tools\Auth\AuthUserTrait;
 

+ 1 - 11
src/Controller/Component/CommonComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace Tools\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Routing\Router;
@@ -17,16 +17,6 @@ use Tools\Utility\Utility;
 class CommonComponent extends Component {
 
 	/**
-	 * CommonComponent::beforeFilter()
-	 *
-	 * @param Event $event
-	 * @return void
-	 */
-	public function beforeFilter(Event $event) {
-		$this->Controller = $event->subject();
-	}
-
-	/**
 	 * For this helper the controller has to be passed as reference
 	 * for manual startup with $disableStartup = true (requires this to be called prior to any other method)
 	 *

+ 1 - 11
src/Controller/Component/FlashComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace Tools\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Utility\Inflector;
@@ -25,16 +25,6 @@ class FlashComponent extends Component {
 	];
 
 	/**
-	 * FlashComponent::beforeFilter()
-	 *
-	 * @param Event $event
-	 * @return void
-	 */
-	public function beforeFilter(Event $event) {
-		$this->Controller = $event->subject();
-	}
-
-	/**
 	 * Called after the Controller::beforeRender(), after the view class is loaded, and before the
 	 * Controller::render()
 	 *

+ 1 - 1
src/Controller/Component/SessionComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace Tools\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 
 /**
  * The CakePHP SessionComponent provides a way to persist client data between

+ 1 - 1
tests/TestApp/Controller/Component/AppleComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace TestApp\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Controller\Controller;
 use Cake\Event\Event;
 

+ 1 - 1
tests/TestApp/Controller/Component/BananaComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace TestApp\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Controller\Controller;
 use Cake\Event\Event;
 

+ 1 - 1
tests/TestApp/Controller/Component/TestComponent.php

@@ -1,7 +1,7 @@
 <?php
 namespace TestApp\Controller\Component;
 
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Event\Event;
 
 class TestComponent extends Component {

+ 1 - 1
tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -2,7 +2,7 @@
 namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Controller\Component\CommonComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;

+ 1 - 1
tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -2,7 +2,7 @@
 namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Network\Request;

+ 1 - 1
tests/TestCase/Controller/ControllerTest.php

@@ -2,7 +2,7 @@
 namespace Tools\Test\TestCase\Controller;
 
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component;
+use Tools\Controller\Component\Component;
 use Cake\Controller\Component\CommonComponent;
 use Cake\Core\Configure;
 use Cake\Network\Request;