Merge branch '3' into 4.0

This commit is contained in:
Steve Boyd 2023-05-31 11:23:24 +12:00
commit 095c2fd785

View File

@ -105,6 +105,9 @@ abstract class SearchVariant
$ref = new ReflectionClass($variantclass);
if ($ref->isInstantiable()) {
$variant = singleton($variantclass);
// reassign actual class since Injector could be involved when creating the singleton
$variantclass = get_class($variant);
if ($variant->appliesToEnvironment()) {
$concrete[$variantclass] = $variant;
}