Changeset 10702

Timestamp:

08/06/08 13:11:16 (1 year ago)

Author:

hartym

Message:

[1.1] Bug: when tasks are nested, newly registered autoloading path does not take precedence over older ones if it was already registered before.

Bug example: registering /a/, then /b/, then /a/ again will give autoloading precedence to /b/, so if a task needs /a/ then /b/ and another needs /b/ then /a/, the first to do it will forbid the other one to bahve correct.

This allows tasks to override their parent task autoloading settings and thus showing correct behavior when an application overrides a plugin's model task (otherwise, the load-data part in build-all-load doesnot behave the same way on its own and within the combo task)

Files:

• branches/1.1/lib/autoload/sfSimpleAutoload.class.php (modified) (2 diffs)

branches/1.1/lib/autoload/sfSimpleAutoload.class.php

@@ -175 +175 @@
-
-  /**
-
+ if not yet present and give it the highest possible precedence
-   *
-   * @param string The directory to look for classes
@@ -183 +183 @@
-  {
-    $finder = sfFinder::type('file')->follow_link()->name('*'.$ext);
+
-    if($dirs = glob($dir))
-    {
-      foreach ($dirs as $dir)
-      {
-in_array($dir, $this->dirs
+false !== ($key = array_search($dir, $this->dirs)
-        {
+          unset($this->dirs[$key]);
+          $this->dirs[] = $dir;
+
-          if ($this->cacheLoaded)
-          {