Adjust to atk4/ui PSR-7 response

composer.json

@@ -34,7 +34,7 @@
     },
     "require-release": {
         "php": ">=7.4 <8.3",
-        "atk4/ui": "~4.0.0",
+        "atk4/ui": "~5.0.0",
         "league/flysystem": "^2.0"
     },
     "require-dev": {

demos/index.php

@@ -52,9 +52,7 @@
 $form->onSubmit(function (Form $form) use ($gr) {
     $form->model->save();
 
-    return [
-        $gr->jsReload(),
-    ];
+    return $gr->jsReload();
 });
 
 View::addTo($app, ['ui' => 'divider']);

src/Helper.php

@@ -6,95 +6,53 @@
 
 use Atk4\Filestore\Model\File;
 use Atk4\Ui\App;
+use Nyholm\Psr7\Factory\Psr17Factory;
 
 class Helper
 {
     /**
      * @return never
      */
-    public static function download(File $model, App $app = null): void
+    public static function download(File $model, App $app): void
     {
-        $headers = [
-            'Content-Description' => 'File Transfer',
-            'Content-Type' => 'application/octet-stream',
-            'Cache-Control' => 'must-revalidate',
-            'Expires' => '-1',
-            'Content-Disposition' => 'attachment; filename="' . $model->get('meta_filename') . '"',
-            'Content-Length' => (string) $model->get('meta_size'),
-            'Pragma' => 'public',
-            'Accept-Ranges' => 'bytes',
-        ];
-
-        static::output($model, $headers, $app);
+        $app->setResponseHeader('Content-Description', 'File Transfer');
+        $app->setResponseHeader('Content-Type', 'application/octet-stream');
+        $app->setResponseHeader('Cache-Control', 'must-revalidate');
+        $app->setResponseHeader('Expires', '-1');
+        $app->setResponseHeader('Content-Disposition', 'attachment; filename="' . $model->get('meta_filename') . '"');
+        $app->setResponseHeader('Content-Length', (string) $model->get('meta_size'));
+        $app->setResponseHeader('Pragma', 'public');
+        $app->setResponseHeader('Accept-Ranges', 'bytes');
+
+        static::output($model, $app);
     }
 
     /**
-     * @param array<string, string> $headers
-     *
      * @return never
      */
-    protected static function output(File $model, array $headers, App $app = null): void
+    protected static function output(File $model, App $app): void
     {
-        // TODO move to App and add support for streams
-
-        $headers = self::normalizeHeaders($headers);
-
-        $location = $model->get('location');
-
-        if ($app !== null) {
-            $app->terminate($model->flysystem->read($location), $headers);
-        }
-
-        $isCli = \PHP_SAPI === 'cli'; // for phpunit
-
-        foreach ($headers as $k => $v) {
-            if (!$isCli) {
-                $kCamelCase = preg_replace_callback('~(?<![a-zA-Z])[a-z]~', function ($matches) {
-                    return strtoupper($matches[0]);
-                }, $k);
-
-                header($kCamelCase . ': ' . $v);
-            }
-        }
-
-        fpassthru($model->flysystem->readStream($location));
+        $path = $model->get('location');
+        $resource = $model->flysystem->readStream($path);
+        $stream = (new Psr17Factory())->createStreamFromResource($resource);
 
-        exit;
+        $app->terminate($stream);
     }
 
     /**
      * @return never
      */
-    public static function view(File $model, App $app = null): void
+    public static function view(File $model, App $app): void
     {
-        $headers = [
-            'Content-Description' => 'File Transfer',
-            'Content-Type' => $model->get('meta_mime_type'),
-            'Cache-Control' => 'must-revalidate',
-            'Expires' => '-1',
-            'Content-Disposition' => 'inline; filename="' . $model->get('meta_filename') . '"',
-            'Content-Length' => (string) $model->get('meta_size'),
-            'Pragma' => 'public',
-            'Accept-Ranges' => 'bytes',
-        ];
-
-        static::output($model, $headers, $app);
-    }
-
-    /**
-     * Copied from atk4/ui App class.
-     *
-     * @param array<string, string> $headers
-     *
-     * @return array<string, string>
-     */
-    private static function normalizeHeaders(array $headers): array
-    {
-        $res = [];
-        foreach ($headers as $k => $v) {
-            $res[strtolower(trim($k))] = trim($v);
-        }
-
-        return $res;
+        $app->setResponseHeader('Content-Description', 'File Transfer');
+        $app->setResponseHeader('Content-Type', $model->get('meta_mime_type'));
+        $app->setResponseHeader('Cache-Control', 'must-revalidate');
+        $app->setResponseHeader('Expires', '-1');
+        $app->setResponseHeader('Content-Disposition', 'inline; filename="' . $model->get('meta_filename') . '"');
+        $app->setResponseHeader('Content-Length', (string) $model->get('meta_size'));
+        $app->setResponseHeader('Pragma', 'public');
+        $app->setResponseHeader('Accept-Ranges', 'bytes');
+
+        static::output($model, $app);
     }
 }