Skip to content

Commit

Permalink
[Routing] moved Matcher exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed May 17, 2011
1 parent 51eb746 commit 02e77ec
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 37 deletions.
14 changes: 14 additions & 0 deletions UPDATE.md
Expand Up @@ -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``.

Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/RequestListener.php
Expand Up @@ -18,8 +18,8 @@
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;

Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
Expand Up @@ -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;

Expand Down
Expand Up @@ -206,8 +206,8 @@ private function startClass($class, $baseClass)
return <<<EOF
<?php
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\RequestContext;
/**
Expand Down
21 changes: 0 additions & 21 deletions src/Symfony/Component/Routing/Matcher/Exception/Exception.php

This file was deleted.

Expand Up @@ -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 <fabien@symfony.com>
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Expand Up @@ -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;
Expand Down
@@ -1,7 +1,7 @@
<?php

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\RequestContext;

/**
Expand Down
@@ -1,7 +1,7 @@
<?php

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\RequestContext;

/**
Expand Down
Expand Up @@ -11,8 +11,8 @@

namespace Symfony\Tests\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\Matcher\UrlMatcher;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
Expand Down

0 comments on commit 02e77ec

Please sign in to comment.