Skip to content

Validate checkedExceptionClasses config #3987

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.

Sign up for GitHub

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

Open
janedbal wants to merge 4 commits into
base: 2.1.x
Choose a base branch
from
Open

Validate checkedExceptionClasses config #3987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c17d37
Validate checkedExceptionClasses config
janedbal Mar 26, 2026
1006e16
Revert unnecessary test changes
janedbal Mar 26, 2026
381c9ff
Move validation after postInitializeContainer
janedbal Mar 27, 2026
9f10e71
Skip validation for derivative containers
janedbal Mar 27, 2026
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
2 changes: 0 additions & 2 deletions build/phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ parameters:
- 'PHPStan\ShouldNotHappenException'
- 'Symfony\Component\Console\Exception\InvalidArgumentException'
- 'PHPStan\BetterReflection\SourceLocator\Exception\InvalidFileLocation'
- 'PHPStan\BetterReflection\SourceLocator\Exception\InvalidArgumentException'
- 'Symfony\Component\Finder\Exception\DirectoryNotFoundException'
- 'InvalidArgumentException'
- 'PHPStan\DependencyInjection\ParameterNotFoundException'
Expand All @@ -69,7 +68,6 @@ parameters:
- 'PHPStan\Reflection\MissingStaticAccessorInstanceException'
- 'LogicException'
- 'Error'
- 'PHPStan\Analyser\Generator\TrampolineException'
check:
missingCheckedExceptionInThrows: true
tooWideThrowType: true
Expand Down
30 changes: 30 additions & 0 deletions src/DependencyInjection/ContainerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Nette\DI\Definitions\Statement;
use Nette\DI\Extensions\ExtensionsExtension;
use Nette\DI\Helpers;
use Nette\DI\InvalidConfigurationException;
use Nette\Schema\Context as SchemaContext;
use Nette\Schema\Elements\AnyOf;
use Nette\Schema\Elements\Structure;
Expand Down Expand Up @@ -162,6 +163,7 @@ public function create(
$container = $configurator->createContainer()->getByType(Container::class);
$this->validateParameters($container->getParameters(), $projectConfig['parametersSchema']);
self::postInitializeContainer($container);
$this->validateExceptionClasses($container->getByType(ReflectionProvider::class), $container->getParameters());

return $container;
}
Expand Down Expand Up @@ -364,6 +366,34 @@ private function validateParameters(array $parameters, array $parametersSchema):
}
}

/**
* @param array<mixed> $parameters
*/
private function validateExceptionClasses(ReflectionProvider $reflectionProvider, array $parameters): void
{
if (!(bool) $parameters['__validate']) {
return;
}

if (
!array_key_exists('featureToggles', $parameters)
|| !is_array($parameters['featureToggles'])
|| !(bool) $parameters['featureToggles']['bleedingEdge']
) {
return;
}

foreach (['checkedExceptionClasses', 'uncheckedExceptionClasses'] as $parameterName) {
foreach ($parameters['exceptions'][$parameterName] ?? [] as $className) {
if ($reflectionProvider->hasClass($className)) {
continue;
}

throw new InvalidConfigurationException(sprintf('Class %s configured in exceptions.%s does not exist.', $className, $parameterName));
}
}
}

/**
* @param Statement[] $statements
*/
Expand Down
Loading