wrapped filesystem lib

Author: akaplya

lib/internal/Magento/Framework/Storage/FileNotFoundException.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Storage;
+
+/**
+ * Class FileNotFoundException
+ */
+class FileNotFoundException extends \RuntimeException
+{
+
+}

lib/internal/Magento/Framework/Storage/RootViolationException.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Storage;
+
+
+class RootViolationException extends \RuntimeException
+{
+
+}

lib/internal/Magento/Framework/Storage/Storage.php

@@ -10,7 +10,68 @@
 /**
  * File storage abstraction
  */
-class Storage extends Filesystem implements StorageInterface
+class Storage implements StorageInterface
 {
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * Storage constructor.
+     *
+     * @param Filesystem $filesystem
+     */
+    public function __construct(Filesystem $filesystem)
+    {
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function put($path, $contents, array $config = []): bool
+    {
+        return $this->filesystem->put($path, $contents, $config);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function deleteDir($dirname): bool
+    {
+        try {
+            $result = $this->filesystem->deleteDir($dirname);
+        } catch (\League\Flysystem\RootViolationException $exception) {
+            throw new \Magento\Framework\Storage\RootViolationException($exception->getMessage());
+        }
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMetadata($path): ?array
+    {
+        try {
+            $metadata = $this->filesystem->getMetadata($path);
+        } catch (\League\Flysystem\FileNotFoundException $exception) {
+            throw new \Magento\Framework\Storage\FileNotFoundException(
+                $exception->getMessage()
+            );
+        }
+        if ($metadata === false) {
+            $metadata = null;
+        }
+        return $metadata;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function has($path): bool
+    {
+        return $this->filesystem->has($path);
+    }
 }

lib/internal/Magento/Framework/Storage/StorageInterface.php

@@ -5,15 +5,53 @@
  */
 namespace Magento\Framework\Storage;
 
-use League\Flysystem\FilesystemInterface;
-
 /**
  * Storage interface to be used by client code to manipulate objects in the storage
  *
  * Retrieve a real instance of storage via $storageProvider->get('<your-storage-name>'),
  * where $storageProvider is an instance of \Magento\Framework\Storage\StorageProvider
  */
-interface StorageInterface extends FilesystemInterface
+interface StorageInterface
 {
+    /**
+     * Create a file or update if exists.
+     *
+     * @param string $path     The path to the file.
+     * @param string $contents The file contents.
+     * @param array  $config   An optional configuration array.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function put($path, $contents, array $config = []): bool;
+
+    /**
+     * Delete a directory.
+     *
+     * @param string $dirname
+     *
+     * @throws RootViolationException Thrown if $dirname is empty.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function deleteDir($dirname): bool;
+
+    /**
+     * Get a file's metadata.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return array|false The file metadata or false on failure.
+     */
+    public function getMetadata($path): ?array;
 
+    /**
+     * Check whether a file exists.
+     *
+     * @param string $path
+     *
+     * @return bool
+     */
+    public function has($path): bool;
 }

lib/internal/Magento/Framework/Storage/StorageProvider.php

@@ -8,6 +8,7 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Storage\AdapterFactory\LocalFactory;
 use Magento\Framework\Storage\StorageFactory;
+use League\Flysystem\FilesystemFactory;
 
 /**
  * Main entry point for accessing file storage
@@ -31,18 +32,26 @@ class StorageProvider
     private $adapterProvider;
 
     /**
-     * Constructor
-     *
+     * @var FilesystemFactory
+     */
+    private $filesystemFactory;
+
+    /**
+     * StorageProvider constructor.
      * @param StorageAdapterProvider $adapterProvider
      * @param \Magento\Framework\Storage\StorageFactory $storageFactory
      * @param array $storage
      * @param DeploymentConfig $envConfig
+     * @param FilesystemFactory $filesystemFactory
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function __construct(
         StorageAdapterProvider $adapterProvider,
         StorageFactory $storageFactory,
         array $storage,
-        DeploymentConfig $envConfig
+        DeploymentConfig $envConfig,
+        FilesystemFactory $filesystemFactory
     ) {
         foreach ($storage as $storageName => $localPath) {
             $this->storageConfig[$storageName] = [
@@ -81,7 +90,15 @@ public function get(string $storageName): StorageInterface
                     );
                 }
                 $adapter = $this->adapterProvider->create($config['adapter'], $config['options']);
-                $this->storage[$storageName] = $this->storageFactory->create(['adapter' => $adapter]);
+                $this->storage[$storageName] = $this->storageFactory->create(
+                    [
+                        'factory' => $this->filesystemFactory->create(
+                            [
+                                'adapter' => $adapter
+                            ]
+                        )
+                    ]
+                );
             } else {
                 throw new UnsupportedStorageException("No storage with name '$storageName' is declared");
             }