.github/workflows/continuous-integration.yml

@@ -25,12 +25,12 @@ jobs:
           - symfony-require: "5.4.*"
             php-version: "8.2"
             php-extensions: "redis"
-          - symfony-require: "6.2.*"
-            php-version: "8.2"
-            php-extensions: "redis"
-          - symfony-require: "6.3.*"
+          - symfony-require: "6.4.*"
             php-version: "8.2"
             php-extensions: "redis-phpredis/phpredis@develop"
+          - symfony-require: "7.0.*"
+            php-version: "8.2"
+            php-extensions: "redis"
 
     steps:
       - name: "Checkout"

composer.json

@@ -23,10 +23,10 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "symfony/deprecation-contracts": "^2 || ^3",
-        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
-        "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/service-contracts": ">=1.0",
-        "symfony/var-dumper": "^4.4 || ^5.3 || ^6.0"
+        "symfony/var-dumper": "^4.4 || ^5.3 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
@@ -37,23 +37,22 @@
         "monolog/monolog": "*",
         "phpunit/phpunit": "^8.5.32 || ^9.5.28",
         "predis/predis": "^2.0",
-        "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
-        "symfony/cache": "^4.4 || ^5.3 || ^6.0",
-        "symfony/console": "^4.4 || ^5.3 || ^6.0",
-        "symfony/dom-crawler": "^4.4 || ^5.3 || ^6.0",
-        "symfony/filesystem": "^4.4 || ^5.3 || ^6.0",
-        "symfony/phpunit-bridge": "^6.0",
+        "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/cache": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/console": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/dom-crawler": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/filesystem": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^6.0 || ^7.0",
         "symfony/profiler-pack": "^1.0",
-        "symfony/stopwatch": "^4.4 || ^5.3 || ^6.0",
-        "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0",
-        "symfony/yaml": "^4.4 || ^5.3 || ^6.0",
+        "symfony/stopwatch": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0",
+        "symfony/yaml": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "vimeo/psalm": "^5.2"
     },
     "suggest": {
         "monolog/monolog": "If you want to use the monolog redis handler.",
         "predis/predis": "If you want to use predis.",
-        "symfony/console": "If you want to use commands to interact with the redis database",
-        "symfony/proxy-manager-bridge": "If you want to lazy-load some services"
+        "symfony/console": "If you want to use commands to interact with the redis database"
     },
     "config": {
         "sort-packages": true,

flake.nix

@@ -30,8 +30,8 @@
                   src = pkgs.fetchFromGitHub {
                     repo = "phpredis";
                     owner = "phpredis";
-                    rev = "fea19b5229343212424c9921a977fce300d4e130";
-                    sha256 = "sha256-1TII8sLDsH9Ufjl0HHtHtBi29FNEG2qNrMkMhM6+iO0=";
+                    rev = "2bddd84f2f653ee3e956a4683f9938787905f72d";
+                    sha256 = "sha256-quKibCW9bMselVNWdu4ZfdZ+dcDYmQxBnKVCHwYpRJA=";
                   };
                 }))
                 # relay section https://relay.so/docs/1.x/installation#manual-installation

src/DependencyInjection/SncRedisExtension.php

@@ -21,7 +21,6 @@
 use Snc\RedisBundle\DependencyInjection\Configuration\RedisEnvDsn;
 use Snc\RedisBundle\Factory\PredisParametersFactory;
 use Snc\RedisBundle\Logger\RedisCallInterceptor;
-use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
@@ -233,7 +232,7 @@ private function loadPhpredisClient(array $options, ContainerBuilder $container)
         ]);
         $phpredisDef->setFactory([new Reference('snc_redis.phpredis_factory'), 'create']);
         $phpredisDef->addTag('snc_redis.client', ['alias' => $options['alias']]);
-        $phpredisDef->setLazy(class_exists(ProxyDumper::class));
+        $phpredisDef->setLazy(true);
 
         $container->setDefinition(sprintf('snc_redis.%s', $options['alias']), $phpredisDef);
     }

tests/Functional/App/Kernel.php

@@ -13,6 +13,7 @@
 
 namespace Snc\RedisBundle\Tests\Functional\App;
 
+use Doctrine\Common\Annotations\Annotation;
 use ReflectionObject;
 use Snc\RedisBundle\SncRedisBundle;
 use Snc\RedisBundle\Tests\Functional\App\Controller\Controller;
@@ -28,6 +29,7 @@
 use Symfony\Component\Routing\RouteCollection;
 
 use function assert;
+use function class_exists;
 use function dirname;
 
 class Kernel extends BaseKernel
@@ -50,7 +52,10 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         $loader->load(__DIR__ . '/config.yaml');
 
         $loader->load(static function (ContainerBuilder $container): void {
-            $framework = ['router' => ['resource' => 'kernel::loadRoutes', 'type' => 'service', 'utf8' => true]];
+            $framework = [
+                'router' => ['resource' => 'kernel::loadRoutes', 'type' => 'service', 'utf8' => true],
+                'annotations' => class_exists(Annotation::class) && self::VERSION_ID < 60400,
+            ];
 
             // Since symfony/framework-bundle 5.3: Not setting the "framework.session.storage_factory_id" configuration option
             // is deprecated, it will replace the "framework.session.storage_id" configuration option in version 6.0.