From 24471a27804fc6da2624bb641aa1b9af3690ef3a Mon Sep 17 00:00:00 2001 From: ProgMiner Date: Sun, 22 Jul 2018 23:38:19 +0300 Subject: [PATCH] [Config] Rename FileLoaderLoadException to LoaderLoadException --- UPGRADE-4.2.md | 1 + UPGRADE-5.0.md | 1 + .../Routing/DelegatingLoader.php | 4 ++-- src/Symfony/Component/Config/CHANGELOG.md | 1 + ...LoaderImportCircularReferenceException.php | 2 +- .../Exception/FileLoaderLoadException.php | 2 ++ .../Config/Exception/LoaderLoadException.php | 21 +++++++++++++++++++ .../Config/Loader/DelegatingLoader.php | 4 ++-- .../Component/Config/Loader/FileLoader.php | 8 +++---- .../Component/Config/Loader/Loader.php | 6 +++--- ...onTest.php => LoaderLoadExceptionTest.php} | 20 +++++++++--------- .../Tests/Loader/DelegatingLoaderTest.php | 2 +- .../Config/Tests/Loader/LoaderTest.php | 2 +- .../Routing/RouteCollectionBuilder.php | 10 ++++----- src/Symfony/Component/Routing/composer.json | 4 ++-- 15 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 src/Symfony/Component/Config/Exception/LoaderLoadException.php rename src/Symfony/Component/Config/Tests/Exception/{FileLoaderLoadExceptionTest.php => LoaderLoadExceptionTest.php} (81%) diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md index e49c442e05..670fe3c7cf 100644 --- a/UPGRADE-4.2.md +++ b/UPGRADE-4.2.md @@ -10,6 +10,7 @@ Config ------ * Deprecated constructing a `TreeBuilder` without passing root node information. + * Deprecated `FileLoaderLoadException`, use `LoaderLoadException` instead. Console ------- diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md index 7fca4a927f..a32dabf104 100644 --- a/UPGRADE-5.0.md +++ b/UPGRADE-5.0.md @@ -12,6 +12,7 @@ Config * Dropped support for constructing a `TreeBuilder` without passing root node information. * Added the `getChildNodeDefinitions()` method to `ParentNodeDefinitionInterface`. * The `Processor` class has been made final + * Removed `FileLoaderLoadException`, use `LoaderLoadException` instead. Console ------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index f7cb2f18da..54f20bcfa1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -12,7 +12,7 @@ namespace Symfony\Bundle\FrameworkBundle\Routing; use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; -use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Exception\LoaderLoadException; use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader; use Symfony\Component\Config\Loader\LoaderResolverInterface; @@ -64,7 +64,7 @@ class DelegatingLoader extends BaseDelegatingLoader // - this handles the case and prevents the second fatal error // by triggering an exception beforehand. - throw new FileLoaderLoadException($resource, null, null, null, $type); + throw new LoaderLoadException($resource, null, null, null, $type); } $this->loading = true; diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index 383c2a229b..fea35f9e47 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * deprecated constructing a `TreeBuilder` without passing root node information + * renamed `FileLoaderLoadException` to `LoaderLoadException` 4.1.0 ----- diff --git a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php index d75860ecf0..da9105d0a5 100644 --- a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php +++ b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php @@ -16,7 +16,7 @@ namespace Symfony\Component\Config\Exception; * * @author Fabien Potencier */ -class FileLoaderImportCircularReferenceException extends FileLoaderLoadException +class FileLoaderImportCircularReferenceException extends LoaderLoadException { public function __construct(array $resources, int $code = null, \Exception $previous = null) { diff --git a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php index 176a55292b..b196dc2efa 100644 --- a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php +++ b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php @@ -15,6 +15,8 @@ namespace Symfony\Component\Config\Exception; * Exception class for when a resource cannot be loaded or imported. * * @author Ryan Weaver + * + * @deprecated since Symfony 4.2, use LoaderLoadException instead. */ class FileLoaderLoadException extends \Exception { diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php new file mode 100644 index 0000000000..41a959d38d --- /dev/null +++ b/src/Symfony/Component/Config/Exception/LoaderLoadException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Exception; + +/** + * Exception class for when a resource cannot be loaded or imported. + * + * @author Ryan Weaver + */ +class LoaderLoadException extends FileLoaderLoadException +{ +} diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php index 452e81c58b..e40e57d7af 100644 --- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php +++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Config\Loader; -use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Exception\LoaderLoadException; /** * DelegatingLoader delegates loading to other loaders using a loader resolver. @@ -34,7 +34,7 @@ class DelegatingLoader extends Loader public function load($resource, $type = null) { if (false === $loader = $this->resolver->resolve($resource, $type)) { - throw new FileLoaderLoadException($resource, null, null, null, $type); + throw new LoaderLoadException($resource, null, null, null, $type); } return $loader->load($resource, $type); diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index ab72e83a1e..ae652da3b9 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -12,8 +12,8 @@ namespace Symfony\Component\Config\Loader; use Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException; -use Symfony\Component\Config\Exception\FileLoaderLoadException; use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException; +use Symfony\Component\Config\Exception\LoaderLoadException; use Symfony\Component\Config\FileLocatorInterface; use Symfony\Component\Config\Resource\FileExistenceResource; use Symfony\Component\Config\Resource\GlobResource; @@ -66,7 +66,7 @@ abstract class FileLoader extends Loader * * @return mixed * - * @throws FileLoaderLoadException + * @throws LoaderLoadException * @throws FileLoaderImportCircularReferenceException * @throws FileLocatorFileNotFoundException */ @@ -161,11 +161,11 @@ abstract class FileLoader extends Loader } catch (\Exception $e) { if (!$ignoreErrors) { // prevent embedded imports from nesting multiple exceptions - if ($e instanceof FileLoaderLoadException) { + if ($e instanceof LoaderLoadException) { throw $e; } - throw new FileLoaderLoadException($resource, $sourceResource, null, $e, $type); + throw new LoaderLoadException($resource, $sourceResource, null, $e, $type); } } } diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php index d2f2ec90b9..698ab40afb 100644 --- a/src/Symfony/Component/Config/Loader/Loader.php +++ b/src/Symfony/Component/Config/Loader/Loader.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Config\Loader; -use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Exception\LoaderLoadException; /** * Loader is the abstract class used by all built-in loaders. @@ -59,7 +59,7 @@ abstract class Loader implements LoaderInterface * * @return $this|LoaderInterface * - * @throws FileLoaderLoadException If no loader is found + * @throws LoaderLoadException If no loader is found */ public function resolve($resource, $type = null) { @@ -70,7 +70,7 @@ abstract class Loader implements LoaderInterface $loader = null === $this->resolver ? false : $this->resolver->resolve($resource, $type); if (false === $loader) { - throw new FileLoaderLoadException($resource, null, null, null, $type); + throw new LoaderLoadException($resource, null, null, null, $type); } return $loader; diff --git a/src/Symfony/Component/Config/Tests/Exception/FileLoaderLoadExceptionTest.php b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php similarity index 81% rename from src/Symfony/Component/Config/Tests/Exception/FileLoaderLoadExceptionTest.php rename to src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php index 8363084c19..60650c3daf 100644 --- a/src/Symfony/Component/Config/Tests/Exception/FileLoaderLoadExceptionTest.php +++ b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php @@ -12,37 +12,37 @@ namespace Symfony\Component\Config\Tests\Exception; use PHPUnit\Framework\TestCase; -use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Exception\LoaderLoadException; -class FileLoaderLoadExceptionTest extends TestCase +class LoaderLoadExceptionTest extends TestCase { public function testMessageCannotLoadResource() { - $exception = new FileLoaderLoadException('resource', null); + $exception = new LoaderLoadException('resource', null); $this->assertEquals('Cannot load resource "resource".', $exception->getMessage()); } public function testMessageCannotLoadResourceWithType() { - $exception = new FileLoaderLoadException('resource', null, null, null, 'foobar'); + $exception = new LoaderLoadException('resource', null, null, null, 'foobar'); $this->assertEquals('Cannot load resource "resource". Make sure there is a loader supporting the "foobar" type.', $exception->getMessage()); } public function testMessageCannotLoadResourceWithAnnotationType() { - $exception = new FileLoaderLoadException('resource', null, null, null, 'annotation'); + $exception = new LoaderLoadException('resource', null, null, null, 'annotation'); $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage()); } public function testMessageCannotImportResourceFromSource() { - $exception = new FileLoaderLoadException('resource', 'sourceResource'); + $exception = new LoaderLoadException('resource', 'sourceResource'); $this->assertEquals('Cannot import resource "resource" from "sourceResource".', $exception->getMessage()); } public function testMessageCannotImportBundleResource() { - $exception = new FileLoaderLoadException('@resource', 'sourceResource'); + $exception = new LoaderLoadException('@resource', 'sourceResource'); $this->assertEquals( 'Cannot import resource "@resource" from "sourceResource". '. 'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '. @@ -53,7 +53,7 @@ class FileLoaderLoadExceptionTest extends TestCase public function testMessageHasPreviousErrorWithDotAndUnableToLoad() { - $exception = new FileLoaderLoadException( + $exception = new LoaderLoadException( 'resource', null, null, @@ -67,7 +67,7 @@ class FileLoaderLoadExceptionTest extends TestCase public function testMessageHasPreviousErrorWithoutDotAndUnableToLoad() { - $exception = new FileLoaderLoadException( + $exception = new LoaderLoadException( 'resource', null, null, @@ -81,7 +81,7 @@ class FileLoaderLoadExceptionTest extends TestCase public function testMessageHasPreviousErrorAndUnableToLoadBundle() { - $exception = new FileLoaderLoadException( + $exception = new LoaderLoadException( '@resource', null, null, diff --git a/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php index 3f4b21f34b..4f3f801872 100644 --- a/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php +++ b/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php @@ -57,7 +57,7 @@ class DelegatingLoaderTest extends TestCase } /** - * @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException + * @expectedException \Symfony\Component\Config\Exception\LoaderLoadException */ public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded() { diff --git a/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php index 30167e3836..926cec8333 100644 --- a/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php +++ b/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php @@ -44,7 +44,7 @@ class LoaderTest extends TestCase } /** - * @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException + * @expectedException \Symfony\Component\Config\Exception\LoaderLoadException */ public function testResolveWhenResolverCannotFindLoader() { diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php index d5ff578c5d..01196d67a9 100644 --- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php +++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Routing; -use Symfony\Component\Config\Exception\FileLoaderLoadException; +use Symfony\Component\Config\Exception\LoaderLoadException; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Resource\ResourceInterface; @@ -54,7 +54,7 @@ class RouteCollectionBuilder * * @return self * - * @throws FileLoaderLoadException + * @throws LoaderLoadException */ public function import($resource, $prefix = '/', $type = null) { @@ -347,7 +347,7 @@ class RouteCollectionBuilder * * @return RouteCollection[] * - * @throws FileLoaderLoadException If no loader is found + * @throws LoaderLoadException If no loader is found */ private function load($resource, string $type = null): array { @@ -362,11 +362,11 @@ class RouteCollectionBuilder } if (null === $resolver = $this->loader->getResolver()) { - throw new FileLoaderLoadException($resource, null, null, null, $type); + throw new LoaderLoadException($resource, null, null, null, $type); } if (false === $loader = $resolver->resolve($resource, $type)) { - throw new FileLoaderLoadException($resource, null, null, null, $type); + throw new LoaderLoadException($resource, null, null, null, $type); } $collections = $loader->load($resource, $type); diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index d12292562d..be489ee983 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,7 +19,7 @@ "php": "^7.1.3" }, "require-dev": { - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/http-foundation": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", @@ -28,7 +28,7 @@ "psr/log": "~1.0" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<4.2", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" },