Merge pull request #217 from AmpersandTarski/bugfix/migrate-to-flyway…

…-v3-api

Migrate to flyway v3 api

.github/workflows/continuous-integration.yml

@@ -31,7 +31,7 @@ jobs:
       with:
         php-version: '8.3'
         # extensions: # allows to install php extensions with PECL
-        tools: phan:v5.3 # allows to install other tools, see: https://github.com/shivammathur/setup-php
+        tools: phan:v5.4 # allows to install other tools, see: https://github.com/shivammathur/setup-php
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-dev --profile --optimize-autoloader --no-scripts --ignore-platform-reqs

composer.json

@@ -41,7 +41,7 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.2",
-        "phan/phan": "^5.3"
+        "phan/phan": "^5.4"
     },
     "prefer-stable": true
 }

src/Ampersand/Controller/FileObjectController.php

@@ -15,7 +15,7 @@ public function getFile(Request $request, Response $response, array $args): Resp
         $filePath = $args['filePath'];
 
         // Check if filePath exists
-        if (!$fs->has($filePath)) {
+        if (!$fs->fileExists($filePath)) {
             throw new NotFoundException("File not found");
         }
 

src/Ampersand/Interfacing/ResourceList.php

@@ -12,7 +12,6 @@
 use Ampersand\Interfacing\InterfaceObjectInterface;
 use Ampersand\Interfacing\Resource;
 use Ampersand\Core\Concept;
-use Ampersand\Exception\AmpersandException;
 use Ampersand\Exception\AtomNotFoundException;
 use Ampersand\Exception\BadRequestException;
 use Ampersand\Exception\UploadException;
@@ -189,15 +188,11 @@ public function post(?stdClass $resourceToPost = null): Resource
                 $filePath = getSafeFileName($fs, $filePath);
 
                 $stream = fopen($tmp_name, 'r+');
-                $result = $fs->writeStream($filePath, $stream);
+                $fs->writeStream($filePath, $stream);
                 if (is_resource($stream)) {
                     fclose($stream);
                 }
 
-                if (!$result) {
-                    throw new AmpersandException("Error in file upload");
-                }
-
                 // Populate filePath and originalFileName relations in database
                 $newResource->link($filePath, 'filePath[FileObject*FilePath]')->add();
                 $newResource->link($originalFileName, 'originalFileName[FileObject*FileName]')->add();

src/Ampersand/Misc/functions.php

@@ -42,7 +42,7 @@ function isSequential(array $arr): bool
  */
 function getSafeFileName(FilesystemOperator $fileSystem, string $filePath): string
 {
-    if (!$fileSystem->has($filePath)) {
+    if (!$fileSystem->fileExists($filePath)) {
         return $filePath;
     }
 
@@ -51,7 +51,7 @@ function getSafeFileName(FilesystemOperator $fileSystem, string $filePath): stri
     $ext = pathinfo($filePath, PATHINFO_EXTENSION);
 
     $i = 1;
-    while ($fileSystem->has($dir . DIRECTORY_SEPARATOR . "{$filename}_{$i}.{$ext}")) {
+    while ($fileSystem->fileExists($dir . DIRECTORY_SEPARATOR . "{$filename}_{$i}.{$ext}")) {
         $i++;
     }
     return $dir . DIRECTORY_SEPARATOR . "{$filename}_{$i}.{$ext}";