style: update to mago:^1.0

.github/CODEOWNERS

@@ -14,6 +14,7 @@
 /.github/workflows/benchmark.yml                     @xHeaven
 /.github/workflows/benchmark-comment.yml             @xHeaven
 /src/                                                @brendt
+/utils/rector/                                       @xHeaven
 /docs/                                               @brendt @innocenzi
 /packages/auth/                                      @innocenzi
 /packages/cache/                                     @innocenzi

.github/workflows/coding-conventions.yml

@@ -24,7 +24,6 @@ jobs:
       - name: Install dependencies
         run: |
           composer update --prefer-dist --no-interaction  --ignore-platform-reqs
-          composer mago:install-binary
 
       - name: Run Mago
         run: |

composer.json

@@ -52,7 +52,7 @@
         "aws/aws-sdk-php": "^3.338.0",
         "azure-oss/storage-blob-flysystem": "^1.2",
         "brianium/paratest": "^7.14",
-        "carthage-software/mago": "1.0.0-beta.28",
+        "carthage-software/mago": "^1.0",
         "guzzlehttp/psr7": "^2.6.1",
         "league/flysystem-aws-s3-v3": "^3.25.1",
         "league/flysystem-ftp": "^3.25.1",
@@ -237,7 +237,8 @@
             "Tempest\\Validation\\Tests\\": "packages/validation/tests",
             "Tempest\\View\\Tests\\": "packages/view/tests",
             "Tempest\\Vite\\Tests\\": "packages/vite/tests",
-            "Tests\\Tempest\\": "tests"
+            "Tests\\Tempest\\": "tests",
+            "Tempest\\Rector\\": "utils/rector/src"
         }
     },
     "bin": [

mago.toml

@@ -15,6 +15,7 @@ excludes = [
 	"**/*.expected.php",
 	"**/.tempest",
 	"./vendor/rector", #see https://github.com/carthage-software/mago/issues/1237 rector clashes and throws errors in tests
+	"packages/intl/bin/plural-rules.php",
 ]
 
 [formatter]
@@ -42,12 +43,12 @@ trait-name = { psr = false }
 class-name = { psr = false }
 literal-named-argument = { enabled = false } # todo
 no-error-control-operator = { enabled = false }
-no-boolean-literal-comparison = { enabled = false }
+#no-boolean-literal-comparison = { enabled = false }
 too-many-methods = { enabled = false }
 kan-defect = { enabled = false }
 cyclomatic-complexity = { enabled = false }
-return-type = { ignore-arrow-function = true, ignore-closure = true }
-parameter-type = { ignore-arrow-function = true, ignore-closure = true }
+#return-type = { ignore-arrow-function = true, ignore-closure = true }
+#parameter-type = { ignore-arrow-function = true, ignore-closure = true }
 too-many-enum-cases = { enabled = false }
 no-redundant-file = { enabled = false }
 assertion-style = { style = "this" }
@@ -65,3 +66,8 @@ prefer-first-class-callable = { enabled = false } # enable when arguments are fi
 strict-behavior = { allow-loose-behavior = true }
 no-redundant-use = { enabled = true }
 no-empty-comment = { enabled = false }
+single-class-per-file = { enabled = false }
+no-isset = { enabled = false }
+instanceof-stringable = { enabled = false }
+prefer-static-closure = { enabled = false }
+sensitive-parameter = { enabled = false }

packages/auth/src/AccessControl/PolicyBasedAccessControl.php

@@ -13,6 +13,7 @@
 use Tempest\Reflection\ParameterReflector;
 use Tempest\Support\Arr\ImmutableArray;
 use Tempest\Support\Str;
+use Throwable;
 use UnitEnum;
 
 /**
@@ -45,7 +46,7 @@ public function isGranted(UnitEnum|string $action, object|string $resource, ?obj
             throw new NoPolicyWereFoundForResource($resource);
         }
 
-        $resource = ! is_object($resource) ? null : $resource;
+        $resource = is_object($resource) ? $resource : null;
 
         foreach ($policies as $policy) {
             $decision = $this->evaluatePolicy($policy, $resource, $subject);
@@ -60,13 +61,13 @@ public function isGranted(UnitEnum|string $action, object|string $resource, ?obj
 
     private function resolveSubject(?object $subject): ?object
     {
-        if ($subject) {
+        if ($subject !== null) {
             return $subject;
         }
 
         try {
             return $this->container->get(Authenticator::class)->current();
-        } catch (\Throwable) {
+        } catch (Throwable) {
             return null;
         }
     }
@@ -113,9 +114,9 @@ private function evaluatePolicy(MethodReflector $policy, ?object $resource, ?obj
         return AccessDecision::from($decision);
     }
 
-    private function ensureParameterAcceptsInput(?ParameterReflector $reflector, mixed $input, \Closure $throw): void
+    private function ensureParameterAcceptsInput(?ParameterReflector $reflector, mixed $input, Closure $throw): void
     {
-        if ($reflector === null || $input === null) {
+        if (! $reflector instanceof ParameterReflector || $input === null) {
             return;
         }
 

packages/auth/src/AccessControl/PolicyDiscovery.php

@@ -2,7 +2,6 @@
 
 namespace Tempest\Auth\AccessControl;
 
-use Tempest\Auth\AccessControl\Policy;
 use Tempest\Auth\AuthConfig;
 use Tempest\Discovery\Discovery;
 use Tempest\Discovery\DiscoveryLocation;

packages/auth/src/Authentication/Authenticatable.php

@@ -7,6 +7,4 @@
 /**
  * Represents an entity that may be authenticated.
  */
-interface Authenticatable
-{
-}
+interface Authenticatable {}

packages/auth/src/Authentication/SessionAuthenticator.php

@@ -10,6 +10,7 @@
 final readonly class SessionAuthenticator implements Authenticator
 {
     public const string AUTHENTICATABLE_KEY = '#authenticatable:id';
+
     public const string AUTHENTICATABLE_CLASS = '#authenticatable:class';
 
     public function __construct(
@@ -35,6 +36,7 @@ public function deauthenticate(): void
     {
         $this->session->remove(self::AUTHENTICATABLE_KEY);
         $this->session->remove(self::AUTHENTICATABLE_CLASS);
+
         $this->sessionManager->save($this->session);
     }
 

packages/auth/src/Exceptions/AuthenticationException.php

@@ -2,6 +2,4 @@
 
 namespace Tempest\Auth\Exceptions;
 
-interface AuthenticationException
-{
-}
+interface AuthenticationException {}

packages/auth/src/Exceptions/NoPolicyWereFoundForResource.php

@@ -9,6 +9,6 @@ final class NoPolicyWereFoundForResource extends Exception implements Authentica
     public function __construct(
         public readonly string|object $resource,
     ) {
-        parent::__construct(sprintf('No policies were found for resource `%s`.', is_object($resource) ? get_class($resource) : $resource));
+        parent::__construct(sprintf('No policies were found for resource `%s`.', is_object($resource) ? $resource::class : $resource));
     }
 }

packages/auth/src/Exceptions/OAuthStateWasInvalid.php

@@ -6,6 +6,4 @@
 
 use Exception;
 
-final class OAuthStateWasInvalid extends Exception implements AuthenticationException
-{
-}
+final class OAuthStateWasInvalid extends Exception implements AuthenticationException {}

packages/auth/src/Installer/AuthenticationInstaller.php

@@ -7,6 +7,7 @@
 use Tempest\Console\Console;
 use Tempest\Console\ConsoleCommand;
 use Tempest\Console\Input\ConsoleArgumentBag;
+use Tempest\Console\Input\ConsoleInputArgument;
 use Tempest\Container\Container;
 use Tempest\Core\Installer;
 use Tempest\Core\PublishesFiles;
@@ -47,7 +48,7 @@ private function shouldMigrate(): bool
         {
             $argument = $this->consoleArgumentBag->get('migrate');
 
-            if ($argument === null || ! is_bool($argument->value)) {
+            if (! $argument instanceof ConsoleInputArgument || ! is_bool($argument->value)) {
                 return $this->console->confirm('Do you want to execute migrations?', default: false);
             }
 
@@ -58,7 +59,7 @@ private function shouldInstallOAuth(): bool
         {
             $argument = $this->consoleArgumentBag->get('oauth');
 
-            if ($argument === null || ! is_bool($argument->value)) {
+            if (! $argument instanceof ConsoleInputArgument || ! is_bool($argument->value)) {
                 return $this->console->confirm('Do you want to install OAuth?', default: false);
             }
 

packages/auth/src/Installer/OAuthInstaller.php

@@ -30,7 +30,7 @@ public function install(): void
     {
         $providers = $this->getProviders();
 
-        if (count($providers) === 0) {
+        if ($providers === []) {
             return;
         }
 

packages/auth/src/OAuth/OAuthConfig.php

@@ -14,32 +14,24 @@ interface OAuthConfig extends HasTag
     /**
      * The OAuth provider class name.
      */
-    public string $provider {
-        get;
-    }
+    public string $provider { get; }
 
     /**
      * The authorization scopes for this OAuth provider.
      *
      * @return string[]
      */
-    public array $scopes {
-        get;
-    }
+    public array $scopes { get; }
 
     /**
      * The client ID for the OAuth provider.
      */
-    public string $clientId {
-        get;
-    }
+    public string $clientId { get; }
 
     /**
      * The controller action to redirect to after the user authorizes the application.
      */
-    public string|array $redirectTo {
-        get;
-    }
+    public string|array $redirectTo { get; }
 
     /**
      * Creates the OAuth provider instance.

packages/auth/tests/AuthenticationAndOAuthSafetyTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use ReflectionMethod;
+use stdClass;
 use Tempest\Auth\Authentication\DatabaseAuthenticatableResolver;
 use Tempest\Auth\Exceptions\ModelWasNotAuthenticatable;
 use Tempest\Auth\OAuth\GenericOAuthClient;
@@ -23,7 +24,7 @@ public function database_authenticatable_resolver_rejects_non_authenticatable_cl
 
         $this->expectException(ModelWasNotAuthenticatable::class);
 
-        $resolve->invoke($resolver, 1, \stdClass::class);
+        $resolve->invoke($resolver, 1, stdClass::class);
     }
 
     #[Test]

packages/auth/tests/OAuthTest.php

@@ -185,7 +185,7 @@ public function oauth_user_creation(): void
             avatar: 'https://example.com/avatar.jpg',
             provider: 'github',
             raw: [
-                'id' => 123456,
+                'id' => 123_456,
                 'login' => 'frieren',
                 'name' => 'Frieren the Mage',
                 'email' => 'frieren@elven-mage.magic',

packages/cache/src/Cache.php

@@ -15,10 +15,7 @@ interface Cache
     /**
      * Whether the cache is enabled.
      */
-    public bool $enabled {
-        get;
-        set;
-    }
+    public bool $enabled { get; set; }
 
     /**
      * Returns a lock for the specified key. The lock is not acquired until `acquire()` is called.

packages/cache/src/CacheCouldNotBeCleared.php

@@ -6,6 +6,4 @@
 
 use Exception;
 
-final class CacheCouldNotBeCleared extends Exception implements CacheException
-{
-}
+final class CacheCouldNotBeCleared extends Exception implements CacheException {}

packages/cache/src/CacheException.php

@@ -2,6 +2,4 @@
 
 namespace Tempest\Cache;
 
-interface CacheException
-{
-}
+interface CacheException {}

packages/cache/src/CacheInitializer.php

@@ -39,7 +39,7 @@ private function shouldCacheBeEnabled(null|string|UnitEnum $tag): bool
     {
         $globalCacheEnabled = (bool) env('CACHE_ENABLED', default: true);
 
-        if (! $tag) {
+        if ($tag === null) {
             return $globalCacheEnabled;
         }
 

packages/cache/src/Commands/CacheClearCommand.php

@@ -21,7 +21,7 @@
 
 use function Tempest\Support\arr;
 
-if (class_exists(\Tempest\Console\ConsoleCommand::class)) {
+if (class_exists(ConsoleCommand::class)) {
     final readonly class CacheClearCommand
     {
         use HasConsole;

packages/cache/src/GenericCache.php

@@ -56,7 +56,7 @@ public function put(Stringable|string $key, mixed $value, null|Duration|DateTime
             $expiration = DateTime::now()->plus($expiration);
         }
 
-        if ($expiration !== null) {
+        if ($expiration instanceof DateTimeInterface) {
             $item = $item->expiresAt($expiration->toNativeDateTime());
         }
 
@@ -74,6 +74,7 @@ public function putMany(iterable $values, null|Duration|DateTimeInterface $expir
         foreach ($values as $key => $value) {
             $items[(string) $key] = $this->put($key, $value, $expiration);
         }
+
         return $items;
     }
 
@@ -149,7 +150,7 @@ public function resolve(Stringable|string $key, Closure $callback, null|Duration
             return $callback();
         }
 
-        if ($stale) {
+        if ($stale instanceof Duration) {
             if ($expiration instanceof Duration) {
                 $expiration = DateTime::now()->plus($expiration);
             }
@@ -168,7 +169,7 @@ public function resolve(Stringable|string $key, Closure $callback, null|Duration
 
     private function resolveAllowingStale(Stringable|string $key, Closure $callback, DateTimeInterface $expiration, Duration $stale): mixed
     {
-        if (! $this->deferredTasks) {
+        if (! $this->deferredTasks instanceof DeferredTasks) {
             return $this->resolve($key, $callback, $expiration);
         }
 

packages/cache/src/GenericLock.php

@@ -32,7 +32,7 @@ public function acquire(): bool
             return false;
         }
 
-        $expiration = $this->duration !== null
+        $expiration = $this->duration instanceof Duration
             ? DateTime::now()->plus($this->duration)
             : null;
 

packages/cache/src/Lock.php

@@ -12,23 +12,17 @@ interface Lock
     /**
      * The key used to identify the lock. This should be unique across all locks.
      */
-    public string $key {
-        get;
-    }
+    public string $key { get; }
 
     /**
      * The duration of the lock. If null, the lock will not expire.
      */
-    public ?Duration $duration {
-        get;
-    }
+    public ?Duration $duration { get; }
 
     /**
      * The owner of the lock. This is used to verify that the lock is being released by the correct owner.
      */
-    public string $owner {
-        get;
-    }
+    public string $owner { get; }
 
     /**
      * Attempts to acquire a lock.