feat: Slight performance improvements

Author: kissifrot

src/Api/ApiClient.php

@@ -424,7 +424,12 @@ protected function buildHttpClientConfig(): array
             ];
         }
 
-        return array_merge_recursive($clientConfig, $authConfig);
+        if (isset($authConfig['headers'])) {
+            $clientConfig['headers'] = array_merge($clientConfig['headers'], $authConfig['headers']);
+            unset($authConfig['headers']);
+        }
+
+        return array_merge($clientConfig, $authConfig);
     }
 
     /**

src/Asset/AssetFinalizerTrait.php

@@ -186,7 +186,7 @@ protected function finalizeSource(): string
     {
         $source = $this->asset->publicId(true);
 
-        if (! preg_match('/^https?:\//i', $source)) {
+        if (stripos($source, 'http:/') !== 0 && stripos($source, 'https:/') !== 0) {
             $source = rawurldecode($source);
         }
 
@@ -212,10 +212,14 @@ protected function finalizeVersion(): ?string
 
         if (empty($version) && $this->urlConfig->forceVersion
             && ! empty($this->asset->location)
-            && ! preg_match('/^https?:\//', $this->asset->publicId())
-            && ! preg_match('/^v\d+/', $this->asset->publicId())
         ) {
-            $version = '1';
+            $publicId = $this->asset->publicId();
+            if (strncmp($publicId, 'http:/', 6) !== 0
+                && strncmp($publicId, 'https:/', 7) !== 0
+                && ! preg_match('/^v\d+/', $publicId)
+            ) {
+                $version = '1';
+            }
         }
 
         return $version ? 'v' . $version : null;

src/Asset/AuthToken.php

@@ -85,7 +85,13 @@ public function isEnabled(): bool
      */
     public function configuration(mixed $configuration): static
     {
-        $tempConfiguration = new Configuration($configuration, false); // TODO: improve performance here
+        if ($configuration instanceof Configuration) {
+            $this->config = clone $configuration->authToken;
+
+            return $this;
+        }
+
+        $tempConfiguration = new Configuration($configuration, false);
 
         $this->config = $tempConfiguration->authToken;
 

src/Asset/BaseAsset.php

@@ -266,7 +266,15 @@ public function importJson(array|string $json): static
      */
     public function configuration(Configuration|array $configuration): static
     {
-        $tempConfiguration = new Configuration($configuration, true); // TODO: improve performance here
+        if ($configuration instanceof Configuration) {
+            $this->cloud     = clone $configuration->cloud;
+            $this->urlConfig = clone $configuration->url;
+            $this->logging   = clone $configuration->logging;
+
+            return $this;
+        }
+
+        $tempConfiguration = new Configuration($configuration, true);
         $this->cloud       = $tempConfiguration->cloud;
         $this->urlConfig   = $tempConfiguration->url;
         $this->logging     = $tempConfiguration->logging;
@@ -372,7 +380,7 @@ public function jsonSerialize(bool $includeEmptyKeys = false, bool $includeEmpty
             if (! $includeEmptySections && empty(array_values($section)[0])) {
                 continue;
             }
-            $json = array_merge($json, $section);
+            $json += $section;
         }
 
         return $json;

src/Asset/Descriptor/AssetDescriptor.php

@@ -162,7 +162,7 @@ public function setSuffix(?string $suffix): static
             return $this;
         }
 
-        if (preg_match('/[.\/]/', $suffix)) {
+        if (str_contains($suffix, '.') || str_contains($suffix, '/')) {
             throw new \UnexpectedValueException(static::class . '::$suffix must not include . or /');
         }
 

src/Configuration/Configuration.php

@@ -331,7 +331,7 @@ public function jsonSerialize(
             if (! $includeEmptySections && empty(array_values($section)[0])) {
                 continue;
             }
-            $json = array_merge($json, $section);
+            $json += $section;
         }
 
         return $json;

tests/Unit/Admin/OAuthTest.php

@@ -43,6 +43,12 @@ public function testOauthTokenAdminApi()
                 'Authorization' => ['Bearer ' . self::FAKE_OAUTH_TOKEN]
             ]
         );
+
+        self::assertArrayHasKey(
+            'User-Agent',
+            $lastRequest->getHeaders(),
+            'User-Agent header must be present alongside Authorization when using OAuth token'
+        );
     }
 
     /**

tests/Unit/Configuration/ConfigurationTest.php

@@ -152,4 +152,28 @@ public function testConfigJsonSerialize()
             json_encode(Configuration::fromJson($expectedJsonConfig))
         );
     }
+
+    public function testAssetConfigurationIsIndependentFromGlobalConfig()
+    {
+        $globalConfig = Configuration::instance();
+        $originalCloudName = $globalConfig->cloud->cloudName;
+        $originalSecure    = $globalConfig->url->secure;
+
+        $image = new \Cloudinary\Asset\Image('sample.png');
+
+        // Mutating the asset's config sections must not affect the global configuration
+        $image->cloud->cloudName = 'mutated_cloud';
+        $image->urlConfig->secure = ! $originalSecure;
+
+        self::assertEquals(
+            $originalCloudName,
+            $globalConfig->cloud->cloudName,
+            'Mutating asset cloud config must not affect the global Configuration'
+        );
+        self::assertEquals(
+            $originalSecure,
+            $globalConfig->url->secure,
+            'Mutating asset url config must not affect the global Configuration'
+        );
+    }
 }

tests/Unit/Upload/OAuthTest.php

@@ -47,6 +47,12 @@ public function testOauthTokenUploadApi()
                 'Authorization' => ['Bearer ' . self::FAKE_OAUTH_TOKEN]
             ]
         );
+
+        self::assertArrayHasKey(
+            'User-Agent',
+            $lastRequest->getHeaders(),
+            'User-Agent header must be present alongside Authorization when using OAuth token'
+        );
     }
 
     /**