Merge pull request #43 from ScaryDonetskiy/feat/update-predis

Update Predis and phpstan versions
php-bundles · Jul 30, 2024 · 1fad99d · 1fad99d
2 parents f347e71 + 2b644d3
commit 1fad99d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/DependencyInjection/RedisExtension.php b/DependencyInjection/RedisExtension.php
@@ -13,7 +13,7 @@ class RedisExtension extends ConfigurableExtension
     /**
      * loadInternal.
      *
-     * @param array[]          $configs
+     * @param mixed[]          $configs
      * @param ContainerBuilder $container
      */
     protected function loadInternal(array $configs, ContainerBuilder $container): void

diff --git a/Redis/Factory.php b/Redis/Factory.php
@@ -14,6 +14,9 @@ class Factory implements FactoryInterface
      */
     public static function create(array $parameters = [], array $options = []): ClientInterface
     {
-        return new static::$clientClass($parameters, $options);
+        /** @var ClientInterface $client */
+        $client = new static::$clientClass($parameters, $options);
+
+        return $client;
     }
 }
diff --git a/Redis/FactoryInterface.php b/Redis/FactoryInterface.php
@@ -7,8 +7,8 @@ interface FactoryInterface
     /**
      * Creates single or aggregate connections from different types of arguments.
      *
-     * @param array[] $parameters Connection parameters.
-     * @param array[] $options    Client options.
+     * @param mixed[] $parameters Connection parameters.
+     * @param mixed[] $options    Client options.
      *
      * @return ClientInterface
      */

diff --git a/Tests/Kernel.php b/Tests/Kernel.php
@@ -14,12 +14,12 @@ class Kernel
      */
     public static function make(): Fixtures\app\AppKernel
     {
-        if (null === static::$instance) {
-            static::$instance = new Fixtures\app\AppKernel('test', true);
+        if (null === self::$instance) {
+            self::$instance = new Fixtures\app\AppKernel('test', true);
 
-            static::$instance->boot();
+            self::$instance->boot();
         }
 
-        return static::$instance;
+        return self::$instance;
     }
 }
diff --git a/Tests/Redis/ClientTest.php b/Tests/Redis/ClientTest.php
@@ -62,7 +62,7 @@ public function testSingleConnection(): void
     /**
      * getClient.
      *
-     * @param array[] $config
+     * @param mixed[] $config
      *
      * @return ClientInterface
      *
@@ -82,7 +82,7 @@ private function getClient(array $config = []): ClientInterface
     /**
      * loadExtension.
      *
-     * @param array[] $config
+     * @param mixed[] $config
      *
      * @return ContainerBuilder
      */

diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
     },
     "require": {
         "php": "^7.2||^8.0",
-        "predis/predis": "~1.1",
+        "predis/predis": "~1.1||~2.2",
         "symfony/framework-bundle": "^4.3||^5.0||^6.0||^7.0",
         "symfony/yaml": "^4.3||^5.0||^6.0||^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5||^9.0",
         "symfony/phpunit-bridge": "^5.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12"
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-phpunit": "^1.4"
     },
     "extra": {
         "branch-alias": {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,6 +5,6 @@ parameters:
 			count: 1
 			path: DependencyInjection/Configuration.php
 		-
-			message: '#^Comparison operation "<" between 60007 and 53000 is always false.$#'
+			message: '#^Comparison operation "<" between 70103 and 53000 is always false.$#'
 			count: 1
 			path: Tests/Fixtures/app/AppKernel.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: max
+    level: 8
     paths:
         - DependencyInjection/
         - Redis/