Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changing initial uses of App::uses() to the new packages system
  • Loading branch information
lorenzo committed Dec 15, 2010
1 parent 07e43bb commit 8436fd5
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/AuthComponent.php
Expand Up @@ -21,7 +21,7 @@
*/

App::uses('Router', 'Routing');
App::uses('Security', 'Core');
App::uses('Security', 'Utility');
App::uses('Debugger', 'Utility');

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/CookieComponent.php
Expand Up @@ -21,7 +21,7 @@
/**
* Load Security class
*/
App::uses('Security', 'Core');
App::uses('Security', 'Utility');

/**
* Cookie Component.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/RequestHandlerComponent.php
Expand Up @@ -20,7 +20,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

App::uses('Xml', 'Core');
App::uses('Xml', 'Utility');

/**
* Request object for handling HTTP requests
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Controller/Component/SecurityComponent.php
Expand Up @@ -17,8 +17,8 @@
* @since CakePHP(tm) v 0.10.8.2156
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('String', 'Core');
App::uses('Security', 'Core');
App::uses('String', 'Utility');
App::uses('Security', 'Utility');

/**
* SecurityComponent
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Network/CakeSocket.php
Expand Up @@ -17,7 +17,7 @@
* @since CakePHP(tm) v 1.2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('Validation', 'Core');
App::uses('Validation', 'Utility');

/**
* Cake network socket connection class.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Network/HttpSocket.php
Expand Up @@ -17,7 +17,7 @@
* @since CakePHP(tm) v 1.2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('CakeSocket', 'Core');
App::uses('CakeSocket', 'Network');
App::uses('Router', 'Routing');

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Route/PluginShortRoute.php
@@ -1,5 +1,5 @@
<?php
App::uses('CakeRoute', 'Core');
App::uses('CakeRoute', 'Routing/Route');
/**
* Plugin short route, that copies the plugin param to the controller parameters
* It is used for supporting /:plugin routes.
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Routing/Route/RedirectRoute.php
@@ -1,6 +1,6 @@
<?php
App::uses('CakeResponse', 'Core');
App::uses('CakeRoute', 'Core');
App::uses('CakeResponse', 'Network');
App::uses('CakeRoute', 'Routing/Route');

/**
* Redirect route will perform an immediate redirect
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Router.php
Expand Up @@ -570,7 +570,7 @@ private static function __parseExtension($url) {
*/
private static function __connectDefaultRoutes() {
if ($plugins = App::objects('plugin')) {
App::uses('PluginShortRoute', 'Core');
App::uses('PluginShortRoute', 'Routing/Route');
foreach ($plugins as $key => $value) {
$plugins[$key] = Inflector::underscore($value);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Utility/Security.php
Expand Up @@ -18,7 +18,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

App::uses('String', 'Core');
App::uses('String', 'Utility');

/**
* Security Library contains utility methods related to security
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/View/MediaView.php
Expand Up @@ -18,7 +18,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('View', 'View');
App::uses('CakeRequest', 'Core');
App::uses('CakeRequest', 'Network');

class MediaView extends View {
/**
Expand Down

0 comments on commit 8436fd5

Please sign in to comment.