Mercurial > hg > isophonics-drupal-site
comparison vendor/symfony/routing/Router.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 |
---|---|
82 * @var ExpressionFunctionProviderInterface[] | 82 * @var ExpressionFunctionProviderInterface[] |
83 */ | 83 */ |
84 private $expressionLanguageProviders = array(); | 84 private $expressionLanguageProviders = array(); |
85 | 85 |
86 /** | 86 /** |
87 * Constructor. | |
88 * | |
89 * @param LoaderInterface $loader A LoaderInterface instance | 87 * @param LoaderInterface $loader A LoaderInterface instance |
90 * @param mixed $resource The main resource to load | 88 * @param mixed $resource The main resource to load |
91 * @param array $options An array of options | 89 * @param array $options An array of options |
92 * @param RequestContext $context The context | 90 * @param RequestContext $context The context |
93 * @param LoggerInterface $logger A logger instance | 91 * @param LoggerInterface $logger A logger instance |
226 return $this->context; | 224 return $this->context; |
227 } | 225 } |
228 | 226 |
229 /** | 227 /** |
230 * Sets the ConfigCache factory to use. | 228 * Sets the ConfigCache factory to use. |
231 * | |
232 * @param ConfigCacheFactoryInterface $configCacheFactory The factory to use | |
233 */ | 229 */ |
234 public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) | 230 public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) |
235 { | 231 { |
236 $this->configCacheFactory = $configCacheFactory; | 232 $this->configCacheFactory = $configCacheFactory; |
237 } | 233 } |
304 | 300 |
305 $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources()); | 301 $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources()); |
306 } | 302 } |
307 ); | 303 ); |
308 | 304 |
309 require_once $cache->getPath(); | 305 if (!class_exists($this->options['matcher_cache_class'], false)) { |
306 require_once $cache->getPath(); | |
307 } | |
310 | 308 |
311 return $this->matcher = new $this->options['matcher_cache_class']($this->context); | 309 return $this->matcher = new $this->options['matcher_cache_class']($this->context); |
312 } | 310 } |
313 | 311 |
314 /** | 312 /** |
336 | 334 |
337 $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources()); | 335 $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources()); |
338 } | 336 } |
339 ); | 337 ); |
340 | 338 |
341 require_once $cache->getPath(); | 339 if (!class_exists($this->options['generator_cache_class'], false)) { |
340 require_once $cache->getPath(); | |
341 } | |
342 | 342 |
343 $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger); | 343 $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger); |
344 } | 344 } |
345 | 345 |
346 if ($this->generator instanceof ConfigurableRequirementsInterface) { | 346 if ($this->generator instanceof ConfigurableRequirementsInterface) { |