Merge branch 'main' into feat/redis

Author: innocenzi

.env.example

@@ -4,25 +4,12 @@ ENVIRONMENT=local
 # The base URI that's used for all generated URIs
 BASE_URI=http://localhost
 
-# The CACHE key is used as a global override to turn all caches on or off
-# Should be true in production, but null or false in local development
-CACHE=null
+# Setting to `false` force-disable internal caches.
+INTERNAL_CACHES=true
 
-# Enable or disable discovery cache
+# Enable or disable discovery cache. Can be `true`, `partial` or `false`.
 DISCOVERY_CACHE=false
 
-# Enable or disable config cache
-CONFIG_CACHE=false
-
-# Enable or disable icon cache
-ICON_CACHE=true
-
-# Enable or disable view cache
-VIEW_CACHE=false
-
-# Enable or disable project cache (allround cache)
-PROJECT_CACHE=false
-
 # Overwrite default log paths (null = default)
 DEBUG_LOG_PATH=null
-SERVER_LOG_PATH=null
+SERVER_LOG_PATH=null

.github/workflows/integration-tests.yml

@@ -5,6 +5,10 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
+env:
+  POSTGRES_USER: runner
+  POSTGRES_PASSWORD: ''
+  POSTGRES_DB: postgres
 
 jobs:
   vitest:
@@ -28,7 +32,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, intl, ftp, zip
+          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql intl, ftp, zip
           coverage: pcov
 
       - name: Setup Bun
@@ -60,6 +64,9 @@ jobs:
         stability:
           - prefer-stable
           - prefer-lowest
+        exclude:
+          - os: windows-latest
+            database: postgres
 
     name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}"
 
@@ -98,7 +105,10 @@ jobs:
         uses: ankane/setup-postgres@v1
 
       - name: Set database config - ${{ matrix.database }}
-        run: php -r "file_exists('tests/Fixtures/Config/database.config.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
+        run: php -r "copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
+
+      - name: Tempest about
+        run: php ./tempest about
 
       - name: List discovered locations
         run: php ./tempest discovery:status

composer.json

@@ -41,7 +41,7 @@
     },
     "require-dev": {
         "aidan-casey/mock-client": "dev-master",
-        "carthage-software/mago": "0.22.2",
+        "carthage-software/mago": "0.24.1",
         "guzzlehttp/psr7": "^2.6.1",
         "illuminate/view": "~11.7.0",
         "league/flysystem-aws-s3-v3": "^3.0",
@@ -152,6 +152,7 @@
             "packages/support/src/Math/constants.php",
             "packages/support/src/Math/functions.php",
             "packages/support/src/Namespace/functions.php",
+            "packages/support/src/Number/functions.php",
             "packages/support/src/Path/functions.php",
             "packages/support/src/Random/functions.php",
             "packages/support/src/Regex/functions.php",

mago.toml

@@ -64,6 +64,11 @@ name = "strictness/require-return-type"
 ignore_arrow_function = true
 ignore_closure = true
 
+# https://github.com/carthage-software/mago/issues/206
+[[linter.rules]]
+name = "best-practices/literal-named-argument"
+level = "off"
+
 # https://github.com/carthage-software/mago/issues/146
 [[linter.rules]]
 name = "strictness/require-strict-types"

packages/auth/src/CurrentUserInitializer.php

@@ -8,15 +8,16 @@
 use Tempest\Container\DynamicInitializer;
 use Tempest\Container\Tag;
 use Tempest\Reflection\ClassReflector;
+use UnitEnum;
 
 final readonly class CurrentUserInitializer implements DynamicInitializer
 {
-    public function canInitialize(ClassReflector $class, ?string $tag): bool
+    public function canInitialize(ClassReflector $class, null|string|UnitEnum $tag): bool
     {
         return $class->implements(CanAuthenticate::class);
     }
 
-    public function initialize(ClassReflector $class, ?string $tag, Container $container): object
+    public function initialize(ClassReflector $class, null|string|UnitEnum $tag, Container $container): object
     {
         $user = $container->get(Authenticator::class)->currentUser();
 

packages/auth/src/Install/User.php

@@ -40,7 +40,7 @@ public function grantPermission(string|UnitEnum|Permission $permission): self
     {
         $permission = $this->resolvePermission($permission);
 
-        new UserPermission(
+        UserPermission::new(
             user: $this,
             permission: $permission,
         )->save();

packages/auth/src/Install/UserPermission.php

@@ -10,8 +10,7 @@ final class UserPermission
 {
     use IsDatabaseModel;
 
-    public function __construct(
-        public User $user,
-        public Permission $permission,
-    ) {}
+    public User $user;
+
+    public Permission $permission;
 }

packages/cache/src/Cache.php

@@ -6,20 +6,90 @@
 
 use Closure;
 use Psr\Cache\CacheItemInterface;
+use Stringable;
 use Tempest\DateTime\DateTimeInterface;
+use Tempest\DateTime\Duration;
 
 interface Cache
 {
-    public function put(string $key, mixed $value, ?DateTimeInterface $expiresAt = null): CacheItemInterface;
+    /**
+     * Whether the cache is enabled.
+     */
+    public bool $enabled {
+        get;
+        set;
+    }
 
-    public function get(string $key): mixed;
+    /**
+     * Returns a lock for the specified key. The lock is not acquired until `acquire()` is called.
+     *
+     * @param Stringable|string $key The identifier of the lock.
+     * @param null|Duration|DateTimeInterface $expiration The expiration time for the lock. If not specified, the lock will not expire.
+     * @param null|Stringable|string $owner The owner of the lock, which will be used to identify the process releasing it. If not specified, a random string will be used.
+     */
+    public function lock(Stringable|string $key, null|Duration|DateTimeInterface $expiration = null, null|Stringable|string $owner = null): Lock;
 
-    /** @param Closure(): mixed $cache */
-    public function resolve(string $key, Closure $cache, ?DateTimeInterface $expiresAt = null): mixed;
+    /**
+     * Sets the specified key to the specified value in the cache. Optionally, specify an expiration.
+     */
+    public function put(Stringable|string $key, mixed $value, null|Duration|DateTimeInterface $expiration = null): CacheItemInterface;
 
-    public function remove(string $key): void;
+    /**
+     * Sets the specified keys to the specified values in the cache. Optionally, specify an expiration.
+     *
+     * @template TKey of array-key
+     * @template TValue
+     *
+     * @param iterable<TKey,TValue> $array
+     * @return array<TKey,CacheItemInterface>
+     */
+    public function putMany(iterable $values, null|Duration|DateTimeInterface $expiration = null): array;
 
-    public function clear(): void;
+    /**
+     * Gets the value associated with the specified key from the cache. If the key does not exist, null is returned.
+     */
+    public function get(Stringable|string $key): mixed;
+
+    /**
+     * Gets the values associated with the specified keys from the cache. If a key does not exist, null is returned for that key.
+     *
+     * @template TKey of array-key
+     * @template TValue
+     *
+     * @param iterable<TKey,TValue> $array
+     * @return array<TValue,mixed>
+     */
+    public function getMany(iterable $key): array;
+
+    /**
+     * Determines whether the cache contains the specified key.
+     */
+    public function has(Stringable|string $key): bool;
+
+    /**
+     * Increments the value associated with the specified key by the specified amount. If the key does not exist, it is created with the specified amount.
+     */
+    public function increment(Stringable|string $key, int $by = 1): int;
 
-    public function isEnabled(): bool;
+    /**
+     * Decrements the value associated with the specified key by the specified amount. If the key does not exist, it is created with the negative amount.
+     */
+    public function decrement(Stringable|string $key, int $by = 1): int;
+
+    /**
+     * If the specified key already exists in the cache, the value is returned and the `$callback` is not executed. Otherwise, the result of the callback is stored, then returned.
+     *
+     * @var null|Duration $stale Allow the value to be stale for the specified amount of time in addition to the time-to-live specified by `$expiration`. When a value is stale, it will still be returned as-is, but it will be refreshed in the background.
+     */
+    public function resolve(Stringable|string $key, Closure $callback, null|Duration|DateTimeInterface $expiration = null, ?Duration $stale = null): mixed;
+
+    /**
+     * Removes the specified key from the cache.
+     */
+    public function remove(Stringable|string $key): void;
+
+    /**
+     * Clears the entire cache.
+     */
+    public function clear(): void;
 }