RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-21 23:43:53 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed classloader issue.

Browse Source
This commit is contained in:
romanb 2009-09-01 13:00:05 +00:00
parent 691aa92302
commit 7c359905a8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Doctrine/Common/ClassLoader.php
View File

@ -49,7 +49,7 @@ class ClassLoader
/**
* @var string Namespace separator
*/
private $_namespaceSeparator = array('\\', '_');
private $_namespaceSeparator = '\\';
/**
* @var string File extension used for classes
@ -131,12 +131,20 @@ class ClassLoader
if (class_exists($className, false) || interface_exists($className, false)) {
return false;
}
$prefix = substr($className, 0, strpos($className, $this->_namespaceSeparator));
$prefix = '';
$separator = $this->_namespaceSeparator;
if (($pos = strpos($className, $this->_namespaceSeparator)) !== false) {
$prefix = substr($className, 0, strpos($className, $this->_namespaceSeparator));
} else if (($pos = strpos($className, '_')) !== false) {
// Support for '_' namespace separator for compatibility with Zend/PEAR/...
$prefix = substr($className, 0, strpos($className, '_'));
$separator = '_';
}
// If we have a custom path for namespace, use it
$class = ((isset($this->_basePaths[$prefix])) ? $this->_basePaths[$prefix] . DIRECTORY_SEPARATOR : '')
. str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
. str_replace($separator, DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
// Assure file exists in codebase before require if flag is active
if ($this->_checkFileExists) {