Changeset 2586 for trunk/lib/Doctrine.php

Timestamp:

09/20/07 22:47:24 (16 months ago)

Author:

meus

Message:

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

Files:

• trunk/lib/Doctrine.php (modified) (4 diffs)

trunk/lib/Doctrine.php

@@ -392 +392 @@
      * @var string $path            doctrine root directory
      */
-    private static $path;
+    private static $_path;
     /**
      * @var boolean $_debug
@@ -413 +413 @@
     public static function getPath()
     {
-        if ( ! self::$path) {
-            self::$path = dirname(__FILE__);
-        }
-        return self::$path;
+        if ( ! self::$_path) {
+            self::$_path = dirname(__FILE__);
+        }
+        return self::$_path;
     }
     /**
@@ -592 +592 @@
             return false;
         }
-        if ( ! self::$path) {
-            self::$path = dirname(__FILE__);
-        }
-        $class = self::$path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR,$classname) . '.php';
+        if ( ! self::$_path) {
+            self::$_path = dirname(__FILE__);
+        }
+        $class = self::$_path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR,$classname) . '.php';
 
         if ( ! file_exists($class)) {
@@ -654 +654 @@
     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]);
     }
     /**