bug #34317 [HttpFoundation][Lock] Connection parameter corrected (wimg)

nicolas-grekas · nicolas-grekas · commit 01121770e973 · 2019-11-11T14:09:50.000+01:00
This PR was submitted for the master branch but it was merged into the 4.4 branch instead. Discussion ---------- [HttpFoundation][Lock] Connection parameter corrected | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Connection parameter incorrectly specified. This variable doesn't exist, the data is in $connection instead. Commits ------- 27207c3 [HttpFoundation][Lock] Connection parameter corrected
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -54,7 +54,7 @@ public static function createHandler($connection): AbstractSessionHandler
             case 0 === strpos($connection, 'rediss://'):
             case 0 === strpos($connection, 'memcached://'):
                 if (!class_exists(AbstractAdapter::class)) {
-                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $this->dsn));
+                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $storage));
                 }
                 $handlerClass = 0 === strpos($connection, 'memcached://') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -70,7 +70,7 @@ public static function createStore($connection)
             case 0 === strpos($connection, 'rediss://'):
             case 0 === strpos($connection, 'memcached://'):
                 if (!class_exists(AbstractAdapter::class)) {
-                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $this->dsn));
+                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
                 }
                 $storeClass = 0 === strpos($connection, 'memcached://') ? MemcachedStore::class : RedisStore::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static function createHandler($connection): AbstractSessionHandler`
`54`	`54`	`case 0 === strpos($connection, 'rediss://'):`
`55`	`55`	`case 0 === strpos($connection, 'memcached://'):`
`56`	`56`	`if (!class_exists(AbstractAdapter::class)) {`
`57`		`- throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $this->dsn));`
	`57`	`+ throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $storage));`
`58`	`58`	`}`
`59`	`59`	`$handlerClass = 0 === strpos($connection, 'memcached://') ? MemcachedSessionHandler::class : RedisSessionHandler::class;`
`60`	`60`	`$connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function createStore($connection)`
`70`	`70`	`case 0 === strpos($connection, 'rediss://'):`
`71`	`71`	`case 0 === strpos($connection, 'memcached://'):`
`72`	`72`	`if (!class_exists(AbstractAdapter::class)) {`
`73`		`- throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $this->dsn));`
	`73`	`+ throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));`
`74`	`74`	`}`
`75`	`75`	`$storeClass = 0 === strpos($connection, 'memcached://') ? MemcachedStore::class : RedisStore::class;`
`76`	`76`	`$connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);`