InstallingSymfonyWithSafeModeEnabled: symfony.safe-mode.patch

sf.base/autoload/sfSimpleAutoload.class.php

@@ -183 +183 @@
-  {
-    $finder = sfFinder::type('file')->follow_link()->name('*'.$ext);
-
-
+sfToolkit::
-    {
-      foreach ($dirs as $dir)
-      {

sf.base/cache/sfFileCache.class.php

@@ -110 +110 @@
-    }
-    else
-    {
-
+sfToolkit::
-    }
-
-    foreach ($paths as $path)

sf.base/config/sfApplicationConfiguration.class.php

@@ -296 +296 @@
-
-    $dirs[sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/actions'] = false;                                     // application
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, array_combine($pluginDirs, array_fill(0, count($pluginDirs), true))); // plugins
-    }
@@ -323 +323 @@
-
-    $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';                        // application
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);                                                        // plugins
-    }
@@ -414 +414 @@
-    }
-
-    // plugins
-
+sfToolkit::
-    if (isset($pluginDirs[0]))
-    {
-      $dirs[] = $pluginDirs[0];
@@ -447 +447 @@
-    }
-
-    // module in plugins
-
+sfToolkit::
-    if (isset($pluginDirs[0]))
-    {
-      $dirs[] = $pluginDirs[0];
-    }
-
-    // plugins
-
+sfToolkit::
-    if (isset($pluginDirs[0]))
-    {
-      $dirs[] = $pluginDirs[0];
@@ -477 +477 @@
-    $files = array(
-      sfConfig::get('sf_symfony_lib_dir').'/config/'.$globalConfigPath,              // symfony
-    );
-
-
+
+sfToolkit::
-    {
-      $files = array_merge($files, $bundledPluginDirs);                              // bundled plugins
-    }
-
-
+sfToolkit::
-    {
-      $files = array_merge($files, $pluginDirs);                                     // plugins
-    }
@@ -495 +495 @@
-      sfConfig::get('sf_app_cache_dir').'/'.$configPath,                             // generated modules
-    ));
-
-
+sfToolkit::
-    {
-      $files = array_merge($files, $pluginDirs);                                     // plugins
-    }

sf.base/config/sfAutoloadConfigHandler.class.php

@@ -80 +80 @@
-          $finder->prune($entry['exclude'])->discard($entry['exclude']);
-        }
-
-
+sfToolkit::
-        {
-          $files = $finder->in($matches);
-        }

sf.base/config/sfLoader.class.php

@@ -33 +33 @@
-    {
-      $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib/helper'; // module
-
-
+sfToolkit::
-      {
-        $dirs = array_merge($dirs, $pluginDirs);                                  // module plugins
-      }
@@ -43 +43 @@
-
-    $dirs[] = sfConfig::get('sf_lib_dir').'/helper';                              // project
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);                                    // plugins
-    }

sf.base/config/sfProjectConfiguration.class.php

@@ -147 +147 @@
-  {
-    $dirs = array();
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);
-    }
@@ -169 +169 @@
-  {
-    $dirs = array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/template');                  // project
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);                                                                // plugin
-    }
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $bundledPluginDirs);                                                         // bundled plugin
-    }
@@ -194 +194 @@
-  {
-    $dirs = array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/skeleton');                  // project
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);                                                                // plugin
-    }
-
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $bundledPluginDirs);                                                         // bundled plugin
-    }

sf.base/i18n/extract/sfI18nModuleExtract.class.php

@@ -57 +57 @@
-    }
-
-    // Extract from validate/*.yml files
-
+sfToolkit::
-    if (is_array($validateFiles))
-    {
-      foreach ($validateFiles as $validateFile)

sf.base/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php

@@ -53 +53 @@
-  {
-    $finder = sfFinder::type('file')->name('*schema.xml');
-
-
+sfToolkit::
-    if (self::CHECK_SCHEMA === $checkSchema && !count($schemas))
-    {
-      throw new sfCommandException('You must create a schema.xml file.');
@@ -87 +87 @@
-  {
-    $finder = sfFinder::type('file')->name('*schema.yml');
-    $dirs = array('config');
-
+sfToolkit::
-    {
-      $dirs = array_merge($dirs, $pluginDirs);
-    }
@@ -159 +159 @@
-
-  protected function copyXmlSchemaFromPlugins($prefix = '')
-  {
-
+sfToolkit::
-    {
-      $schemas = sfFinder::type('file')->name('*schema.xml')->in($dirs);
-      foreach ($schemas as $schema)

sf.base/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php

@@ -78 +78 @@
-    }
-    else
-    {
-
+sfToolkit::
-      {
-        $pluginDirs = array();
-      }

sf.base/task/project/sfUpgradeTo11Task.class.php

@@ -55 +55 @@
-    $baseDir = dirname(__FILE__).'/upgrade1.1/';
-    $classes = array();
-
-
+sfToolkit::
-    {
-      $class = str_replace(array($baseDir, '.class.php'), '', $file);
-

sf.base/task/project/upgrade1.1/sfComponentUpgrade.class.php

@@ -21 +21 @@
-  public function upgrade()
-  {
-    $phpFinder = $this->getFinder('file')->name('*.php');
-
+sfToolkit::
-    foreach ($phpFinder->in($dirs) as $file)
-    {
-      $content = file_get_contents($file);

sf.base/task/project/upgrade1.1/sfLayoutUpgrade.class.php

@@ -21 +21 @@
-  public function upgrade()
-  {
-    $finder = $this->getFinder('file')->name('*.php');
-
+sfToolkit::
-    {
-      $content = file_get_contents($file);
-      $content = preg_replace('#\$sf_data\->getRaw\(\'sf_content\'\)#s', '$sf_content', $content, -1, $count);

sf.base/task/project/upgrade1.1/sfUpgrade.class.php

@@ -60 +60 @@
-  protected function getProjectTemplateDirectories()
-  {
-    return array_merge(
-
-
+sfToolkit::
+sfToolkit::
-    );
-  }
-
@@ -70 +70 @@
-   */
-  protected function getProjectActionDirectories()
-  {
-
+sfToolkit::
-  }
-
-  /**
@@ -79 +79 @@
-  protected function getProjectLibDirectories()
-  {
-    return array_merge(
-
-
+sfToolkit::
+sfToolkit::
-      array(
-        sfConfig::get('sf_apps_dir').'/lib',
-        sfConfig::get('sf_lib_dir'),
@@ -94 +94 @@
-  protected function getProjectConfigDirectories()
-  {
-    return array_merge(
-
-
-
+sfToolkit::
+sfToolkit::
+sfToolkit::
-    );
-  }
-

sf.base/util/sfToolkit.class.php

@@ -100 +100 @@
-   */
-  public static function clearGlob($pattern)
-  {
-
+sfToolkit::
-
-    // order is important when removing directories
-    sort($files);
@@ -813 +813 @@
-
-    return $string;
-  }
+
+  /**
+   * replacement for php's glob()-function which doesn't work on systems with 
+   * php < 5.2.5 and safe-mode enabled.
+   *
+   * The bug is further described here: {@link http://bugs.php.net/bug.php?id=41655}
+   * please note that this method is far slower than the php-function.
+   *
+   * @param  string $expr  the glob-expression as it would be used in the glob()-function.
+   *
+   * @return array  an array of 
+   */
+  public static function glob($expr) {
+    if($tmp = @glob($expr)) { return $tmp; }
+
+    $parts = explode(DIRECTORY_SEPARATOR, $expr);
+    $searchedDirs = array("");
+    
+    while(null !== ($part = array_shift($parts)))
+    {
+      if($part === "") { continue; }
+      
+      if(!preg_match("/[*?]/", $part))
+      {
+        foreach($searchedDirs as $idx => $dir)
+        {
+          $searchedDirs[$idx] .= DIRECTORY_SEPARATOR . $part;
+        }
+        
+        continue;
+      }
+
+      if(count($parts) > 0)
+      {
+        $searchedDirs = sfFinder::type('dir')->name($part)->maxdepth(0)->in($searchedDirs);
+      }
+      else
+      {
+        $searchedDirs = sfFinder::type('any')->name($part)->maxdepth(0)->in($searchedDirs);
+      }
+    }
+    
+    return $searchedDirs;
+  }
-}

sf.base/vendor/lime/lime.php

@@ -1010 +1010 @@
-
-  public function register_glob($glob)
-  {
-
+sfToolkit::
-    {
-      foreach ($dirs as $file)
-      {