Added file upload support and symfony4 support

Author: marcj

Bootstraps/Symfony.php

@@ -49,8 +49,16 @@ public function getApplication()
             require './vendor/autoload.php';
         }
 
+        // environment loading as of Symfony 3.3
+        if (!getenv('APP_ENV') && class_exists('Symfony\Component\Dotenv\Dotenv') && file_exists(realpath('.env'))) {
+            (new \Symfony\Component\Dotenv\Dotenv())->load(realpath('.env'));
+        }
+
+        $class = class_exists('\AppKernel') ? '\AppKernel' : '\App\Kernel';
+
         //since we need to change some services, we need to manually change some services
-        $app = new \AppKernel($this->appenv, $this->debug);
+        $app = new $class($this->appenv, $this->debug);
+
         // We need to change some services, before the boot, because they would 
         // otherwise be instantiated and passed to other classes which makes it 
         // impossible to replace them.
@@ -66,8 +74,7 @@ public function getApplication()
         //now we can modify the container
         $nativeStorage = new StrongerNativeSessionStorage(
             $app->getContainer()->getParameter('session.storage.options'),
-            $app->getContainer()->has('session.handler') ? $app->getContainer()->get('session.handler'): null,
-            $app->getContainer()->get('session.storage.metadata_bag')
+            $app->getContainer()->has('session.handler') ? $app->getContainer()->get('session.handler'): null
         );
         $app->getContainer()->set('session.storage.native', $nativeStorage);
 

Bridges/HttpKernel.php

@@ -30,6 +30,11 @@ class HttpKernel implements BridgeInterface
      */
     protected $bootstrap;
 
+    /**
+     * @var string[]
+     */
+    protected $tempFiles = [];
+
     /**
      * Bootstrap an application implementing the HttpKernelInterface.
      *
@@ -82,7 +87,8 @@ public function handle(ServerRequestInterface $request)
             $syResponse = $this->application->handle($syRequest);
         } catch (\Exception $exception) {
             // internal server error
-            $response = new Psr7\Response(500, ['Content-type' => 'text/plain'], $exception->getMessage());
+            error_log((string)$exception);
+            $response = new Psr7\Response(500, ['Content-type' => 'text/plain'], 'Unexpected error');
 
             // end buffering if we need to throw
             @ob_end_clean();
@@ -142,8 +148,30 @@ protected function mapRequest(ServerRequestInterface $psrRequest)
             session_id(Utils::generateSessionId());
         }
 
-        // files
-        $files = $psrRequest->getUploadedFiles();
+        /** @var \React\Http\Io\UploadedFile $file */
+        $uploadedFiles = $psrRequest->getUploadedFiles();
+
+        $mapFiles = function(&$files) use (&$mapFiles) {
+            foreach ($files as &$value) {
+                if (is_array($value)) {
+                    $mapFiles($value);
+                } else if ($value instanceof \React\Http\Io\UploadedFile) {
+                    $tmpname = tempnam(sys_get_temp_dir(), 'upload');
+                    $this->tempFiles[] = $tmpname;
+
+                    file_put_contents($tmpname, (string)$value->getStream());
+                    $value = new \Symfony\Component\HttpFoundation\File\UploadedFile(
+                        $tmpname,
+                        $value->getClientFilename(),
+                        $value->getClientMediaType(),
+                        $value->getSize(),
+                        $value->getError(),
+                        true
+                    );
+                }
+            }
+        };
+        $mapFiles($uploadedFiles);
 
         // @todo check howto handle additional headers
 
@@ -158,7 +186,7 @@ protected function mapRequest(ServerRequestInterface $psrRequest)
         }
 
         /** @var SymfonyRequest $syRequest */
-        $syRequest = new $class($query, $post, $attributes = [], $_COOKIE, $files, $_SERVER, $psrRequest->getBody());
+        $syRequest = new $class($query, $post, $attributes = [], $_COOKIE, $uploadedFiles, $_SERVER, $psrRequest->getBody());
 
         $syRequest->setMethod($method);
 
@@ -256,6 +284,12 @@ protected function mapResponse(SymfonyResponse $syResponse)
 
         $psrResponse = $psrResponse->withBody(Psr7\stream_for($content));
 
+        foreach ($this->tempFiles as $tmpname) {
+            if (file_exists($tmpname)) {
+                unlink($tmpname);
+            }
+        }
+
         return $psrResponse;
     }