comparison vendor/symfony/http-kernel/Controller/ArgumentResolver.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer
author Chris Cannam
date Mon, 23 Apr 2018 09:46:53 +0100
parents 4c8ae668cc8c
children 129ea1e6d783
comparison
equal deleted inserted replaced
13:5fb285c0d0e3 14:1fec387a4317
13 13
14 use Symfony\Component\HttpFoundation\Request; 14 use Symfony\Component\HttpFoundation\Request;
15 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver; 15 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
16 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver; 16 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
17 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver; 17 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
18 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\SessionValueResolver;
18 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver; 19 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver;
19 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory; 20 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
20 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactoryInterface; 21 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactoryInterface;
21 22
22 /** 23 /**
27 final class ArgumentResolver implements ArgumentResolverInterface 28 final class ArgumentResolver implements ArgumentResolverInterface
28 { 29 {
29 private $argumentMetadataFactory; 30 private $argumentMetadataFactory;
30 31
31 /** 32 /**
32 * @var ArgumentValueResolverInterface[] 33 * @var iterable|ArgumentValueResolverInterface[]
33 */ 34 */
34 private $argumentValueResolvers; 35 private $argumentValueResolvers;
35 36
36 public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, array $argumentValueResolvers = array()) 37 public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, $argumentValueResolvers = array())
37 { 38 {
38 $this->argumentMetadataFactory = $argumentMetadataFactory ?: new ArgumentMetadataFactory(); 39 $this->argumentMetadataFactory = $argumentMetadataFactory ?: new ArgumentMetadataFactory();
39 $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers(); 40 $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
40 } 41 }
41 42
83 public static function getDefaultArgumentValueResolvers() 84 public static function getDefaultArgumentValueResolvers()
84 { 85 {
85 return array( 86 return array(
86 new RequestAttributeValueResolver(), 87 new RequestAttributeValueResolver(),
87 new RequestValueResolver(), 88 new RequestValueResolver(),
89 new SessionValueResolver(),
88 new DefaultValueResolver(), 90 new DefaultValueResolver(),
89 new VariadicValueResolver(), 91 new VariadicValueResolver(),
90 ); 92 );
91 } 93 }
92 } 94 }