Skip to content

Commit cc61be4

Browse files
committed
change: make options an array again which is allowed since symfony v6
1 parent a6f0f4c commit cc61be4

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- '8.2'
2222
- '8.3'
2323
symfony-version:
24-
- '5.4.*'
2524
- '6.3.*'
2625
- '7.0.*'
2726
- '7.1.*'

src/DependencyInjection/CompilerPass/RegisterDataLoadersFromTagsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private function registerDataLoader(ContainerBuilder $container, array $loaderCo
4040

4141
$container->register($optionServiceID, Option::class)
4242
->setPublic(false)
43-
->setArguments([$this->buildOptionsParams($loaderConfig)]);
43+
->setArguments([$this->buildOptionsParams($loaderConfig['options'])]);
4444

4545
$definition = $container->register($dataLoaderServiceID, DataLoader::class)
4646
->setPublic(true)

src/DependencyInjection/OverblogDataLoaderExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function load(array $configs, ContainerBuilder $container): void
3434
'name' => $attribute->name,
3535
'alias' => $attribute->alias,
3636
'method' => $reflector instanceof \ReflectionMethod ? $reflector->getName() : ($attribute->method ?? '__invoke'),
37-
...array_merge($config['defaults']['options'], $attribute->options ?? []),
37+
'options' => array_merge($config['defaults']['options'], $attribute->options ?? []),
3838
]));
3939
});
4040

@@ -44,7 +44,7 @@ public function load(array $configs, ContainerBuilder $container): void
4444
'name' => $name,
4545
'alias' => $loaderConfig['alias'] ?? null,
4646
'batch_load_fn' => $loaderConfig['batch_load_fn'],
47-
...array_merge($config['defaults']['options'], $loaderConfig['options'] ?? []),
47+
'options' => array_merge($config['defaults']['options'], $loaderConfig['options'] ?? []),
4848
]));
4949
}
5050
}

0 commit comments

Comments
 (0)