diff --git a/UPDATE.md b/UPDATE.md index 844d44cfc5..c1fa4e740f 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -9,6 +9,20 @@ timeline closely anyway. beta1 to beta2 -------------- +* The Routing Exceptions have been moved: + + Before: + + Symfony\Component\Routing\Matcher\Exception\Exception + Symfony\Component\Routing\Matcher\Exception\NotFoundException + Symfony\Component\Routing\Matcher\Exception\MethodNotAllowedException + + After: + + Symfony\Component\Routing\Exception\Exception + Symfony\Component\Routing\Exception\NotFoundException + Symfony\Component\Routing\Exception\MethodNotAllowedException + * The ``error_handler`` setting has been removed. The ``ErrorHandler`` class is now managed directly by Symfony SE in ``AppKernel``. diff --git a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php index c5c08d0350..9b37913b9e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php +++ b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php @@ -18,8 +18,8 @@ use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Routing\Matcher\Exception\MethodNotAllowedException; -use Symfony\Component\Routing\Matcher\Exception\NotFoundException; +use Symfony\Component\Routing\Exception\MethodNotAllowedException; +use Symfony\Component\Routing\Exception\NotFoundException; use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RequestContext; diff --git a/src/Symfony/Component/Routing/Matcher/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php similarity index 94% rename from src/Symfony/Component/Routing/Matcher/Exception/MethodNotAllowedException.php rename to src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php index 88f3a71aba..dea23b9522 100644 --- a/src/Symfony/Component/Routing/Matcher/Exception/MethodNotAllowedException.php +++ b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Routing\Matcher\Exception; +namespace Symfony\Component\Routing\Exception; /** * The resource was found but the request method is not allowed. diff --git a/src/Symfony/Component/Routing/Matcher/Exception/NotFoundException.php b/src/Symfony/Component/Routing/Exception/NotFoundException.php similarity index 89% rename from src/Symfony/Component/Routing/Matcher/Exception/NotFoundException.php rename to src/Symfony/Component/Routing/Exception/NotFoundException.php index 093611c356..24b2da0174 100644 --- a/src/Symfony/Component/Routing/Matcher/Exception/NotFoundException.php +++ b/src/Symfony/Component/Routing/Exception/NotFoundException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Routing\Matcher\Exception; +namespace Symfony\Component\Routing\Exception; /** * The resource was not found. diff --git a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php index 71252c81b1..cbe26b4f59 100644 --- a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Routing\Matcher; -use Symfony\Component\Routing\Matcher\Exception\MethodNotAllowedException; +use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index 6b1bae069e..c4141e1c3d 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -206,8 +206,8 @@ EOF return << - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Routing\Matcher\Exception; - -/** - * A matching exception. - * - * @author Kris Wallsmith - */ -interface Exception -{ -} diff --git a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php index e18ea8df2f..4de1c6475f 100644 --- a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Routing\Matcher; -use Symfony\Component\Routing\Matcher\Exception\NotFoundException; +use Symfony\Component\Routing\Exception\NotFoundException; /** * @author Fabien Potencier diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index 84691b7fe3..6aa0dd8fef 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -11,8 +11,8 @@ namespace Symfony\Component\Routing\Matcher; -use Symfony\Component\Routing\Matcher\Exception\MethodNotAllowedException; -use Symfony\Component\Routing\Matcher\Exception\NotFoundException; +use Symfony\Component\Routing\Exception\MethodNotAllowedException; +use Symfony\Component\Routing\Exception\NotFoundException; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RequestContext; diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php index 000c9dd4a3..b1bbee837a 100644 --- a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php +++ b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php @@ -1,7 +1,7 @@