Changeset 19587

Timestamp:

06/26/09 11:26:27 (8 months ago)

Author:

fabien

Message:

[dependency_injection] refactored loader file classes

Files:

• components/dependency_injection/trunk/lib/sfServiceContainerLoaderFile.php (modified) (1 diff)
• components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileIni.php (modified) (1 diff)
• components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileXml.php (modified) (2 diffs)
• components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileYaml.php (modified) (1 diff)

components/dependency_injection/trunk/lib/sfServiceContainerLoaderFile.php

@@ -41 +41 @@
-  }
-
+  /**
+   * Loads a resource.
+   *
+   * A resource is a file or an array of files.
+   *
+   * The concrete classes always hava access to an array of files
+   * as this method converts single files to arrays.
+   *
+   * @param mixed $resource The resource path
+   */
+  public function load($resource)
+  {
+    if (!is_array($resource))
+    {
+      $resource = array($resource);
+    }
+
+    return parent::load($resource);
+  }
+
-  protected function getAbsolutePath($file, $currentPath = null)
-  {

components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileIni.php

@@ -22 +22 @@
-  public function doLoad($files)
-  {
-    if (!is_array($files))
-    {
-      $files = array($files);
-    }
-
-    $parameters = array();
-    foreach ($files as $file)

components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileXml.php

@@ -22 +22 @@
-  public function doLoad($files)
-  {
-    if (!is_array($files))
-    {
-      $files = array($files);
-    }
-
-    return $this->parse($this->getFilesAsXml($files));
-  }
@@ -169 +164 @@
-  }
-
-
+array 
-  {
-    $xmls = array();

components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileYaml.php

@@ -24 +24 @@
-  public function doLoad($files)
-  {
-    if (!is_array($files))
-    {
-      $files = array($files);
-    }
-
-    return $this->parse($this->getFilesAsArray($files));
-  }