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

Merge pull request #1677 from dereuromark/master-cleanup

Browse source 
App::import to App::uses
This commit is contained in:
Mark Story 2013-09-25 11:40:17 -07:00
commit 1c148c28f0
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Console/Command/Task/TestTask.php
View file

@ -279,7 +279,7 @@ class TestTask extends BakeTask {
*/
public function buildTestSubject($type, $class) {
ClassRegistry::flush();
App::import($type, $class);
App::uses($class, $type);
$class = $this->getRealClassName($type, $class);
if (strtolower($type) === 'model') {
$instance = ClassRegistry::init($class);

3
lib/Cake/Network/Email/CakeEmail.php
View file

@ -24,7 +24,6 @@ App::uses('AbstractTransport', 'Network/Email');
App::uses('File', 'Utility');
App::uses('String', 'Utility');
App::uses('View', 'View');
App::import('I18n', 'Multibyte');
/**
* Cake e-mail class.
@ -980,7 +979,7 @@ class CakeEmail {
* 'contentDisposition' => false
* ));
* }}}
*
*
* Attach a file from string and specify additional properties:
*
* {{{

2
lib/Cake/Utility/Sanitize.php
View file

@ -20,7 +20,7 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::import('Model', 'ConnectionManager');
App::uses('ConnectionManager', 'Model');
/**
* Data Sanitization.