Merge pull request #9 from nazg-hack/feature/added-namespace

added namespace NazgTest
nazg-hack · Jan 22, 2018 · 850aea9 · 850aea9
2 parents 64ca52e + 57894b4
commit 850aea9
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -48,9 +48,9 @@
     ]
   },
   "autoload-dev": {
-    "classmap": [
-      "tests/"
-    ],
+    "psr-4": {
+      "NazgTest\\": "tests/"
+    },
     "files": [
       "tests/Struct/Shapes.php"
     ]

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -148,8 +148,9 @@ protected function middlewareProcessor(
     ContainerInterface $container,
   ): RequestHandlerInterface {
     $appMiddleware =
-      $this->im->concat($this->middleware())
-        |> $$->concat($middleware)->toArray();
+      $this->im
+        ->concat($this->middleware())
+        ->concat($middleware)->toArray();
     $dispatcher = new Dispatcher(
       new MiddlewareStack(
         $appMiddleware,

diff --git a/src/Foundation/Exception/ExceptionHandler.php b/src/Foundation/Exception/ExceptionHandler.php
@@ -54,7 +54,7 @@ protected function toImmMap(\Exception $e): ExceptionMap {
         'line' => $e->getLine(),
         'trace' => map(
           $e->getTrace(),
-          $v ==> (new Map($v)) |> $$->removeKey('args') |> $$->toArray(),
+          $v ==> (new Map($v))->removeKey('args')->toArray(),
         ),
       ],
     );

diff --git a/src/Foundation/Exception/ExceptionServiceModule.php b/src/Foundation/Exception/ExceptionServiceModule.php
@@ -41,9 +41,10 @@ private function invariantExceptionHandler(
     FactoryContainer $container,
   ): ExceptionHandleInterface {
     $instance = $container->get(ExceptionHandleInterface::class);
-    if ($instance instanceof ExceptionHandleInterface) {
-      return $instance;
-    }
-    throw new \LogicException();
+    invariant(
+      $instance instanceof ExceptionHandleInterface,
+      "Interface '\Nazg\Exceptions\ExceptionHandleInterface' is not implemented by this class",
+    );
+    return $instance;
   }
 }
diff --git a/tests/Action/IndexAction.php b/tests/Action/IndexAction.php
@@ -1,5 +1,8 @@
 <?hh // strict
 
+namespace NazgTest\Action;
+
+use NazgTest\Responder\IndexResponder;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Interop\Http\Server\MiddlewareInterface;

diff --git a/tests/Action/ParameterAction.php b/tests/Action/ParameterAction.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Action;
+
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Interop\Http\Server\MiddlewareInterface;

diff --git a/tests/Action/ValidateAction.php b/tests/Action/ValidateAction.php
@@ -1,15 +1,18 @@
 <?hh 
 
+namespace NazgTest\Action;
+
 use Nazg\Foundation\Validation\Attribute;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Interop\Http\Server\MiddlewareInterface;
 use Interop\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\JsonResponse;
+use NazgTest\Validation\MockValidateActionFaild;
 
 final class ValidateAction implements MiddlewareInterface {
 
-  <<RequestValidation(\MockValidateActionFaild::class)>>
+  <<RequestValidation(MockValidateActionFaild::class)>>
   public function process(
     ServerRequestInterface $request,
     RequestHandlerInterface $handler,

diff --git a/tests/ApplicationTest.php b/tests/ApplicationTest.php
@@ -1,5 +1,7 @@
 <?hh
 
+namespace NazgTest;
+
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Nazg\Foundation\Application;

diff --git a/tests/Exception/ExceptionHandlerTest.php b/tests/Exception/ExceptionHandlerTest.php
@@ -1,5 +1,7 @@
 <?hh // strict
 
+namespace NazgTest\Exception;
+
 use PHPUnit\Framework\TestCase;
 use Ytake\HHContainer\ServiceModule;
 use Ytake\HHContainer\FactoryContainer;

diff --git a/tests/Log/LogServiceModuleTest.php b/tests/Log/LogServiceModuleTest.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Middleware;
+
 use Nazg\Log\LogServiceModule;
 use PHPUnit\Framework\TestCase;
 use Ytake\HHContainer\ServiceModule;

diff --git a/tests/Middleware/FakeAttributeMiddleware.php b/tests/Middleware/FakeAttributeMiddleware.php
@@ -1,5 +1,7 @@
 <?hh // strict
 
+namespace NazgTest\Middleware;
+
 use Interop\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/tests/Middleware/FakeThrowExceptionMiddleware.php b/tests/Middleware/FakeThrowExceptionMiddleware.php
@@ -1,5 +1,7 @@
 <?hh // strict
 
+namespace NazgTest\Middleware;
+
 use Interop\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/tests/Middleware/LogExceptionMiddlewareTest.php b/tests/Middleware/LogExceptionMiddlewareTest.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Middleware;
+
 use Nazg\Log\LogServiceModule;
 use Nazg\Middleware\LogExceptionMiddleware;
 use PHPUnit\Framework\TestCase;
@@ -10,6 +12,7 @@
 use Nazg\Heredity\MiddlewareStack;
 use Nazg\Heredity\PsrContainerResolver;
 use Nazg\Foundation\Middleware\Dispatcher;
+use NazgTest\StubRequestHandler;
 
 class LogExceptionMiddlewareTest extends TEstCase {
   /**

diff --git a/tests/Middleware/OverrideLogServiceModule.php b/tests/Middleware/OverrideLogServiceModule.php
@@ -1,17 +1,18 @@
 <?hh
 
+namespace NazgTest\Middleware;
+
 use Ytake\HHContainer\ServiceModule;
 use Ytake\HHContainer\FactoryContainer;
 use Psr\Log\LoggerInterface;
 use Monolog\Logger;
 use Monolog\Monolog;
 use Monolog\Handler\StreamHandler;
 
-class OverrideLogServiceModule extends Nazg\Log\LogServiceModule {
+class OverrideLogServiceModule extends \Nazg\Log\LogServiceModule {
 
   const string LOG_FILE = __DIR__ . '/../logs/tests.log';
 
-  <<__Override>>
   protected function defaultLogger(): LoggerInterface {
     $monolog = new \Monolog\Logger("Nazg.Log");
     $monolog->pushHandler(

diff --git a/tests/Middleware/SimpleCorsMiddlewareTest.php b/tests/Middleware/SimpleCorsMiddlewareTest.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Middleware;
+
 use Nazg\Http\HttpMethod;
 use Nazg\Middleware\SimpleCorsMiddleware;
 use Nazg\Middleware\AccessControl;
@@ -20,7 +22,7 @@ public function testShouldThrowException(): void {
         [SimpleCorsMiddleware::class],
         new PsrContainerResolver($container),
       ),
-      new StubRequestHandler(), 
+      new \NazgTest\StubRequestHandler(), 
     );
     $response = $heredity->handle(
       ServerRequestFactory::fromGlobals(),

diff --git a/tests/Responder/IndexResponder.php b/tests/Responder/IndexResponder.php
@@ -1,8 +1,10 @@
 <?hh
 
+namespace NazgTest\Responder;
+
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response\JsonResponse;
-use IndexStructure;
+use NazgTest\IndexStructure;
 
 final class IndexResponder {
 

diff --git a/tests/Routing/RouterTest.php b/tests/Routing/RouterTest.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Routing;
+
 use PHPUnit\Framework\TestCase;
 use Nazg\Routing\Router;
 use Nazg\Foundation\Service;
@@ -12,7 +14,7 @@ public function testShouldBeMatchRoute(): void {
     $router = new Router(ImmMap{
       HttpMethod::GET => ImmMap {
         '/' => ImmVector{
-          IndexAction::class
+          \NazgTest\Action\IndexAction::class
         },
       },
     });
@@ -23,7 +25,7 @@ public function testShouldBeMatchRoute(): void {
       ])
     );
     $this->assertInternalType('array', $match);
-    $this->assertContains(\IndexAction::class, $match[0]);
+    $this->assertContains(\NazgTest\Action\IndexAction::class, $match[0][0]);
   }
 
   /**
@@ -32,7 +34,7 @@ public function testShouldBeMatchRoute(): void {
   public function testShouldNotBeMatchRoute(): void {
     $router = new Router(ImmMap{
       HttpMethod::GET => ImmMap {
-        '/' => ImmVector{IndexAction::class},
+        '/' => ImmVector{\NazgTest\Action\IndexAction::class},
       },
     });
     $match = $router->routePsr7Request(

diff --git a/tests/Struct/Shapes.php b/tests/Struct/Shapes.php
@@ -1,3 +1,5 @@
 <?hh // strict
 
+namespace NazgTest;
+
 type IndexStructure = shape('language' => string, 'version' => string);
diff --git a/tests/StubRequestHandler.php b/tests/StubRequestHandler.php
@@ -1,5 +1,7 @@
 <?hh
 
+namespace NazgTest;
+
 use Interop\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;

diff --git a/tests/TestingServiceModule.php b/tests/TestingServiceModule.php
@@ -1,26 +1,31 @@
 <?hh // strict
 
+namespace NazgTest;
+
 use Ytake\HHContainer\FactoryContainer;
 use Ytake\HHContainer\ServiceModule;
 
 class TestingServiceModule extends ServiceModule {
   public function provide(FactoryContainer $container): void {
-    $container->set(stdClass::class, $container ==> new stdClass());
     $container->set(
-      \IndexAction::class, 
-      $container ==> new \IndexAction()
+      \NazgTest\Action\IndexAction::class, 
+      $container ==> new \NazgTest\Action\IndexAction()
+    );
+    $container->set(
+      \NazgTest\Action\ParameterAction::class, 
+      $container ==> new \NazgTest\Action\ParameterAction()
     );
     $container->set(
-      \ParameterAction::class, 
-      $container ==> new \ParameterAction()
+      \NazgTest\Action\ValidateAction::class, 
+      $container ==> new \NazgTest\Action\ValidateAction()
     );
     $container->set(
-      \ValidateAction::class, 
-      $container ==> new \ValidateAction()
+      \NazgTest\Middleware\FakeAttributeMiddleware::class, 
+      $container ==> new \NazgTest\Middleware\FakeAttributeMiddleware()
     );
     $container->set(
-      \FakeAttributeMiddleware::class, 
-      $container ==> new \FakeAttributeMiddleware()
+      \NazgTest\Validation\MockValidateActionFaild::class, 
+      $container ==> new \NazgTest\Validation\MockValidateActionFaild()
     );
   }
 }
diff --git a/tests/Validation/MockValidateActionFaild.php b/tests/Validation/MockValidateActionFaild.php
@@ -1,5 +1,7 @@
 <?hh // strict
 
+namespace NazgTest\Validation;
+
 use Nazg\Foundation\Validation\Validator;
 use Psr\Http\Message\ServerRequestInterface;
 

diff --git a/tests/Validation/ValidatorTest.php b/tests/Validation/ValidatorTest.php
@@ -1,5 +1,7 @@
 <?hh 
 
+namespace NazgTest\Validation;
+
 use Facebook\TypeAssert;
 use PHPUnit\Framework\TestCase;
 use Nazg\Foundation\Validation\Validator;

diff --git a/tests/config/modules.testing.php b/tests/config/modules.testing.php
@@ -1,9 +1,7 @@
 <?hh 
 
-use Nazg\Foundation\Service;
-
 return [
-  Service::MODULES => ImmVector{
-    \TestingServiceModule::class,
+  \Nazg\Foundation\Service::MODULES => ImmVector{
+    \NazgTest\TestingServiceModule::class,
   },
 ];
diff --git a/tests/config/routes.testing.php b/tests/config/routes.testing.php
@@ -1,17 +1,18 @@
 <?hh 
 
-use Nazg\Foundation\Service;
-use Nazg\Http\HttpMethod;
-
 return [
-  Service::ROUTES => ImmMap {
-    HttpMethod::GET => ImmMap {
-      '/' => ImmVector {IndexAction::class},
+  \Nazg\Foundation\Service::ROUTES => ImmMap {
+    \Nazg\Http\HttpMethod::GET => ImmMap {
+      '/' => ImmVector {
+        \NazgTest\Action\IndexAction::class
+      },
       '/testing/{id}' => ImmVector {
-        FakeAttributeMiddleware::class,
-        ParameterAction::class,
+        \NazgTest\Middleware\FakeAttributeMiddleware::class,
+        \NazgTest\Action\ParameterAction::class,
+      },
+      '/validate/{id}' => ImmVector {
+        \NazgTest\Action\ValidateAction::class
       },
-      '/validate/{id}' => ImmVector {ValidateAction::class},
     },
   },
 ];