more quote identeiifers fixessss

[Pman.Core] / Process / FixCode.php

diff --git a/Process/FixCode.php b/Process/FixCode.php
index b066377..d4adbf7 100644 (file)
--- a/Process/FixCode.php
+++ b/Process/FixCode.php
@@ -55,7 +55,7 @@ class Pman_Core_Process_FixCode extends Pman
             
     );
     
-    function get($p,$opts)
+    function get($p,$opts=array())
     {
         $file = realpath($opts['file']);
         if (!file_exists($file) || !is_writable($file)) {
@@ -70,8 +70,12 @@ class Pman_Core_Process_FixCode extends Pman
             exit;
         }
         foreach($this->factory_map as $from=>$to) {
-            $c = str_ireplace("DB_DataObject::factory('$from')","DB_DataObject::factory('$to')", $c);
-            $c = str_ireplace("DB_DataObject::factory(\"$from\")","DB_DataObject::factory('$to')", $c);
+            
+            $c = preg_replace("/DB_DataObject::factory\((\s{0,}['\"]" . $from . "['\"]\s{0,})\)/i", "DB_DataObject::factory('{$to}')", $c);
+            
+//            $c = str_ireplace("DB_DataObject::factory('$from')","DB_DataObject::factory('$to')", $c);
+//            $c = str_ireplace("DB_DataObject::factory(\"$from\")","DB_DataObject::factory('$to')", $c);
+            
         }
         if ($old_c == $c) {
             echo "$file: SKIP NO CHANGES\n";