projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.5. Core Media not yet in use.
[yaffs-website]
/
vendor
/
symfony
/
dependency-injection
/
Tests
/
Fixtures
/
includes
/
ProjectExtension.php
diff --git
a/vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
index c9f80102687174aa893aa71403d8e8a007c0f135..ba07d7c44cbd67fc9dabe355d922ea83672b1796 100644
(file)
--- a/
vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
+++ b/
vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
@@
-8,7
+8,14
@@
class ProjectExtension implements ExtensionInterface
{
public function load(array $configs, ContainerBuilder $configuration)
{
{
public function load(array $configs, ContainerBuilder $configuration)
{
- $config = call_user_func_array('array_merge', $configs);
+ $configuration->setParameter('project.configs', $configs);
+ $configs = array_filter($configs);
+
+ if ($configs) {
+ $config = call_user_func_array('array_merge', $configs);
+ } else {
+ $config = array();
+ }
$configuration->setDefinition('project.service.bar', new Definition('FooClass'));
$configuration->setParameter('project.parameter.bar', isset($config['foo']) ? $config['foo'] : 'foobar');
$configuration->setDefinition('project.service.bar', new Definition('FooClass'));
$configuration->setParameter('project.parameter.bar', isset($config['foo']) ? $config['foo'] : 'foobar');