symfony
diff --git a/‎src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php
+13-4Lines changed: 13 additions & 4 deletions b/‎src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php
+13-4Lines changed: 13 additions & 4 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
+5Lines changed: 5 additions & 0 deletions
@@ -19,14 +19,14 @@
  */
 trait VarDumperTestTrait
 {
-    public function assertDumpEquals($dump, $data, $filter = 0, $message = '')
+    public function assertDumpEquals($expected, $data, $filter = 0, $message = '')
     {
-        $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);
+        $this->assertSame($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);
     }
 
-    public function assertDumpMatchesFormat($dump, $data, $filter = 0, $message = '')
+    public function assertDumpMatchesFormat($expected, $data, $filter = 0, $message = '')
     {
-        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);
+        $this->assertStringMatchesFormat($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);
     }
 
     protected function getDump($data, $key = null, $filter = 0)
@@ -45,4 +45,13 @@ protected function getDump($data, $key = null, $filter = 0)
 
         return rtrim($dumper->dump($data, true));
     }
+
+    private function prepareExpectation($expected, $filter)
+    {
+        if (!is_string($expected)) {
+            $expected = $this->getDump($expected, null, $filter);
+        }
+
+        return rtrim($expected);
+    }
 }
@@ -38,4 +38,9 @@ public function testItComparesLargeData()
 
         $this->assertDumpEquals($expected, $data);
     }
+
+    public function testAllowsNonScalarExpectation()
+    {
+        $this->assertDumpEquals(new \ArrayObject(array('bim' => 'bam')), new \ArrayObject(array('bim' => 'bam')));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@`
`19`	`19`	`*/`
`20`	`20`	`trait VarDumperTestTrait`
`21`	`21`	`{`
`22`		`- public function assertDumpEquals($dump, $data, $filter = 0, $message = '')`
	`22`	`+ public function assertDumpEquals($expected, $data, $filter = 0, $message = '')`
`23`	`23`	`{`
`24`		`- $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);`
	`24`	`+ $this->assertSame($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function assertDumpMatchesFormat($dump, $data, $filter = 0, $message = '')`
	`27`	`+ public function assertDumpMatchesFormat($expected, $data, $filter = 0, $message = '')`
`28`	`28`	`{`
`29`		`- $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);`
	`29`	`+ $this->assertStringMatchesFormat($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`protected function getDump($data, $key = null, $filter = 0)`
`@@ -45,4 +45,13 @@ protected function getDump($data, $key = null, $filter = 0)`
`45`	`45`
`46`	`46`	`return rtrim($dumper->dump($data, true));`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ private function prepareExpectation($expected, $filter)`
	`50`	`+ {`
	`51`	`+ if (!is_string($expected)) {`
	`52`	`+ $expected = $this->getDump($expected, null, $filter);`
	`53`	`+ }`
	`54`	`+`
	`55`	`+ return rtrim($expected);`
	`56`	`+ }`
`48`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,9 @@ public function testItComparesLargeData()`
`38`	`38`
`39`	`39`	`$this->assertDumpEquals($expected, $data);`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ public function testAllowsNonScalarExpectation()`
	`43`	`+ {`
	`44`	`+ $this->assertDumpEquals(new \ArrayObject(array('bim' => 'bam')), new \ArrayObject(array('bim' => 'bam')));`
	`45`	`+ }`
`41`	`46`	`}`