Remove Laminas dependencies

Author: santiagolizardo

composer.json

@@ -22,8 +22,6 @@
     "graylog2/gelf-php": "dev-master",
     "guzzlehttp/guzzle": "^7.2",
     "guzzlehttp/psr7": "^2.1",
-    "laminas/laminas-diactoros": "^3.0",
-    "laminas/laminas-httphandlerrunner": "^2.1",
     "league/commonmark": "^2.0",
     "league/container": "^4.2",
     "league/html-to-markdown": "^5.0",

composer.lock

@@ -5,12 +5,12 @@
 require $applicationDir . '/vendor/autoload.php';
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Monolog\Logger;
 use Reconmap\ApiRouter;
 use Reconmap\Services\ApplicationConfig;
 use Reconmap\Services\ApplicationContainer;
 use Reconmap\Services\Logging\LoggingConfigurator;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 
 $configFilePath = $applicationDir . '/config.json';
 if (!file_exists($configFilePath) || !is_readable($configFilePath)) {
@@ -36,5 +36,8 @@
 
 $response = $router->dispatch($request);
 
-(new SapiEmitter)->emit($response);
+$httpFoundationFactory = new HttpFoundationFactory();
+$symfonyResponse = $httpFoundationFactory->createResponse($response);
+
+$symfonyResponse->send();
 

public/index.php

@@ -2,7 +2,7 @@
 
 namespace Reconmap;
 
-use Laminas\Diactoros\ResponseFactory;
+use GuzzleHttp\Psr7\HttpFactory;
 use League\Container\Container;
 use League\Route\RouteGroup;
 use League\Route\Router;
@@ -64,7 +64,7 @@ class ApiRouter extends Router
 
     public function mapRoutes(Container $container, ApplicationConfig $applicationConfig): void
     {
-        $responseFactory = new ResponseFactory;
+        $responseFactory = new HttpFactory();
 
         $corsResponseDecorator = $container->get(CorsResponseDecorator::class);
         $logger = $container->get(Logger::class);

src/ApiRouter.php

@@ -3,7 +3,7 @@
 namespace Reconmap\Controllers\System;
 
 use GuzzleHttp\Psr7\Response;
-use Laminas\Diactoros\CallbackStream;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Reconmap\Controllers\Controller;
@@ -40,24 +40,22 @@ public function __invoke(ServerRequestInterface $request): ResponseInterface
 
         $fileName = 'reconmap-' . $packageName . '-' . date('Ymd-His') . '.json';
 
-        $body = new CallbackStream(function () use ($entities) {
-            $data = [];
+        $data = [];
 
-            foreach (Exportables::List as $exportable) {
-                $exportableKey = $exportable['key'];
-                if (in_array($exportableKey, $entities)) {
-                    /** @var Exportable $exporter */
-                    $exporter = $this->container->get($exportable['className']);
-                    $data[$exportableKey] = $exporter->export();
-                }
+        foreach (Exportables::List as $exportable) {
+            $exportableKey = $exportable['key'];
+            if (in_array($exportableKey, $entities)) {
+                /** @var Exportable $exporter */
+                $exporter = $this->container->get($exportable['className']);
+                $data[$exportableKey] = $exporter->export();
             }
+        }
 
-            return json_encode($data);
-        });
+        $body = json_encode($data);
 
         $response = new Response;
         return $response
-            ->withBody($body)
+            ->withBody(Utils::streamFor($body))
             ->withHeader('Access-Control-Expose-Headers', 'Content-Disposition')
             ->withHeader('Content-Disposition', 'attachment; filename="' . $fileName . '";')
             ->withAddedHeader('Content-Type', 'application/json; charset=UTF-8');