Make YAML an optional dependency.

sebastianbergmann · Jan 19, 2010 · 6a1a170 · 6a1a170
1 parent 3aa062a
commit 6a1a170
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/PHPUnit/Util/Log/TAP.php b/PHPUnit/Util/Log/TAP.php
@@ -47,7 +47,10 @@
 require_once 'PHPUnit/Util/Filter.php';
 require_once 'PHPUnit/Util/Printer.php';
 require_once 'PHPUnit/Util/Test.php';
-require_once 'SymfonyComponents/YAML/sfYamlDumper.php';
+
+if (PHPUnit_Util_Filesystem::fileExistsInIncludePath('SymfonyComponents/YAML/sfYamlDumper.php')) {
+    require_once 'SymfonyComponents/YAML/sfYamlDumper.php';
+}
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
 
@@ -137,14 +140,16 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
             }
         }
 
-        $yaml = new sfYamlDumper();
+        if (class_exists('sfYamlDumper')) {
+            $yaml = new sfYamlDumper;
 
-        $this->write(
-          sprintf(
-            "  ---\n%s  ...\n",
-            $yaml->dump($diagnostic, 2, 2)
-          )
-        );
+            $this->write(
+              sprintf(
+                "  ---\n%s  ...\n",
+                $yaml->dump($diagnostic, 2, 2)
+              )
+            );
+        }
     }
 
     /**

diff --git a/package.xml b/package.xml
@@ -1102,11 +1102,6 @@
    <pearinstaller>
     <min>1.8.1</min>
    </pearinstaller>
-   <package>
-    <name>YAML</name>
-    <channel>pear.symfony-project.com</channel>
-    <min>1.0.2</min>
-   </package>
    <extension>
     <name>dom</name>
    </extension>
@@ -1130,6 +1125,11 @@
     <name>Log</name>
     <channel>pear.php.net</channel>
    </package>
+   <package>
+    <name>YAML</name>
+    <channel>pear.symfony-project.com</channel>
+    <min>1.0.2</min>
+   </package>
    <extension>
     <name>json</name>
    </extension>