symfony · fabpot · Oct 10, 2017 · Oct 10, 2017
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
@@ -50,7 +50,7 @@ public function countErrors()
     */
    public function clear()
    {
-        if (($logger = $this->getDebugLogger()) && method_exists($logger, 'clear')) {
+        if ($logger = $this->getDebugLogger()) {
            $logger->clear();
        }
    }

diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----

 * removed the `ContainerAwareEventDispatcher` class
+ * added the `reset()` method to the `TraceableEventDispatcherInterface`

 3.4.0
 -----

diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
@@ -15,8 +15,6 @@

 /**
 * @author Fabien Potencier <fabien@symfony.com>
- *
- * @method reset() Resets the trace.
 */
 interface TraceableEventDispatcherInterface extends EventDispatcherInterface
 {
@@ -33,4 +31,9 @@ public function getCalledListeners();
     * @return array An array of not called listeners
     */
    public function getNotCalledListeners();
+
+    /**
+     * Resets the trace.
+     */
+    public function reset();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
@@ -18,8 +18,6 @@
 * DataCollectorInterface.
 *
 * @author Fabien Potencier <fabien@symfony.com>
- *
- * @method reset() Resets this data collector to its initial state.
 */
 interface DataCollectorInterface
 {
@@ -38,4 +36,9 @@ public function collect(Request $request, Response $response, \Exception $except
     * @return string The collector name
     */
    public function getName();
+
+    /**
+     * Resets this data collector to its initial state.
+     */
+    public function reset();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -27,9 +27,6 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter

    public function __construct(EventDispatcherInterface $dispatcher = null)
    {
-        if ($dispatcher instanceof TraceableEventDispatcherInterface && !method_exists($dispatcher, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', TraceableEventDispatcherInterface::class, \get_class($dispatcher)), E_USER_DEPRECATED);
-        }
        $this->dispatcher = $dispatcher;
    }

@@ -49,10 +46,6 @@ public function reset()
        $this->data = array();

        if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
-            if (!method_exists($this->dispatcher, 'reset')) {
-                return; // @deprecated
-            }
-
            $this->dispatcher->reset();
        }
    }

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -29,10 +29,6 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
    public function __construct($logger = null, $containerPathPrefix = null)
    {
        if (null !== $logger && $logger instanceof DebugLoggerInterface) {
-            if (!method_exists($logger, 'clear')) {
-                @trigger_error(sprintf('Implementing "%s" without the "clear()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DebugLoggerInterface::class, \get_class($logger)), E_USER_DEPRECATED);
-            }
-
            $this->logger = $logger;
        }

@@ -52,7 +48,7 @@ public function collect(Request $request, Response $response, \Exception $except
     */
    public function reset()
    {
-        if ($this->logger && method_exists($this->logger, 'clear')) {
+        if ($this->logger instanceof DebugLoggerInterface) {
            $this->logger->clear();
        }
        $this->data = array();

diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -15,8 +15,6 @@
 * DebugLoggerInterface.
 *
 * @author Fabien Potencier <fabien@symfony.com>
- *
- * @method clear() Removes all log records.
 */
 interface DebugLoggerInterface
 {
@@ -37,4 +35,9 @@ public function getLogs();
     * @return int The number of errors
     */
    public function countErrors();
+
+    /**
+     * Removes all log records.
+     */
+    public function clear();
 }
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -198,10 +198,6 @@ public function collect(Request $request, Response $response, \Exception $except
    public function reset()
    {
        foreach ($this->collectors as $collector) {
-            if (!method_exists($collector, 'reset')) {
-                continue;
-            }
-
            $collector->reset();
        }
        $this->enabled = $this->initiallyEnabled;
@@ -237,10 +233,6 @@ public function set(array $collectors = array())
     */
    public function add(DataCollectorInterface $collector)
    {
-        if (!method_exists($collector, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DataCollectorInterface::class, \get_class($collector)), E_USER_DEPRECATED);
-        }
-
        $this->collectors[$collector->getName()] = $collector;
    }