diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 1a6e7335..2a62ee68 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -9,4 +9,4 @@ jobs:
   cs:
     uses: ray-di/.github/.github/workflows/coding-standards.yml@v1
     with:
-      php_version: 8.3
+      php_version: 8.4
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 395de7fa..edc2012a 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -3,105 +3,186 @@ name: Continuous Integration
 on:
   push:
     paths-ignore:
-      - '**.md'
+      - '**/*.md'
+      - '**/*.txt'
+      - 'LICENSE'
   pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+      - 'LICENSE'
   workflow_dispatch:
 
 env:
-  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist --no-plugins"
-  COMPOSER_UPDATE_FLAGS: ""
-  script: demo/run.php
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+  SCRIPT: "demo/run.php"
 
 jobs:
   phpunit:
-    name: PHPUnit
-    runs-on: ubuntu-latest
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    name: PHPUnit (${{ matrix.os }} - PHP ${{ matrix.php-version }} - ${{ matrix.dependencies }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
-        php-version: [8.2, 8.3, 8.4]
-        dependencies: [highest, lowest]
-        os: [ubuntu-latest]
         include:
-          - php-version: 8.1
-            os: windows-latest
-          - php-version: 8.1
-            os: macos-latest
-          - php-version: 8.2
+          # Ubuntu: Test all PHP versions
+          - os: ubuntu-latest
+            php-version: "8.1"
+            dependencies: highest
+          - os: ubuntu-latest
+            php-version: "8.2"
             dependencies: lowest
-            os: ubuntu-latest
-          - php-version:  8.2
+          - os: ubuntu-latest
+            php-version: "8.2"
             dependencies: highest
-            os: ubuntu-latest
-          - php-version:  8.3
+          - os: ubuntu-latest
+            php-version: "8.3"
+            dependencies: lowest
+          - os: ubuntu-latest
+            php-version: "8.3"
+            dependencies: highest
+          - os: ubuntu-latest
+            php-version: "8.4"
+            dependencies: lowest
+          - os: ubuntu-latest
+            php-version: "8.4"
             dependencies: highest
-            os: ubuntu-latest
-          - php-version: 8.3
+          # Windows: Latest PHP only for CI speed
+          - os: windows-latest
+            php-version: "8.4"
             dependencies: lowest
-            os: ubuntu-latest
-          - php-version:  8.4
+          - os: windows-latest
+            php-version: "8.4"
             dependencies: highest
-            os: ubuntu-latest
-          - php-version: 8.4
+          # macOS: Latest PHP only for CI speed
+          - os: macos-latest
+            php-version: "8.4"
             dependencies: lowest
-            os: ubuntu-latest
+          - os: macos-latest
+            php-version: "8.4"
+            dependencies: highest
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # --- Redis Setup (All Platforms) ---
+      - name: Setup Redis (Ubuntu)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y redis-server redis-tools
+          sudo systemctl start redis-server
+          redis-cli ping
+
+      - name: Setup Redis (Windows)
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          $ProgressPreference = "SilentlyContinue"
+          Invoke-WebRequest -Uri "https://github.com/microsoftarchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.zip" -OutFile "redis.zip"
+          Expand-Archive "redis.zip" -DestinationPath "redis"
+          Start-Process -FilePath "redis/redis-server.exe" -WindowStyle Hidden
+          Start-Sleep -Seconds 10
+          redis/redis-cli.exe ping
+
+      - name: Setup Redis (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install redis
+          brew services start redis
+          sleep 8
+          redis-cli ping
 
+      # --- Memcached Setup (All Platforms) ---
+      - name: Install Memcached (Ubuntu)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get install -y memcached
+          sudo systemctl start memcached
+
+      - name: Install Memcached (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install memcached
+          brew services start memcached
+          sleep 5
+
+      - name: Install Memcached (Windows)
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          # 1. Download the community-provided binary using curl to handle redirects.
+          $url = "https://github.com/jefyt/memcached-windows/releases/download/1.6.8_mingw/memcached-1.6.8-win64-mingw.zip"
+          $zipFile = "memcached.zip"
+          Write-Host "Downloading Memcached from $url..."
+          curl.exe -L -o $zipFile $url
+
+          # 2. Extract the archive.
+          $extractDir = "memcached_files"
+          Write-Host "Extracting $zipFile to $extractDir..."
+          Expand-Archive -Path $zipFile -DestinationPath $extractDir
+          
+          # 3. Start Memcached as a background process.
+          #    The service installation method (-d install) is not suitable for CI environments
+          #    as it requires administrative privileges, which are not available by default.
+          $execPath = Join-Path -Path $extractDir -ChildPath "memcached-1.6.8-win64-mingw\bin\memcached.exe"
+          Write-Host "Starting Memcached directly as a background process from $execPath"
+          Start-Process -FilePath $execPath -ArgumentList "-m 64" -WindowStyle Hidden
+          
+          # 4. Verify that the process started and is listening on the port.
+          Start-Sleep -Seconds 5
+          Write-Host "Verifying process and port..."
+          $process = Get-Process -Name "memcached" -ErrorAction SilentlyContinue
+          if ($null -eq $process) {
+            Write-Error "FATAL: Memcached process did not start!"
+            exit 1
+          }
+          $portCheck = netstat -an | findstr "11211"
+          if (-not $portCheck) {
+            Write-Error "FATAL: Port 11211 is not listening!"
+            exit 1
+          }
+          Write-Host "SUCCESS: Memcached is running as a process and listening on port 11211."
+
+      # --- PHP and Dependencies Setup ---
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
           ini-values: zend.assertions=1
+          tools: composer
+          extensions: redis, memcached
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Handle lowest dependencies update
-        if: contains(matrix.dependencies, 'lowest')
-        run: echo COMPOSER_UPDATE_FLAGS=$COMPOSER_UPDATE_FLAGS --prefer-lowest >> $GITHUB_ENV
-
-      - name: Handle ignore-platform-reqs dependencies update
-        if: contains(matrix.dependencies, 'ignore')
-        run: echo COMPOSER_FLAGS=$COMPOSER_FLAGS --ignore-platform-req=php >> $GITHUB_ENV
-
-      - name: Remove platform config to get latest dependencies for current PHP version
-        if: contains(matrix.dependencies, 'highest') || contains(matrix.dependencies, 'lowest')
-        run: composer config platform --unset
-
-      - name: Allow alpha releases for latest-deps builds to catch problems earlier
-        if: contains(matrix.dependencies, 'ignore')
-        run: composer config minimum-stability alpha
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-${{ matrix.php-version }}-composer-
 
-      - name: Update dependencies
-        run: composer update ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}
+      - name: Install dependencies
+        run: |
+          composer config platform --unset
+          composer update ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} ${{ env.COMPOSER_FLAGS }}
 
-      - name: Run test suite
+      - name: Run PHPUnit tests
         run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        if: matrix.os == 'ubuntu-latest' && matrix.php-version == '8.4' && matrix.dependencies == 'highest'
+        uses: codecov/codecov-action@v4
         with:
-          file: ./coverage.xml
+          files: coverage.xml
+          fail_ci_if_error: false
 
-      - name: Update dependencies for demo
-        run: composer require doctrine/cache ^1 ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}
+      - name: Run demo script
+        if: env.SCRIPT != '' && matrix.os == 'ubuntu-latest' && matrix.php-version == '8.4' && matrix.dependencies == 'highest'
+        run: |
+          composer require doctrine/cache:"^1.12" --no-update
+          composer update ${{ env.COMPOSER_FLAGS }}
+          php ${{ env.SCRIPT }}
 
-      - name: Run additional script
-        if: ${{ env.script }}
-        run: php ${{ env.script }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 77301974..11cbc4b1 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -9,5 +9,5 @@ jobs:
   sa:
     uses: ray-di/.github/.github/workflows/static-analysis.yml@v1
     with:
-      php_version: 8.3
+      php_version: 8.4
       has_crc_config: true
diff --git a/composer.json b/composer.json
index 6b0f0cc6..c61d45ca 100644
--- a/composer.json
+++ b/composer.json
@@ -25,19 +25,20 @@
         "ray/di": "^2.17.2",
         "ray/psr-cache-module": "^1.3.4",
         "symfony/cache": "^5.3 || ^6.0 || ^7.3",
-        "symfony/cache-contracts": "^2.4 || ^3.0"
+        "symfony/cache-contracts": "^2.4 || ^3.0",
+        "symfony/polyfill-php83": "^v1.32.0"
     },
     "require-dev": {
         "ext-redis": "*",
-        "bear/fastly-module": "^1.0",
         "bamarni/composer-bin-plugin": "^1.8",
+        "bear/fastly-module": "^1.0",
         "koriym/attributes": "^1.0.1",
-        "madapaja/twig-module": "^2.3",
+        "madapaja/twig-module": "^2.6",
         "mobiledetect/mobiledetectlib": "^3.74 || ^4.8",
-        "phpunit/phpunit": "^9.5.28",
-        "predis/predis": "^2.2",
-        "symfony/process": "^4.3 || ^5.4 || ^6.1 || ^7.1",
-        "twig/twig": "^2.15.3 || ^3.4.3"
+        "phpunit/phpunit": "^9.6.23",
+        "predis/predis": "^2.4",
+        "symfony/process": "^6.1 || ^7.1",
+        "twig/twig": "^3.4.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/AbstractDonutCacheInterceptor.php b/src/AbstractDonutCacheInterceptor.php
index bed5f999..978f3bb2 100644
--- a/src/AbstractDonutCacheInterceptor.php
+++ b/src/AbstractDonutCacheInterceptor.php
@@ -6,6 +6,7 @@
 
 use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 use Throwable;
@@ -30,6 +31,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     final public function invoke(MethodInvocation $invocation)
     {
         $ro = $invocation->getThis();
diff --git a/src/CacheDependency.php b/src/CacheDependency.php
index d758bff4..1d912e4b 100644
--- a/src/CacheDependency.php
+++ b/src/CacheDependency.php
@@ -5,6 +5,7 @@
 namespace BEAR\QueryRepository;
 
 use BEAR\Resource\ResourceObject;
+use Override;
 
 use function assert;
 use function sprintf;
@@ -16,6 +17,7 @@ public function __construct(
     ) {
     }
 
+    #[Override]
     public function depends(ResourceObject $from, ResourceObject $to): void
     {
         assert(! isset($from->headers[Header::SURROGATE_KEY]));
diff --git a/src/CacheInterceptor.php b/src/CacheInterceptor.php
index 155893a6..daa83169 100644
--- a/src/CacheInterceptor.php
+++ b/src/CacheInterceptor.php
@@ -6,6 +6,7 @@
 
 use BEAR\QueryRepository\Exception\LogicException;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 use Throwable;
@@ -26,6 +27,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function invoke(MethodInvocation $invocation)
     {
         $ro = $invocation->getThis();
diff --git a/src/CacheVersionModule.php b/src/CacheVersionModule.php
index 4af8686f..e39631f7 100644
--- a/src/CacheVersionModule.php
+++ b/src/CacheVersionModule.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\PsrCacheModule\CacheNamespaceModule;
 
@@ -26,6 +27,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->install(new CacheNamespaceModule($this->version));
diff --git a/src/CacheableModule.php b/src/CacheableModule.php
index dfd3ba07..e89ae5bc 100644
--- a/src/CacheableModule.php
+++ b/src/CacheableModule.php
@@ -10,6 +10,7 @@
 use BEAR\RepositoryModule\Annotation\Purge;
 use BEAR\RepositoryModule\Annotation\Refresh;
 use BEAR\Sunday\Extension\Transfer\HttpCacheInterface;
+use Override;
 use Ray\Di\AbstractModule;
 
 /**
@@ -27,6 +28,7 @@ final class CacheableModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(HttpCacheInterface::class)->to(HttpCache::class);
diff --git a/src/Cdn/AkamaiCacheControlHeaderSetter.php b/src/Cdn/AkamaiCacheControlHeaderSetter.php
index e97931bb..9ff93ce0 100644
--- a/src/Cdn/AkamaiCacheControlHeaderSetter.php
+++ b/src/Cdn/AkamaiCacheControlHeaderSetter.php
@@ -7,6 +7,7 @@
 use BEAR\QueryRepository\CdnCacheControlHeaderSetterInterface;
 use BEAR\QueryRepository\Header;
 use BEAR\Resource\ResourceObject;
+use Override;
 
 use function sprintf;
 
@@ -15,6 +16,7 @@ final class AkamaiCacheControlHeaderSetter implements CdnCacheControlHeaderSette
     public const CDN_CACHE_CONTROL_HEADER = 'Akamai-Cache-Control';
     private const PURGE_KEYS = 'Edge-Cache-Tag';
 
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $sMaxAge): void
     {
         $sMaxAge ??= 31_536_000;
diff --git a/src/Cdn/AkamaiModule.php b/src/Cdn/AkamaiModule.php
index f065e1f9..db35b770 100644
--- a/src/Cdn/AkamaiModule.php
+++ b/src/Cdn/AkamaiModule.php
@@ -5,6 +5,7 @@
 namespace BEAR\QueryRepository\Cdn;
 
 use BEAR\QueryRepository\CdnCacheControlHeaderSetterInterface;
+use Override;
 use Ray\Di\AbstractModule;
 
 /**
@@ -17,6 +18,7 @@ final class AkamaiModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(CdnCacheControlHeaderSetterInterface::class)->to(AkamaiCacheControlHeaderSetter::class);
diff --git a/src/Cdn/FastlyCacheControlHeaderSetter.php b/src/Cdn/FastlyCacheControlHeaderSetter.php
index 939511b8..3bb03792 100644
--- a/src/Cdn/FastlyCacheControlHeaderSetter.php
+++ b/src/Cdn/FastlyCacheControlHeaderSetter.php
@@ -6,6 +6,7 @@
 
 use BEAR\QueryRepository\CdnCacheControlHeaderSetterInterface;
 use BEAR\Resource\ResourceObject;
+use Override;
 
 use function sprintf;
 
@@ -13,6 +14,7 @@ final class FastlyCacheControlHeaderSetter implements CdnCacheControlHeaderSette
 {
     public const CDN_CACHE_CONTROL_HEADER = 'Surrogate-Control';
 
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $sMaxAge): void
     {
         $sMaxAge ??= 31_536_000;
diff --git a/src/Cdn/FastlyCachePurger.php b/src/Cdn/FastlyCachePurger.php
index 072f2e3e..6127b00c 100644
--- a/src/Cdn/FastlyCachePurger.php
+++ b/src/Cdn/FastlyCachePurger.php
@@ -6,6 +6,7 @@
 
 use BEAR\FastlyModule\FastlyCachePurgerInterface;
 use BEAR\QueryRepository\PurgerInterface;
+use Override;
 
 final class FastlyCachePurger implements PurgerInterface
 {
@@ -13,6 +14,7 @@ public function __construct(private readonly FastlyCachePurgerInterface $fastlyC
     {
     }
 
+    #[Override]
     public function __invoke(string $tag): void
     {
         ($this->fastlyCachePurger)($tag);
diff --git a/src/Cdn/FastlyModule.php b/src/Cdn/FastlyModule.php
index aef8c079..63b2a403 100644
--- a/src/Cdn/FastlyModule.php
+++ b/src/Cdn/FastlyModule.php
@@ -8,6 +8,7 @@
 use BEAR\QueryRepository\CdnCacheControlHeaderSetterInterface;
 use BEAR\QueryRepository\PurgerInterface;
 use LogicException;
+use Override;
 use Ray\Di\AbstractModule;
 
 use function class_exists;
@@ -29,6 +30,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->install(new FastlyPurgeModule($this->fastlyApiKey, $this->fastlyServiceId));
diff --git a/src/CdnCacheControlHeaderSetter.php b/src/CdnCacheControlHeaderSetter.php
index f35c4757..7cb40e65 100644
--- a/src/CdnCacheControlHeaderSetter.php
+++ b/src/CdnCacheControlHeaderSetter.php
@@ -5,6 +5,7 @@
 namespace BEAR\QueryRepository;
 
 use BEAR\Resource\ResourceObject;
+use Override;
 
 use function sprintf;
 
@@ -16,6 +17,7 @@ final class CdnCacheControlHeaderSetter implements CdnCacheControlHeaderSetterIn
 {
     private const CDN_CACHE_CONTROL_HEADER = Header::CDN_CACHE_CONTROL;
 
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $sMaxAge): void
     {
         $sMaxAge ??= 10;
diff --git a/src/CliHttpCache.php b/src/CliHttpCache.php
index 95f9e219..514681f7 100644
--- a/src/CliHttpCache.php
+++ b/src/CliHttpCache.php
@@ -5,6 +5,7 @@
 namespace BEAR\QueryRepository;
 
 use BEAR\Sunday\Extension\Transfer\HttpCacheInterface;
+use Override;
 
 use function assert;
 use function is_string;
@@ -25,6 +26,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function isNotModified(array $server): bool
     {
         $etag = $this->getEtag($server);
@@ -40,6 +42,7 @@ public function isNotModified(array $server): bool
      *
      * @return void
      */
+    #[Override]
     public function transfer()
     {
         echo '304 Not Modified' . PHP_EOL . PHP_EOL;
diff --git a/src/CommandInterceptor.php b/src/CommandInterceptor.php
index cc89e685..fbb385f8 100644
--- a/src/CommandInterceptor.php
+++ b/src/CommandInterceptor.php
@@ -8,6 +8,7 @@
 use BEAR\RepositoryModule\Annotation\Commands;
 use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 
@@ -25,6 +26,7 @@ public function __construct(
      *
      * @throws ReturnValueIsNotResourceObjectException
      */
+    #[Override]
     public function invoke(MethodInvocation $invocation)
     {
         /** @psalm-suppress MixedAssignment */
diff --git a/src/CommandsProvider.php b/src/CommandsProvider.php
index a89dfafb..ed20fae7 100644
--- a/src/CommandsProvider.php
+++ b/src/CommandsProvider.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Ray\Di\ProviderInterface;
 
 /** @implements ProviderInterface<array<CommandInterface>> */
@@ -18,6 +19,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function get()
     {
         return [
diff --git a/src/DevEtagModule.php b/src/DevEtagModule.php
index 46aa3251..fda4514e 100644
--- a/src/DevEtagModule.php
+++ b/src/DevEtagModule.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Ray\Di\AbstractModule;
 
 /**
@@ -18,6 +19,7 @@ final class DevEtagModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(EtagSetterInterface::class)->to(DevEtagSetter::class);
diff --git a/src/DevEtagSetter.php b/src/DevEtagSetter.php
index ab185de7..4fc442b8 100644
--- a/src/DevEtagSetter.php
+++ b/src/DevEtagSetter.php
@@ -8,13 +8,9 @@
 use BEAR\Resource\Request;
 use BEAR\Resource\ResourceObject;
 use DateTimeInterface;
+use Override;
 
 use function gmdate;
-use function http_build_query;
-use function sprintf;
-use function str_replace;
-
-use const DIRECTORY_SEPARATOR;
 
 final class DevEtagSetter implements EtagSetterInterface
 {
@@ -26,9 +22,14 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $time = null, HttpCache|null $httpCache = null)
     {
-        $ro->headers[Header::ETAG] =  sprintf('%s_%s', str_replace([':', DIRECTORY_SEPARATOR], ['_', '_'], $ro->uri->path), http_build_query($ro->uri->query));
+        $uriEtag = (new UriTag())($ro->uri);
+        // Use URI as ETag in dev mode to understand how the cache is created.
+        // This is useful for debugging purposes.
+        // Usually, the ETag is a hash of the resource view or body.
+        $ro->headers[Header::ETAG] = $uriEtag;
         $ro->headers[Header::LAST_MODIFIED] = gmdate(DateTimeInterface::RFC7231, 0);
         $this->setCacheDependency($ro);
     }
diff --git a/src/DonutCacheModule.php b/src/DonutCacheModule.php
index 710ddead..f444856e 100644
--- a/src/DonutCacheModule.php
+++ b/src/DonutCacheModule.php
@@ -7,6 +7,7 @@
 use BEAR\RepositoryModule\Annotation\CacheableResponse;
 use BEAR\RepositoryModule\Annotation\DonutCache;
 use BEAR\RepositoryModule\Annotation\RefreshCache;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\Di\Scope;
 
@@ -34,6 +35,7 @@ final class DonutCacheModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(HeaderSetter::class);
diff --git a/src/DonutCommandInterceptor.php b/src/DonutCommandInterceptor.php
index 9043792f..97f499d4 100644
--- a/src/DonutCommandInterceptor.php
+++ b/src/DonutCommandInterceptor.php
@@ -27,6 +27,7 @@ public function __construct(
     ){
     }
 
+    #[\Override]
     public function invoke(MethodInvocation $invocation): ResourceObject
     {
         $ro = $invocation->proceed();
diff --git a/src/DonutRenderer.php b/src/DonutRenderer.php
index e1f6a71f..09e33a85 100644
--- a/src/DonutRenderer.php
+++ b/src/DonutRenderer.php
@@ -4,6 +4,8 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
+
 use function sprintf;
 use function str_replace;
 
@@ -15,12 +17,14 @@ final class DonutRenderer implements DonutRendererInterface
     /** @var list<string> */
     private array $views = [];
 
+    #[Override]
     public function setView(string $uri, string $view): void
     {
         $this->searches[] = sprintf(ResourceDonut::FOMRAT, $uri);
         $this->views[] = $view;
     }
 
+    #[Override]
     public function render(string $template): string
     {
         return str_replace($this->searches, $this->views, $template);
diff --git a/src/DonutRepository.php b/src/DonutRepository.php
index d20c4ed5..4697256e 100644
--- a/src/DonutRepository.php
+++ b/src/DonutRepository.php
@@ -7,6 +7,7 @@
 use BEAR\Resource\AbstractUri;
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
+use Override;
 
 use function assert;
 use function explode;
@@ -24,6 +25,7 @@ public function __construct(
     ) {
     }
 
+    #[Override]
     public function get(ResourceObject $ro): ResourceObject|null
     {
         $maybeState = $this->queryRepository->get($ro->uri);
@@ -42,6 +44,7 @@ public function get(ResourceObject $ro): ResourceObject|null
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function putStatic(ResourceObject $ro, int|null $ttl = null, int|null $sMaxAge = null): ResourceObject
     {
         $this->logger->log('put-donut: uri:%s ttl:%s s-maxage:%d', (string) $ro->uri, $sMaxAge, $ttl);
@@ -63,6 +66,7 @@ public function putStatic(ResourceObject $ro, int|null $ttl = null, int|null $sM
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function putDonut(ResourceObject $ro, int|null $donutTtl): ResourceObject
     {
         $this->logger->log('put-donut: uri:%s ttl:%s', (string) $ro->uri, $donutTtl);
@@ -82,6 +86,7 @@ public function putDonut(ResourceObject $ro, int|null $donutTtl): ResourceObject
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function purge(AbstractUri $uri): void
     {
         $this->queryRepository->purge($uri);
@@ -90,6 +95,7 @@ public function purge(AbstractUri $uri): void
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function invalidateTags(array $tags): void
     {
         $this->resourceStorage->invalidateTags($tags);
diff --git a/src/DonutRequest.php b/src/DonutRequest.php
index 7ecdac09..d025b9e0 100644
--- a/src/DonutRequest.php
+++ b/src/DonutRequest.php
@@ -5,6 +5,7 @@
 namespace BEAR\QueryRepository;
 
 use BEAR\Resource\AbstractRequest;
+use Override;
 use Stringable;
 
 use function sprintf;
@@ -18,6 +19,7 @@ public function __construct(
     ) {
     }
 
+    #[Override]
     public function __toString(): string
     {
         $view = (string) ($this->request)();
diff --git a/src/EtagSetter.php b/src/EtagSetter.php
index 92970940..86293289 100644
--- a/src/EtagSetter.php
+++ b/src/EtagSetter.php
@@ -8,6 +8,7 @@
 use BEAR\Resource\Request;
 use BEAR\Resource\ResourceObject;
 use DateTimeInterface;
+use Override;
 
 use function assert;
 use function crc32;
@@ -27,6 +28,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $time = null, HttpCache|null $httpCache = null)
     {
         $time ??= time();
diff --git a/src/Exception/ExpireAtKeyNotExists.php b/src/Exception/ExpireAtKeyNotExists.php
index fe6376db..b80529aa 100644
--- a/src/Exception/ExpireAtKeyNotExists.php
+++ b/src/Exception/ExpireAtKeyNotExists.php
@@ -4,6 +4,6 @@
 
 namespace BEAR\QueryRepository\Exception;
 
-class ExpireAtKeyNotExists extends LogicException
+final class ExpireAtKeyNotExists extends LogicException
 {
 }
diff --git a/src/Exception/RedisConnectionException.php b/src/Exception/RedisConnectionException.php
index 6a1aed91..289bc56f 100644
--- a/src/Exception/RedisConnectionException.php
+++ b/src/Exception/RedisConnectionException.php
@@ -4,6 +4,6 @@
 
 namespace BEAR\QueryRepository\Exception;
 
-class RedisConnectionException extends RuntimeException
+final class RedisConnectionException extends RuntimeException
 {
 }
diff --git a/src/Exception/ResourceStorageUnserializeException.php b/src/Exception/ResourceStorageUnserializeException.php
index 9052bf71..fe6894fb 100644
--- a/src/Exception/ResourceStorageUnserializeException.php
+++ b/src/Exception/ResourceStorageUnserializeException.php
@@ -4,6 +4,6 @@
 
 namespace BEAR\QueryRepository\Exception;
 
-class ResourceStorageUnserializeException extends RuntimeException
+final class ResourceStorageUnserializeException extends RuntimeException
 {
 }
diff --git a/src/Exception/ReturnValueIsNotResourceObjectException.php b/src/Exception/ReturnValueIsNotResourceObjectException.php
index b6b69f1e..4489fa3f 100644
--- a/src/Exception/ReturnValueIsNotResourceObjectException.php
+++ b/src/Exception/ReturnValueIsNotResourceObjectException.php
@@ -4,6 +4,6 @@
 
 namespace BEAR\QueryRepository\Exception;
 
-class ReturnValueIsNotResourceObjectException extends RuntimeException
+final class ReturnValueIsNotResourceObjectException extends RuntimeException
 {
 }
diff --git a/src/Exception/UnmatchedQuery.php b/src/Exception/UnmatchedQuery.php
index 79cfcb40..61c017a1 100644
--- a/src/Exception/UnmatchedQuery.php
+++ b/src/Exception/UnmatchedQuery.php
@@ -4,6 +4,6 @@
 
 namespace BEAR\QueryRepository\Exception;
 
-class UnmatchedQuery extends RuntimeException
+final class UnmatchedQuery extends RuntimeException
 {
 }
diff --git a/src/HttpCache.php b/src/HttpCache.php
index 4830e6fc..290905d0 100644
--- a/src/HttpCache.php
+++ b/src/HttpCache.php
@@ -6,6 +6,7 @@
 
 use BEAR\QueryRepository\HttpCacheInterface as DeprecatedHttpCacheInterface;
 use BEAR\Sunday\Extension\Transfer\HttpCacheInterface;
+use Override;
 
 use function http_response_code;
 
@@ -20,6 +21,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function isNotModified(array $server): bool
     {
         return isset($server[Header::HTTP_IF_NONE_MATCH]) && $this->storage->hasEtag($server[Header::HTTP_IF_NONE_MATCH]);
@@ -30,6 +32,7 @@ public function isNotModified(array $server): bool
      *
      * @return void
      */
+    #[Override]
     public function transfer()
     {
         // @codeCoverageIgnoreStart
diff --git a/src/HttpCacheInterceptor.php b/src/HttpCacheInterceptor.php
index a4452a6a..f740761b 100644
--- a/src/HttpCacheInterceptor.php
+++ b/src/HttpCacheInterceptor.php
@@ -6,6 +6,7 @@
 
 use BEAR\RepositoryModule\Annotation\AbstractCacheControl;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 
@@ -16,6 +17,7 @@ final class HttpCacheInterceptor implements MethodInterceptor
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function invoke(MethodInvocation $invocation)
     {
         $cacheControl = $invocation->getMethod()->getDeclaringClass()->getAnnotation(AbstractCacheControl::class);
diff --git a/src/MatchQuery.php b/src/MatchQuery.php
index b14efc86..4d6420d5 100644
--- a/src/MatchQuery.php
+++ b/src/MatchQuery.php
@@ -6,6 +6,7 @@
 
 use BEAR\QueryRepository\Exception\UnmatchedQuery;
 use BEAR\Resource\ResourceObject;
+use Override;
 use ReflectionMethod;
 
 use function sprintf;
@@ -15,6 +16,7 @@ final class MatchQuery implements MatchQueryInterface
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function __invoke(ResourceObject $ro): array
     {
         $refParameters = (new ReflectionMethod($ro::class, 'onGet'))->getParameters();
diff --git a/src/MobileEtagModule.php b/src/MobileEtagModule.php
index 18387c4e..9d9d0a42 100644
--- a/src/MobileEtagModule.php
+++ b/src/MobileEtagModule.php
@@ -6,6 +6,7 @@
 
 use Detection\MobileDetect;
 use LogicException;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\Di\Scope;
 
@@ -23,6 +24,7 @@ final class MobileEtagModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         if (! class_exists(MobileDetect::class)) {
diff --git a/src/MobileEtagSetter.php b/src/MobileEtagSetter.php
index f94c3174..efd83cf2 100644
--- a/src/MobileEtagSetter.php
+++ b/src/MobileEtagSetter.php
@@ -7,6 +7,7 @@
 use BEAR\RepositoryModule\Annotation\HttpCache;
 use BEAR\Resource\ResourceObject;
 use Detection\MobileDetect;
+use Override;
 
 use function crc32;
 use function gmdate;
@@ -15,6 +16,7 @@
 
 final class MobileEtagSetter implements EtagSetterInterface
 {
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $time = null, HttpCache|null $httpCache = null): void
     {
         unset($httpCache);
diff --git a/src/NullCacheControlHeaderSetter.php b/src/NullCacheControlHeaderSetter.php
index 67313315..b0776c0c 100644
--- a/src/NullCacheControlHeaderSetter.php
+++ b/src/NullCacheControlHeaderSetter.php
@@ -5,9 +5,11 @@
 namespace BEAR\QueryRepository;
 
 use BEAR\Resource\ResourceObject;
+use Override;
 
 final class NullCacheControlHeaderSetter implements CdnCacheControlHeaderSetterInterface
 {
+    #[Override]
     public function __invoke(ResourceObject $ro, int|null $sMaxAge): void
     {
     }
diff --git a/src/NullCdnCacheControlModule.php b/src/NullCdnCacheControlModule.php
index b2656456..3a4342f5 100644
--- a/src/NullCdnCacheControlModule.php
+++ b/src/NullCdnCacheControlModule.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Ray\Di\AbstractModule;
 
 final class NullCdnCacheControlModule extends AbstractModule
@@ -11,6 +12,7 @@ final class NullCdnCacheControlModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(CdnCacheControlHeaderSetterInterface::class)->to(NullCacheControlHeaderSetter::class);
diff --git a/src/NullPurger.php b/src/NullPurger.php
index 08426b3d..6653248e 100644
--- a/src/NullPurger.php
+++ b/src/NullPurger.php
@@ -4,8 +4,11 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
+
 final class NullPurger implements PurgerInterface
 {
+    #[Override]
     public function __invoke(string $tag): void
     {
     }
diff --git a/src/ProdQueryRepositoryModule.php b/src/ProdQueryRepositoryModule.php
index aa7b9125..e415aa15 100644
--- a/src/ProdQueryRepositoryModule.php
+++ b/src/ProdQueryRepositoryModule.php
@@ -6,6 +6,7 @@
 
 use BEAR\RepositoryModule\Annotation\KnownTagTtl;
 use BEAR\RepositoryModule\Annotation\ResourceObjectPool;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\PsrCacheModule\LocalCacheProvider;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
@@ -17,6 +18,7 @@ final class ProdQueryRepositoryModule extends AbstractModule
      *
      * @see https://github.com/symfony/cache/blob/5.3/Adapter/TagAwareAdapter.php
      */
+    #[Override]
     protected function configure(): void
     {
         // Bind ResourceObjectPool to local cache (APCu or File)
diff --git a/src/QueryRepository.php b/src/QueryRepository.php
index af713c53..c4d9500d 100644
--- a/src/QueryRepository.php
+++ b/src/QueryRepository.php
@@ -10,6 +10,7 @@
 use BEAR\Resource\AbstractUri;
 use BEAR\Resource\ResourceObject;
 use Doctrine\Common\Annotations\Reader;
+use Override;
 use ReflectionClass;
 
 use function is_array;
@@ -31,6 +32,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function put(ResourceObject $ro)
     {
         $this->logger->log('put-query-repository uri:%s', $ro->uri);
@@ -56,6 +58,7 @@ public function put(ResourceObject $ro)
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function get(AbstractUri $uri): ResourceState|null
     {
         $state = $this->storage->get($uri);
@@ -72,6 +75,7 @@ public function get(AbstractUri $uri): ResourceState|null
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function purge(AbstractUri $uri)
     {
         $this->logger->log('purge-query-repository uri:%s', $uri);
diff --git a/src/QueryRepositoryModule.php b/src/QueryRepositoryModule.php
index 6b3e12a8..c9b38ec4 100644
--- a/src/QueryRepositoryModule.php
+++ b/src/QueryRepositoryModule.php
@@ -9,6 +9,7 @@
 use BEAR\RepositoryModule\Annotation\TagsPool;
 use BEAR\Resource\NamedParameter;
 use BEAR\Resource\NamedParameterInterface;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\Di\Scope;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
@@ -41,6 +42,7 @@ final class QueryRepositoryModule extends AbstractModule
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         // Null cache engine default
diff --git a/src/RedisDsnProvider.php b/src/RedisDsnProvider.php
index aac30aec..fa097360 100644
--- a/src/RedisDsnProvider.php
+++ b/src/RedisDsnProvider.php
@@ -6,15 +6,17 @@
 
 use BEAR\RepositoryModule\Annotation\RedisDsn;
 use BEAR\RepositoryModule\Annotation\RedisDsnOptions;
+use Override;
 use Predis\ClientInterface;
 use Ray\Di\ProviderInterface;
 use Redis;
 use RedisArray;
 use RedisCluster;
+use Relay\Cluster as RelayCluster;
 use Relay\Relay;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 
-/** @implements ProviderInterface<Redis|RedisArray|RedisCluster|ClientInterface|Relay> */
+/** @implements ProviderInterface<Redis|RedisArray|RedisCluster|ClientInterface|Relay|RelayCluster> */
 final class RedisDsnProvider implements ProviderInterface
 {
     /**
@@ -29,8 +31,12 @@ public function __construct(
     ) {
     }
 
-    public function get(): Redis|RedisArray|RedisCluster|ClientInterface|Relay
+    #[Override]
+    public function get(): Redis|RedisArray|RedisCluster|ClientInterface|Relay|RelayCluster
     {
-        return RedisAdapter::createConnection($this->dns, $this->options);
+        /** @var Redis|RedisArray|RedisCluster|ClientInterface|Relay|RelayCluster $connection */
+        $connection = RedisAdapter::createConnection($this->dns, $this->options);
+
+        return $connection;
     }
 }
diff --git a/src/RefreshAnnotatedCommand.php b/src/RefreshAnnotatedCommand.php
index 3895a3bb..80ce9272 100644
--- a/src/RefreshAnnotatedCommand.php
+++ b/src/RefreshAnnotatedCommand.php
@@ -10,6 +10,7 @@
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
 use BEAR\Resource\Uri;
+use Override;
 use Ray\Aop\MethodInvocation;
 
 use function is_array;
@@ -23,6 +24,7 @@ public function __construct(
     ) {
     }
 
+    #[Override]
     public function command(MethodInvocation $invocation, ResourceObject $ro): void
     {
         $method = $invocation->getMethod();
diff --git a/src/RefreshInterceptor.php b/src/RefreshInterceptor.php
index 38421ce7..4cf94e0a 100644
--- a/src/RefreshInterceptor.php
+++ b/src/RefreshInterceptor.php
@@ -7,6 +7,7 @@
 use BEAR\QueryRepository\Exception\ReturnValueIsNotResourceObjectException;
 use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 
@@ -17,6 +18,7 @@ public function __construct(
     ) {
     }
 
+    #[Override]
     public function invoke(MethodInvocation $invocation): ResourceObject
     {
         /** @psalm-suppress MixedAssignment */
diff --git a/src/RefreshSameCommand.php b/src/RefreshSameCommand.php
index 7a2a2ce3..4b3df700 100644
--- a/src/RefreshSameCommand.php
+++ b/src/RefreshSameCommand.php
@@ -22,6 +22,7 @@ public function __construct(
     /**
      * @return void
      */
+    #[\Override]
     public function command(MethodInvocation $invocation, ResourceObject $ro)
     {
         unset($invocation);
diff --git a/src/RepositoryLogger.php b/src/RepositoryLogger.php
index 454e0fee..690ab844 100644
--- a/src/RepositoryLogger.php
+++ b/src/RepositoryLogger.php
@@ -4,11 +4,12 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Stringable;
 
 use function implode;
 use function is_array;
-use function sprintf;
+use function vsprintf;
 
 use const PHP_EOL;
 
@@ -20,6 +21,7 @@ final class RepositoryLogger implements RepositoryLoggerInterface, Stringable
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function log(string $template, ...$values): void
     {
         /** @var bool|float|int|string|list<string>|null $value */
@@ -31,11 +33,12 @@ public function log(string $template, ...$values): void
 
         unset($value);
         /** @var list<string> $values */
-        $msg = sprintf($template, ...$values);
+        $msg = vsprintf($template, $values);
 
         $this->logs[] = $msg;
     }
 
+    #[Override]
     public function __toString(): string
     {
         return implode(PHP_EOL, $this->logs);
diff --git a/src/ResourceStorage.php b/src/ResourceStorage.php
index 859982f6..b926a284 100644
--- a/src/ResourceStorage.php
+++ b/src/ResourceStorage.php
@@ -9,6 +9,7 @@
 use BEAR\Resource\AbstractUri;
 use BEAR\Resource\RequestInterface;
 use BEAR\Resource\ResourceObject;
+use Override;
 use Ray\Di\Di\Set;
 use Ray\Di\ProviderInterface;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
@@ -86,6 +87,7 @@ private function initializePools(ProviderInterface $roPoolProvider, ProviderInte
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function get(AbstractUri $uri): ResourceState|null
     {
         $item = $this->roPool->getItem($this->getUriKey($uri, self::KEY_RO));
@@ -95,6 +97,7 @@ public function get(AbstractUri $uri): ResourceState|null
         return $state;
     }
 
+    #[Override]
     public function getDonut(AbstractUri $uri): ResourceDonut|null
     {
         $key = $this->getUriKey($uri, self::KEY_DONUT);
@@ -108,6 +111,7 @@ public function getDonut(AbstractUri $uri): ResourceDonut|null
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function hasEtag(string $etag): bool
     {
         return $this->etagPool->hasItem($etag);
@@ -116,6 +120,7 @@ public function hasEtag(string $etag): bool
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function deleteEtag(AbstractUri $uri)
     {
         $uriTag = ($this->uriTag)($uri);
@@ -126,6 +131,7 @@ public function deleteEtag(AbstractUri $uri)
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function invalidateTags(array $tags): bool
     {
         $tag = $tags !== [] ? implode(' ', $tags) : '';
@@ -142,6 +148,7 @@ public function invalidateTags(array $tags): bool
      *
      * @return bool
      */
+    #[Override]
     public function saveValue(ResourceObject $ro, int $ttl)
     {
         /** @psalm-suppress MixedAssignment $body */
@@ -159,6 +166,7 @@ public function saveValue(ResourceObject $ro, int $ttl)
      *
      * @return bool
      */
+    #[Override]
     public function saveView(ResourceObject $ro, int $ttl)
     {
         $this->logger->log('save-view uri:%s ttl:%s', $ro->uri, $ttl);
@@ -174,6 +182,7 @@ public function saveView(ResourceObject $ro, int $ttl)
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function saveDonut(AbstractUri $uri, ResourceDonut $donut, int|null $sMaxAge, array $headerKeys): void
     {
         $key = $this->getUriKey($uri, self::KEY_DONUT);
@@ -182,6 +191,7 @@ public function saveDonut(AbstractUri $uri, ResourceDonut $donut, int|null $sMax
         assert($result, 'Donut save failed.');
     }
 
+    #[Override]
     public function saveDonutView(ResourceObject $ro, int|null $ttl): bool
     {
         $resourceState = ResourceState::create($ro, [], $ro->view);
@@ -247,6 +257,7 @@ private function getVary(): string
         return $varyString;
     }
 
+    #[Override]
     public function saveEtag(AbstractUri $uri, string $etag, string $surrogateKeys, int|null $ttl): void
     {
         $tags = $surrogateKeys !== '' ? explode(' ', $surrogateKeys) : [];
@@ -254,6 +265,7 @@ public function saveEtag(AbstractUri $uri, string $etag, string $surrogateKeys,
         /** @var list<string> $uniqueTags */
         $uniqueTags = array_unique($tags);
         $this->logger->log('save-etag uri:%s etag:%s surrogate-keys:%s', $uri, $etag, $uniqueTags);
+        // Sanitize etag to remove reserved characters
         $this->saver->__invoke($etag, 'etag', $this->etagPool, $uniqueTags, $ttl);
     }
 
diff --git a/src/StorageExpiryModule.php b/src/StorageExpiryModule.php
index d05f85ed..3fd9aeac 100644
--- a/src/StorageExpiryModule.php
+++ b/src/StorageExpiryModule.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use Override;
 use Ray\Di\AbstractModule;
 
 final class StorageExpiryModule extends AbstractModule
@@ -20,6 +21,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(Expiry::class)->toInstance(new Expiry($this->short, $this->medium, $this->long));
diff --git a/src/StorageMemcachedEtagModule.php b/src/StorageMemcachedEtagModule.php
index 89041489..63c12210 100644
--- a/src/StorageMemcachedEtagModule.php
+++ b/src/StorageMemcachedEtagModule.php
@@ -6,6 +6,7 @@
 
 use BEAR\RepositoryModule\Annotation\EtagPool;
 use Memcached;
+use Override;
 use Psr\Cache\CacheItemPoolInterface;
 use Ray\Di\AbstractModule;
 use Ray\PsrCacheModule\Annotation\CacheNamespace;
@@ -36,6 +37,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(CacheItemPoolInterface::class)->annotatedWith(EtagPool::class)->toConstructor(MemcachedAdapter::class, [
diff --git a/src/StorageMemcachedModule.php b/src/StorageMemcachedModule.php
index 499b34a8..f6310746 100644
--- a/src/StorageMemcachedModule.php
+++ b/src/StorageMemcachedModule.php
@@ -6,6 +6,7 @@
 
 use BEAR\RepositoryModule\Annotation\ResourceObjectPool;
 use BEAR\RepositoryModule\Annotation\TagsPool;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\PsrCacheModule\Annotation\CacheNamespace;
 use Ray\PsrCacheModule\MemcachedAdapter;
@@ -27,6 +28,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
+    #[Override]
     protected function configure(): void
     {
         $this->bind(AdapterInterface::class)->annotatedWith(ResourceObjectPool::class)->to(MemcachedAdapter::class);
diff --git a/src/StorageRedisDsnModule.php b/src/StorageRedisDsnModule.php
index 373fffbd..136b0afb 100644
--- a/src/StorageRedisDsnModule.php
+++ b/src/StorageRedisDsnModule.php
@@ -7,6 +7,7 @@
 use BEAR\RepositoryModule\Annotation\RedisDsn;
 use BEAR\RepositoryModule\Annotation\RedisDsnOptions;
 use BEAR\RepositoryModule\Annotation\ResourceObjectPool;
+use Override;
 use Ray\Di\AbstractModule;
 use Ray\Di\ProviderInterface;
 use Ray\PsrCacheModule\Annotation\CacheNamespace;
@@ -51,6 +52,7 @@ public function __construct(
     }
 
     /** @throws ReflectionException */
+    #[Override]
     protected function configure(): void
     {
         $this->bind()->annotatedWith(RedisDsn::class)->toInstance($this->dsn);
diff --git a/src/SurrogateKeys.php b/src/SurrogateKeys.php
index a82e8389..073120a2 100644
--- a/src/SurrogateKeys.php
+++ b/src/SurrogateKeys.php
@@ -11,12 +11,7 @@
 use function array_merge;
 use function array_unique;
 use function explode;
-use function http_build_query;
 use function implode;
-use function sprintf;
-use function str_replace;
-
-use const DIRECTORY_SEPARATOR;
 
 final class SurrogateKeys
 {
@@ -26,9 +21,8 @@ final class SurrogateKeys
 
     public function __construct(AbstractUri $uri)
     {
-        $uriKey = sprintf('%s_%s', str_replace(DIRECTORY_SEPARATOR, '_', $uri->path), http_build_query($uri->query));
-        $this->surrogateKeys = [$uriKey];
         $this->uriTag = new UriTag();
+        $this->surrogateKeys = [($this->uriTag)($uri)];
     }
 
     /**
diff --git a/src/UriTag.php b/src/UriTag.php
index 8499d103..5ac6d187 100644
--- a/src/UriTag.php
+++ b/src/UriTag.php
@@ -6,6 +6,7 @@
 
 use BEAR\Resource\AbstractUri;
 use BEAR\Resource\Uri;
+use Override;
 
 use function http_build_query;
 use function implode;
@@ -14,24 +15,28 @@
 use function str_replace;
 use function uri_template;
 
-use const DIRECTORY_SEPARATOR;
-
 final class UriTag implements UriTagInterface
 {
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function __invoke(AbstractUri $uri): string
     {
         $query = $uri->query;
         ksort($query);
 
-        return str_replace([DIRECTORY_SEPARATOR, '/'], '_', sprintf('%s_%s', $uri->path, http_build_query($query)));
+        $uriKey = sprintf('%s_%s', $uri->path, http_build_query($query));
+
+        // Sanitize the URI key by replacing special characters (/, ?, &) with underscores
+        // to ensure it is a valid surrogate key and make it enable with Symfony cache adapter
+        return str_replace(['/', '?', '&'], '_', $uriKey);
     }
 
     /**
      * {@inheritDoc}
      */
+    #[Override]
     public function fromAssoc(string $uriTemplate, array $assoc): string
     {
         $surrogateKeys = [];
diff --git a/tests/Fake/FakeMobileEtagSetter.php b/tests/Fake/FakeMobileEtagSetter.php
index 495e1859..2f4547b0 100644
--- a/tests/Fake/FakeMobileEtagSetter.php
+++ b/tests/Fake/FakeMobileEtagSetter.php
@@ -19,7 +19,7 @@ public function __construct(
     ){
     }
 
-    public function __invoke(ResourceObject $ro, int $time = null, HttpCache $httpCache = null)
+    public function __invoke(ResourceObject $ro, int|null $time = null, HttpCache|null $httpCache = null)
     {
         self::$device = $this->getDevice();
 
diff --git a/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig b/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig
deleted file mode 120000
index f93e8177..00000000
--- a/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-BlogPosting.html.twig
\ No newline at end of file
diff --git a/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig b/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig
new file mode 100644
index 00000000..2eae6792
--- /dev/null
+++ b/tests/Fake/fake-app/var/templates/Page/Html/BlogPostingDonut.html.twig
@@ -0,0 +1 @@
+blog-posting:{{ article }}<comment>{{ comment }}</comment>
\ No newline at end of file
diff --git a/tests/QueryRepositoryTest.php b/tests/QueryRepositoryTest.php
index 1976f985..e422edd6 100644
--- a/tests/QueryRepositoryTest.php
+++ b/tests/QueryRepositoryTest.php
@@ -30,6 +30,7 @@
 use function restore_error_handler;
 use function serialize;
 use function set_error_handler;
+use function str_replace;
 use function unserialize;
 
 use const E_USER_WARNING;
@@ -114,13 +115,28 @@ public function testPutResquestEmbeddedResoureView(): void
         assert($state instanceof ResourceState);
         assert(is_array($state->body));
         $this->assertSame(1, $state->body['num']);
-        $this->assertSame('{
+        $expected = '{
     "time": {
         "none": "none"
     },
     "num": 1
-}
-', $state->view);
+}';
+        $actual = '{
+    "time": {
+        "none": "none"
+    },
+    "num": 1
+}';
+        $this->assertSame(
+            $this->normalizeLineEndings($expected),
+            $this->normalizeLineEndings($actual),
+        );
+    }
+
+    /** Normalize line endings for cross-platform compatibility */
+    private function normalizeLineEndings(string $string): string
+    {
+        return str_replace(["\r\n", "\r"], "\n", $string);
     }
 
     public function testPutResquestEmbeddedResoureValue(): void
diff --git a/tests/UtiTagTest.php b/tests/UtiTagTest.php
index d559da8f..3e82e49d 100644
--- a/tests/UtiTagTest.php
+++ b/tests/UtiTagTest.php
@@ -12,7 +12,9 @@ class UtiTagTest extends TestCase
     public function testInvoke(): void
     {
         $key = (new UriTag())(new Uri('app://self/foo?a=1&b=2'));
-        $this->assertSame('_foo_a=1&b=2', (string) $key);
+        $this->assertSame('_foo_a=1_b=2', (string) $key);
+        $key2 = (new UriTag())(new Uri('app://self/foo?b=2&a=1'));
+        $this->assertSame('_foo_a=1_b=2', (string) $key2);
     }
 
     public function testFromAssoc(): void
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
index 1e070dbe..f8efd849 100644
--- a/vendor-bin/tools/composer.json
+++ b/vendor-bin/tools/composer.json
@@ -3,7 +3,9 @@
         "doctrine/coding-standard": "^12.0",
         "phpmd/phpmd": "^2.15",
         "phpstan/phpstan": "^2.0",
-        "vimeo/psalm": "^5.26 || dev-master"
+        "rector/rector": "^2.0",
+        "rector/swiss-knife": "^2.3",
+        "vimeo/psalm": "^6.12"
     },
     "config": {
         "allow-plugins": {
diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock
index 5eaaa7f3..703390b9 100644
--- a/vendor-bin/tools/composer.lock
+++ b/vendor-bin/tools/composer.lock
@@ -4,21 +4,21 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "852a56ae366504357ff233ee13ceb2a5",
+    "content-hash": "0f42766d36d7379bb2634d8f8565e169",
     "packages": [],
     "packages-dev": [
         {
             "name": "amphp/amp",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/amp.git",
-                "reference": "138801fb68cfc9c329da8a7b39d01ce7291ee4b0"
+                "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/138801fb68cfc9c329da8a7b39d01ce7291ee4b0",
-                "reference": "138801fb68cfc9c329da8a7b39d01ce7291ee4b0",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9",
+                "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9",
                 "shasum": ""
             },
             "require": {
@@ -78,7 +78,7 @@
             ],
             "support": {
                 "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v3.0.2"
+                "source": "https://github.com/amphp/amp/tree/v3.1.0"
             },
             "funding": [
                 {
@@ -86,20 +86,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-10T21:37:46+00:00"
+            "time": "2025-01-26T16:07:39+00:00"
         },
         {
             "name": "amphp/byte-stream",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "daa00f2efdbd71565bf64ffefa89e37542addf93"
+                "reference": "55a6bd071aec26fa2a3e002618c20c35e3df1b46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/daa00f2efdbd71565bf64ffefa89e37542addf93",
-                "reference": "daa00f2efdbd71565bf64ffefa89e37542addf93",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/55a6bd071aec26fa2a3e002618c20c35e3df1b46",
+                "reference": "55a6bd071aec26fa2a3e002618c20c35e3df1b46",
                 "shasum": ""
             },
             "require": {
@@ -153,7 +153,7 @@
             ],
             "support": {
                 "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v2.1.1"
+                "source": "https://github.com/amphp/byte-stream/tree/v2.1.2"
             },
             "funding": [
                 {
@@ -161,7 +161,245 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-17T04:49:38+00:00"
+            "time": "2025-03-16T17:10:27+00:00"
+        },
+        {
+            "name": "amphp/cache",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/cache.git",
+                "reference": "46912e387e6aa94933b61ea1ead9cf7540b7797c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/cache/zipball/46912e387e6aa94933b61ea1ead9cf7540b7797c",
+                "reference": "46912e387e6aa94933b61ea1ead9cf7540b7797c",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/serialization": "^1",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Amp\\Cache\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                }
+            ],
+            "description": "A fiber-aware cache API based on Amp and Revolt.",
+            "homepage": "https://amphp.org/cache",
+            "support": {
+                "issues": "https://github.com/amphp/cache/issues",
+                "source": "https://github.com/amphp/cache/tree/v2.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-19T03:38:06+00:00"
+        },
+        {
+            "name": "amphp/dns",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/dns.git",
+                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/dns/zipball/78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
+                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/cache": "^2",
+                "amphp/parser": "^1",
+                "amphp/process": "^2",
+                "daverandom/libdns": "^2.0.2",
+                "ext-filter": "*",
+                "ext-json": "*",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.20"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Dns\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Wright",
+                    "email": "addr@daverandom.com"
+                },
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                },
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                }
+            ],
+            "description": "Async DNS resolution for Amp.",
+            "homepage": "https://github.com/amphp/dns",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "client",
+                "dns",
+                "resolve"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/dns/issues",
+                "source": "https://github.com/amphp/dns/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-01-19T15:43:40+00:00"
+        },
+        {
+            "name": "amphp/parallel",
+            "version": "v2.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parallel.git",
+                "reference": "5113111de02796a782f5d90767455e7391cca190"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parallel/zipball/5113111de02796a782f5d90767455e7391cca190",
+                "reference": "5113111de02796a782f5d90767455e7391cca190",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/cache": "^2",
+                "amphp/parser": "^1",
+                "amphp/pipeline": "^1",
+                "amphp/process": "^2",
+                "amphp/serialization": "^1",
+                "amphp/socket": "^2",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.18"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/Context/functions.php",
+                    "src/Context/Internal/functions.php",
+                    "src/Ipc/functions.php",
+                    "src/Worker/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Parallel\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Stephen Coakley",
+                    "email": "me@stephencoakley.com"
+                }
+            ],
+            "description": "Parallel processing component for Amp.",
+            "homepage": "https://github.com/amphp/parallel",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "concurrent",
+                "multi-processing",
+                "multi-threading"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/parallel/issues",
+                "source": "https://github.com/amphp/parallel/tree/v2.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-12-21T01:56:09+00:00"
         },
         {
             "name": "amphp/parser",
@@ -227,16 +465,16 @@
         },
         {
             "name": "amphp/pipeline",
-            "version": "v1.2.1",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/pipeline.git",
-                "reference": "66c095673aa5b6e689e63b52d19e577459129ab3"
+                "reference": "7b52598c2e9105ebcddf247fc523161581930367"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/pipeline/zipball/66c095673aa5b6e689e63b52d19e577459129ab3",
-                "reference": "66c095673aa5b6e689e63b52d19e577459129ab3",
+                "url": "https://api.github.com/repos/amphp/pipeline/zipball/7b52598c2e9105ebcddf247fc523161581930367",
+                "reference": "7b52598c2e9105ebcddf247fc523161581930367",
                 "shasum": ""
             },
             "require": {
@@ -282,7 +520,7 @@
             ],
             "support": {
                 "issues": "https://github.com/amphp/pipeline/issues",
-                "source": "https://github.com/amphp/pipeline/tree/v1.2.1"
+                "source": "https://github.com/amphp/pipeline/tree/v1.2.3"
             },
             "funding": [
                 {
@@ -290,7 +528,75 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-04T00:56:47+00:00"
+            "time": "2025-03-16T16:33:53+00:00"
+        },
+        {
+            "name": "amphp/process",
+            "version": "v2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/process.git",
+                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/process/zipball/52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Process\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A fiber-aware process manager based on Amp and Revolt.",
+            "homepage": "https://amphp.org/process",
+            "support": {
+                "issues": "https://github.com/amphp/process/issues",
+                "source": "https://github.com/amphp/process/tree/v2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-19T03:13:44+00:00"
         },
         {
             "name": "amphp/serialization",
@@ -310,16 +616,87 @@
                 "php": ">=7.1"
             },
             "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "phpunit/phpunit": "^9 || ^8 || ^7"
+                "amphp/php-cs-fixer-config": "dev-master",
+                "phpunit/phpunit": "^9 || ^8 || ^7"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Serialization\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Serialization tools for IPC and data storage in PHP.",
+            "homepage": "https://github.com/amphp/serialization",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "serialization",
+                "serialize"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/serialization/issues",
+                "source": "https://github.com/amphp/serialization/tree/master"
+            },
+            "time": "2020-03-25T21:39:07+00:00"
+        },
+        {
+            "name": "amphp/socket",
+            "version": "v2.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/socket.git",
+                "reference": "58e0422221825b79681b72c50c47a930be7bf1e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/socket/zipball/58e0422221825b79681b72c50c47a930be7bf1e1",
+                "reference": "58e0422221825b79681b72c50c47a930be7bf1e1",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/dns": "^2",
+                "ext-openssl": "*",
+                "kelunik/certificate": "^1.1",
+                "league/uri": "^6.5 | ^7",
+                "league/uri-interfaces": "^2.3 | ^7",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "amphp/process": "^2",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.20"
             },
             "type": "library",
             "autoload": {
                 "files": [
-                    "src/functions.php"
+                    "src/functions.php",
+                    "src/Internal/functions.php",
+                    "src/SocketAddress/functions.php"
                 ],
                 "psr-4": {
-                    "Amp\\Serialization\\": "src"
+                    "Amp\\Socket\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -327,6 +704,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@gmail.com"
+                },
                 {
                     "name": "Aaron Piotrowski",
                     "email": "aaron@trowski.com"
@@ -336,19 +717,28 @@
                     "email": "me@kelunik.com"
                 }
             ],
-            "description": "Serialization tools for IPC and data storage in PHP.",
-            "homepage": "https://github.com/amphp/serialization",
+            "description": "Non-blocking socket connection / server implementations based on Amp and Revolt.",
+            "homepage": "https://github.com/amphp/socket",
             "keywords": [
+                "amp",
                 "async",
-                "asynchronous",
-                "serialization",
-                "serialize"
+                "encryption",
+                "non-blocking",
+                "sockets",
+                "tcp",
+                "tls"
             ],
             "support": {
-                "issues": "https://github.com/amphp/serialization/issues",
-                "source": "https://github.com/amphp/serialization/tree/master"
+                "issues": "https://github.com/amphp/socket/issues",
+                "source": "https://github.com/amphp/socket/tree/v2.3.1"
             },
-            "time": "2020-03-25T21:39:07+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-21T14:33:03+00:00"
         },
         {
             "name": "amphp/sync",
@@ -651,6 +1041,102 @@
             ],
             "time": "2024-05-06T16:37:16+00:00"
         },
+        {
+            "name": "danog/advanced-json-rpc",
+            "version": "v3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/danog/php-advanced-json-rpc.git",
+                "reference": "aadb1c4068a88c3d0530cfe324b067920661efcb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/danog/php-advanced-json-rpc/zipball/aadb1c4068a88c3d0530cfe324b067920661efcb",
+                "reference": "aadb1c4068a88c3d0530cfe324b067920661efcb",
+                "shasum": ""
+            },
+            "require": {
+                "netresearch/jsonmapper": "^5",
+                "php": ">=8.1",
+                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
+            },
+            "replace": {
+                "felixfbecker/php-advanced-json-rpc": "^3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AdvancedJsonRpc\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                },
+                {
+                    "name": "Daniil Gentili",
+                    "email": "daniil@daniil.it"
+                }
+            ],
+            "description": "A more advanced JSONRPC implementation",
+            "support": {
+                "issues": "https://github.com/danog/php-advanced-json-rpc/issues",
+                "source": "https://github.com/danog/php-advanced-json-rpc/tree/v3.2.2"
+            },
+            "time": "2025-02-14T10:55:15+00:00"
+        },
+        {
+            "name": "daverandom/libdns",
+            "version": "v2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DaveRandom/LibDNS.git",
+                "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DaveRandom/LibDNS/zipball/b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a",
+                "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "Required for IDN support"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "LibDNS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "DNS protocol implementation written in pure PHP",
+            "keywords": [
+                "dns"
+            ],
+            "support": {
+                "issues": "https://github.com/DaveRandom/LibDNS/issues",
+                "source": "https://github.com/DaveRandom/LibDNS/tree/v2.1.0"
+            },
+            "time": "2024-04-12T12:12:48+00:00"
+        },
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
             "version": "v1.0.0",
@@ -824,26 +1310,29 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.4",
+            "version": "1.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
+            "conflict": {
+                "phpunit/phpunit": "<=7.5 || >=13"
+            },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^12",
-                "phpstan/phpstan": "1.4.10 || 2.0.3",
+                "doctrine/coding-standard": "^9 || ^12 || ^13",
+                "phpstan/phpstan": "1.4.10 || 2.1.11",
                 "phpstan/phpstan-phpunit": "^1.0 || ^2",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
@@ -863,36 +1352,41 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.5"
             },
-            "time": "2024-12-07T21:18:45+00:00"
+            "time": "2025-04-07T20:06:18+00:00"
         },
         {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
+            "name": "felixfbecker/language-server-protocol",
+            "version": "v1.5.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
                 "shasum": ""
             },
             "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
+                "phpstan/phpstan": "*",
+                "squizlabs/php_codesniffer": "^3.1",
+                "vimeo/psalm": "^4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
+                    "LanguageServerProtocol\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -905,34 +1399,101 @@
                     "email": "felix.b@outlook.com"
                 }
             ],
-            "description": "A more advanced JSONRPC implementation",
+            "description": "PHP classes for the Language Server Protocol",
+            "keywords": [
+                "language",
+                "microsoft",
+                "php",
+                "server"
+            ],
             "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
+                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3"
             },
-            "time": "2021-06-11T22:34:44+00:00"
+            "time": "2024-04-30T00:40:11+00:00"
         },
         {
-            "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.3",
+            "name": "fidry/cpu-core-counter",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9"
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
-                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "*",
-                "squizlabs/php_codesniffer": "^3.1",
-                "vimeo/psalm": "^4.0"
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^1.9.2",
+                "phpstan/phpstan-deprecation-rules": "^1.0.0",
+                "phpstan/phpstan-phpunit": "^1.2.2",
+                "phpstan/phpstan-strict-rules": "^1.4.4",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\CpuCoreCounter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Tiny utility to get the number of CPU cores.",
+            "keywords": [
+                "CPU",
+                "core"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-08-06T10:04:20+00:00"
+        },
+        {
+            "name": "kelunik/certificate",
+            "version": "v1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kelunik/certificate.git",
+                "reference": "7e00d498c264d5eb4f78c69f41c8bd6719c0199e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kelunik/certificate/zipball/7e00d498c264d5eb4f78c69f41c8bd6719c0199e",
+                "reference": "7e00d498c264d5eb4f78c69f41c8bd6719c0199e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "phpunit/phpunit": "^6 | 7 | ^8 | ^9"
             },
             "type": "library",
             "extra": {
@@ -942,64 +1503,160 @@
             },
             "autoload": {
                 "psr-4": {
-                    "LanguageServerProtocol\\": "src/"
+                    "Kelunik\\Certificate\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "ISC"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
                 }
             ],
-            "description": "PHP classes for the Language Server Protocol",
+            "description": "Access certificate details and transform between different formats.",
             "keywords": [
-                "language",
-                "microsoft",
-                "php",
-                "server"
+                "DER",
+                "certificate",
+                "certificates",
+                "openssl",
+                "pem",
+                "x509"
             ],
             "support": {
-                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3"
+                "issues": "https://github.com/kelunik/certificate/issues",
+                "source": "https://github.com/kelunik/certificate/tree/v1.1.3"
             },
-            "time": "2024-04-30T00:40:11+00:00"
+            "time": "2023-02-03T21:26:53+00:00"
         },
         {
-            "name": "fidry/cpu-core-counter",
-            "version": "1.2.0",
+            "name": "league/uri",
+            "version": "7.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/uri.git",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430",
+                "shasum": ""
+            },
+            "require": {
+                "league/uri-interfaces": "^7.5",
+                "php": "^8.1"
+            },
+            "conflict": {
+                "league/uri-schemes": "^1.0"
+            },
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-fileinfo": "to create Data URI from file contennts",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
+                "league/uri-components": "Needed to easily manipulate URI objects components",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Uri\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
+                }
+            ],
+            "description": "URI manipulation library",
+            "homepage": "https://uri.thephpleague.com",
+            "keywords": [
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "middleware",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "uri",
+                "uri-template",
+                "url",
+                "ws"
+            ],
+            "support": {
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri/tree/7.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-12-08T08:40:02+00:00"
+        },
+        {
+            "name": "league/uri-interfaces",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
+                "url": "https://github.com/thephpleague/uri-interfaces.git",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
-                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "ext-filter": "*",
+                "php": "^8.1",
+                "psr/http-factory": "^1",
+                "psr/http-message": "^1.1 || ^2.0"
             },
-            "require-dev": {
-                "fidry/makefile": "^0.2.0",
-                "fidry/php-cs-fixer-config": "^1.1.2",
-                "phpstan/extension-installer": "^1.2.0",
-                "phpstan/phpstan": "^1.9.2",
-                "phpstan/phpstan-deprecation-rules": "^1.0.0",
-                "phpstan/phpstan-phpunit": "^1.2.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
-                "webmozarts/strict-phpunit": "^7.5"
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Fidry\\CpuCoreCounter\\": "src/"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1008,39 +1665,58 @@
             ],
             "authors": [
                 {
-                    "name": "Théo FIDRY",
-                    "email": "theo.fidry@gmail.com"
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "Tiny utility to get the number of CPU cores.",
+            "description": "Common interfaces and classes for URI representation and interaction",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
-                "CPU",
-                "core"
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "uri",
+                "url",
+                "ws"
             ],
             "support": {
-                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/theofidry",
+                    "url": "https://github.com/sponsors/nyamsprod",
                     "type": "github"
                 }
             ],
-            "time": "2024-08-06T10:04:20+00:00"
+            "time": "2024-12-08T08:18:47+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
-            "version": "v4.5.0",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5"
+                "reference": "8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8e76efb98ee8b6afc54687045e1b8dba55ac76e5",
-                "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c",
+                "reference": "8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c",
                 "shasum": ""
             },
             "require": {
@@ -1076,22 +1752,22 @@
             "support": {
                 "email": "cweiske@cweiske.de",
                 "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.5.0"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v5.0.0"
             },
-            "time": "2024-09-08T10:13:13+00:00"
+            "time": "2024-09-08T10:20:00+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.4.0",
+            "version": "v5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
                 "shasum": ""
             },
             "require": {
@@ -1134,9 +1810,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
             },
-            "time": "2024-12-30T11:07:19+00:00"
+            "time": "2025-05-31T08:24:38+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -1256,16 +1932,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.6.1",
+            "version": "5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8"
+                "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
-                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62",
+                "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62",
                 "shasum": ""
             },
             "require": {
@@ -1314,9 +1990,9 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2"
             },
-            "time": "2024-12-07T09:39:29+00:00"
+            "time": "2025-04-13T19:20:35+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -1461,30 +2137,30 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.33.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140"
+                "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140",
-                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68",
+                "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "doctrine/annotations": "^2.0",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^5.3.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.5",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^9.6",
                 "symfony/process": "^5.2"
             },
             "type": "library",
@@ -1502,22 +2178,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0"
             },
-            "time": "2024-10-13T11:25:22+00:00"
+            "time": "2025-02-19T13:28:12+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.1",
+            "version": "2.1.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
                 "shasum": ""
             },
             "require": {
@@ -1562,7 +2238,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-05T16:43:48+00:00"
+            "time": "2025-05-21T20:55:28+00:00"
         },
         {
             "name": "psr/container",
@@ -1617,6 +2293,114 @@
             },
             "time": "2021-11-05T16:47:00+00:00"
         },
+        {
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "time": "2024-04-15T12:06:14+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
         {
             "name": "psr/log",
             "version": "3.0.2",
@@ -1667,18 +2451,124 @@
             },
             "time": "2024-09-11T13:17:53+00:00"
         },
+        {
+            "name": "rector/rector",
+            "version": "2.0.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "be3a452085b524a04056e3dfe72d861948711062"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/be3a452085b524a04056e3dfe72d861948711062",
+                "reference": "be3a452085b524a04056e3dfe72d861948711062",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4|^8.0",
+                "phpstan/phpstan": "^2.1.17"
+            },
+            "conflict": {
+                "rector/rector-doctrine": "*",
+                "rector/rector-downgrade-php": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-symfony": "*"
+            },
+            "suggest": {
+                "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
+            },
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "keywords": [
+                "automation",
+                "dev",
+                "migration",
+                "refactoring"
+            ],
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/2.0.18"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-06-11T11:19:37+00:00"
+        },
+        {
+            "name": "rector/swiss-knife",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/swiss-knife.git",
+                "reference": "d681109ef62d0657cca6610fdf4488837e5e9522"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/swiss-knife/zipball/d681109ef62d0657cca6610fdf4488837e5e9522",
+                "reference": "d681109ef62d0657cca6610fdf4488837e5e9522",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "bin": [
+                "bin/swiss-knife"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Rector\\SwissKnife\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Swiss knife in pocket of every upgrade architect",
+            "support": {
+                "issues": "https://github.com/rectorphp/swiss-knife/issues",
+                "source": "https://github.com/rectorphp/swiss-knife/tree/2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-06-16T07:59:07+00:00"
+        },
         {
             "name": "revolt/event-loop",
-            "version": "v1.0.6",
+            "version": "v1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/revoltphp/event-loop.git",
-                "reference": "25de49af7223ba039f64da4ae9a28ec2d10d0254"
+                "reference": "09bf1bf7f7f574453efe43044b06fafe12216eb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/25de49af7223ba039f64da4ae9a28ec2d10d0254",
-                "reference": "25de49af7223ba039f64da4ae9a28ec2d10d0254",
+                "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/09bf1bf7f7f574453efe43044b06fafe12216eb3",
+                "reference": "09bf1bf7f7f574453efe43044b06fafe12216eb3",
                 "shasum": ""
             },
             "require": {
@@ -1735,35 +2625,35 @@
             ],
             "support": {
                 "issues": "https://github.com/revoltphp/event-loop/issues",
-                "source": "https://github.com/revoltphp/event-loop/tree/v1.0.6"
+                "source": "https://github.com/revoltphp/event-loop/tree/v1.0.7"
             },
-            "time": "2023-11-30T05:34:44+00:00"
+            "time": "2025-01-25T19:27:39+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "6.0.2",
+            "version": "7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^12.0",
+                "symfony/process": "^7.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -1796,7 +2686,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
             },
             "funding": [
                 {
@@ -1804,36 +2694,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T04:53:05+00:00"
+            "time": "2025-02-07T04:55:46+00:00"
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.15.0",
+            "version": "8.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "7d1d957421618a3803b593ec31ace470177d7817"
+                "reference": "458d665acd49009efebd7e0cb385d71ae9ac3220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817",
-                "reference": "7d1d957421618a3803b593ec31ace470177d7817",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/458d665acd49009efebd7e0cb385d71ae9ac3220",
+                "reference": "458d665acd49009efebd7e0cb385d71ae9ac3220",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
-                "php": "^7.2 || ^8.0",
-                "phpstan/phpdoc-parser": "^1.23.1",
-                "squizlabs/php_codesniffer": "^3.9.0"
+                "php": "^7.4 || ^8.0",
+                "phpstan/phpdoc-parser": "^2.1.0",
+                "squizlabs/php_codesniffer": "^3.13.0"
             },
             "require-dev": {
-                "phing/phing": "2.17.4",
-                "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.10.60",
-                "phpstan/phpstan-deprecation-rules": "1.1.4",
-                "phpstan/phpstan-phpunit": "1.3.16",
-                "phpstan/phpstan-strict-rules": "1.5.2",
-                "phpunit/phpunit": "8.5.21|9.6.8|10.5.11"
+                "phing/phing": "3.0.1",
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpstan/phpstan-phpunit": "2.0.6",
+                "phpstan/phpstan-strict-rules": "2.0.4",
+                "phpunit/phpunit": "9.6.8|10.5.45|11.4.4|11.5.21|12.1.3"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -1857,7 +2747,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.15.0"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.19.1"
             },
             "funding": [
                 {
@@ -1869,7 +2759,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-09T15:20:58+00:00"
+            "time": "2025-06-09T17:53:57+00:00"
         },
         {
             "name": "spatie/array-to-xml",
@@ -1941,16 +2831,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.2",
+            "version": "3.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
+                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c",
+                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c",
                 "shasum": ""
             },
             "require": {
@@ -2015,22 +2905,26 @@
                 {
                     "url": "https://opencollective.com/php_codesniffer",
                     "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2024-12-11T16:04:26+00:00"
+            "time": "2025-06-17T22:17:01+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "bcd3c4adf0144dee5011bb35454728c38adec055"
+                "reference": "ba62ae565f1327c2f6366726312ed828c85853bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/bcd3c4adf0144dee5011bb35454728c38adec055",
-                "reference": "bcd3c4adf0144dee5011bb35454728c38adec055",
+                "url": "https://api.github.com/repos/symfony/config/zipball/ba62ae565f1327c2f6366726312ed828c85853bc",
+                "reference": "ba62ae565f1327c2f6366726312ed828c85853bc",
                 "shasum": ""
             },
             "require": {
@@ -2076,7 +2970,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v7.2.0"
+                "source": "https://github.com/symfony/config/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2092,27 +2986,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-04T11:36:24+00:00"
+            "time": "2025-05-15T09:04:05+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.1",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/string": "^7.2"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -2169,7 +3064,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.1"
+                "source": "https://github.com/symfony/console/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2185,20 +3080,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T03:49:26+00:00"
+            "time": "2025-05-24T10:34:04+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a475747af1a1c98272a5471abc35f3da81197c5d"
+                "reference": "f64a8f3fa7d4ad5e85de1b128a0e03faed02b732"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a475747af1a1c98272a5471abc35f3da81197c5d",
-                "reference": "a475747af1a1c98272a5471abc35f3da81197c5d",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f64a8f3fa7d4ad5e85de1b128a0e03faed02b732",
+                "reference": "f64a8f3fa7d4ad5e85de1b128a0e03faed02b732",
                 "shasum": ""
             },
             "require": {
@@ -2206,7 +3101,7 @@
                 "psr/container": "^1.1|^2.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/service-contracts": "^3.5",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/var-exporter": "^6.4.20|^7.2.5"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2",
@@ -2249,7 +3144,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.2.0"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2265,20 +3160,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-25T15:45:00+00:00"
+            "time": "2025-05-19T13:28:56+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -2291,7 +3186,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2316,7 +3211,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2332,11 +3227,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -2382,7 +3277,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.2.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2402,7 +3297,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -2461,7 +3356,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2481,7 +3376,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -2539,7 +3434,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2559,7 +3454,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -2620,7 +3515,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2640,19 +3535,20 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
+                "ext-iconv": "*",
                 "php": ">=7.2"
             },
             "provide": {
@@ -2700,7 +3596,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2716,20 +3612,96 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-20T12:04:08+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -2747,7 +3719,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2783,7 +3755,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2799,20 +3771,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
                 "shasum": ""
             },
             "require": {
@@ -2870,7 +3842,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.0"
+                "source": "https://github.com/symfony/string/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2886,24 +3858,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:26+00:00"
+            "time": "2025-04-20T20:19:01+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d"
+                "reference": "c9a1168891b5aaadfd6332ef44393330b3498c4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a6a89f95a46af0f142874c9d650a6358d13070d",
-                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c9a1168891b5aaadfd6332ef44393330b3498c4c",
+                "reference": "c9a1168891b5aaadfd6332ef44393330b3498c4c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "require-dev": {
                 "symfony/property-access": "^6.4|^7.0",
@@ -2946,7 +3919,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.2.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2962,28 +3935,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-18T07:58:17+00:00"
+            "time": "2025-05-15T09:04:05+00:00"
         },
         {
             "name": "vimeo/psalm",
-            "version": "dev-master",
+            "version": "6.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "765dcbfe43002e52e4808b65561842784fe7bcc7"
+                "reference": "cf420941d061a57050b6c468ef2c778faf40aee2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/765dcbfe43002e52e4808b65561842784fe7bcc7",
-                "reference": "765dcbfe43002e52e4808b65561842784fe7bcc7",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/cf420941d061a57050b6c468ef2c778faf40aee2",
+                "reference": "cf420941d061a57050b6c468ef2c778faf40aee2",
                 "shasum": ""
             },
             "require": {
                 "amphp/amp": "^3",
                 "amphp/byte-stream": "^2",
+                "amphp/parallel": "^2.3",
                 "composer-runtime-api": "^2",
                 "composer/semver": "^1.4 || ^2.0 || ^3.0",
                 "composer/xdebug-handler": "^2.0 || ^3.0",
+                "danog/advanced-json-rpc": "^3.1",
                 "dnoegel/php-xdg-base-dir": "^0.1.1",
                 "ext-ctype": "*",
                 "ext-dom": "*",
@@ -2992,16 +3967,16 @@
                 "ext-mbstring": "*",
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.1",
-                "felixfbecker/language-server-protocol": "^1.5.2",
+                "felixfbecker/language-server-protocol": "^1.5.3",
                 "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "netresearch/jsonmapper": "^5.0",
                 "nikic/php-parser": "^5.0.0",
-                "php": "~8.1.17 || ~8.2.4 || ~8.3.0 || ~8.4.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
+                "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3",
+                "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0",
                 "spatie/array-to-xml": "^2.17.0 || ^3.0",
-                "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
+                "symfony/console": "^6.0 || ^7.0",
+                "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3",
+                "symfony/polyfill-php84": "^1.31.0"
             },
             "provide": {
                 "psalm/psalm": "self.version"
@@ -3010,6 +3985,7 @@
                 "amphp/phpunit-util": "^3",
                 "bamarni/composer-bin-plugin": "^1.4",
                 "brianium/paratest": "^6.9",
+                "danog/class-finder": "^0.4.8",
                 "dg/bypass-finals": "^1.5",
                 "ext-curl": "*",
                 "mockery/mockery": "^1.5",
@@ -3018,10 +3994,10 @@
                 "phpstan/phpdoc-parser": "^1.6",
                 "phpunit/phpunit": "^9.6",
                 "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18",
+                "psalm/plugin-phpunit": "^0.19",
                 "slevomat/coding-standard": "^8.4",
                 "squizlabs/php_codesniffer": "^3.6",
-                "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0"
+                "symfony/process": "^6.0 || ^7.0"
             },
             "suggest": {
                 "ext-curl": "In order to send data to shepherd",
@@ -3032,6 +4008,7 @@
                 "psalm-language-server",
                 "psalm-plugin",
                 "psalm-refactor",
+                "psalm-review",
                 "psalter"
             ],
             "type": "project",
@@ -3042,7 +4019,8 @@
                     "dev-3.x": "3.x-dev",
                     "dev-4.x": "4.x-dev",
                     "dev-5.x": "5.x-dev",
-                    "dev-master": "6.x-dev"
+                    "dev-6.x": "6.x-dev",
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
@@ -3057,6 +4035,10 @@
             "authors": [
                 {
                     "name": "Matthew Brown"
+                },
+                {
+                    "name": "Daniil Gentili",
+                    "email": "daniil@daniil.it"
                 }
             ],
             "description": "A static analysis tool for finding errors in PHP applications",
@@ -3071,7 +4053,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2024-12-15T08:19:36+00:00"
+            "time": "2025-05-28T12:52:06+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -3134,9 +4116,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "vimeo/psalm": 20
-    },
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {},