ENH Improve typing to support refactored template layer

silverstripe · Sep 26, 2024 · d287e85 · d287e85
1 parent d4296a9
commit d287e85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/AssetControlExtension.php b/src/AssetControlExtension.php
@@ -247,7 +247,7 @@ protected function findAssets(DataObject $record)
             }
 
             // Omit variant and merge with set
-            $next = $record->dbObject($field)->getValue();
+            $next = $record->dbObject($field)?->getValue();
             unset($next['Variant']);
             if ($next) {
                 $files[] = $next;

diff --git a/src/File.php b/src/File.php
@@ -1322,16 +1322,14 @@ public function forTemplate(): string
 
     /**
      * Return a html5 tag of the appropriate for this file (normally img or a)
-     *
-     * @return string
      */
-    public function getTag()
+    public function getTag(): string
     {
         $template = $this->File->getFrontendTemplate();
         if (empty($template)) {
             return '';
         }
-        return (string)$this->renderWith($template);
+        return $this->renderWith($template);
     }
 
     /**