Update flysystem usage after upgrade

.github/workflows/continuous-integration.yaml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-version: [ '7.4', '8.0', '8.1' ]
+        php-version: [ '8.1', '8.2', '8.3' ]
         include:
-          - php-version: '8.1'
+          - php-version: '8.3'
             coverage: true
 
     steps:

actions/class.RdfController.php

@@ -657,7 +657,6 @@ public function editInstance()
      * Duplicate the current instance
      * render a JSON response
      *
-     * @throws \League\Flysystem\FileExistsException
      * @throws common_Exception
      * @throws common_exception_BadRequest
      * @throws common_exception_Error

composer.json

@@ -67,7 +67,7 @@
         "oat-sa/jig": "~0.2",
         "oat-sa/composer-npm-bridge": "~0.4.2||dev-master",
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
-        "oat-sa/generis": ">=15.36.4",
+        "oat-sa/generis": "dev-feat/REL-1723/update-flysystem-lib",
         "composer/package-versions-deprecated": "^1.11",
         "paragonie/random_compat": "^2.0",
         "phpdocumentor/reflection-docblock": "^5.2",

models/classes/GenerisServiceTrait.php

@@ -172,7 +172,6 @@ public function bindProperties(core_kernel_classes_Resource $instance, $properti
      * @param  core_kernel_classes_Resource $instance
      * @param  core_kernel_classes_Class $clazz
      * @return core_kernel_classes_Resource
-     * @throws \League\Flysystem\FileExistsException
      * @throws \common_Exception
      * @throws \common_exception_Error
      */
@@ -209,7 +208,6 @@ public function cloneInstance(core_kernel_classes_Resource $instance, core_kerne
      * @param core_kernel_classes_Resource $source
      * @param core_kernel_classes_Resource $destination
      * @param core_kernel_classes_Property $property
-     * @throws \League\Flysystem\FileExistsException
      * @throws \common_Exception
      * @throws \common_exception_Error
      */

models/classes/service/class.FileStorage.php

@@ -116,7 +116,7 @@ public function deleteDirectoryById($id)
             ->getServiceLocator()
             ->get(FileSystemService::SERVICE_ID)
             ->getFileSystem($this->getFsId($public))
-            ->deleteDir($path);
+            ->deleteDirectory($path);
     }
 
     /**

models/classes/service/class.StorageDirectory.php

@@ -20,9 +20,9 @@
  *
  */
 
+use League\Flysystem\Local\LocalFilesystemAdapter;
 use oat\tao\model\websource\Websource;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Adapter\Local;
 use oat\oatbox\filesystem\Directory;
 use Psr\Http\Message\StreamInterface;
 
@@ -102,31 +102,13 @@ public function getRelativePath()
         return $this->getPrefix();
     }
 
-    /**
-     * Returned the absolute path to this directory
-     * Please use read and write to access files
-     *
-     * @deprecated
-     * @return mixed
-     * @throws common_exception_InconsistentData
-     */
-    public function getPath()
-    {
-        $adapter = $this->getFileSystem()->getAdapter();
-        if (!$adapter instanceof Local) {
-            throw new common_exception_InconsistentData(__CLASS__ . ' can only handle local files');
-        }
-        return $adapter->getPathPrefix() . $this->getPrefix();
-    }
-
     /**
      * @deprecated use File->write instead
      *
      * @param $path
      * @param $string
      * @param null $mimeType
      * @return bool
-     * @throws FileNotFoundException
      * @throws common_Exception
      */
     public function write($path, $string, $mimeType = null)
@@ -141,7 +123,6 @@ public function write($path, $string, $mimeType = null)
      * @param $resource
      * @param null $mimeType
      * @return bool
-     * @throws FileNotFoundException
      * @throws common_Exception
      */
     public function writeStream($path, $resource, $mimeType = null)
@@ -156,7 +137,6 @@ public function writeStream($path, $resource, $mimeType = null)
      * @param $stream
      * @param null $mimeType
      * @return bool
-     * @throws FileNotFoundException
      * @throws common_Exception
      */
     public function writePsrStream($path, $stream, $mimeType = null)

models/classes/state/StateMigration.php

@@ -93,8 +93,7 @@ public function removeState($userId, $callId)
 
     public function removeBackup($userId, $callId)
     {
-
-        return $this->getFileSystem()->delete($this->generateSerial($userId, $callId));
+        $this->getFileSystem()->delete($this->generateSerial($userId, $callId));
     }
 
     private function generateSerial($userId, $callId)

models/classes/taskQueue/Task/FilesystemAwareTrait.php

@@ -97,7 +97,6 @@ protected function saveStreamToStorage($stream, $fileName)
      * @param string $fileName
      * @return string
      *
-     * @throws \League\Flysystem\FileExistsException
      * @throws \common_Exception
      */
     protected function saveStringToStorage($string, $fileName)

models/classes/websource/BaseWebsource.php

@@ -22,8 +22,8 @@
 namespace oat\tao\model\websource;
 
 use GuzzleHttp\Psr7\Stream;
-use League\Flysystem\FileNotFoundException;
 use oat\oatbox\Configurable;
+use oat\oatbox\filesystem\FilesystemException;
 use oat\oatbox\filesystem\FileSystemService;
 use oat\oatbox\service\ServiceManager;
 use Psr\Http\Message\StreamInterface;
@@ -107,10 +107,10 @@ public function getFileStream($filePath)
         $fs = $this->getFileSystem();
         try {
             $resource = $fs->readStream($filePath);
-        } catch (FileNotFoundException $e) {
+        } catch (FilesystemException $e) {
             throw new \tao_models_classes_FileNotFoundException($filePath);
         }
-        return new Stream($resource, ['size' => $fs->getSize($filePath)]);
+        return new Stream($resource, ['size' => $fs->fileSize($filePath)]);
     }
 
     /**
@@ -119,10 +119,11 @@ public function getFileStream($filePath)
      * @return string|false The file mime-type or false on failure.
      * @throws \common_exception_Error
      * @throws \common_exception_NotFound
+     * @throws FilesystemException
      */
     public function getMimetype($filePath)
     {
-        $mimeType = $this->getFileSystem()->getMimetype($filePath);
+        $mimeType = $this->getFileSystem()->mimeType($filePath);
 
         $pathParts = pathinfo($filePath);
         if (isset($pathParts['extension'])) {

scripts/install/SetServiceFileStorage.php

@@ -25,7 +25,6 @@
 use oat\oatbox\filesystem\FileSystemService;
 use oat\tao\model\websource\TokenWebSourceService;
 use tao_models_classes_service_FileStorage;
-use League\Flysystem\Adapter\Local;
 use oat\tao\model\websource\FlyTokenWebSource;
 
 /**

test/TaoPhpUnitTestRunner.php

@@ -25,7 +25,7 @@
 
 namespace oat\tao\test;
 
-use League\Flysystem\Memory\MemoryAdapter;
+use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
 use oat\generis\persistence\PersistenceManager;
 use oat\generis\test\GenerisPhpUnitTestRunner;
 use oat\oatbox\filesystem\Directory;
@@ -154,9 +154,9 @@ protected function getTempDirectory()
 
             $adapters = $fileSystemService->getOption(FileSystemService::OPTION_ADAPTERS);
             $tmpDir = \tao_helpers_File::createTempDir();
-            if (class_exists('League\Flysystem\Memory\MemoryAdapter')) {
+            if (class_exists('League\Flysystem\InMemory\InMemoryFilesystemAdapter')) {
                 $adapters[$this->tempFileSystemId] = [
-                    'class' => MemoryAdapter::class
+                    'class' => InMemoryFilesystemAdapter::class
                 ];
             } else {
                 $adapters[$this->tempFileSystemId] = [

test/unit/models/classes/websource/BaseWebsourceTest.php

@@ -60,7 +60,7 @@ private function getFileSystemMockWithMimeType($mimeType)
             ->getMock();
 
         $fileSystemMock
-            ->method('getMimetype')
+            ->method('mimeType')
             ->willReturn($mimeType);
 
         return $fileSystemMock;