Upgrade FlySystem 2.0 (#21)

* Align with atk 2.4

* Add php-cs-fixer

* Align to 2.4 and cleanup

* Add helper class for View and Download of files

* typo old namespace

* Update readme with new namespace

* Renamed basic.php to index.php

* Add headers normalize

* Typo classname

* Upgrade FlySystem 2.0

Author: abbadon1334

.gitignore

@@ -3,4 +3,5 @@ docs/build
 /build
 /vendor
 .DS_Store
-demos/localfiles/file-*
+/demos/localfiles/file-*
+/demos/filestore.db

composer.json

@@ -27,7 +27,7 @@
   "require": {
     "atk4/ui": "2.4.0",
     "php": ">=7.2",
-    "league/flysystem": "^1.0"
+    "league/flysystem": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "<6",

demos/index.php

@@ -13,16 +13,6 @@
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 
-$app = new \Atk4\Ui\App('Filestore Demo');
-$app->initLayout([\Atk4\Ui\Layout\Centered::class]);
-
-// change this as needed
-$app->db = Atk4\Data\Persistence::connect('mysql://root:root@localhost/atk4_filestore');
-
-// specify folder where files will be actually stored
-$adapter = new Local(__DIR__ . '/localfiles');
-$filesystem = new Filesystem($adapter);
-
 class Friend extends \Atk4\Data\Model
 {
     public $table = 'friend';
@@ -39,6 +29,30 @@ protected function init(): void
     }
 }
 
+// specify folder where files will be actually stored
+$adapter = new \League\Flysystem\Local\LocalFilesystemAdapter(__DIR__ . '/localfiles');
+$filesystem = new Filesystem($adapter);
+
+// init App
+$app = new \Atk4\Ui\App('Filestore Demo');
+$app->initLayout([\Atk4\Ui\Layout\Centered::class]);
+
+// init db
+$db_file = __DIR__ . "/filestore.db";
+$db_file_exists = file_exists($db_file);
+// change this as needed
+$app->db = Atk4\Data\Persistence::connect('sqlite:' . $db_file);
+/*
+if (!$db_file_exists) {
+    (new \Atk4\Schema\Migration(new \Friend($app->db, ['filesystem' => $filesystem,])))
+        ->dropIfExists()
+        ->create();
+    (new \Atk4\Schema\Migration(new \Atk4\Filestore\Model\File($app->db)))
+        ->dropIfExists()
+        ->create();
+}
+*/
+
 $col = Columns::addTo($app);
 
 $form = Form::addTo($col->addColumn());

src/Form/Control/Upload.php

@@ -5,6 +5,7 @@
 namespace Atk4\Filestore\Form\Control;
 
 use Atk4\Filestore\Field\File;
+use League\MimeTypeDetection\FinfoMimeTypeDetector;
 
 class Upload extends \Atk4\Ui\Form\Control\Upload
 {
@@ -39,17 +40,19 @@ protected function uploaded($file)
             fclose($stream);
         }
 
+        $detector = new \League\MimeTypeDetection\FinfoMimeTypeDetector();
+
+        $mimeType = $detector->detectMimeTypeFromFile($file['tmp_name']);
         // get meta from browser
-        $f->set('meta_mime_type', $file['type']);
+        $f->set('meta_mime_type', $mimeType);
 
         // store meta-information
         $is = getimagesize($file['tmp_name']);
-        if ($f->set('meta_is_image', (bool) $is)) {
-            $f->set('meta_mime_type', $is['mime']);
+        if ($f->set('meta_is_image', (bool) $is) === true) {
             $f->set('meta_image_width', $is[0]);
             $f->set('meta_image_height', $is[1]);
-            //$m['extension'] = $is['mime'];
         }
+
         $f->set('meta_md5', md5_file($file['tmp_name']));
         $f->set('meta_filename', $file['name']);
         $f->set('meta_size', $file['size']);

src/Helper.php

@@ -32,14 +32,13 @@ private static function output(File $model, array $headers, App $app = null)
         $location = $model->get('location');
 
         if ($app !== null) {
-            $app->terminate($model->flysystem->get($location)->read(), $headers);
+            $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);