add FileAttribute to handle file in attributes

core/Entity/Site/Page/FileBlock.php

@@ -2,6 +2,7 @@
 
 namespace App\Core\Entity\Site\Page;
 
+use App\Core\File\FileAttribute;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\HttpFoundation\File\File;
 
@@ -12,17 +13,7 @@ class FileBlock extends Block
 {
     public function getValue()
     {
-        $value = parent::getValue();
+        return FileAttribute::handleFile(parent::getValue());
-
-        if (is_string($value)) {
-            if (file_exists($value)) {
-                return new File($value);
-            }
-
-            return null;
-        }
-
-        return $value;
     }
 
     public function setValue($value): self

core/Entity/Site/Page/Page.php

@@ -11,6 +11,7 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\File\File;
+use App\Core\File\FileAttribute;
 
 /**
  * @ORM\Entity(repositoryClass=PageRepository::class)
@@ -229,15 +230,7 @@ class Page implements EntityInterface
 
     public function getOgImage()
     {
-        if (is_string($this->ogImage)) {
+        return FileAttribute::handleFile($this->ogImage);
-            if (file_exists($this->ogImage)) {
-                return new File($this->ogImage);
-            }
-
-            return null;
-        }
-
-        return $this->ogImage;
     }
 
     public function setOgImage($ogImage): self

core/File/FileAttribute.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Core\File;
+
+use Symfony\Component\HttpFoundation\File\File;
+
+/**
+ * class FileAttribute.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class FileAttribute
+{
+    public static function handleFile($attribute, string $class = null)
+    {
+        if (null === $class) {
+            $class = File::class;
+        }
+
+        if (is_string($attribute)) {
+            if (file_exists($attribute)) {
+                return new $class($attribute);
+            }
+
+            return null;
+        }
+
+        return $attribute;
+    }
+}