diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index 3424d93a3e..b752df6fe2 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -7,6 +7,7 @@ CHANGELOG * removed `ReferenceDumper` class * removed the `ResourceInterface::isFresh()` method * removed `BCResourceInterfaceChecker` class + * removed `ResourceInterface::getResource()` method 2.8.0 ----- diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php index 9407ba509a..38413934f3 100644 --- a/src/Symfony/Component/Config/Resource/DirectoryResource.php +++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php @@ -42,7 +42,7 @@ class DirectoryResource implements SelfCheckingResourceInterface, \Serializable } /** - * {@inheritdoc} + * @return string The file path to the resource */ public function getResource() { diff --git a/src/Symfony/Component/Config/Resource/FileExistenceResource.php b/src/Symfony/Component/Config/Resource/FileExistenceResource.php index ba15846381..349402edf0 100644 --- a/src/Symfony/Component/Config/Resource/FileExistenceResource.php +++ b/src/Symfony/Component/Config/Resource/FileExistenceResource.php @@ -45,7 +45,7 @@ class FileExistenceResource implements SelfCheckingResourceInterface, \Serializa } /** - * {@inheritdoc} + * @return string The file path to the resource */ public function getResource() { diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php index bd0ce03eaf..54a974caef 100644 --- a/src/Symfony/Component/Config/Resource/FileResource.php +++ b/src/Symfony/Component/Config/Resource/FileResource.php @@ -44,7 +44,7 @@ class FileResource implements SelfCheckingResourceInterface, \Serializable } /** - * {@inheritdoc} + * @return string|false The canonicalized, absolute path to the resource or false if the resource does not exist. */ public function getResource() { diff --git a/src/Symfony/Component/Config/Resource/ResourceInterface.php b/src/Symfony/Component/Config/Resource/ResourceInterface.php index d27ca2e4f3..d98fd427a2 100644 --- a/src/Symfony/Component/Config/Resource/ResourceInterface.php +++ b/src/Symfony/Component/Config/Resource/ResourceInterface.php @@ -30,17 +30,4 @@ interface ResourceInterface * @return string A string representation unique to the underlying Resource */ public function __toString(); - - /** - * Returns the tied resource. - * - * @return mixed The resource - * - * @deprecated since 2.8, to be removed in 3.0. As there are many different kinds of resource, - * a single getResource() method does not make sense at the interface level. You - * can still call getResource() on implementing classes, probably after performing - * a type check. If you know the concrete type of Resource at hand, the return value - * of this method may make sense to you. - */ - public function getResource(); } diff --git a/src/Symfony/Component/Config/Tests/Resource/ResourceStub.php b/src/Symfony/Component/Config/Tests/Resource/ResourceStub.php index 78799d7b91..b01729cbff 100644 --- a/src/Symfony/Component/Config/Tests/Resource/ResourceStub.php +++ b/src/Symfony/Component/Config/Tests/Resource/ResourceStub.php @@ -31,9 +31,4 @@ class ResourceStub implements SelfCheckingResourceInterface { return $this->fresh; } - - public function getResource() - { - return 'stub'; - } } diff --git a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php index b4178a50ee..bad199be94 100644 --- a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php +++ b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php @@ -50,7 +50,7 @@ class EnvParametersResource implements SelfCheckingResourceInterface, \Serializa } /** - * {@inheritdoc} + * @return array An array with two keys: 'prefix' for the prefix used and 'variables' containing all the variables watched by this resource */ public function getResource() { diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php index 75093580b4..6bd7bb4c9e 100644 --- a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php +++ b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php @@ -288,10 +288,6 @@ class StaleResource implements SelfCheckingResourceInterface return false; } - public function getResource() - { - } - public function __toString() { return '';