Add filter in VarDumperTestTrait

maidmaid · maidmaid · commit 7fea5364aaab · 2017-05-19T15:08:09.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php b/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php
@@ -19,17 +19,17 @@
  */
 trait VarDumperTestTrait
 {
-    public function assertDumpEquals($dump, $data, $message = '')
+    public function assertDumpEquals($dump, $data, $message = '', $filter = 0)
     {
-        $this->assertSame(rtrim($dump), $this->getDump($data), $message);
+        $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);
     }
 
-    public function assertDumpMatchesFormat($dump, $data, $message = '')
+    public function assertDumpMatchesFormat($dump, $data, $message = '', $filter = 0)
     {
-        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);
+        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);
     }
 
-    protected function getDump($data, $key = null)
+    protected function getDump($data, $key = null, $filter = 0)
     {
         $flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;
         $flags |= getenv('DUMP_STRING_LENGTH') ? CliDumper::DUMP_STRING_LENGTH : 0;
@@ -38,7 +38,7 @@ protected function getDump($data, $key = null)
         $cloner->setMaxItems(-1);
         $dumper = new CliDumper(null, null, $flags);
         $dumper->setColors(false);
-        $data = $cloner->cloneVar($data)->withRefHandles(false);
+        $data = $cloner->cloneVar($data, $filter)->withRefHandles(false);
         if (null !== $key && null === $data = $data->seek($key)) {
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,17 @@`
`19`	`19`	`*/`
`20`	`20`	`trait VarDumperTestTrait`
`21`	`21`	`{`
`22`		`- public function assertDumpEquals($dump, $data, $message = '')`
	`22`	`+ public function assertDumpEquals($dump, $data, $message = '', $filter = 0)`
`23`	`23`	`{`
`24`		`- $this->assertSame(rtrim($dump), $this->getDump($data), $message);`
	`24`	`+ $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function assertDumpMatchesFormat($dump, $data, $message = '')`
	`27`	`+ public function assertDumpMatchesFormat($dump, $data, $message = '', $filter = 0)`
`28`	`28`	`{`
`29`		`- $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);`
	`29`	`+ $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected function getDump($data, $key = null)`
	`32`	`+ protected function getDump($data, $key = null, $filter = 0)`
`33`	`33`	`{`
`34`	`34`	`$flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;`
`35`	`35`	`$flags \|= getenv('DUMP_STRING_LENGTH') ? CliDumper::DUMP_STRING_LENGTH : 0;`
`@@ -38,7 +38,7 @@ protected function getDump($data, $key = null)`
`38`	`38`	`$cloner->setMaxItems(-1);`
`39`	`39`	`$dumper = new CliDumper(null, null, $flags);`
`40`	`40`	`$dumper->setColors(false);`
`41`		`- $data = $cloner->cloneVar($data)->withRefHandles(false);`
	`41`	`+ $data = $cloner->cloneVar($data, $filter)->withRefHandles(false);`
`42`	`42`	`if (null !== $key && null === $data = $data->seek($key)) {`
`43`	`43`	`return;`
`44`	`44`	`}`