X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fsymfony%2Fconsole%2FTests%2FDescriptor%2FJsonDescriptorTest.php;fp=vendor%2Fsymfony%2Fconsole%2FTests%2FDescriptor%2FJsonDescriptorTest.php;h=dffcaf6648cefa713628af48a960814a276df64d;hp=f9a15612b3f995177cb997f3a3a3d8e85d792b3f;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0

diff --git a/vendor/symfony/console/Tests/Descriptor/JsonDescriptorTest.php b/vendor/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
index f9a15612b..dffcaf664 100644
--- a/vendor/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
+++ b/vendor/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
@@ -26,10 +26,10 @@ class JsonDescriptorTest extends AbstractDescriptorTest
         return 'json';
     }
 
-    protected function assertDescription($expectedDescription, $describedObject)
+    protected function assertDescription($expectedDescription, $describedObject, array $options = array())
     {
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
-        $this->getDescriptor()->describe($output, $describedObject, array('raw_output' => true));
+        $this->getDescriptor()->describe($output, $describedObject, $options + array('raw_output' => true));
         $this->assertEquals(json_decode(trim($expectedDescription), true), json_decode(trim(str_replace(PHP_EOL, "\n", $output->fetch())), true));
     }
 }