More replacements of App::import to App::uses

lib/Cake/Error/ExceptionRenderer.php

@@ -21,7 +21,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Sanitize', 'Utility');
+App::uses('Sanitize', 'Utility');
 
 /**
  * Exception Renderer.

lib/Cake/tests/cases/console/shells/command_list.test.php

@@ -17,7 +17,8 @@
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('CommandListShell', 'Console/Command');
+
+App::uses('CommandListShell', 'Console/Command');
 
 
 class TestStringOutput extends ConsoleOutput {

lib/Cake/tests/cases/console/shells/tasks/plugin.test.php

@@ -24,7 +24,7 @@ App::uses('ShellDispatcher', 'Console');
 App::uses('Shell', 'Console');
 App::uses('PluginTask', 'Console/Command/Task');
 App::uses('ModelTask', 'Console/Command/Task');
-App::import('File', 'Utility');
+App::uses('File', 'Utility');
 
 /**
  * PluginTaskPlugin class

lib/Cake/tests/cases/console/shells/tasks/project.test.php

@@ -23,7 +23,7 @@
 App::uses('ShellDispatcher', 'Console');
 App::uses('Shell', 'Console');
 App::uses('ProjecTask', 'Console/Command/Task');
-App::import('File', 'Utility');
+App::uses('File', 'Utility');
 
 /**
  * ProjectTask Test class

lib/Cake/tests/cases/console/shells/tasks/view.test.php

@@ -19,16 +19,14 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/view',
-	'tasks/controller',
-	'tasks/template',
-	'tasks/project',
-	'tasks/db_config'
-));
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ViewTask', 'Console/Command/Task');
+App::uses('ControllerTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('ProjectTask', 'Console/Command/Task');
+App::uses('DbConfigTask', 'Console/Command/Task');
 
 /**
  * Test View Task Comment Model

lib/Cake/tests/cases/console/shells/testsuite.test.php

@@ -18,11 +18,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Testsuite');
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
-
+App::uses('ShellDispatcher', 'Console');
+App::uses('TestSuiteShell', 'Console/Command');
 
 class TestSuiteShellTest extends CakeTestCase {
 

lib/Cake/tests/cases/libs/cake_log.test.php

@@ -17,8 +17,9 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Log');
-App::import('Core', 'log/FileLog');
+
+App::uses('CakeLog', 'Log');
+App::uses('FileLog', 'Log/Engine');
 
 /**
  * CakeLogTest class

lib/Cake/tests/cases/libs/cake_request.test.php

@@ -17,10 +17,9 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('dispatcher')) {
-	require CAKE . 'dispatcher.php';
-}
-App::import('Core', 'CakeRequest');
+
+App::uses('Dispatcher', 'Routing')
+App::uses('CakeRequest', 'Network');
 
 class CakeRequestTestCase extends CakeTestCase {
 /**

lib/Cake/tests/cases/libs/cake_response.test.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Core', 'CakeResponse');
+App::uses('CakeResponse', 'Network');
 
 class CakeResponseTestCase extends CakeTestCase {
 

lib/Cake/tests/cases/libs/cake_session.test.php

@@ -17,9 +17,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('CakeSession')) {
-	App::import('Core', 'CakeSession');
-}
+
+App::uses('CakeSession', 'Model/Datasource');
 
 class TestCakeSession extends CakeSession {
 	public static function setUserAgent($value) {

lib/Cake/tests/cases/libs/cake_socket.test.php

@@ -17,7 +17,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'CakeSocket');
+
+App::uses('CakeSocket', 'Network');
 
 /**
  * SocketTest class

lib/Cake/tests/cases/libs/cake_test_case.test.php

@@ -19,11 +19,12 @@
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-require_once TEST_CAKE_CORE_INCLUDE_PATH  . 'tests' . DS . 'lib' . DS . 'reporter' . DS . 'cake_html_reporter.php';
 
-if (!class_exists('AppController')) {
-	require_once LIBS . 'controller' . DS . 'app_controller.php';
+App::uses('Controller', 'Controller');
+App::uses('CakeHtmlReporter', 'TestSuite/Reporter');
+
+if (!class_exists('AppController', false)) {
+	require_once LIBS . 'Controller' . DS . 'app_controller.php';
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }

lib/Cake/tests/cases/libs/cake_test_fixture.test.php

@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Datasource', 'DboSource', false);
+App::import('DboSource', 'Model/Datasource');
 
 /**
  * CakeTestFixtureTestFixture class

lib/Cake/tests/cases/libs/class_registry.test.php

@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ClassRegistry');
+App::uses('ClassRegistry', 'Utility');
 
 /**
  * ClassRegisterModel class

lib/Cake/tests/cases/libs/config/ini_reader.test.php

@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/IniReader');
+App::uses('IniReader', 'Configure');
 
 class IniReaderTest extends CakeTestCase {
 

lib/Cake/tests/cases/libs/config/php_reader.test.php

@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/PhpReader');
+App::uses('PhpReader', 'Configure');
 
 class PhpReaderTest extends CakeTestCase {
 /**

lib/Cake/tests/cases/libs/configure.test.php

@@ -19,7 +19,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/PhpReader');
+App::uses('PhpReader', 'Configure');
 
 /**
  * ConfigureTest

lib/Cake/tests/cases/libs/controller/component.test.php

@@ -17,10 +17,11 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Controller', 'Component', false);
 
-if (!class_exists('AppController')) {
+App::uses('Controller', 'Controller');
+App::uses('Component', 'Controller');
+
+if (!class_exists('AppController', false)) {
 
 /**
  * AppController class

lib/Cake/tests/cases/libs/controller/component_collection.test.php

@@ -18,8 +18,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Component', array('Cookie', 'Security'));
-App::import('Core', 'ComponentCollection');
+App::uses('CookieComponent', 'Controller/Component');
+App::uses('SecurityComponent', 'Controller/Component');
+App::uses('ComponentCollection', 'Controller');
 
 class ComponentCollectionTest extends CakeTestCase {
 /**

lib/Cake/tests/cases/libs/controller/components/acl.test.php

@@ -17,8 +17,9 @@
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'Acl');
-App::import('model' . DS . 'db_acl');
+App::uses('AclComponent', 'Component');
+App::uses('DbAcl', 'Model');
+
 
 /**
  * AclNodeTwoTestBase class

lib/Cake/tests/cases/libs/route/redirect_route.test.php

@@ -1,7 +1,9 @@
 <?php
-App::import('Core', 'route/RedirectRoute');
-App::import('Core', 'CakeResponse');
-App::import('Core', 'Router');
+
+App::uses('RedirectRoute', 'Routing/Route');
+App::uses('CakeResponse', 'Network');
+App::uses('Router', 'Routing');
+
 /**
  * test case for RedirectRoute
  *

lib/Cake/tests/cases/libs/router.test.php

@@ -17,8 +17,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Router'));
-App::import('Core', 'CakeResponse');
+
+App::uses('Router', 'Routing');
+App::uses('CakeResponse', 'Network');
 
 if (!defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');