Ticket #3407: OverloadBundledPlugins.php.patch

lib/command/sfSymfonyCommandApplication.class.php

@@ -36 +36 @@
-    $this->setName('symfony');
-    $this->setVersion(SYMFONY_VERSION);
-
-
+$configuration
-  }
-
-  /**
@@ -73 +73 @@
-   * Loads all available tasks.
-   *
-   * Looks for tasks in the symfony core, the current project and all project plugins.
+   *
+   * @param sfProjectConfiguration The project configuration
-   */
-
+sfProjectConfiguration $configuration
-  {
-    $dirs = array(
-      sfConfig::get('sf_symfony_lib_dir').'/task',               // symfony tasks
-      sfConfig::get('sf_symfony_lib_dir').'/plugins/*/lib/task', // bundled plugin tasks
-      sfConfig::get('sf_plugins_dir').'/*/lib/task',             // plugin tasks
-      sfConfig::get('sf_lib_dir').'/task',                       // project tasks
-    );
-    $finder = sfFinder::type('file')->name('*Task.class.php');
-
-dirs as $globDir
+finder->in($dirs) as $task
-    {
-
-
-
-
+
+
-
-
+
+
+
+
-      {
-
+
+
+
+
-      }
-    }
-  }

lib/config/sfProjectConfiguration.class.php

@@ -227 +227 @@
-  }
-
-  /**
+   * Gets the paths to plugins root directories, minding overloaded plugins.
+   *
+   * @return array The plugin root paths.
+   */
+  public function getPluginPaths()
+  {
+    $plugins = sfFinder::type('dir')->discard('.*')->prune('.*')->maxdepth(0)->in(sfConfig::get('sf_plugins_dir'));
+
+    $bundledPluginDir = sfConfig::get('sf_symfony_lib_dir').'/plugins';
+    $bundledPlugins = sfFinder::type('dir')->maxdepth(0)->relative()->in($bundledPluginDir);
+    foreach ($bundledPlugins as $bundledPlugin)
+    {
+      if (!is_dir(sfConfig::get('sf_plugins_dir').'/'.$bundledPlugin))
+      {
+        $plugins[] = $bundledPluginDir.'/'.$bundledPlugin;
+      }
+    }
+
+    return $plugins;
+  }
+
+  /**
-   * Returns the event dispatcher.
-   *
-   * @return sfEventDispatcher A sfEventDispatcher instance

lib/config/sfApplicationConfiguration.class.php

@@ -506 +506 @@
-   */
-  public function loadPluginConfig()
-  {
-if ($pluginConfigs = glob(sfConfig::get('sf_symfony_lib_dir').'/plugins/*/config/config.php')
+foreach ($this->getPluginPaths() as $path
-    {
-
+
+
-      {
-        require $config;
-      }
-    }
-
-    if ($pluginConfigs = glob(sfConfig::get('sf_plugins_dir').'/*/config/config.php'))
-    {
-      foreach ($pluginConfigs as $config)
-      {
-        require $config;
-      }
-    }
-  }
-
-  /**