Merge pull request #4 from Micro-PHP/v1.0.2-release

v1.0.2 - fix tests

Author: Asisyas

composer.json

@@ -34,7 +34,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Micro\\Plugin\\Http\\Test\\": "tests/"
+            "Micro\\Plugin\\Http\\Test\\Unit\\": "tests/Unit"
         }
     },
     "config": {
@@ -45,8 +45,8 @@
     },
     "scripts": {
         "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
-        "php-cs-fix": "./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
-        "php-cs-try": "./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
+        "php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
+        "php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
         "phpstan": "./vendor/bin/phpstan analyze --no-progress",
         "phpunit": "./vendor/bin/phpunit",
         "psalm": "./vendor/bin/psalm --no-progress --show-info=true",

src/Business/Route/RouteBuilder.php

@@ -116,7 +116,7 @@ public function build(): RouteInterface
         if (!$this->uri) {
             $this->uri = '';
 
-            $exceptions[] = 'Path can not be empty';
+            $exceptions[] = 'Uri can not be empty.';
         }
 
         if ($this->name && !preg_match('/^(.[aA-zZ_])/', $this->name)) {

src/Exception/RouteInvalidConfigurationException.php

@@ -28,7 +28,12 @@ class RouteInvalidConfigurationException extends RouteConfigurationException
      */
     public function __construct(string $routeName, array $messages, int $code = 0, ?\Throwable $previous = null)
     {
-        $message = sprintf('Invalid route "%s" configuration.', $routeName);
+        $message = <<<EOF
+            Invalid route "%s" configuration:
+                * %s
+        EOF;
+
+        $message = sprintf($message, $routeName, implode("\r\n        * ", $messages));
 
         $this->messages = $messages;
         parent::__construct(

tests/Unit/Business/Route/RouteBuilderTest.php

@@ -56,10 +56,12 @@ public function testBuild(
             $this->expectException($allowedException);
         }
 
-        $route = $builder->build();
+        try {
+            $route = $builder->build();
+        } catch (RouteInvalidConfigurationException $configurationException) {
+            $this->assertNotEmpty($configurationException->getMessages());
 
-        if ($allowedException) {
-            return;
+            throw $configurationException;
         }
 
         $this->assertIsCallable($route->getController());
@@ -73,10 +75,11 @@ public function dataProvider()
     {
         return [
             ['test', function () {}, '/{test}.{_format}', '/\/(.[aA-zZ0-9-_]+)\.(.[aA-zZ0-9-_]+)/', ['POST'], null],
+            ['test', function () {}, '/{test}-{date}.{_format}', '/\/(.[aA-zZ0-9-_]+)-(.[aA-zZ0-9-_]+)\.(.[aA-zZ0-9-_]+)/', ['POST'], null],
             [null, function () {}, '/{test}.{_format}', '/\/(.[aA-zZ0-9-_]+)\.(.[aA-zZ0-9-_]+)/', null, null],
             ['test', null, '/{test}.{_format}', null, null, RouteInvalidConfigurationException::class],
             ['test', function () {}, '/test', null, null, null],
-            ['test', function () {}, null, null, null, RouteInvalidConfigurationException::class],
+            ['test', null, null, null, null, RouteInvalidConfigurationException::class],
         ];
     }
 }

tests/Unit/HttpCorePluginTest.php

@@ -30,7 +30,7 @@ public function testPlugin(string $parameter)
         $kernel = new AppKernel(
             $config,
             [
-                TestPlugin::class,
+                HttpTestPlugin::class,
             ],
             'dev',
         );

tests/Unit/TestPlugin.php tests/Unit/HttpTestPlugin.phptests/Unit/TestPlugin.php renamed to tests/Unit/HttpTestPlugin.php

@@ -29,7 +29,7 @@
 /**
  * @author Stanislau Komar <kost@micro-php.net>
  */
-class TestPlugin implements DependencyProviderInterface, HttpResponseTransformerPlugin, HttpRouteLocatorPluginInterface, PluginDependedInterface
+class HttpTestPlugin implements DependencyProviderInterface, HttpResponseTransformerPlugin, HttpRouteLocatorPluginInterface, PluginDependedInterface
 {
     private Container $container;
 
@@ -77,7 +77,7 @@ public function test(Request $request)
         }
 
         if ('bad_request' === $parameter) {
-            throw new HttpBadRequestException($request);
+            throw new HttpBadRequestException();
         }
 
         return $parameter;
@@ -96,7 +96,7 @@ public function locate(): iterable
                     ->createRouteBuilder()
                     ->setUri('/{parameter}')
                     ->setName('test')
-                    ->setController(TestPlugin::class)
+                    ->setController(HttpTestPlugin::class)
                     ->build()
                 ;
             }