minor #23117 [EventDispatcher] Remove dead code in WrappedListener (chalasr)

fabpot · fabpot · commit d024c82b48b9 · 2017-06-09T08:14:08.000-07:00
This PR was merged into the 3.3 branch. Discussion ---------- [EventDispatcher] Remove dead code in WrappedListener | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a The static `$cloner` property is unused since ab716c6 Commits ------- 8b7de02 [EventDispatcher] Remove dead code in WrappedListener
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -15,7 +15,6 @@
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\VarDumper\Caster\ClassStub;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -30,8 +29,7 @@ class WrappedListener
     private $dispatcher;
     private $pretty;
     private $stub;
-
-    private static $cloner;
+    private static $hasClassStub;
 
     public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)
     {
@@ -58,8 +56,8 @@ public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatc
             $this->name = $name;
         }
 
-        if (null === self::$cloner) {
-            self::$cloner = class_exists(ClassStub::class) ? new VarCloner() : false;
+        if (null === self::$hasClassStub) {
+            self::$hasClassStub = class_exists(ClassStub::class);
         }
     }
 
@@ -86,7 +84,7 @@ public function getPretty()
     public function getInfo($eventName)
     {
         if (null === $this->stub) {
-            $this->stub = false === self::$cloner ? $this->pretty.'()' : new ClassStub($this->pretty.'()', $this->listener);
+            $this->stub = self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';
         }
 
         return array(

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use Symfony\Component\EventDispatcher\Event;`
`16`	`16`	`use Symfony\Component\EventDispatcher\EventDispatcherInterface;`
`17`	`17`	`use Symfony\Component\VarDumper\Caster\ClassStub;`
`18`		`-use Symfony\Component\VarDumper\Cloner\VarCloner;`
`19`	`18`
`20`	`19`	`/**`
`21`	`20`	`* @author Fabien Potencier <[email protected]>`
`@@ -30,8 +29,7 @@ class WrappedListener`
`30`	`29`	`private $dispatcher;`
`31`	`30`	`private $pretty;`
`32`	`31`	`private $stub;`
`33`		`-`
`34`		`- private static $cloner;`
	`32`	`+ private static $hasClassStub;`
`35`	`33`
`36`	`34`	`public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)`
`37`	`35`	`{`
`@@ -58,8 +56,8 @@ public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatc`
`58`	`56`	`$this->name = $name;`
`59`	`57`	`}`
`60`	`58`
`61`		`- if (null === self::$cloner) {`
`62`		`- self::$cloner = class_exists(ClassStub::class) ? new VarCloner() : false;`
	`59`	`+ if (null === self::$hasClassStub) {`
	`60`	`+ self::$hasClassStub = class_exists(ClassStub::class);`
`63`	`61`	`}`
`64`	`62`	`}`
`65`	`63`
`@@ -86,7 +84,7 @@ public function getPretty()`
`86`	`84`	`public function getInfo($eventName)`
`87`	`85`	`{`
`88`	`86`	`if (null === $this->stub) {`
`89`		`- $this->stub = false === self::$cloner ? $this->pretty.'()' : new ClassStub($this->pretty.'()', $this->listener);`
	`87`	`+ $this->stub = self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`return array(`