adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing more App::import calls for App::uses

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-03 18:08:52 -04:30
parent fd639cc956
commit 1d129840f6
20 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/cake_request.php
View file

@ -17,7 +17,7 @@
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'Set');
App::uses('Set', 'Core');
/**
* A class that helps wrap Request information and particulars about a single request.

1
cake/libs/cake_session.php
View file

@ -141,7 +141,6 @@ class CakeSession {
* @param boolean $start Should session be started right now
*/
public static function init($base = null, $start = true) {
App::import('Core', 'Security');
self::$time = time();
$checkAgent = Configure::read('Session.checkAgent');

2
cake/libs/controller/component.php
View file

@ -16,7 +16,7 @@
* @since CakePHP(tm) v 1.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Controller', 'ComponentCollection', false);
App::uses('ComponentCollection', 'Controller');
/**
* Base class for an individual Component. Components provide resuable bits of

2
cake/libs/controller/component_collection.php
View file

@ -16,7 +16,7 @@
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'ObjectCollection');
App::uses('ObjectCollection', 'Core');
class ComponentCollection extends ObjectCollection {

6
cake/libs/controller/components/auth.php
View file

@ -20,8 +20,9 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'Router', false);
App::import('Core', 'Security', false);
App::uses('Router', 'Core');
App::uses('Security', 'Core');
App::uses('Debugger', 'Core');
/**
* Authentication control component class
@ -287,7 +288,6 @@ class AuthComponent extends Component {
}
}
if (Configure::read('debug') > 0) {
App::import('Debugger');
Debugger::checkSecurityKeys();
}
}

2
cake/libs/controller/components/cookie.php
View file

@ -21,7 +21,7 @@
/**
* Load Security class
*/
App::import('Core', 'Security');
App::uses('Security', 'Core');
/**
* Cookie Component.

2
cake/libs/controller/components/email.php
View file

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

5
cake/libs/controller/components/request_handler.php
View file

@ -20,6 +20,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('Xml', 'Core');
/**
* Request object for handling HTTP requests
*
@ -172,9 +174,6 @@ class RequestHandlerComponent extends Component {
}
if ($this->requestedWith('xml')) {
if (!class_exists('Xml')) {
App::import('Core', 'Xml');
}
try {
$xml = Xml::build(trim(file_get_contents('php://input')));

4
cake/libs/controller/components/security.php
View file

@ -17,8 +17,8 @@
* @since CakePHP(tm) v 0.10.8.2156
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'String', false);
App::import('Core', 'Security', false);
App::uses('String', 'Core');
App::uses('Security', 'Core');
/**
* SecurityComponent

5
cake/libs/controller/components/session.php
View file

@ -17,9 +17,8 @@
* @since CakePHP(tm) v 0.10.0.1232
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
if (!class_exists('cakesession')) {
require LIBS . 'cake_session.php';
}
App::uses('CakeSession', 'Core');
/**
* Session Component.

2
cake/libs/controller/scaffold.php
View file

@ -19,7 +19,7 @@
* @since Cake v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('View', 'Scaffold');
App::uses('Scaffold', 'View');
/**
* Scaffolding is a set of automatic actions for starting web development work faster.

8
cake/libs/debugger.php
View file

@ -24,12 +24,8 @@
* Included libraries.
*
*/
if (!class_exists('CakeLog')) {
require_once LIBS . 'cake_log.php';
}
if (!class_exists('String')) {
require_once LIBS . 'string.php';
}
App::uses('CakeLog', 'Core');
App::uses('String', 'Core');
/**
* Provide custom logging and error handling.

2
cake/libs/dispatcher.php
View file

@ -28,6 +28,7 @@ App::uses('Router', 'Core');
App::uses('CakeRequest', 'Core');
App::uses('CakeResponse', 'Core');
App::uses('Controller', 'Controller');
App::uses('Scaffold', 'Controller');
App::uses('View', 'View');
App::uses('Debugger', 'Core');
@ -163,7 +164,6 @@ class Dispatcher {
if (!isset($methods[$request->params['action']])) {
if ($controller->scaffold !== false) {
App::import('Controller', 'Scaffold', false);
return new Scaffold($controller, $request);
}
throw new MissingActionException(array(

4
cake/libs/http_socket.php
View file

@ -17,8 +17,8 @@
* @since CakePHP(tm) v 1.2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'CakeSocket');
App::import('Core', 'Router');
App::uses('CakeSocket', 'Core');
App::uses('Router', 'Core');
/**
* Cake network socket connection class.

4
cake/libs/i18n.php
View file

@ -21,8 +21,8 @@
/**
* Included libraries.
*/
App::import('Core', 'L10n');
App::import('Core', 'Multibyte');
App::uses('L10n', 'Core');
App::uses('Multibyte', 'Core');
/**
* I18n handles translation of Text and time format strings.

2
cake/libs/l10n.php
View file

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

2
cake/libs/model/behavior_collection.php
View file

@ -19,7 +19,7 @@
* @since CakePHP(tm) v 1.2.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'ObjectCollection');
App::uses('ObjectCollection', 'Core');
/**
* Model behavior collection class.

4
cake/libs/model/cake_schema.php
View file

@ -17,8 +17,8 @@
* @since CakePHP(tm) v 1.2.0.5550
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'Model');
App::import('Core', 'ConnectionManager');
App::uses('Model', 'Core');
App::uses('ConnectionManager', 'Core');
/**
* Base Class for Schema management

4
cake/libs/model/connection_manager.php
View file

@ -19,8 +19,6 @@
* @since CakePHP(tm) v 0.10.x.1402
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
include_once CONFIGS . 'database.php';
/**
* Manages loaded instances of DataSource objects
@ -59,6 +57,7 @@ class ConnectionManager {
*
*/
function __construct() {
include_once CONFIGS . 'database.php';
if (class_exists('DATABASE_CONFIG')) {
$this->config = new DATABASE_CONFIG();
$this->_getConnectionObjects();
@ -102,6 +101,7 @@ class ConnectionManager {
$conn = $_this->_connectionsEnum[$name];
$class = $conn['classname'];
require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
if ($_this->loadDataSource($name) === null) {
trigger_error(sprintf(__("ConnectionManager::getDataSource - Could not load class %s"), $class), E_USER_ERROR);
$null = null;

4
cake/libs/router.php
View file

@ -18,8 +18,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'CakeRequest');
App::import('Core', 'route/CakeRoute');
App::uses('CakeRequest', 'Core');
App::uses('CakeRoute', 'Core');
/**
* Parses the request URL into controller, action, and parameters.