Merge pull request #1668 from bolt/feature/better-svg-handling

Add image.extension value
bolt · Jul 31, 2020 · bb98eed · bb98eed
2 parents b8bcd60 + 69fd903
commit bb98eed
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/src/Controller/ImageController.php b/src/Controller/ImageController.php
@@ -157,9 +157,9 @@ private function parseParameters(string $paramString): void
 
     private function isSvg(string $filename): bool
     {
-        $pathinfo = pathinfo($filename);
+        $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        return array_key_exists('extension', $pathinfo) && $pathinfo['extension'] === 'svg';
+        return $extension === 'svg';
     }
 
     private function isImage(string $filename): bool

diff --git a/src/Entity/Field/FileExtrasTrait.php b/src/Entity/Field/FileExtrasTrait.php
@@ -41,4 +41,9 @@ private function getHost(Request $request)
 
         return $host . ':' . $port;
     }
+
+    private function getExtension(): string
+    {
+        return pathinfo($this->__toString(), PATHINFO_EXTENSION);
+    }
 }
diff --git a/src/Entity/Field/FileField.php b/src/Entity/Field/FileField.php
@@ -25,6 +25,7 @@ private function getFieldBase()
             'path' => '',
             'fieldname' => '',
             'url' => '',
+            'extension' => '',
         ];
     }
 
@@ -50,6 +51,7 @@ public function getValue(): array
         // Generate a URL
         $value['path'] = $this->getPath();
         $value['url'] = $this->getUrl();
+        $value['extension'] = $this->getExtension();
 
         return $value;
     }

diff --git a/src/Entity/Field/ImageField.php b/src/Entity/Field/ImageField.php
@@ -33,6 +33,7 @@ private function getFieldBase()
             'fieldname' => '',
             'alt' => '',
             'url' => '',
+            'extension' => '',
         ];
     }
 
@@ -58,6 +59,7 @@ public function getValue(): array
         // Generate a URL
         $value['path'] = $this->getPath();
         $value['url'] = $this->getUrl();
+        $value['extension'] = $this->getExtension();
 
         $thumbPackage = new PathPackage('/thumbs/', new EmptyVersionStrategy());
         $thumbnailHelper = new ThumbnailHelper();

diff --git a/tests/api/get_content.feature b/tests/api/get_content.feature
@@ -28,7 +28,8 @@ Feature: Get content with API
              "media": @string@,
              "url": @string@,
              "thumbnail": @string@,
-             "fieldname": @string@
+             "fieldname": @string@,
+             "extension": @string@
           },
           "@*@": "@*@"
        },
@@ -74,7 +75,8 @@ Feature: Get content with API
              "media": @string@,
              "url": @string@,
              "thumbnail": @string@,
-             "fieldname": @string@
+             "fieldname": @string@,
+             "extension": @string@
         },
        "@*@": "@*@"
      },
@@ -125,7 +127,8 @@ Feature: Get content with API
                  "media": @string@,
                  "url": @string@,
                  "thumbnail": @string@,
-                 "fieldname": @string@
+                 "fieldname": @string@,
+                 "extension": @string@
               },
               "@*@": "@*@"
            },
@@ -189,7 +192,8 @@ Feature: Get content with API
                  "media": @string@,
                  "url": @string@,
                  "thumbnail": @string@,
-                 "fieldname": @string@
+                 "fieldname": @string@,
+                 "extension": @string@
               },
               "@*@": "@*@"
            },
@@ -250,7 +254,8 @@ Feature: Get content with API
             "media": @string@,
             "url": @string@,
             "thumbnail": @string@,
-            "fieldname": @string@
+            "fieldname": @string@,
+            "extension": @string@
         },
         "@*@": "@*@"
      },