Remove factories, use laminas/lamians-di instead. (#20)

* 1. Add `RequestUtils` and `ResponseUtils`. 2. Add cache feature for `RouteMetadata` * Update docs * Remove factories, use `laminas/lamians-di` instead. * Fix test. * Fix test. * Fix test. * Fix cs.
zfegg · Sep 13, 2023 · 9b3744b · 9b3744b
1 parent 63d3fcb
commit 9b3744b
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 248 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
     ],
     "require-dev": {
         "laminas/laminas-config-aggregator": "^1.7",
+        "laminas/laminas-di": "^3.9",
         "laminas/laminas-diactoros": "^2.5",
         "laminas/laminas-servicemanager": "^3.6",
         "mezzio/mezzio": "^3.6",

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -7,15 +7,9 @@
 use Mezzio\Middleware\ErrorResponseGenerator;
 use Mezzio\Router\RouteCollector;
 use Zfegg\PsrMvc\Container\RouteCollectorInjectionDelegator;
-use Zfegg\PsrMvc\Middleware\ContentTypeMiddleware;
-use Zfegg\PsrMvc\ParamResolver\ParamResolverManager;
-use Zfegg\PsrMvc\Preparer\CommonPreparer;
-use Zfegg\PsrMvc\Preparer\DefaultPreparer;
 use Zfegg\PsrMvc\Preparer\PreparerStack;
 use Zfegg\PsrMvc\Preparer\ResultPreparableInterface;
-use Zfegg\PsrMvc\Preparer\SerializationPreparer;
 use Zfegg\PsrMvc\Routing\ParameterConverterInterface;
-use Zfegg\PsrMvc\Routing\RouteMetadata;
 use Zfegg\PsrMvc\Routing\SlugifyParameterConverter;
 
 class ConfigProvider
@@ -27,17 +21,7 @@ public function __invoke(): array
             'dependencies' => [
                 'factories' => [
                     ErrorResponseGenerator::class => Container\ErrorResponseGeneratorFactory::class,
-                    CallbackHandlerFactory::class => Container\CallbackHandlerFactoryFactory::class,
-                    RouteMetadata::class => Container\RouteMetadataFactory::class,
-                    FormatMatcher::class => Container\FormatMatcherFactory::class,
-                    ParamResolverManager::class => Container\ParamResolverManagerFactory::class,
-                    ControllerHandler::class => Container\ControllerHandlerFactory::class,
-                    SlugifyParameterConverter::class => Container\SlugifyParameterConverterFactory::class,
                     PreparerStack::class => Container\PreparerStackFactory::class,
-                    CommonPreparer::class => Container\InvokableFactory::class,
-                    DefaultPreparer::class => Container\InvokableFactory::class,
-                    SerializationPreparer::class => Container\SerializationPreparerFactory::class,
-                    ContentTypeMiddleware::class => Container\ContentTypeMiddlewareFactory::class,
                 ],
                 'delegators' => [
                     RouteCollector::class => [
@@ -47,10 +31,16 @@ public function __invoke(): array
                 'aliases' => [
                     ParameterConverterInterface::class => SlugifyParameterConverter::class,
                     ResultPreparableInterface::class => PreparerStack::class,
-                ]
-            ],
-            RouteMetadata::class => [
-                'paths' => []
+                ],
+                'auto' => [
+                    'types' => [
+                        ControllerHandler::class => [
+                            'parameters' => [
+                                'notFoundHandler' => \Mezzio\Handler\NotFoundHandler::class,
+                            ]
+                        ],
+                    ]
+                ],
             ],
         ];
     }

diff --git a/src/Container/CallbackHandlerAbstractFactory.php b/src/Container/CallbackHandlerAbstractFactory.php
@@ -5,6 +5,7 @@
 namespace Zfegg\PsrMvc\Container;
 
 use Interop\Container\ContainerInterface;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
 use Zfegg\PsrMvc\CallbackHandlerFactory;
 
@@ -15,7 +16,15 @@ class CallbackHandlerAbstractFactory implements AbstractFactoryInterface
      */
     public function canCreate(ContainerInterface $container, $requestedName)
     {
-        return $container->get(CallbackHandlerFactory::class)->exists($requestedName);
+        // For resolve cycle create.
+        if ($requestedName === CallbackHandlerFactory::class) {
+            return false;
+        }
+        try {
+            return $container->get(CallbackHandlerFactory::class)->exists($requestedName);
+        } catch (ServiceNotFoundException $e) {
+            return false;
+        }
     }
 
     /**

diff --git a/src/Container/CallbackHandlerFactoryFactory.php b/src/Container/CallbackHandlerFactoryFactory.php
diff --git a/src/Container/ContentTypeMiddlewareFactory.php b/src/Container/ContentTypeMiddlewareFactory.php
diff --git a/src/Container/ControllerHandlerFactory.php b/src/Container/ControllerHandlerFactory.php
diff --git a/src/Container/FormatMatcherFactory.php b/src/Container/FormatMatcherFactory.php
diff --git a/src/Container/InvokableFactory.php b/src/Container/InvokableFactory.php
diff --git a/src/Container/ParamResolverManagerFactory.php b/src/Container/ParamResolverManagerFactory.php
diff --git a/src/Container/PreparerStackFactory.php b/src/Container/PreparerStackFactory.php
@@ -15,10 +15,9 @@ class PreparerStackFactory
 
     public function __invoke(ContainerInterface $container): ResultPreparableInterface
     {
-        $preparer = new PreparerStack();
-        $preparer->push($container->get(DefaultPreparer::class));
-        $preparer->push($container->get(CommonPreparer::class));
-
-        return $preparer;
+        return new PreparerStack([
+            $container->get(DefaultPreparer::class),
+            $container->get(CommonPreparer::class),
+        ]);
     }
 }
diff --git a/src/Container/RouteMetadataFactory.php b/src/Container/RouteMetadataFactory.php
diff --git a/src/Container/SerializationPreparerFactory.php b/src/Container/SerializationPreparerFactory.php
diff --git a/src/Container/SerializationPreparerStackFactory.php b/src/Container/SerializationPreparerStackFactory.php
@@ -16,11 +16,10 @@ class SerializationPreparerStackFactory
 
     public function __invoke(ContainerInterface $container): ResultPreparableInterface
     {
-        $preparer = new PreparerStack();
-        $preparer->push($container->get(DefaultPreparer::class));
-        $preparer->push($container->get(SerializationPreparer::class));
-        $preparer->push($container->get(CommonPreparer::class));
-
-        return $preparer;
+        return new PreparerStack([
+            $container->get(DefaultPreparer::class),
+            $container->get(SerializationPreparer::class),
+            $container->get(CommonPreparer::class),
+        ]);
     }
 }
diff --git a/src/Container/SlugifyParameterConverterFactory.php b/src/Container/SlugifyParameterConverterFactory.php
diff --git a/src/Preparer/PreparerStack.php b/src/Preparer/PreparerStack.php
@@ -11,6 +11,14 @@
 
 class PreparerStack extends SplStack implements ResultPreparableInterface
 {
+
+    public function __construct(iterable $preparers = [])
+    {
+        foreach ($preparers as $preparer) {
+            $this->push($preparer);
+        }
+    }
+
     public function prepare(ServerRequestInterface $request, mixed $result, array $options = []): ResponseInterface
     {
         /** @var ResultPreparableInterface $preparer */