Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use development ini when testing in CI #406

Merged
merged 6 commits into from
Mar 14, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix more class check asserts
  • Loading branch information
cspray committed Mar 14, 2025

Verified

This commit was signed with the committer’s verified signature.
cspray Charles Sprayberry
commit 8ce8f92f182ebe5d063efe03d70f04eaed3f9147
Original file line number Diff line number Diff line change
@@ -305,7 +305,10 @@ private function addServiceDefinitionsToBuilder(ContainerDefinitionBuilder $buil

foreach ($serviceDefinitions as $serviceDefinition) {
$serviceType = $xpath->query('cd:type/text()', $serviceDefinition)[0]->nodeValue;
assert(class_exists($serviceType));
assert(
class_exists($serviceType) || interface_exists($serviceType),
"The type $serviceType does not exist"
);
$isConcrete = $xpath->query('@isConcrete', $serviceDefinition)[0]->nodeValue === 'true';
$attr = unserialize(base64_decode(
$xpath->query('cd:attribute/text()', $serviceDefinition)[0]?->nodeValue
Original file line number Diff line number Diff line change
@@ -68,7 +68,10 @@ private function getConcreteServicesInstanceOf(ContainerDefinition $containerDef
foreach ($containerDefinition->serviceDefinitions() as $service) {
if ($service->isConcrete()) {
$serviceDefinitionType = $serviceDefinition->type()->name();
assert(class_exists($serviceDefinitionType));
assert(
class_exists($serviceDefinitionType) || interface_exists($serviceDefinitionType),
"The type $serviceDefinitionType does not exist"
);
if (is_subclass_of($service->type()->name(), $serviceDefinitionType)) {
yield $service;
}
Original file line number Diff line number Diff line change
@@ -189,7 +189,10 @@ private function addAnnotatedDefinitions(
foreach ($abstractPrepareDefinitions as $abstractPrepareDefinition) {
$concreteServiceName = $concretePrepareDefinition->service()->name();
$abstractServiceName = $abstractPrepareDefinition->service()->name();
assert(class_exists($abstractServiceName));
assert(
class_exists($abstractServiceName) || interface_exists($abstractServiceName),
"The type $abstractServiceName does not exist"
);
if (is_subclass_of($concreteServiceName, $abstractServiceName)) {
$hasAbstractPrepare = true;
break;
@@ -277,12 +280,12 @@ private function addAliasDefinitions(ContainerDefinitionBuilder $containerDefini
}

foreach ($abstractTypes as $abstractType) {
$abstractTypeString = $abstractType->name();
assert(
class_exists($abstractTypeString) || interface_exists($abstractTypeString),
"The type $abstractTypeString does not exist"
);
foreach ($concreteTypes as $concreteType) {
$abstractTypeString = $abstractType->name();
assert(
class_exists($abstractTypeString) || interface_exists($abstractTypeString),
"The type $abstractTypeString does not exist"
);
if (is_subclass_of($concreteType->name(), $abstractTypeString)) {
$aliasDefinition = definitionFactory()->aliasDefinition($abstractType, $concreteType);
$containerDefinitionBuilder = $containerDefinitionBuilder->withAliasDefinition($aliasDefinition);