Fix ServerDumper issue if no wrapped dumper set

ogizanagi · ogizanagi · commit 7ae32d84173a · 2017-08-08T19:12:34.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
@@ -63,7 +63,7 @@ public function dump(Data $data, $output = null)
             }
         } finally {
             restore_error_handler();
-            if ($failed) {
+            if ($failed && $this->wrappedDumper) {
                 $this->wrappedDumper->dump($data);
             }
         }
@@ -85,7 +85,7 @@ public function dump(Data $data, $output = null)
             }
         } finally {
             restore_error_handler();
-            if (!$this->swallows || $failed) {
+            if ($this->wrappedDumper && (!$this->swallows || $failed)) {
                 $this->wrappedDumper->dump($data);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function dump(Data $data, $output = null)`
`63`	`63`	`}`
`64`	`64`	`} finally {`
`65`	`65`	`restore_error_handler();`
`66`		`- if ($failed) {`
	`66`	`+ if ($failed && $this->wrappedDumper) {`
`67`	`67`	`$this->wrappedDumper->dump($data);`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -85,7 +85,7 @@ public function dump(Data $data, $output = null)`
`85`	`85`	`}`
`86`	`86`	`} finally {`
`87`	`87`	`restore_error_handler();`
`88`		`- if (!$this->swallows \|\| $failed) {`
	`88`	`+ if ($this->wrappedDumper && (!$this->swallows \|\| $failed)) {`
`89`	`89`	`$this->wrappedDumper->dump($data);`
`90`	`90`	`}`
`91`	`91`	`}`