dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Norm

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8581 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-09-14 15:33:14 +00:00
parent 23e00a95f8
commit 6700cc023e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Autoload.php
+11 -11
View File
@@ -85,17 +85,17 @@ class Autoload
if (substr($classname, -4) != 'Core') if (substr($classname, -4) != 'Core')
{ {
// If requested class does not exist, load associated core class // If requested class does not exist, load associated core class
if (isset($this->index[$classname]) && !$this->index[$classname]) if (isset($this->index[$classname]) && !$this->index[$classname])
{ {
require_once($this->root_dir.$this->index[$classname.'Core']); require_once($this->root_dir.$this->index[$classname.'Core']);
if (file_exists($this->root_dir.'override/'.$this->index[$classname.'Core'])) if (file_exists($this->root_dir.'override/'.$this->index[$classname.'Core']))
{ {
$this->generateIndex(); $this->generateIndex();
require_once($this->root_dir.$this->index[$classname]); require_once($this->root_dir.$this->index[$classname]);
} }
else else
{ {
// Since the classname does not exists (we only have a classCore class), we have to emulate the declaration of this class // Since the classname does not exists (we only have a classCore class), we have to emulate the declaration of this class
$class_infos = new ReflectionClass($classname.'Core'); $class_infos = new ReflectionClass($classname.'Core');
eval(($class_infos->isAbstract() ? 'abstract ' : '').'class '.$classname.' extends '.$classname.'Core {}'); eval(($class_infos->isAbstract() ? 'abstract ' : '').'class '.$classname.' extends '.$classname.'Core {}');
@@ -105,9 +105,7 @@ class Autoload
{ {
// request a non Core Class load the associated Core class if exists // request a non Core Class load the associated Core class if exists
if (isset($this->index[$classname.'Core'])) if (isset($this->index[$classname.'Core']))
{
require_once($this->root_dir.$this->index[$classname.'Core']); require_once($this->root_dir.$this->index[$classname.'Core']);
}
if (isset($this->index[$classname])) if (isset($this->index[$classname]))
require_once($this->root_dir.$this->index[$classname]); require_once($this->root_dir.$this->index[$classname]);
@@ -156,9 +154,11 @@ class Autoload
if (is_dir($this->root_dir.$path.$file)) if (is_dir($this->root_dir.$path.$file))
$classes = array_merge($classes, $this->getClassesFromDir($path.$file.'/')); $classes = array_merge($classes, $this->getClassesFromDir($path.$file.'/'));
else if (substr($file, -4) == '.php') else if (substr($file, -4) == '.php')
{ {
$content = file_get_contents($this->root_dir.$path.$file); $content = file_get_contents($this->root_dir.$path.$file);
if (preg_match('#\W((abstract\s+)?class|interface)\s+(?P<classname>'.basename($file, '.php').'(Core)?)(\s+(extends|implements)\s+[a-z][a-z0-9_]*)?\s*\{#i', $content, $m)) $pattern = '#\W((abstract\s+)?class|interface)\s+(?P<classname>'.basename($file, '.php')
.'(Core)?)(\s+(extends|implements)\s+[a-z][a-z0-9_]*)?\s*\{#i';
if (preg_match($pattern, $content, $m))
{ {
$classes[$m['classname']] = $path.$file; $classes[$m['classname']] = $path.$file;
if (substr($m['classname'], -4) == 'Core') if (substr($m['classname'], -4) == 'Core')