From 4cdae9816ec251192493a9dfac66b735924d451d Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sat, 26 Sep 2015 11:27:23 +0200 Subject: [PATCH] Removed Resource#isFresh() related functionality --- .../Resources/config/services.xml | 7 ---- src/Symfony/Component/Config/CHANGELOG.md | 2 ++ src/Symfony/Component/Config/ConfigCache.php | 7 ---- .../Resource/BCResourceInterfaceChecker.php | 36 ------------------- .../Config/Resource/ResourceInterface.php | 12 ------- 5 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 src/Symfony/Component/Config/Resource/BCResourceInterfaceChecker.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml index 8892e0028b..ff10096d0c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml @@ -49,12 +49,5 @@ - - - - - diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index 75750cc9f0..dea3827f18 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -5,6 +5,8 @@ CHANGELOG ----- * removed `ReferenceDumper` class + * removed the `ResourceInterface::isFresh()` method + * removed `BCResourceInterfaceChecker` class 2.8.0 ----- diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php index 69d6704c5f..8318684186 100644 --- a/src/Symfony/Component/Config/ConfigCache.php +++ b/src/Symfony/Component/Config/ConfigCache.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Config; -use Symfony\Component\Config\Resource\BCResourceInterfaceChecker; use Symfony\Component\Config\Resource\SelfCheckingResourceChecker; /** @@ -21,11 +20,6 @@ use Symfony\Component\Config\Resource\SelfCheckingResourceChecker; * \Symfony\Component\Config\Resource\SelfCheckingResourceInterface will * be used to check cache freshness. * - * During a transition period, also instances of - * \Symfony\Component\Config\Resource\ResourceInterface will be checked - * by means of the isFresh() method. This behaviour is deprecated since 2.8 - * and will be removed in 3.0. - * * @author Fabien Potencier * @author Matthias Pigulla */ @@ -41,7 +35,6 @@ class ConfigCache extends ResourceCheckerConfigCache { parent::__construct($file, array( new SelfCheckingResourceChecker(), - new BCResourceInterfaceChecker(), )); $this->debug = (bool) $debug; } diff --git a/src/Symfony/Component/Config/Resource/BCResourceInterfaceChecker.php b/src/Symfony/Component/Config/Resource/BCResourceInterfaceChecker.php deleted file mode 100644 index 631755e8fe..0000000000 --- a/src/Symfony/Component/Config/Resource/BCResourceInterfaceChecker.php +++ /dev/null @@ -1,36 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Config\Resource; - -/** - * Resource checker for the ResourceInterface. Exists for BC. - * - * @author Matthias Pigulla - * - * @deprecated since 2.8, to be removed in 3.0. - */ -class BCResourceInterfaceChecker extends SelfCheckingResourceChecker -{ - public function supports(ResourceInterface $metadata) - { - /* As all resources must be instanceof ResourceInterface, - we support them all. */ - return true; - } - - public function isFresh(ResourceInterface $resource, $timestamp) - { - @trigger_error('Resource checking through ResourceInterface::isFresh() is deprecated since 2.8 and will be removed in 3.0', E_USER_DEPRECATED); - - return parent::isFresh($resource, $timestamp); // For now, $metadata features the isFresh() method, so off we go (quack quack) - } -} diff --git a/src/Symfony/Component/Config/Resource/ResourceInterface.php b/src/Symfony/Component/Config/Resource/ResourceInterface.php index c0f0e50e06..46e1962ff0 100644 --- a/src/Symfony/Component/Config/Resource/ResourceInterface.php +++ b/src/Symfony/Component/Config/Resource/ResourceInterface.php @@ -31,18 +31,6 @@ interface ResourceInterface */ public function __toString(); - /** - * Returns true if the resource has not been updated since the given timestamp. - * - * @param int $timestamp The last time the resource was loaded - * - * @return bool True if the resource has not been updated, false otherwise - * - * @deprecated since 2.8, to be removed in 3.0. If your resource can check itself for - * freshness implement the SelfCheckingResourceInterface instead. - */ - public function isFresh($timestamp); - /** * Returns the tied resource. *