adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing all uses of uses() global method & replacing with require or App::import.

Browse source
This commit is contained in:
jperras 2009-07-23 16:53:37 -04:00
parent d70900c540
commit e40428801e
18 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/libs/shell.php
View file

@ -436,7 +436,7 @@ class Shell extends Object {
} }
} }
if (!class_exists('File')) { if (!class_exists('File')) {
uses('file'); require LIBS . 'file.php';
} }
if ($File = new File($path, true)) { if ($File = new File($path, true)) {

2
cake/console/libs/tasks/project.php
View file

@ -194,7 +194,7 @@ class ProjectTask extends Shell {
$contents = $File->read(); $contents = $File->read();
if (preg_match('/([\\t\\x20]*Configure::write\\(\\\'Security.salt\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) { if (preg_match('/([\\t\\x20]*Configure::write\\(\\\'Security.salt\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
if (!class_exists('Security')) { if (!class_exists('Security')) {
uses('Security'); require LIBS . 'security.php';
} }
$string = Security::generateAuthKey(); $string = Security::generateAuthKey();
$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \''.$string.'\');', $contents); $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \''.$string.'\');', $contents);

6
cake/console/libs/templates/default/views/home.ctp
View file

@ -52,7 +52,9 @@ endif;
</p> </p>
<?php <?php
if (!empty(\$filePresent)): if (!empty(\$filePresent)):
uses('model' . DS . 'connection_manager'); if (!class_exists('ConnectionManager')) {
require LIBS . 'model' . DS . 'connection_manager.php';
}
\$db = ConnectionManager::getInstance(); \$db = ConnectionManager::getInstance();
\$connected = \$db->getDataSource('default'); \$connected = \$db->getDataSource('default');
?> ?>
@ -79,4 +81,4 @@ $output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\
$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n"; $output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
$output .= "?>\n"; $output .= "?>\n";
$output .= "</p>\n"; $output .= "</p>\n";
?> ?>

2
cake/console/libs/templates/skel/webroot/css.php
View file

@ -32,7 +32,7 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
* Enter description here... * Enter description here...
*/ */
if (!class_exists('File')) { if (!class_exists('File')) {
uses('file'); require LIBS . 'file.php';
} }
/** /**
* Enter description here... * Enter description here...

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

@ -201,7 +201,7 @@ class DbAcl extends AclBase {
function __construct() { function __construct() {
parent::__construct(); parent::__construct();
if (!class_exists('AclNode')) { if (!class_exists('AclNode')) {
uses('model' . DS . 'db_acl'); require LIBS . 'model' . DS . 'db_acl.php';
} }
$this->Aro =& ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro')); $this->Aro =& ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
$this->Aco =& ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco')); $this->Aco =& ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco'));

2
cake/libs/file.php
View file

@ -27,7 +27,7 @@
* *
*/ */
if (!class_exists('Object')) { if (!class_exists('Object')) {
uses('object'); require LIBS . 'object.php';
} }
if (!class_exists('Folder')) { if (!class_exists('Folder')) {
require LIBS . 'folder.php'; require LIBS . 'folder.php';

2
cake/libs/folder.php
View file

@ -27,7 +27,7 @@
* *
*/ */
if (!class_exists('Object')) { if (!class_exists('Object')) {
uses('object'); require LIBS . 'object.php';
} }
/** /**
* Folder structure browser, lists folders and files. * Folder structure browser, lists folders and files.

5
cake/libs/magic_db.php
View file

@ -22,8 +22,11 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/ */
if (!class_exists('Object')) {
require LIBS . 'object.php';
}
if (!class_exists('File')) { if (!class_exists('File')) {
uses('object', 'file'); require LIBS . 'file.php';
} }
/** /**
* A class to parse and use the MagicDb for file type analysis * A class to parse and use the MagicDb for file type analysis

2
cake/libs/model/behaviors/acl.php
View file

@ -55,7 +55,7 @@ class AclBehavior extends ModelBehavior {
$type = $this->__typeMaps[$this->settings[$model->name]['type']]; $type = $this->__typeMaps[$this->settings[$model->name]['type']];
if (!class_exists('AclNode')) { if (!class_exists('AclNode')) {
uses('model' . DS . 'db_acl'); require LIBS . 'model' . DS . 'db_acl.php';
} }
$model->{$type} =& ClassRegistry::init($type); $model->{$type} =& ClassRegistry::init($type);
if (!method_exists($model, 'parentNode')) { if (!method_exists($model, 'parentNode')) {

2
cake/libs/object.php
View file

@ -148,7 +148,7 @@ class Object {
*/ */
function log($msg, $type = LOG_ERROR) { function log($msg, $type = LOG_ERROR) {
if (!class_exists('CakeLog')) { if (!class_exists('CakeLog')) {
uses('cake_log'); require LIBS . 'cake_log.php';
} }
if (is_null($this->_log)) { if (is_null($this->_log)) {
$this->_log = new CakeLog(); $this->_log = new CakeLog();

4
cake/libs/view/pages/home.ctp
View file

@ -78,7 +78,9 @@ endif;
</p> </p>
<?php <?php
if (isset($filePresent)): if (isset($filePresent)):
uses('model' . DS . 'connection_manager'); if (!class_exists('ConnectionManager')) {
require LIBS . 'model' . DS . 'connection_manager.php';
}
$db = ConnectionManager::getInstance(); $db = ConnectionManager::getInstance();
@$connected = $db->getDataSource('default'); @$connected = $db->getDataSource('default');
?> ?>

1
cake/tests/cases/basics.test.php
View file

@ -147,6 +147,7 @@ class BasicsTest extends CakeTestCase {
* *
* @access public * @access public
* @return void * @return void
* @deprecated
*/ */
function testUses() { function testUses() {
$this->skipIf(class_exists('Security') || class_exists('Sanitize'), '%s Security and/or Sanitize class already loaded'); $this->skipIf(class_exists('Security') || class_exists('Sanitize'), '%s Security and/or Sanitize class already loaded');

4
cake/tests/cases/libs/magic_db.test.php
View file

@ -22,7 +22,9 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/ */
uses('magic_db', 'object'); if (!class_exists('MagicDb')) {
require LIBS . 'magic_db.php';
}
/** /**
* The test class for the MagicDb class * The test class for the MagicDb class
* *

1
cake/tests/cases/libs/set.test.php
View file

@ -1755,7 +1755,6 @@ class SetTest extends CakeTestCase {
$result = Set::reverse($class); $result = Set::reverse($class);
$this->assertIdentical($result, $expected); $this->assertIdentical($result, $expected);
uses('model'.DS.'model');
$model = new Model(array('id' => false, 'name' => 'Model', 'table' => false)); $model = new Model(array('id' => false, 'name' => 'Model', 'table' => false));
$expected = array( $expected = array(
'Behaviors' => array('modelName' => 'Model', '_attached' => array(), '_disabled' => array(), '__methods' => array(), '__mappedMethods' => array(), '_log' => null), 'Behaviors' => array('modelName' => 'Model', '_attached' => array(), '_disabled' => array(), '__methods' => array(), '__mappedMethods' => array(), '_log' => null),

11
cake/tests/cases/libs/view/helpers/ajax.test.php
View file

@ -27,16 +27,7 @@
if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
define('CAKEPHP_UNIT_TEST_EXECUTION', 1); define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
} }
uses( App::import('Helper', array('Html', 'Form', 'Javascript', 'Ajax'));
'view' . DS . 'helpers' . DS . 'app_helper',
'controller' . DS . 'controller',
'model' . DS . 'model',
'view' . DS . 'helper',
'view' . DS . 'helpers'.DS.'ajax',
'view' . DS . 'helpers' . DS . 'html',
'view' . DS . 'helpers' . DS . 'form',
'view' . DS . 'helpers' . DS . 'javascript'
);
/** /**
* AjaxTestController class * AjaxTestController class
* *

7
cake/tests/cases/libs/view/helpers/js.test.php
View file

@ -27,13 +27,6 @@
if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
define('CAKEPHP_UNIT_TEST_EXECUTION', 1); define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
} }
uses(
'view' . DS . 'helpers' . DS . 'app_helper',
'controller' . DS . 'controller',
'model' . DS . 'model',
'view' . DS . 'helper',
'view' . DS . 'helpers' . DS . 'js'
);
/** /**
* JsHelperTest class * JsHelperTest class
* *

6
cake/tests/test_app/views/pages/home.ctp
View file

@ -51,7 +51,9 @@ endif;
</p> </p>
<?php <?php
if (!empty($filePresent)): if (!empty($filePresent)):
uses('model' . DS . 'connection_manager'); if (!class_exists('ConnectionManager')) {
require LIBS . 'model' . DS . 'connection_manager.php';
}
$db = ConnectionManager::getInstance(); $db = ConnectionManager::getInstance();
$connected = $db->getDataSource('default'); $connected = $db->getDataSource('default');
?> ?>
@ -77,4 +79,4 @@ if (!empty($filePresent)):
You can also add some CSS styles for your pages at: %s', true), You can also add some CSS styles for your pages at: %s', true),
APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css'); APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');
?> ?>
</p> </p>

4
cake/tests/test_app/views/posts/test_nocache_tags.ctp
View file

@ -81,7 +81,9 @@
</p> </p>
<?php <?php
if (!empty($filePresent)): if (!empty($filePresent)):
uses('model' . DS . 'connection_manager'); if (!class_exists('ConnectionManager')) {
require LIBS . 'model' . DS . 'connection_manager.php';
}
$db = ConnectionManager::getInstance(); $db = ConnectionManager::getInstance();
$connected = $db->getDataSource('default'); $connected = $db->getDataSource('default');
?> ?>