RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 05:13:37 +03:00
Code Issues Projects Releases Wiki Activity

fixing coding standard $_ infront of private var and removing \e from pcre call due to incompatibility with suhosin

Browse source
This commit is contained in:
meus 2007-09-20 21:47:24 +00:00
parent dc701e1345
commit aae6950889
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/Doctrine.php
View file

@ -391,7 +391,7 @@ final class Doctrine
/** /**
* @var string $path doctrine root directory * @var string $path doctrine root directory
*/ */
private static $path; private static $_path;
/** /**
* @var boolean $_debug * @var boolean $_debug
*/ */
@ -412,10 +412,10 @@ final class Doctrine
*/ */
public static function getPath() public static function getPath()
{ {
if ( ! self::$path) { if ( ! self::$_path) {
self::$path = dirname(__FILE__); self::$_path = dirname(__FILE__);
} }
return self::$path; return self::$_path;
} }
/** /**
* loadAll * loadAll
@ -591,10 +591,10 @@ final class Doctrine
if (class_exists($classname, false)) { if (class_exists($classname, false)) {
return false; return false;
} }
if ( ! self::$path) { if ( ! self::$_path) {
self::$path = dirname(__FILE__); self::$_path = dirname(__FILE__);
} }
$class = self::$path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR,$classname) . '.php'; $class = self::$_path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR,$classname) . '.php';
if ( ! file_exists($class)) { if ( ! file_exists($class)) {
return false; return false;
@ -653,7 +653,19 @@ final class Doctrine
*/ */
public static function classify($tablename) public static function classify($tablename)
{ {
return preg_replace('~(_?)(_)([\w])~e', '"$1".strtoupper("$3")', ucfirst($tablename)); echo "rat";
return preg_replace_callback('~(_?)(_)([\w])~', array("Doctrine", "classifyCallback"), ucfirst($tablename));
}
/**
* Callback function to classify a classname propperly.
*
* @param array $matches An array of matches from a pcre_replace call
* @return string A string with matches 1 and mathces 3 in upper case.
*/
public static function classifyCallback($matches)
{
return $matches[1] . strtoupper($matches[3]);
} }
/** /**
* checks for valid class name (uses camel case and underscores) * checks for valid class name (uses camel case and underscores)
@ -669,4 +681,4 @@ final class Doctrine
return true; return true;
} }
} }