diff --git a/app/webroot/css.php b/app/webroot/css.php index bab3b5405..26cddcb14 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -25,9 +25,7 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) { /** * Ensure required classes are available. */ -if (!class_exists('File')) { - uses('file'); -} +App::import('Core', 'File'); /** * Make clean CSS diff --git a/cake/basics.php b/cake/basics.php index b88e14a9e..a5ee633dd 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -61,24 +61,6 @@ return true; } -/** - * Loads component/components from LIBS. Takes optional number of parameters. - * - * Example: - * - * `uses('flay', 'time');` - * - * @param string $name Filename without the .php part - * @deprecated Will be removed in 2.0 - * @link http://book.cakephp.org/view/1140/uses - */ - function uses() { - $args = func_get_args(); - foreach ($args as $file) { - require_once(LIBS . strtolower($file) . '.php'); - } - } - /** * Prints out debug information about given variable. * diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 323429f8d..524c8857a 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -167,25 +167,6 @@ class BasicsTest extends CakeTestCase { $_ENV = $__ENV; } -/** - * test uses() - * - * @return void - * @access public - * @deprecated - */ - function testUses() { - $this->skipIf(class_exists('Security') || class_exists('Sanitize'), '%s Security and/or Sanitize class already loaded'); - - $this->assertFalse(class_exists('Security')); - $this->assertFalse(class_exists('Sanitize')); - - uses('Security', 'Sanitize'); - - $this->assertTrue(class_exists('Security')); - $this->assertTrue(class_exists('Sanitize')); - } - /** * Test h() *