diff --git a/vendor/autoload.php b/vendor/autoload.php index e928b9e69..c80b83114 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit5b4788472e0cb40219a653c677276921::getLoader(); +return ComposerAutoloaderInit22183b783e201ec2112d708dc8d5d619::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 6da143b6e..65de38edf 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit5b4788472e0cb40219a653c677276921 +class ComposerAutoloaderInit22183b783e201ec2112d708dc8d5d619 { private static $loader; @@ -13,21 +13,24 @@ class ComposerAutoloaderInit5b4788472e0cb40219a653c677276921 } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5b4788472e0cb40219a653c677276921', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit22183b783e201ec2112d708dc8d5d619', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit5b4788472e0cb40219a653c677276921', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit22183b783e201ec2112d708dc8d5d619', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit5b4788472e0cb40219a653c677276921::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit22183b783e201ec2112d708dc8d5d619::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +51,19 @@ class ComposerAutoloaderInit5b4788472e0cb40219a653c677276921 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit5b4788472e0cb40219a653c677276921::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit22183b783e201ec2112d708dc8d5d619::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire5b4788472e0cb40219a653c677276921($fileIdentifier, $file); + composerRequire22183b783e201ec2112d708dc8d5d619($fileIdentifier, $file); } return $loader; } } -function composerRequire5b4788472e0cb40219a653c677276921($fileIdentifier, $file) +function composerRequire22183b783e201ec2112d708dc8d5d619($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 350c7d7fd..e4f4814ad 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit5b4788472e0cb40219a653c677276921 +class ComposerStaticInit22183b783e201ec2112d708dc8d5d619 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -384,9 +384,9 @@ class ComposerStaticInit5b4788472e0cb40219a653c677276921 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit5b4788472e0cb40219a653c677276921::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit5b4788472e0cb40219a653c677276921::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit5b4788472e0cb40219a653c677276921::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit22183b783e201ec2112d708dc8d5d619::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit22183b783e201ec2112d708dc8d5d619::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit22183b783e201ec2112d708dc8d5d619::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4d98f585b..62853f6b7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -177,17 +177,17 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.38", - "version_normalized": "3.4.38.0", + "version": "v3.4.42", + "version_normalized": "3.4.42.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed" + "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd", + "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd", "shasum": "", "mirrors": [ { @@ -199,7 +199,7 @@ "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2020-01-01T11:03:25+00:00", + "time": "2020-05-21T13:02:25+00:00", "type": "library", "extra": { "branch-alias": { @@ -235,6 +235,20 @@ "config", "configuration", "options" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } ] }, { diff --git a/vendor/symfony/options-resolver/OptionsResolver.php b/vendor/symfony/options-resolver/OptionsResolver.php index fd8a603fe..7354caf8a 100644 --- a/vendor/symfony/options-resolver/OptionsResolver.php +++ b/vendor/symfony/options-resolver/OptionsResolver.php @@ -146,7 +146,7 @@ class OptionsResolver implements Options $reflClosure = new \ReflectionFunction($value); $params = $reflClosure->getParameters(); - if (isset($params[0]) && null !== ($class = $params[0]->getClass()) && Options::class === $class->name) { + if (isset($params[0]) && Options::class === $this->getParameterClassName($params[0])) { // Initialize the option if no previous value exists if (!isset($this->defaults[$option])) { $this->defaults[$option] = null; @@ -1066,4 +1066,20 @@ class OptionsResolver implements Options { return (\function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type; } + + /** + * @return string|null + */ + private function getParameterClassName(\ReflectionParameter $parameter) + { + if (!method_exists($parameter, 'getType')) { + return ($class = $parameter->getClass()) ? $class->name : null; + } + + if (!($type = $parameter->getType()) || $type->isBuiltin()) { + return null; + } + + return method_exists($type, 'getName') ? $type->getName() : (string) $type; + } } diff --git a/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php b/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php index 8d6e9f63f..5fdb9e265 100644 --- a/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php +++ b/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php @@ -44,7 +44,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver->setDefined($option = 'foo'); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getDefault($option)); + $debug->getDefault($option); } public function testGetDefaultThrowsOnNotDefinedOption() @@ -54,7 +54,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver = new OptionsResolver(); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getDefault('foo')); + $debug->getDefault('foo'); } public function testGetLazyClosures() @@ -75,7 +75,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver->setDefined($option = 'foo'); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getLazyClosures($option)); + $debug->getLazyClosures($option); } public function testGetLazyClosuresThrowsOnNotDefinedOption() @@ -85,7 +85,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver = new OptionsResolver(); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getLazyClosures('foo')); + $debug->getLazyClosures('foo'); } public function testGetAllowedTypes()