Merge pull request #113 from netgen/cloudinary-callback-notification-…

…system-issue-fix Revert changes in AbstractController, adjust tests
netgen · Sep 19, 2024 · 19b2964 · 19b2964
2 parents 21a41df + 2d060bd
commit 19b2964
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/bundle/Controller/Resource/AbstractController.php b/bundle/Controller/Resource/AbstractController.php
@@ -39,8 +39,8 @@ protected function formatResource(RemoteResource $resource): array
             'size' => $resource->getSize(),
             'width' => $resource->getMetadataProperty('width'),
             'height' => $resource->getMetadataProperty('height'),
-            'filename' => (string) $resource->getName(),
-            'originalFilename' => (string) $resource->getOriginalFilename(),
+            'filename' => $resource->getName(),
+            'originalFilename' => $resource->getOriginalFilename(),
             'format' => $resource->getMetadataProperty('format'),
             'browseUrl' => $this->resolveImageUrl($resource, 'browse'),
             'previewUrl' => $this->resolveImageUrl($resource, 'preview'),

diff --git a/tests/bundle/Controller/Resource/BrowseTest.php b/tests/bundle/Controller/Resource/BrowseTest.php
@@ -176,7 +176,7 @@ public function test(): void
                     'width' => null,
                     'height' => null,
                     'filename' => 'image.jpg',
-                    'originalFilename' => '',
+                    'originalFilename' => null,
                     'format' => null,
                     'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/images/image.jpg',
                     'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/images/image.jpg',
@@ -194,7 +194,7 @@ public function test(): void
                     'width' => null,
                     'height' => null,
                     'filename' => 'image2.jpg',
-                    'originalFilename' => '',
+                    'originalFilename' => null,
                     'format' => null,
                     'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/images/image2.jpg',
                     'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/images/image2.jpg',
@@ -212,7 +212,7 @@ public function test(): void
                     'width' => null,
                     'height' => null,
                     'filename' => 'example.mp4',
-                    'originalFilename' => '',
+                    'originalFilename' => null,
                     'format' => null,
                     'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/videos/example.mp4.jpg',
                     'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/videos/example.mp4.jpg',

diff --git a/tests/bundle/Controller/Resource/UploadTest.php b/tests/bundle/Controller/Resource/UploadTest.php
@@ -152,7 +152,7 @@ public function testUpload(): void
             'width' => null,
             'height' => null,
             'filename' => 'sample_image.jpg',
-            'originalFilename' => '',
+            'originalFilename' => null,
             'format' => null,
             'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/image/media/image/sample_image.jpg',
             'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/image/media/image/sample_image.jpg',
@@ -305,7 +305,7 @@ public function testUploadProtectedWithContext(): void
             'width' => null,
             'height' => null,
             'filename' => 'sample_image.jpg',
-            'originalFilename' => '',
+            'originalFilename' => null,
             'format' => null,
             'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/authenticated/image/media/image/sample_image.jpg',
             'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/authenticated/image/media/image/sample_image.jpg',
@@ -470,7 +470,7 @@ public function testUploadExistingFile(): void
             'width' => null,
             'height' => null,
             'filename' => 'sample_image.jpg',
-            'originalFilename' => '',
+            'originalFilename' => null,
             'format' => null,
             'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/image/sample_image.jpg',
             'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/image/sample_image.jpg',
@@ -631,7 +631,7 @@ public function testUploadExistingFileName(): void
             'width' => null,
             'height' => null,
             'filename' => 'sample_image.jpg',
-            'originalFilename' => '',
+            'originalFilename' => null,
             'format' => null,
             'browseUrl' => 'https://cloudinary.com/test/c_fit_160_120/upload/image/media/image/sample_image.jpg',
             'previewUrl' => 'https://cloudinary.com/test/c_fit_800_600/upload/image/media/image/sample_image.jpg',