add use at top and use assertNull

cakephp · Jan 16, 2018 · ffe1131 · ffe1131
1 parent c5934fa
commit ffe1131
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -17,6 +17,7 @@
 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 @@ public static function urlOrNull($url = null, $full = false)
     {
         try {
             return static::url($url, $full);
-        } catch (\Cake\Routing\Exception\MissingRouteException $e) {
+        } catch (MissingRouteException $e) {
             return null;
         }
     }

diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
@@ -139,7 +139,7 @@ public function testRouteUrlOrNull()
         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']));
     }
 
     /**