commit 606269dbf6745170362a1044d3d17e4e9e26cba7 Author: peterh <peterh@giantrabbit.com> Date: Mon Jun 24 11:58:08 2019 -0700 Applied the patch for EXPYRE to vendor Needed to run composer install separately to get it to patch it. --- vendor/composer/autoload_files.php | 4 ++-- vendor/composer/autoload_psr4.php | 2 +- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 5 +++++ vendor/predis/predis/PATCHES.txt | 7 +++++++ vendor/predis/predis/src/Profile/RedisProfile.php | 8 ++++---- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index d3db499e..b18a8b6c 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -8,11 +8,11 @@ $baseDir = dirname($vendorDir); return array( '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', - '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', '253c157292f75eb38082b5acb06f3f01' => $vendorDir . '/nikic/fast-route/src/functions.php', + '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 1d6d66a4..df78f4a3 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,7 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - 'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'), + 'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src'), 'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'), 'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'), 'Twig\\Extensions\\' => array($vendorDir . '/twig/extensions/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index e32de4a2..3bb196bf 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -9,12 +9,12 @@ class ComposerStaticInit03db25c8965eb7fcdca0d6c90029b515 public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', - '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', '253c157292f75eb38082b5acb06f3f01' => __DIR__ . '/..' . '/nikic/fast-route/src/functions.php', + '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', - '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php', '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', ); @@ -86,8 +86,8 @@ class ComposerStaticInit03db25c8965eb7fcdca0d6c90029b515 'phpDocumentor\\Reflection\\' => array ( 0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src', - 1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src', - 2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src', + 1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src', + 2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src', ), 'cweagans\\Composer\\' => array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index bf1b7194..b9d32b23 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1580,6 +1580,11 @@ }, "time": "2016-06-16T16:22:20+00:00", "type": "library", + "extra": { + "patches_applied": { + "EXPIRE bug": "patches/predis-locale-bug.patch" + } + }, "installation-source": "dist", "autoload": { "psr-4": { diff --git a/vendor/predis/predis/PATCHES.txt b/vendor/predis/predis/PATCHES.txt new file mode 100644 index 00000000..047bc60b --- /dev/null +++ b/vendor/predis/predis/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +EXPIRE bug +Source: patches/predis-locale-bug.patch + + diff --git a/vendor/predis/predis/src/Profile/RedisProfile.php b/vendor/predis/predis/src/Profile/RedisProfile.php index 3ef31688..2ed654a0 100644 --- a/vendor/predis/predis/src/Profile/RedisProfile.php +++ b/vendor/predis/predis/src/Profile/RedisProfile.php @@ -45,7 +45,7 @@ abstract class RedisProfile implements ProfileInterface */ public function supportsCommand($commandID) { - return isset($this->commands[strtoupper($commandID)]); + return isset($this->commands[mb_strtoupper($commandID)]); } /** @@ -72,7 +72,7 @@ abstract class RedisProfile implements ProfileInterface */ public function getCommandClass($commandID) { - if (isset($this->commands[$commandID = strtoupper($commandID)])) { + if (isset($this->commands[$commandID = mb_strtoupper($commandID)])) { return $this->commands[$commandID]; } } @@ -82,7 +82,7 @@ abstract class RedisProfile implements ProfileInterface */ public function createCommand($commandID, array $arguments = array()) { - $commandID = strtoupper($commandID); + $commandID = mb_strtoupper($commandID); if (!isset($this->commands[$commandID])) { throw new ClientException("Command '$commandID' is not a registered Redis command."); @@ -115,7 +115,7 @@ abstract class RedisProfile implements ProfileInterface throw new \InvalidArgumentException("The class '$class' is not a valid command class."); } - $this->commands[strtoupper($commandID)] = $class; + $this->commands[mb_strtoupper($commandID)] = $class; } /**