Merge branch '3.12' into 3
This commit is contained in:
commit
39a37d9c41
|
@ -105,6 +105,9 @@ abstract class SearchVariant
|
||||||
$ref = new ReflectionClass($variantclass);
|
$ref = new ReflectionClass($variantclass);
|
||||||
if ($ref->isInstantiable()) {
|
if ($ref->isInstantiable()) {
|
||||||
$variant = singleton($variantclass);
|
$variant = singleton($variantclass);
|
||||||
|
// reassign actual class since Injector could be involved when creating the singleton
|
||||||
|
$variantclass = get_class($variant);
|
||||||
|
|
||||||
if ($variant->appliesToEnvironment()) {
|
if ($variant->appliesToEnvironment()) {
|
||||||
$concrete[$variantclass] = $variant;
|
$concrete[$variantclass] = $variant;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue