fixed tests

fabpot · fabpot · commit cb52d4263405 · 2016-10-01T07:22:03.000-07:00
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -236,14 +236,13 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
                 $a[$prefix.'typeHint'] = $m[1];
             }
         }
-<<<<<<< HEAD
+
         if (isset($a[$prefix.'typeHint'])) {
             $v = $a[$prefix.'typeHint'];
             $a[$prefix.'typeHint'] = new ClassStub($v, array(class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', ''));
-=======
+        }
         if (!isset($a[$prefix.'typeHint'])) {
             unset($a[$prefix.'allowsNull']);
->>>>>>> 3.1
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -236,14 +236,13 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st`
`236`	`236`	`$a[$prefix.'typeHint'] = $m[1];`
`237`	`237`	`}`
`238`	`238`	`}`
`239`		`-<<<<<<< HEAD`
	`239`	`+`
`240`	`240`	`if (isset($a[$prefix.'typeHint'])) {`
`241`	`241`	`$v = $a[$prefix.'typeHint'];`
`242`	`242`	`$a[$prefix.'typeHint'] = new ClassStub($v, array(class_exists($v, false) \|\| interface_exists($v, false) \|\| trait_exists($v, false) ? $v : '', ''));`
`243`		`-=======`
	`243`	`+ }`
`244`	`244`	`if (!isset($a[$prefix.'typeHint'])) {`
`245`	`245`	`unset($a[$prefix.'allowsNull']);`
`246`		`->>>>>>> 3.1`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`try {`