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

Refactoring App::build() so it looks more readable

Browse source
This commit is contained in:
Yosuke Basuke Suzuki 2011-10-06 10:47:26 +09:00 committed by Jose Lorenzo Rodriguez
parent 0a70963a74
commit 0b6c93cf82
2 changed files with 94 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

178
lib/Cake/Core/App.php
View file

@ -214,8 +214,9 @@ class App {
if (!empty($plugin)) { if (!empty($plugin)) {
$path = array(); $path = array();
$pluginPath = self::pluginPath($plugin); $pluginPath = self::pluginPath($plugin);
if (!empty(self::$_packageFormat[$type])) { $packageFormat= self::_packageFormat();
foreach (self::$_packageFormat[$type] as $f) { if (!empty($packageFormat[$type])) {
foreach ($packageFormat[$type] as $f) {
$path[] = sprintf($f, $pluginPath); $path[] = sprintf($f, $pluginPath);
} }
} }
@ -260,88 +261,6 @@ class App {
* @return void * @return void
*/ */
public static function build($paths = array(), $mode = App::PREPEND) { public static function build($paths = array(), $mode = App::PREPEND) {
if (empty(self::$_packageFormat)) {
self::$_packageFormat = array(
'Model' => array(
'%s' . 'Model' . DS,
'%s' . 'models' . DS
),
'Model/Behavior' => array(
'%s' . 'Model' . DS . 'Behavior' . DS,
'%s' . 'models' . DS . 'behaviors' . DS
),
'Model/Datasource' => array(
'%s' . 'Model' . DS . 'Datasource' . DS,
'%s' . 'models' . DS . 'datasources' . DS
),
'Model/Datasource/Database' => array(
'%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS,
'%s' . 'models' . DS . 'datasources' . DS . 'database' . DS
),
'Model/Datasource/Session' => array(
'%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS,
'%s' . 'models' . DS . 'datasources' . DS . 'session' . DS
),
'Controller' => array(
'%s' . 'Controller' . DS,
'%s' . 'controllers' . DS
),
'Controller/Component' => array(
'%s' . 'Controller' . DS . 'Component' . DS,
'%s' . 'controllers' . DS . 'components' . DS
),
'Controller/Component/Auth' => array(
'%s' . 'Controller' . DS . 'Component' . DS . 'Auth' . DS,
'%s' . 'controllers' . DS . 'components' . DS . 'auth' . DS
),
'View' => array(
'%s' . 'View' . DS,
'%s' . 'views' . DS
),
'View/Helper' => array(
'%s' . 'View' . DS . 'Helper' . DS,
'%s' . 'views' . DS . 'helpers' . DS
),
'Console' => array(
'%s' . 'Console' . DS,
'%s' . 'console' . DS
),
'Console/Command' => array(
'%s' . 'Console' . DS . 'Command' . DS,
'%s' . 'console' . DS . 'shells' . DS,
),
'Console/Command/Task' => array(
'%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS,
'%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS
),
'Lib' => array(
'%s' . 'Lib' . DS,
'%s' . 'libs' . DS
),
'locales' => array(
'%s' . 'Locale' . DS,
'%s' . 'locale' . DS
),
'Vendor' => array('%s' . 'Vendor' . DS, VENDORS),
'Plugin' => array(
APP . 'Plugin' . DS,
APP . 'plugins' . DS,
dirname(dirname(CAKE)) . DS . 'plugins' . DS,
)
);
}
if ($mode === App::RESET) {
foreach ($paths as $type => $new) {
if (!empty(self::$legacy[$type])) {
$type = self::$legacy[$type];
}
self::$_packages[$type] = (array)$new;
self::objects($type, null, false);
}
return $paths;
}
//Provides Backwards compatibility for old-style package names //Provides Backwards compatibility for old-style package names
$legacyPaths = array(); $legacyPaths = array();
foreach ($paths as $type => $path) { foreach ($paths as $type => $path) {
@ -350,10 +269,20 @@ class App {
} }
$legacyPaths[$type] = $path; $legacyPaths[$type] = $path;
} }
$paths = $legacyPaths; $paths = $legacyPaths;
if ($mode === App::RESET) {
foreach ($paths as $type => $new) {
self::$_packages[$type] = (array)$new;
self::objects($type, null, false);
}
return;
}
$packageFormat = self::_packageFormat();
$defaults = array(); $defaults = array();
foreach (self::$_packageFormat as $package => $format) { foreach ($packageFormat as $package => $format) {
foreach ($format as $f) { foreach ($format as $f) {
$defaults[$package][] = sprintf($f, APP); $defaults[$package][] = sprintf($f, APP);
} }
@ -853,6 +782,83 @@ class App {
return false; return false;
} }
protected static function _packageFormat() {
if (empty(self::$_packageFormat)) {
self::$_packageFormat = array(
'Model' => array(
'%s' . 'Model' . DS,
'%s' . 'models' . DS
),
'Model/Behavior' => array(
'%s' . 'Model' . DS . 'Behavior' . DS,
'%s' . 'models' . DS . 'behaviors' . DS
),
'Model/Datasource' => array(
'%s' . 'Model' . DS . 'Datasource' . DS,
'%s' . 'models' . DS . 'datasources' . DS
),
'Model/Datasource/Database' => array(
'%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS,
'%s' . 'models' . DS . 'datasources' . DS . 'database' . DS
),
'Model/Datasource/Session' => array(
'%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS,
'%s' . 'models' . DS . 'datasources' . DS . 'session' . DS
),
'Controller' => array(
'%s' . 'Controller' . DS,
'%s' . 'controllers' . DS
),
'Controller/Component' => array(
'%s' . 'Controller' . DS . 'Component' . DS,
'%s' . 'controllers' . DS . 'components' . DS
),
'Controller/Component/Auth' => array(
'%s' . 'Controller' . DS . 'Component' . DS . 'Auth' . DS,
'%s' . 'controllers' . DS . 'components' . DS . 'auth' . DS
),
'View' => array(
'%s' . 'View' . DS,
'%s' . 'views' . DS
),
'View/Helper' => array(
'%s' . 'View' . DS . 'Helper' . DS,
'%s' . 'views' . DS . 'helpers' . DS
),
'Console' => array(
'%s' . 'Console' . DS,
'%s' . 'console' . DS
),
'Console/Command' => array(
'%s' . 'Console' . DS . 'Command' . DS,
'%s' . 'console' . DS . 'shells' . DS,
),
'Console/Command/Task' => array(
'%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS,
'%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS
),
'Lib' => array(
'%s' . 'Lib' . DS,
'%s' . 'libs' . DS
),
'locales' => array(
'%s' . 'Locale' . DS,
'%s' . 'locale' . DS
),
'Vendor' => array(
'%s' . 'Vendor' . DS, VENDORS
),
'Plugin' => array(
APP . 'Plugin' . DS,
APP . 'plugins' . DS,
dirname(dirname(CAKE)) . DS . 'plugins' . DS
)
);
}
return self::$_packageFormat;
}
/** /**
* Object destructor. * Object destructor.
* *

4
lib/Cake/Test/Case/Core/AppTest.php
View file

@ -345,7 +345,7 @@ class AppTest extends CakeTestCase {
$path = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS; $path = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS;
App::build(array( App::build(array(
'plugins' => array($path) 'plugins' => array($path)
), true); ), App::RESET);
mkdir($path . '.svn'); mkdir($path . '.svn');
$result = App::objects('plugin', null, false); $result = App::objects('plugin', null, false);
rmdir($path . '.svn'); rmdir($path . '.svn');
@ -362,7 +362,7 @@ class AppTest extends CakeTestCase {
App::build(array( App::build(array(
'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS), 'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), App::RESET);
CakePlugin::loadAll(); CakePlugin::loadAll();
$result = App::objects('TestPlugin.model'); $result = App::objects('TestPlugin.model');