Skip to content

Commit f1ad4f7

Browse files
ProgMinernicolas-grekas
authored andcommitted
[Config] Rename FileLoaderLoadException to LoaderLoadException
1 parent efaada6 commit f1ad4f7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

RouteCollectionBuilder.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Routing;
1313

14-
use Symfony\Component\Config\Exception\FileLoaderLoadException;
14+
use Symfony\Component\Config\Exception\LoaderLoadException;
1515
use Symfony\Component\Config\Loader\LoaderInterface;
1616
use Symfony\Component\Config\Resource\ResourceInterface;
1717

@@ -54,7 +54,7 @@ public function __construct(LoaderInterface $loader = null)
5454
*
5555
* @return self
5656
*
57-
* @throws FileLoaderLoadException
57+
* @throws LoaderLoadException
5858
*/
5959
public function import($resource, $prefix = '/', $type = null)
6060
{
@@ -347,7 +347,7 @@ private function generateRouteName(Route $route): string
347347
*
348348
* @return RouteCollection[]
349349
*
350-
* @throws FileLoaderLoadException If no loader is found
350+
* @throws LoaderLoadException If no loader is found
351351
*/
352352
private function load($resource, string $type = null): array
353353
{
@@ -362,11 +362,11 @@ private function load($resource, string $type = null): array
362362
}
363363

364364
if (null === $resolver = $this->loader->getResolver()) {
365-
throw new FileLoaderLoadException($resource, null, null, null, $type);
365+
throw new LoaderLoadException($resource, null, null, null, $type);
366366
}
367367

368368
if (false === $loader = $resolver->resolve($resource, $type)) {
369-
throw new FileLoaderLoadException($resource, null, null, null, $type);
369+
throw new LoaderLoadException($resource, null, null, null, $type);
370370
}
371371

372372
$collections = $loader->load($resource, $type);

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^7.1.3"
2020
},
2121
"require-dev": {
22-
"symfony/config": "~3.4|~4.0",
22+
"symfony/config": "~4.2",
2323
"symfony/http-foundation": "~3.4|~4.0",
2424
"symfony/yaml": "~3.4|~4.0",
2525
"symfony/expression-language": "~3.4|~4.0",
@@ -28,7 +28,7 @@
2828
"psr/log": "~1.0"
2929
},
3030
"conflict": {
31-
"symfony/config": "<3.4",
31+
"symfony/config": "<4.2",
3232
"symfony/dependency-injection": "<3.4",
3333
"symfony/yaml": "<3.4"
3434
},

0 commit comments

Comments
 (0)