minor #16129 [VarDumper] Move $prev as 1st argument in ThrowingCasterException::__construct, removing $caster (nicolas-grekas)

fabpot · fabpot · commit b6ab750e1805 · 2015-10-06T08:07:09.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [VarDumper] Move $prev as 1st argument in ThrowingCasterException::__construct, removing $caster | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 02b86b0 [VarDumper] Move $prev as 1st argument in ThrowingCasterException::__construct, removing $caster
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -292,7 +292,7 @@ private function callCaster($callback, $obj, $a, $stub, $isNested)
                 $a = $cast;
             }
         } catch (\Exception $e) {
-            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($callback, $e);
+            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($e);
         }
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php b/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
@@ -17,11 +17,15 @@
 class ThrowingCasterException extends \Exception
 {
     /**
-     * @param callable   $caster The failing caster
-     * @param \Exception $prev   The exception thrown from the caster
+     * @param \Exception $prev The exception thrown from the caster
      */
-    public function __construct($caster, \Exception $prev)
+    public function __construct($prev, \Exception $e = null)
     {
+        if (!$prev instanceof \Exception) {
+            @trigger_error('Providing $caster a 1st argument when instanciating a '.__CLASS__.' is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);
+
+            $prev = $e;
+        }
         parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ private function callCaster($callback, $obj, $a, $stub, $isNested)`
`292`	`292`	`$a = $cast;`
`293`	`293`	`}`
`294`	`294`	`} catch (\Exception $e) {`
`295`		`- $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($callback, $e);`
	`295`	`+ $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($e);`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`return $a;`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,15 @@`
`17`	`17`	`class ThrowingCasterException extends \Exception`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @param callable $caster The failing caster`
`21`		`- * @param \Exception $prev The exception thrown from the caster`
	`20`	`+ * @param \Exception $prev The exception thrown from the caster`
`22`	`21`	`*/`
`23`		`- public function __construct($caster, \Exception $prev)`
	`22`	`+ public function __construct($prev, \Exception $e = null)`
`24`	`23`	`{`
	`24`	`+ if (!$prev instanceof \Exception) {`
	`25`	`+ @trigger_error('Providing $caster a 1st argument when instanciating a '.__CLASS__.' is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);`
	`26`	`+`
	`27`	`+ $prev = $e;`
	`28`	`+ }`
`25`	`29`	`parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);`
`26`	`30`	`}`
`27`	`31`	`}`