From d762dd1dc6a45ec0c0a0638242ca96f6dd5fcb33 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 10 Oct 2017 12:58:54 +0200 Subject: [PATCH] remove deprecated features --- src/Symfony/Bridge/Monolog/Logger.php | 2 +- src/Symfony/Component/EventDispatcher/CHANGELOG.md | 1 + .../Debug/TraceableEventDispatcherInterface.php | 7 +++++-- .../HttpKernel/DataCollector/DataCollectorInterface.php | 7 +++++-- .../HttpKernel/DataCollector/EventDataCollector.php | 7 ------- .../HttpKernel/DataCollector/LoggerDataCollector.php | 6 +----- .../Component/HttpKernel/Log/DebugLoggerInterface.php | 7 +++++-- src/Symfony/Component/HttpKernel/Profiler/Profiler.php | 8 -------- 8 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php index 7cd75c5ec1..d4771f2894 100644 --- a/src/Symfony/Bridge/Monolog/Logger.php +++ b/src/Symfony/Bridge/Monolog/Logger.php @@ -50,7 +50,7 @@ class Logger extends BaseLogger implements DebugLoggerInterface */ 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 index cde9a680a5..e570303e74 100644 --- 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 index f0212753be..4adbe9693a 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php @@ -15,8 +15,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** * @author Fabien Potencier - * - * @method reset() Resets the trace. */ interface TraceableEventDispatcherInterface extends EventDispatcherInterface { @@ -33,4 +31,9 @@ interface TraceableEventDispatcherInterface extends EventDispatcherInterface * @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 index c0a0c0a982..9e76a99fc5 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php @@ -18,8 +18,6 @@ use Symfony\Component\HttpFoundation\Response; * DataCollectorInterface. * * @author Fabien Potencier - * - * @method reset() Resets this data collector to its initial state. */ interface DataCollectorInterface { @@ -38,4 +36,9 @@ interface DataCollectorInterface * @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 index ab44405edb..e82a1fc19b 100644 --- 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 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter $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 index ee645d53e8..f1df6e2d7e 100644 --- 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 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte */ 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 index f0606d3b0e..1d955c4829 100644 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php +++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php @@ -15,8 +15,6 @@ namespace Symfony\Component\HttpKernel\Log; * DebugLoggerInterface. * * @author Fabien Potencier - * - * @method clear() Removes all log records. */ interface DebugLoggerInterface { @@ -37,4 +35,9 @@ interface DebugLoggerInterface * @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 index 85a71641be..c99e7113fc 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -198,10 +198,6 @@ class Profiler public function reset() { foreach ($this->collectors as $collector) { - if (!method_exists($collector, 'reset')) { - continue; - } - $collector->reset(); } $this->enabled = $this->initiallyEnabled; @@ -237,10 +233,6 @@ class Profiler */ 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; }