fixed tests

2016-10-01 07:22:03 -07:00 · 2016-10-01 07:22:03 -07:00 · cb52d42634
commit cb52d42634
parent 6399ffa32b
1 changed files with 2 additions and 3 deletions
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@ -236,14 +236,13 @@ class ReflectionCaster
                $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 {