Ticket #2808: build_model.patch

lib/command/sfSymfonyCommandApplication.class.php

@@ -111 +111 @@
-    // include path
-    set_include_path(
-      sfConfig::get('sf_lib_dir').PATH_SEPARATOR.
-sfConfig::get('sf_app_lib_dir').PATH_SEPARATOR
-sfConfig::get('sf_model_dir').PATH_SEPARATOR
+(($tmp = sfConfig::get('sf_app_lib_dir', false)) ? ($tmp.PATH_SEPARATOR) : '')
+(($tmp = sfConfig::get('sf_model_dir', false)) ? ($tmp.PATH_SEPARATOR) : '')
-      get_include_path()
-    );
+
-  }
-
-  /**

lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php

@@ -893 +893 @@
-        $path = str_replace('/', DIRECTORY_SEPARATOR, $path);
-
-        foreach (self::$importPaths as $prefix) {
-DIRECTORY_SEPARATOR
+(( $prefix !== '') ? DIRECTORY_SEPARATOR : '')
-            if (file_exists($foo_path)) {
-                return $foo_path;
-            }

lib/util/sfFinder.class.php

@@ -347 +347 @@
-      $numargs  = count($arg_list);
-    }
-
+    if( $arg_list === false || $arg_list[0] === false )
+    {
+      return array();
+    }
+
-    for ($i = 0; $i < $numargs; $i++)
-    {
-      $real_dir = realpath($arg_list[$i]);