Fixing some errors from namespace changes.

cakephp · Sep 9, 2012 · 617f171 · markstory · Sep 10, 2012 · jrbasso
1 parent 77cf044
commit 617f171
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 11 deletions.
diff --git a/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php
@@ -21,6 +21,7 @@
 use Cake\Controller\Controller;
 use Cake\Controller\ComponentCollection;
 use Cake\Controller\Component\AclComponent;
+use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Utility\Hash;
 
@@ -72,9 +73,8 @@ public function startup() {
 		}
 
 		$class = Configure::read('Acl.classname');
-		list($plugin, $class) = pluginSplit($class, true);
-		App::uses($class, $plugin . 'Controller/Component/Acl');
-		if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) {
+		$className = App::classname($class, 'Controller/Component/Acl');
+		if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($className, 'Cake\Controller\Component\Acl\DbAcl')) {
 			$out = "--------------------------------------------------\n";
 			$out .= __d('cake_console', 'Error: Your current Cake configuration is set to an ACL implementation other than DB.') . "\n";
 			$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n";

diff --git a/lib/Cake/Error/MethodNotAllowedExpcetion.php → lib/Cake/Error/MethodNotAllowedException.php b/lib/Cake/Error/MethodNotAllowedExpcetion.php → lib/Cake/Error/MethodNotAllowedException.php
diff --git a/lib/Cake/Event/EventManager.php b/lib/Cake/Event/EventManager.php
@@ -96,7 +96,7 @@ public static function instance($manager = null) {
  * when the listener is called. If $called is an instance of Cake\Event\EventListener, this parameter will be ignored
  *
  * @return void
- * @throws Cake\Error\InvalidArgumentException When event key is missing or callable is not an
+ * @throws InvalidArgumentException When event key is missing or callable is not an
  *   instance of Cake\Event\EventListener.
  */
 	public function attach($callable, $eventKey = null, $options = array()) {

diff --git a/lib/Cake/Network/Socket.php b/lib/Cake/Network/Socket.php
@@ -310,13 +310,13 @@ public function reset($state = null) {
  * @param string $clientOrServer can be one of 'client', 'server'. Default is 'client'
  * @param boolean $enable enable or disable encryption. Default is true (enable)
  * @return boolean True on success
- * @throws Cake\Error\InvalidArgumentException When an invalid encryption scheme is chosen.
- * @throws Cake\Error\SocketException When attempting to enable SSL/TLS fails
+ * @throws InvalidArgumentException When an invalid encryption scheme is chosen.
+ * @throws SocketException When attempting to enable SSL/TLS fails
  * @see stream_socket_enable_crypto
  */
 	public function enableCrypto($type, $clientOrServer = 'client', $enable = true) {
 		if (!array_key_exists($type . '_' . $clientOrServer, $this->_encryptMethods)) {
-			throw new Error\InvalidArgumentException(__d('cake_dev', 'Invalid encryption scheme chosen'));
+			throw new \InvalidArgumentException(__d('cake_dev', 'Invalid encryption scheme chosen'));
 		}
 		$enableCryptoResult = false;
 		try {

diff --git a/lib/Cake/Test/TestCase/Console/ShellTest.php b/lib/Cake/Test/TestCase/Console/ShellTest.php
@@ -22,6 +22,7 @@
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;
+use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Folder;
 use Cake\Utility\Hash;

diff --git a/lib/Cake/Test/TestCase/Network/RequestTest.php b/lib/Cake/Test/TestCase/Network/RequestTest.php
@@ -21,6 +21,28 @@
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Xml;
 
+class TestRequest extends Request {
+
+	public function reConstruct($url = 'some/path', $parseEnvironment = true) {
+		$this->_base();
+		if (empty($url)) {
+			$url = $this->_url();
+		}
+		if ($url[0] == '/') {
+			$url = substr($url, 1);
+		}
+		$this->url = $url;
+
+		if ($parseEnvironment) {
+			$this->_processPost();
+			$this->_processGet();
+			$this->_processFiles();
+		}
+		$this->here = $this->base . '/' . $this->url;
+	}
+
+}
+
 class RequestTest extends TestCase {
 
 /**
@@ -224,7 +246,7 @@ public function testPutParsingJSON() {
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 		$_SERVER['CONTENT_TYPE'] = 'application/json';
 
-		$request = $this->getMock('TestCakeRequest', array('_readInput'));
+		$request = $this->getMock(__NAMESPACE__ . '\TestRequest', array('_readInput'));
 		$request->expects($this->at(0))->method('_readInput')
 			->will($this->returnValue('{Article":["title"]}'));
 		$request->reConstruct();

diff --git a/lib/Cake/Test/TestCase/Network/SocketTest.php b/lib/Cake/Test/TestCase/Network/SocketTest.php
@@ -260,7 +260,7 @@ protected function _connectSocketToSslTls() {
 /**
  * testEnableCryptoBadMode
  *
- * @expectedException Cake\Error\InvalidArgumentException
+ * @expectedException InvalidArgumentException
  * @return void
  */
 	public function testEnableCryptoBadMode() {

diff --git a/lib/Cake/Test/TestCase/Utility/StringTest.php b/lib/Cake/Test/TestCase/Utility/StringTest.php
@@ -17,6 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 namespace Cake\Test\TestCase\Utility;
+use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\String;
 

diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php
@@ -258,8 +258,8 @@ protected function _testAction($url = '', $options = array()) {
 		$Dispatch = new ControllerTestDispatcher();
 		$Dispatch->loadRoutes = $this->loadRoutes;
 		$Dispatch->parseParams(new Event('ControllerTestCase', $Dispatch, array('request' => $request)));
-		if (!isset($request->params['controller']) && Router::currentRoute()) {
-			$this->headers = Router::currentRoute()->response->header();
+		if (!isset($request->params['controller']) && Router::getRequest()) {
+			$this->headers = Router::getRequest()->response->header();
 			return;
 		}
 		if ($this->__dirtyController) {