Merge pull request #493 from oat-sa/feat/REL-1723/update-flysystem

Update flysystem usage after upgrade
oat-sa · Nov 28, 2024 · ba53751 · ba53751
2 parents efb2e20 + 2b19073
commit ba53751
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.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:

diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
     "minimum-stability": "dev",
     "require": {
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
-        "oat-sa/generis": ">=15.36.4",
-        "oat-sa/tao-core": ">=54.14.7",
+        "oat-sa/generis": ">=16.0.0",
+        "oat-sa/tao-core": ">=54.26.0",
         "oat-sa/extension-tao-delivery": ">=15.0.0",
         "oat-sa/extension-tao-group": ">=7.0.0",
         "oat-sa/extension-tao-item": ">=11.0.0",

diff --git a/model/DataStore/PersistDataService.php b/model/DataStore/PersistDataService.php
@@ -25,7 +25,7 @@
 use common_Exception;
 use common_exception_Error;
 use common_exception_NotFound;
-use oat\oatbox\filesystem\FileSystem;
+use oat\oatbox\filesystem\FilesystemInterface;
 use oat\oatbox\filesystem\FileSystemService;
 use oat\oatbox\service\ConfigurableService;
 use oat\tao\helpers\FileHelperService;
@@ -71,7 +71,7 @@ public function remove(ResourceSyncDTO $resourceSyncDTO): void
      * @throws common_exception_Error
      * @throws common_exception_NotFound
      */
-    private function getDataStoreFilesystem(string $fileSystemId): FileSystem
+    private function getDataStoreFilesystem(string $fileSystemId): FilesystemInterface
     {
         return $this->getFileSystemManager()->getFileSystem($fileSystemId);
     }
@@ -90,13 +90,13 @@ private function removeArchive(string $resourceId, string $fileSystemId, string
         // There is a bug for gcp storage adapter - when deleting a dir with only one file exception is thrown
         // This is why the file itself is removed first
         $zipFileName = $this->getZipFileName($resourceId, $tenantId);
-        if ($this->getDataStoreFilesystem($fileSystemId)->has($zipFileName)) {
+        if ($this->getDataStoreFilesystem($fileSystemId)->fileExists($zipFileName)) {
             $this->getDataStoreFilesystem($fileSystemId)->delete($zipFileName);
         }
 
         $directoryPath = $this->getZipFileDirectory($resourceId, $tenantId);
-        if ($this->getDataStoreFilesystem($fileSystemId)->has($directoryPath)) {
-            $this->getDataStoreFilesystem($fileSystemId)->deleteDir($directoryPath);
+        if ($this->getDataStoreFilesystem($fileSystemId)->directoryExists($directoryPath)) {
+            $this->getDataStoreFilesystem($fileSystemId)->deleteDirectory($directoryPath);
         }
     }
 
@@ -150,17 +150,10 @@ private function moveExportedZipTest(
 
                 $contents = file_get_contents($zipFile);
 
-                if ($this->getDataStoreFilesystem($fileSystemId)->has($zipFileName)) {
-                    $this->getDataStoreFilesystem($fileSystemId)->update(
-                        $zipFileName,
-                        $contents
-                    );
-                } else {
-                    $this->getDataStoreFilesystem($fileSystemId)->write(
-                        $zipFileName,
-                        $contents
-                    );
-                }
+                $this->getDataStoreFilesystem($fileSystemId)->write(
+                    $zipFileName,
+                    $contents
+                );
             }
         }
     }

diff --git a/model/DeliveryArchiveService.php b/model/DeliveryArchiveService.php
@@ -84,7 +84,7 @@ public function archive($compiledDelivery, $force = false)
     {
         $fileName = $this->getArchiveFileName($compiledDelivery);
 
-        if (!$force && $this->getArchiveFileSystem()->has($fileName)) {
+        if (!$force && $this->getArchiveFileSystem()->fileExists($fileName)) {
             throw new DeliverArchiveExistingException(
                 'Delivery archive already created: ' . $compiledDelivery->getUri()
             );
@@ -135,7 +135,7 @@ public function unArchive($compiledDelivery, $force = false)
     {
         $fileName = $this->getArchiveFileName($compiledDelivery);
 
-        if (!$this->getArchiveFileSystem()->has($fileName)) {
+        if (!$this->getArchiveFileSystem()->fileExists($fileName)) {
             throw new DeliveryArchiveNotExistingException(
                 'Delivery archive not exist please generate: ' . $compiledDelivery->getUri()
             );
@@ -172,7 +172,7 @@ public function unArchive($compiledDelivery, $force = false)
     public function deleteArchive($compiledDelivery)
     {
         $fileName = $this->getArchiveFileName($compiledDelivery);
-        if ($this->getArchiveFileSystem()->has($fileName)) {
+        if ($this->getArchiveFileSystem()->fileExists($fileName)) {
             $this->getArchiveFileSystem()->delete($fileName);
         }
 
@@ -207,7 +207,7 @@ private function copyFromZip($zip)
                     $entryName = implode('/', $parts);
                     $stream = $zip->getStream($zipEntryName);
                     if (is_resource($stream)) {
-                        $fileSystem->getFileSystem($bucketDestination)->putStream($entryName, $stream);
+                        $fileSystem->getFileSystem($bucketDestination)->writeStream($entryName, $stream);
                     }
                 }
             }
@@ -229,7 +229,7 @@ private function uploadZip($compiledDelivery)
         if (!file_exists($zipPath) || ($stream = fopen($zipPath, 'r')) === false) {
             throw new DeliveryZipException('Cannot open local tmp zip archive');
         }
-        $this->getArchiveFileSystem()->putStream($fileName, $stream);
+        $this->getArchiveFileSystem()->writeStream($fileName, $stream);
         fclose($stream);
 
         return $fileName;