Merge branch 'main' into try-rector-dev-main

Author: samsonasik

composer.json

@@ -49,7 +49,7 @@
         "adam-paterson/oauth2-slack": "^1.1",
         "aws/aws-sdk-php": "^3.338.0",
         "azure-oss/storage-blob-flysystem": "^1.2",
-        "carthage-software/mago": "1.0.0-beta.24",
+        "carthage-software/mago": "1.0.0-beta.28",
         "depotwarehouse/oauth2-twitch": "^1.3",
         "guzzlehttp/psr7": "^2.6.1",
         "league/flysystem-aws-s3-v3": "^3.25.1",

mago.toml

@@ -61,4 +61,4 @@ halstead = { enabled = false }
 prefer-arrow-function = { enabled = false } # enable when references are fixed
 prefer-first-class-callable = { enabled = false } # enable when arguments are fixed
 strict-behavior = { allow-loose-behavior = true }
-yoda-conditions = { enabled = false }
+no-redundant-use = { enabled = true }

packages/auth/src/AuthConfig.php

@@ -4,14 +4,12 @@
 
 namespace Tempest\Auth;
 
-use BackedEnum;
 use Tempest\Auth\AccessControl\Policy;
 use Tempest\Auth\Authentication\Authenticatable;
 use Tempest\Auth\Exceptions\PolicyWasInvalid;
 use Tempest\Reflection\MethodReflector;
 use Tempest\Support\Arr;
 use Tempest\Support\Str;
-use UnitEnum;
 
 final class AuthConfig
 {

packages/auth/src/OAuth/Config/AppleOAuthConfig.php

@@ -60,8 +60,8 @@ public function createProvider(): AbstractProvider
         return new Apple([
             'clientId' => $this->clientId,
             'teamId' => $this->teamId,
-            'keyId' => $this->keyId,
-            'keyFile' => $this->keyFile,
+            'keyFileId' => $this->keyId,
+            'keyFilePath' => $this->keyFile,
         ]);
     }
 

packages/auth/tests/OAuthTest.php

@@ -4,6 +4,7 @@
 
 namespace Tempest\Auth\Tests;
 
+use League\OAuth2\Client\Provider\Apple;
 use League\OAuth2\Client\Provider\Facebook;
 use League\OAuth2\Client\Provider\Github;
 use League\OAuth2\Client\Provider\Google;
@@ -12,6 +13,7 @@
 use League\OAuth2\Client\Provider\ResourceOwnerInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
+use Tempest\Auth\OAuth\Config\AppleOAuthConfig;
 use Tempest\Auth\OAuth\Config\DiscordOAuthConfig;
 use Tempest\Auth\OAuth\Config\FacebookOAuthConfig;
 use Tempest\Auth\OAuth\Config\GenericOAuthConfig;
@@ -143,6 +145,26 @@ public function discord_oauth_config(): void
         $this->assertStringContainsString('discord-123', $url);
     }
 
+    #[Test]
+    public function apple_oauth_config(): void
+    {
+        $config = new AppleOAuthConfig(
+            clientId: 'apple-123',
+            teamId: 'apple-team-id',
+            keyId: 'apple-key-id',
+            keyFile: 'apple-key-file',
+            redirectTo: '/auth/apple/callback',
+            scopes: ['email', 'name'],
+        );
+
+        $provider = $config->createProvider();
+        $url = $provider->getAuthorizationUrl();
+
+        $this->assertInstanceOf(Apple::class, $provider);
+        $this->assertStringContainsString('apple.com', $url);
+        $this->assertStringContainsString('apple-123', $url);
+    }
+
     #[Test]
     public function oauth_user_creation(): void
     {

packages/cache/src/Commands/CacheStatusCommand.php

@@ -6,7 +6,6 @@
 
 use Tempest\Cache\Cache;
 use Tempest\Cache\Config\CacheConfig;
-use Tempest\Cache\Config\InMemoryCacheConfig;
 use Tempest\Cache\GenericCache;
 use Tempest\Console\Console;
 use Tempest\Console\ConsoleCommand;

packages/cache/src/Config/CustomCacheConfig.php

@@ -6,8 +6,6 @@
 use Tempest\Container\Container;
 use UnitEnum;
 
-use function Tempest\get;
-
 /**
  * Use a custom adapter as the cache backend.
  */

packages/cache/src/UserCacheInsightsProvider.php

@@ -7,7 +7,6 @@
 use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Tempest\Cache\Config\CacheConfig;
-use Tempest\Cache\Config\InMemoryCacheConfig;
 use Tempest\Container\Container;
 use Tempest\Container\GenericContainer;
 use Tempest\Core\Insight;

packages/command-bus/src/AsyncCommandMiddleware.php

@@ -4,7 +4,6 @@
 
 namespace Tempest\CommandBus;
 
-use Symfony\Component\Uid\Uuid;
 use Tempest\Core\Priority;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Support\Random;

packages/console/src/Components/InteractiveComponentRenderer.php

@@ -11,7 +11,6 @@
 use Tempest\Console\InteractiveConsoleComponent;
 use Tempest\Console\Key;
 use Tempest\Console\Terminal\Terminal;
-use Tempest\Intl\Translator;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\MethodReflector;
 use Tempest\Support\Arr;