Changeset 19582

Timestamp:

06/26/09 09:25:52 (8 months ago)

Author:

fabien

Message:

[dependency_injection] allowed empty YAML file for service definitions, and simplified the YAML output when no parameter or service are defined

Files:

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

components/dependency_injection/trunk/lib/sfServiceContainerDumperYaml.php

@@ -92 +92 @@
-  protected function addServices()
-  {
+    if (!$this->container->getServiceDefinitions())
+    {
+      return '';
+    }
+
-    $code = "services:\n";
-    foreach ($this->container->getServiceDefinitions() as $id => $definition)
@@ -103 +108 @@
-  protected function addParameters()
-  {
+    if (!$this->container->getParameters())
+    {
+      return '';
+    }
+
-    return sfYaml::dump(array('parameters' => $this->escape($this->container->getParameters())), 2);
-  }

components/dependency_injection/trunk/lib/sfServiceContainerLoaderFileYaml.php

@@ -177 +177 @@
-  protected function validate($content, $file)
-  {
+    if (is_null($content))
+    {
+      return $content;
+    }
+
-    if (!is_array($content))
-    {