run cs fixer

Author: JonPurvis

src/Helpers/Storage.php

@@ -49,7 +49,7 @@ protected function buildPath(string $path): string
     {
         $trimRules = DIRECTORY_SEPARATOR . ' ';
 
-        return rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . ltrim($path, $trimRules);
+        return mb_rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . mb_ltrim($path, $trimRules);
     }
 
     /**
@@ -100,7 +100,7 @@ protected function ensurePathUnderBase(string $fullPath): void
             throw new InvalidArgumentException('Path must remain inside the storage base directory.');
         }
 
-        $baseTrimmed = rtrim($this->baseDirectory, DIRECTORY_SEPARATOR . ' ');
+        $baseTrimmed = mb_rtrim($this->baseDirectory, DIRECTORY_SEPARATOR . ' ');
         $baseNorm = $this->normalizePath($baseTrimmed);
         $fullNorm = $this->normalizePath($fullPath);
         $baseWithSep = $baseNorm . DIRECTORY_SEPARATOR;

src/Helpers/URLHelper.php

@@ -31,7 +31,7 @@ public static function matches(string $pattern, string $value): bool
      */
     public static function join(string $baseUrl, string $endpoint, bool $allowBaseUrlOverride = false): string
     {
-        $baseTrimmed = trim($baseUrl, '/ ');
+        $baseTrimmed = mb_trim($baseUrl, '/ ');
         if ($baseTrimmed !== '' && static::isValidUrl($endpoint)) {
             if ($allowBaseUrlOverride) {
                 return $endpoint;
@@ -47,12 +47,12 @@ public static function join(string $baseUrl, string $endpoint, bool $allowBaseUr
         }
 
         if ($endpoint !== '/') {
-            $endpoint = ltrim($endpoint, '/ ');
+            $endpoint = mb_ltrim($endpoint, '/ ');
         }
 
         $requiresTrailingSlash = ! empty($endpoint) && $endpoint !== '/';
 
-        $baseEndpoint = rtrim($baseUrl, '/ ');
+        $baseEndpoint = mb_rtrim($baseUrl, '/ ');
 
         $baseEndpoint = $requiresTrailingSlash ? $baseEndpoint . '/' : $baseEndpoint;
 

src/Http/Auth/TokenAuthenticator.php

@@ -22,6 +22,6 @@ public function __construct(
      */
     public function set(PendingRequest $pendingRequest): void
     {
-        $pendingRequest->headers()->add('Authorization', trim($this->prefix . ' ' . $this->token));
+        $pendingRequest->headers()->add('Authorization', mb_trim($this->prefix . ' ' . $this->token));
     }
 }

src/Traits/OAuth2/AuthorizationCodeGrant.php

@@ -58,7 +58,7 @@ public function getAuthorizationUrl(array $scopes = [], ?string $state = null, s
         ]);
 
         $query = http_build_query($queryParameters, '', '&', PHP_QUERY_RFC3986);
-        $query = trim($query, '?&');
+        $query = mb_trim($query, '?&');
 
         $allows = $config->getAllowBaseUrlOverride() || $this->allowBaseUrlOverride;
         $url = URLHelper::join($this->resolveBaseUrl(), $config->getAuthorizeEndpoint(), $allows);

tests/Unit/RequestCloneTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
+use Saloon\Http\Response;
 use Saloon\Http\Faking\MockClient;
 use Saloon\Http\Faking\MockResponse;
-use Saloon\Http\Response;
-use Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Tests\Fixtures\Requests\UserRequest;
+use Saloon\Tests\Fixtures\Connectors\TestConnector;
 
 test('cloning a request after query() is initialized gives independent query bags', function () {
     $original = new UserRequest;