Merge pull request #112 from netgen/fix-tests

Fix tests
netgen · Sep 20, 2024 · dca4631 · dca4631
2 parents 19b2964 + 2f86960
commit dca4631
Show file tree

Hide file tree

Showing 17 changed files with 649 additions and 238 deletions.
diff --git a/.github/workflows/coding_standards.yml b/.github/workflows/coding_standards.yml
@@ -13,6 +13,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: OskarStark/php-cs-fixer-ga@master
+      - uses: docker://oskarstark/php-cs-fixer-ga
         with:
           args: --diff --dry-run
diff --git a/bundle/Command/RefreshStoredResourcesCommand.php b/bundle/Command/RefreshStoredResourcesCommand.php
@@ -64,7 +64,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         do {
             $resources = $this->getBatch($this->batchSize, $offset);
 
-            $this->refreshResources($resources);
+            if (count($resources) > 0) {
+                $this->refreshResources($resources);
+            }
 
             $offset += $this->batchSize;
         } while (count($resources) > 0);

diff --git a/bundle/Controller/Callback/Cloudinary/Notify.php b/bundle/Controller/Callback/Cloudinary/Notify.php
@@ -52,7 +52,7 @@ public function __construct(
         ProviderInterface $provider,
         RequestVerifierInterface $signatureVerifier,
         EntityManagerInterface $entityManager,
-        EventDispatcherInterface $eventDispatcher
+        EventDispatcherInterface $eventDispatcher,
     ) {
         $this->gateway = $gateway;
         $this->provider = $provider;

diff --git a/lib/API/Values/RemoteResource.php b/lib/API/Values/RemoteResource.php
@@ -53,7 +53,7 @@ public function __construct(
         private ?string $name = null,
         private ?string $originalFilename = null,
         private ?string $version = null,
-        private ?string $visibility = self::VISIBILITY_PUBLIC,
+        private string $visibility = self::VISIBILITY_PUBLIC,
         private ?Folder $folder = null,
         private int $size = 0,
         private ?string $altText = null,

diff --git a/lib/Core/Provider/Cloudinary/Factory/RemoteResource.php b/lib/Core/Provider/Cloudinary/Factory/RemoteResource.php
@@ -132,7 +132,7 @@ private function resolveOriginalFilename(array $data): string
             return $data['context']['custom']['original_filename'];
         }
 
-        return $data['context']['original_filename'] ?? basename((string) $data['secure_url']);
+        return $data['context']['original_filename'] ?? basename((string) $data['secure_url'] ?? (string) $data['url']);
     }
 
     /**