Browse Source

add use at top and use assertNull

Elias De Vos 8 years ago
parent
commit
ffe1131485
2 changed files with 3 additions and 2 deletions
  1. 2 1
      src/Routing/Router.php
  2. 1 1
      tests/TestCase/Routing/RouterTest.php

+ 2 - 1
src/Routing/Router.php

@@ -17,6 +17,7 @@ namespace Cake\Routing;
 use Cake\Core\Configure;
 use Cake\Http\ServerRequest;
 use Cake\Utility\Inflector;
+use Cake\Routing\Exception\MissingRouteException;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -725,7 +726,7 @@ class Router
     {
         try {
             return static::url($url, $full);
-        } catch (\Cake\Routing\Exception\MissingRouteException $e) {
+        } catch (MissingRouteException $e) {
             return null;
         }
     }

+ 1 - 1
tests/TestCase/Routing/RouterTest.php

@@ -139,7 +139,7 @@ class RouterTest extends TestCase
         Router::connect('/:controller/:action', ['controller' => 'posts']);
         $this->assertEquals(Router::urlOrNull(['action' => 'view']), '/view');
 
-        $this->assertEquals(Router::urlOrNull(['action' => 'view', 'controller' => 'users', 'plugin' => 'test']), null);
+        $this->assertNull(Router::urlOrNull(['action' => 'view', 'controller' => 'users', 'plugin' => 'test']));
     }
 
     /**