Merge branch '4.4'

* 4.4:
  [HttpFoundation] fix typo
  [HttpFoundation][Lock] Connection parameter corrected
  Removed declare(strict_types=1) in DispatchAfterCurrentBusStamp
This commit is contained in:
Fabien Potencier 2019-11-11 17:28:28 +01:00
commit 3445e5c602
3 changed files with 2 additions and 4 deletions

View File

@ -54,7 +54,7 @@ class SessionHandlerFactory
case 0 === strpos($connection, 'rediss://'): case 0 === strpos($connection, 'rediss://'):
case 0 === strpos($connection, 'memcached://'): case 0 === strpos($connection, 'memcached://'):
if (!class_exists(AbstractAdapter::class)) { 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));
} }
$handlerClass = 0 === strpos($connection, 'memcached://') ? MemcachedSessionHandler::class : RedisSessionHandler::class; $handlerClass = 0 === strpos($connection, 'memcached://') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
$connection = AbstractAdapter::createConnection($connection, ['lazy' => true]); $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);

View File

@ -70,7 +70,7 @@ class StoreFactory
case 0 === strpos($connection, 'rediss://'): case 0 === strpos($connection, 'rediss://'):
case 0 === strpos($connection, 'memcached://'): case 0 === strpos($connection, 'memcached://'):
if (!class_exists(AbstractAdapter::class)) { 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; $storeClass = 0 === strpos($connection, 'memcached://') ? MemcachedStore::class : RedisStore::class;
$connection = AbstractAdapter::createConnection($connection, ['lazy' => true]); $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);

View File

@ -9,8 +9,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
declare(strict_types=1);
namespace Symfony\Component\Messenger\Stamp; namespace Symfony\Component\Messenger\Stamp;
/** /**