Use lazy-loading in FileTrait; Add informative exception if the fil…

…e is missing in `FileTrait`.
rekalogika · Dec 27, 2023 · 0bfdfa8 · 0bfdfa8
1 parent 9e5f4d1
commit 0bfdfa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.7.3
+
+* Use lazy-loading in `FileTrait`.
+* Add informative exception if the file is missing in `FileTrait`.
+
 ## 1.7.2
 
 * Fix typehints

diff --git a/packages/file-association-entity/src/FileTrait.php b/packages/file-association-entity/src/FileTrait.php
@@ -31,7 +31,7 @@ trait FileTrait
 {
     use FileDecoratorTrait;
 
-    #[AsFileAssociation]
+    #[AsFileAssociation(fetch: 'LAZY')]
     private FileInterface $file;
 
     #[Embedded()]
@@ -50,6 +50,10 @@ private function setWrapped(FileInterface $file): void
 
     private function getWrapped(): FileInterface
     {
+        if (!isset($this->file)) {
+            throw new \LogicException(sprintf('$file is not set. This might be caused by the use of `AbstractQuery::toIterable()`. If that is the case, you can: 1. stop involving "%s" in the query; 2. pre-hydrate the file entities before the query; or 3. use other means to iterate the query.', static::class));
+        }
+
         return FileDecorator::getFile($this->file, $this->getMetadata()) ?? new NullFile();
     }
 }