Mercurial > hg > isophonics-drupal-site
comparison vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | 1fec387a4317 |
children |
comparison
equal
deleted
inserted
replaced
16:c2387f117808 | 17:129ea1e6d783 |
---|---|
36 /** | 36 /** |
37 * @return ImportConfigurator | 37 * @return ImportConfigurator |
38 */ | 38 */ |
39 final public function import($resource, $type = null, $ignoreErrors = false) | 39 final public function import($resource, $type = null, $ignoreErrors = false) |
40 { | 40 { |
41 $this->loader->setCurrentDir(dirname($this->path)); | 41 $this->loader->setCurrentDir(\dirname($this->path)); |
42 $imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file); | 42 $imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file); |
43 if (!is_array($imported)) { | 43 if (!\is_array($imported)) { |
44 return new ImportConfigurator($this->collection, $imported); | 44 return new ImportConfigurator($this->collection, $imported); |
45 } | 45 } |
46 | 46 |
47 $mergedCollection = new RouteCollection(); | 47 $mergedCollection = new RouteCollection(); |
48 foreach ($imported as $subCollection) { | 48 foreach ($imported as $subCollection) { |