- Preparing for full Laminas conversion and some Kernel bugs corrected

composer.json

@@ -13,6 +13,8 @@
         "vlucas/phpdotenv": "^3.4@dev",
         "php-di/php-di": "dev-master",
         "league/route": "dev-master",
+        "laminas/laminas-diactoros": "2.24.x-dev",
+        "laminas/laminas-httphandlerrunner": "2.5.x-dev",
         "mcnd/storage": "dev-master",
         "mcnd/ulmus": "dev-master",
         "mcnd/picea": "dev-master",

meta/definitions/http.php

@@ -4,9 +4,7 @@ use function DI\autowire, DI\create, DI\get;
 
 use Psr\Http\Message\ServerRequestInterface;
 
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\{ Diactoros\ServerRequestFactory, HttpHandlerRunner\Emitter\EmitterInterface, HttpHandlerRunner\Emitter\SapiEmitter };
-use Zend\HttpHandlerRunner\Emitter\EmitterInterface,
-    Zend\HttpHandlerRunner\Emitter\SapiEmitter;
 
 return [
     ServerRequestInterface::class => function ($c) {

src/ControllerTrait.php

@@ -115,7 +115,7 @@ trait ControllerTrait {
     public function fromResponse(ResponseInterface $response)
     {
         if ( $response->getStatusCode() === 200 ) {
-            if ( $response instanceof \Zend\Diactoros\Response\JsonResponse) {
+            if ( $response instanceof \Laminas\Diactoros\Response\JsonResponse) {
                 return $response->getPayload();
             }
         }

src/Kernel.php

@@ -11,13 +11,13 @@ use League\Route\Strategy\ApplicationStrategy;
 
 use Psr\Http\Message\ServerRequestInterface;
 
-use Psr\SimpleCache\CacheInterface;
 use Tell\I18n;
 use Ulmus\Container\AdapterProxy;
 
+use Laminas\Diactoros\ServerRequestFactory,
+    Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
+
 use Ulmus\Ulmus;
-use Zend\Diactoros\ServerRequestFactory,
-    Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 
 class Kernel {
 
@@ -61,7 +61,7 @@ class Kernel {
         Dotenv::create(getenv("PROJECT_PATH"))->load();
 
         // Override using headers
-        if ( ( $keys = getenv('keys') ) && ( $auth = $_SERVER["HTTP_X_DEV_AUTH"] ) && in_array($auth, explode(',', getenv('keys'))) ) {
+        if ( ( $keys = getenv('KEYS') ) && ( $auth = $_SERVER["HTTP_X_DEV_AUTH"] ) && in_array($auth, explode(',', $keys)) ) {
             foreach (['APP_ENV', 'DEBUG',] as $env) {
                 if (null !== $value = $_SERVER["HTTP_X_$env"] ?? null) {
                     static::putenv($env, $value);
@@ -115,7 +115,7 @@ class Kernel {
             }
         }
 
-        $containerBuilder->useAttributes(false);
+        # $containerBuilder->useAnnotations(false);
 
         if ($this->definitionFilePath ?? false) {
             $containerBuilder->addDefinitions(require($this->definitionFilePath));

src/Response/DownloadResponse.php

@@ -6,10 +6,10 @@ use function get_class, gettype, is_object, is_string, sprintfm, pathinfo, PATHI
 
 use Psr\Http\Message\StreamInterface;
 
-use Zend\Diactoros\Exception,
+use Laminas\Diactoros\Exception,
-    Zend\Diactoros\Response,
+    Laminas\Diactoros\Response,
-    Zend\Diactoros\Stream,
+    Laminas\Diactoros\Stream,
-    Zend\Diactoros\Response\InjectContentTypeTrait;
+    Laminas\Diactoros\Response\InjectContentTypeTrait;
 
 /**
  * PDF Response

src/Response/FileDownloadResponse.php

@@ -6,10 +6,10 @@ use function get_class, gettype, is_object, is_string, sprintfm, pathinfo, PATHI
 
 use Psr\Http\Message\StreamInterface;
 
-use Zend\Diactoros\Exception,
+use Laminas\Diactoros\Exception,
-    Zend\Diactoros\Response,
+    Laminas\Diactoros\Response,
-    Zend\Diactoros\Stream,
+    Laminas\Diactoros\Stream,
-    Zend\Diactoros\Response\InjectContentTypeTrait;
+    Laminas\Diactoros\Response\InjectContentTypeTrait;
 
 /**
  * PDF Response

src/Response/MarkdownResponse.php

@@ -2,7 +2,7 @@
 
 namespace Lean\Response;
 
-use Zend\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
 use League\CommonMark\CommonMarkConverter;
 
 /**

src/Response/PdfResponse.php

@@ -6,10 +6,10 @@ use function get_class, gettype, is_object, is_string, sprintf;
 
 use Psr\Http\Message\StreamInterface;
 
-use Zend\Diactoros\Exception,
+use Laminas\Diactoros\Exception,
-    Zend\Diactoros\Response,
+    Laminas\Diactoros\Response,
-    Zend\Diactoros\Stream,
+    Laminas\Diactoros\Stream,
-    Zend\Diactoros\Response\InjectContentTypeTrait;
+    Laminas\Diactoros\Response\InjectContentTypeTrait;
 
 /**
  * PDF Response