Merge pull request #93 from chives/fix

Fill entity field before checking file existance, do not check existence before file update or removal

Author: rn0

src/Entity/FileLoader.php

@@ -51,10 +51,11 @@ public function loadEntityFiles(object $entity): void
         array_walk(
             $configurations,
             function (FilePropertyConfiguration $configuration, $key, object $entity): void {
-                $configuration->getFilePropertyReflection()->setValue(
-                    $entity,
-                    $this->fromEntity($configuration, $entity)
-                );
+                $file = $this->fromEntity($configuration, $entity);
+                $configuration->getFilePropertyReflection()->setValue($entity, $file);
+                if (null !== $file) {
+                    $this->checkFileExistenceIfEnabled($configuration, $file);
+                }
             },
             $entity
         );
@@ -75,12 +76,7 @@ public function fromEntity(FilePropertyConfiguration $configuration, object $ent
             return null;
         }
 
-        $file = $this->fileManager->load($configuration->getFileSystemName(), $path);
-        if (null !== $file) {
-            $this->checkFileExistenceIfEnabled($className, $file);
-        }
-
-        return $file;
+        return $this->fileManager->load($configuration->getFileSystemName(), $path);
     }
 
     public function disableFileExistenceChecksOnLoad(): void
@@ -112,16 +108,17 @@ public function enableClassFileExistenceChecksOnLoad(string $className): void
     }
 
     /**
-     * @param class-string<object> $className
+     * @param FilePropertyConfiguration $configuration
      * @param WebFile $file
      * @return void
      */
-    private function checkFileExistenceIfEnabled(string $className, WebFile $file): void
+    public function checkFileExistenceIfEnabled(FilePropertyConfiguration $configuration, WebFile $file): void
     {
         if (false === $this->fileExistenceChecksOnLoad) {
             return;
         }
 
+        $className = $configuration->getEntityClass();
         if (false === array_key_exists($className, $this->classFileExistenceChecksOnLoad)) {
             $this->classFileExistenceChecksOnLoad[$className] = true;
         }

src/Entity/FileRemover.php

@@ -56,6 +56,7 @@ function (FilePropertyConfiguration $configuration, $key, object $entity): void
                     return;
                 }
 
+                $this->fileLoader->checkFileExistenceIfEnabled($configuration, $file);
                 $this->add($configuration->getPathPrefix(), $file);
             },
             $entity

src/Entity/FileUpdater.php

@@ -56,6 +56,9 @@ public function updateFiles(object $entity): void
             function (FilePropertyConfiguration $configuration, $key, object $entity): void {
                 $newFile = $this->readNewFileFromEntity($configuration, $entity);
                 $currentFile = $this->fileLoader->fromEntity($configuration, $entity);
+                if (null !== $currentFile) {
+                    $this->fileLoader->checkFileExistenceIfEnabled($configuration, $currentFile);
+                }
                 if (false === $this->shouldFilePropertyBeUpdated($newFile, $currentFile)) {
                     return;
                 }

tests/_support/Module/UploadModule.php

@@ -12,12 +12,12 @@
 namespace Tests\FSi\Module;
 
 use Assert\Assertion;
+use Codeception\Lib\Connector\Symfony as SymfonyConnector;
 use Codeception\Module;
 use Codeception\Module\Symfony;
 use Codeception\TestInterface;
 use FSi\Component\Files\Upload\FileFactory;
 use FSi\Component\Files\Upload\PhpFilesHandler;
-use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\DomCrawler\Crawler;
 
 final class UploadModule extends Module
@@ -51,7 +51,7 @@ public function grabFileFactory(): FileFactory
         return $fileFactory;
     }
 
-    public function grabClient(): AbstractBrowser
+    public function grabClient(): SymfonyConnector
     {
         Assertion::notNull($this->symfony->client);