add explicit exception

Author: Fady Michel

src/Exception/RouteNotFound.php

@@ -1,10 +1,7 @@
 <?php
 
-
 namespace DevCoder\Exception;
 
-
-class RouteNotFound
+class RouteNotFound extends \Exception
 {
-
 }

src/Route.php

@@ -35,6 +35,9 @@ class Route
 
     public function __construct(string $name, string $path, array $controller, array $methods = ['GET', 'POST'])
     {
+        if ($methods === []) {
+            throw new \InvalidArgumentException('HTTP methods argument was empty; must contain at least one method');
+        }
         $this->name = $name;
         $this->path = $path;
         $this->controller = $controller;

src/Router.php

@@ -2,6 +2,7 @@
 
 namespace DevCoder;
 
+use DevCoder\Exception\RouteNotFound;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -10,7 +11,7 @@
  */
 class Router implements RouterInterface
 {
-    const NO_ROUTE = 1;
+    const NO_ROUTE = 404;
 
     /**
      * @var array<Route>
@@ -62,26 +63,27 @@ public function matchFromPath(string $path, string $method): Route
             return $route;
         }
 
-        throw new \Exception('Aucune route ne correspond à l\'URL', self::NO_ROUTE);
+        throw new RouteNotFound('No route found for '.$method, self::NO_ROUTE);
     }
 
     public function generateUri(string $name, array $parameters = []): string
     {
         if (!array_key_exists($name, $this->routes)) {
-            throw new \Exception(sprintf('%s name route doesnt exist', $name));
+            throw new \InvalidArgumentException(sprintf('Unknown %s name route', $name));
         }
 
         $route = $this->routes[$name];
-        if ($route->hasVars() && empty($parameters)) {
-            throw new \Exception(sprintf('%s route need parameters: %s', $name, implode(',', $route->getVarsNames()))
+        if ($route->hasVars() && $parameters === []) {
+            throw new \InvalidArgumentException(
+                sprintf('%s route need parameters: %s', $name, implode(',', $route->getVarsNames()))
             );
         }
 
         $uri = $route->getPath();
         foreach ($route->getVarsNames() as $variable) {
             $varName = trim($variable, '{\}');
             if (!array_key_exists($varName, $parameters)) {
-                throw new \Exception(sprintf('%s not found in parameters to generate url', $varName));
+                throw new \InvalidArgumentException(sprintf('%s not found in parameters to generate url', $varName));
             }
             $uri = str_replace($variable, $parameters[$varName], $uri);
         }

tests/RouteTest.php

@@ -4,6 +4,7 @@
 
 
 
+use DevCoder\Exception\RouteNotFound;
 use PHPUnit\Framework\TestCase;
 use DevCoder\Route;
 
@@ -34,4 +35,10 @@ public function testMatchRoute()
         $this->assertTrue($routeWithAttributes->match('/view/article/1/24','GET'));
         $this->assertTrue($routeWithoutAttribute->match('/view/article/','GET'));
     }
+
+    public function testException()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        new Route('view_articles','/view', ['App\\Controller\\HomeController', 'home'], []);
+    }
 }

tests/RouterTest.php

@@ -2,6 +2,7 @@
 
 namespace Test\DevCoder;
 
+use DevCoder\Exception\RouteNotFound;
 use PHPUnit\Framework\TestCase;
 use DevCoder\Route;
 use DevCoder\Router;
@@ -32,17 +33,36 @@ public function __construct($name = null, array $data = [], $dataName = '')
             ->add($routeArticleWithParams);
     }
 
+    public function testMatchRoute() {
+
+        $route = $this->router->matchFromPath('/view/article/25', 'GET');
+        $this->assertInstanceOf(Route::class, $route);
+
+        $this->assertNotEmpty($route->getController());
+        $this->assertNotEmpty($route->getMethods());
+        $this->assertSame(['id' => '25'], $route->getVars());
+
+
+        $this->assertInstanceOf(Route::class, $this->router->matchFromPath('/home', 'GET'));
+        $this->expectException(RouteNotFound::class);
+        $this->router->matchFromPath('/home', 'PUT');
+
+    }
+
     public function testGenerateUrl() {
 
         $urlHome = $this->router->generateUri('home_page');
         $urlArticle = $this->router->generateUri('article_page');
         $urlArticleWithParam = $this->router->generateUri('article_page_by_id', ['id' => 25]);
         $routeArticleWithParams = $this->router->generateUri('article_page_by_id_and_page', ['id' => 25, 'page' => 3]);
 
-        $this->assertEquals($urlHome, '/home');
-        $this->assertEquals($urlArticle, '/view/article');
-        $this->assertEquals($urlArticleWithParam, '/view/article/25');
-        $this->assertEquals($routeArticleWithParams, '/view/article/25/3');
+        $this->assertSame($urlHome, '/home');
+        $this->assertSame($urlArticle, '/view/article');
+        $this->assertSame($urlArticleWithParam, '/view/article/25');
+        $this->assertSame($routeArticleWithParams, '/view/article/25/3');
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->router->generateUri('article_page_by_id_and_page', ['id' => 25]);
 
     }
 }