Fixed phpstan issues

Author: tuj

bin/console

@@ -0,0 +1,36 @@
+#!/usr/bin/env php
+<?php
+
+declare(strict_types=1);
+
+use ITKDev\EntityBundle\Tests\App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (!is_file(__DIR__.'/../vendor/autoload.php')) {
+    fwrite(STDERR, "vendor/autoload.php not found. Run composer install.\n");
+    exit(1);
+}
+
+require __DIR__.'/../vendor/autoload.php';
+
+if (is_file(__DIR__.'/../.env')) {
+    (new Dotenv())->bootEnv(__DIR__.'/../.env');
+}
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'test');
+$debug = ($_SERVER['APP_DEBUG'] ?? '1') && !$input->hasParameterOption('--no-debug', true);
+
+if ($debug) {
+    umask(0000);
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($env, (bool) $debug);
+$application = new Application($kernel);
+$application->run($input);

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+require __DIR__.'/vendor/autoload.php';
+
+$_ENV['APP_DEBUG'] = $_SERVER['APP_DEBUG'] = '1';
+$_ENV['APP_ENV'] = $_SERVER['APP_ENV'] = 'test';
+
+$kernel = new ITKDev\EntityBundle\Tests\App\Kernel('test', true);
+$kernel->boot();

phpstan-bootstrap.php

@@ -1,10 +1,11 @@
-includes:
-    - phpstan-baseline.neon
-
 parameters:
     level: 8
     paths:
         - src
         - tests
     excludePaths:
         - tests/App/var/*
+    bootstrapFiles:
+        - phpstan-bootstrap.php
+    symfony:
+        containerXmlPath: var/cache/test/ITKDev_EntityBundle_Tests_App_KernelTestDebugContainer.xml

phpstan.neon.dist

@@ -23,9 +23,6 @@
 )]
 final class PrivacyAnonymizeCommand extends Command
 {
-    /**
-     * @param class-string<UserInterface&IdentifiableInterface> $userClass
-     */
     public function __construct(
         private readonly EntityManagerInterface $em,
         private readonly SubjectAnonymizer $anonymizer,
@@ -44,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        if ('' === $this->userClass) {
+        if ('' === $this->userClass || !class_exists($this->userClass)) {
             $io->error('privacy:anonymize requires itk_dev_entity.user_class to be configured.');
 
             return Command::FAILURE;

src/Command/PrivacyAnonymizeCommand.php

@@ -151,33 +151,49 @@ public function prepend(ContainerBuilder $container): void
      * Merge config-supplied anonymization rules into the attribute-discovered set.
      * For the same property name, the config wins (it's the explicit override).
      *
+     * $configRules comes from a variableNode in the config tree, so its shape is
+     * not enforced upstream — every layer is validated here. Class keys are not
+     * required to exist locally (the bundle supports overrides for third-party
+     * entities that may live in unloaded namespaces).
+     *
      * @param array<class-string, list<array{property: string, strategy: string, replacement: ?string}>> $discovered
-     * @param array<string, array<string, array{strategy: string, replacement?: ?string}>>               $configRules
+     * @param array<string, mixed>                                                                       $configRules
      *
-     * @return array<class-string, list<array{property: string, strategy: string, replacement: ?string}>>
+     * @return array<string, list<array{property: string, strategy: string, replacement: ?string}>>
      */
     private function mergeAnonymizationRules(array $discovered, array $configRules): array
     {
+        /** @var array<string, list<array{property: string, strategy: string, replacement: ?string}>> $merged */
+        $merged = $discovered;
+
         foreach ($configRules as $class => $propRules) {
+            if (!\is_array($propRules)) {
+                throw new InvalidConfigurationException(sprintf('itk_dev_entity.anonymization.rules[%s] must be a map of property => { strategy: ..., replacement?: ... }.', $class));
+            }
+
             /** @var array<string, array{property: string, strategy: string, replacement: ?string}> $byProp */
             $byProp = [];
-            foreach ($discovered[$class] ?? [] as $rule) {
+            foreach ($merged[$class] ?? [] as $rule) {
                 $byProp[$rule['property']] = $rule;
             }
             foreach ($propRules as $property => $spec) {
-                if (!\is_array($spec) || !isset($spec['strategy'])) {
-                    throw new InvalidConfigurationException(sprintf('itk_dev_entity.anonymization.rules[%s][%s] must be { strategy: ..., replacement?: ... }', $class, $property));
+                if (!\is_string($property) || !\is_array($spec) || !isset($spec['strategy']) || !\is_string($spec['strategy'])) {
+                    throw new InvalidConfigurationException(sprintf('itk_dev_entity.anonymization.rules[%s][%s] must be { strategy: ..., replacement?: ... }', $class, (string) $property));
+                }
+                $replacement = $spec['replacement'] ?? null;
+                if (null !== $replacement && !\is_string($replacement)) {
+                    throw new InvalidConfigurationException(sprintf('itk_dev_entity.anonymization.rules[%s][%s].replacement must be a string or null.', $class, $property));
                 }
                 $byProp[$property] = [
                     'property' => $property,
-                    'strategy' => (string) $spec['strategy'],
-                    'replacement' => $spec['replacement'] ?? null,
+                    'strategy' => $spec['strategy'],
+                    'replacement' => $replacement,
                 ];
             }
-            $discovered[$class] = array_values($byProp);
+            $merged[$class] = array_values($byProp);
         }
 
-        return $discovered;
+        return $merged;
     }
 
     /**
@@ -209,7 +225,6 @@ private function discoverAuditIgnoredColumns(string $class): array
     private function discoverEntities(ContainerBuilder $container, array $paths): array
     {
         $projectDir = $container->getParameter('kernel.project_dir');
-        \assert(\is_string($projectDir));
 
         $entities = [];
         foreach ($paths as $path) {
@@ -241,6 +256,8 @@ private function discoverEntities(ContainerBuilder $container, array $paths): ar
      * Walk the class hierarchy looking for #[ITKDevEntity]. The attribute is non-inherited
      * at the language level, but the bundle treats inherited declarations as opting in —
      * so subclasses of AbstractITKDevEntity automatically count.
+     *
+     * @param \ReflectionClass<object> $ref
      */
     private function hasITKDevEntityAttribute(\ReflectionClass $ref): bool
     {

src/DependencyInjection/ITKDevEntityExtension.php

@@ -10,7 +10,7 @@
 
 final class ArchivableFilter extends SQLFilter
 {
-    public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias): string
+    public function addFilterConstraint(ClassMetadata $targetEntity, string $targetTableAlias): string
     {
         if (!$targetEntity->reflClass?->implementsInterface(ArchivableInterface::class)) {
             return '';

src/Doctrine/Filter/ArchivableFilter.php

@@ -10,7 +10,7 @@
 
 final class SoftDeleteFilter extends SQLFilter
 {
-    public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias): string
+    public function addFilterConstraint(ClassMetadata $targetEntity, string $targetTableAlias): string
     {
         if (!$targetEntity->reflClass?->implementsInterface(SoftDeletableInterface::class)) {
             return '';

src/Doctrine/Filter/SoftDeleteFilter.php

@@ -9,19 +9,19 @@
 trait TimestampableTrait
 {
     #[ORM\Column(type: 'datetime_immutable')]
-    private ?\DateTimeImmutable $createdAt = null;
+    private \DateTimeImmutable $createdAt;
 
     #[ORM\Column(type: 'datetime_immutable')]
-    private ?\DateTimeImmutable $updatedAt = null;
+    private \DateTimeImmutable $updatedAt;
 
     public function getCreatedAt(): ?\DateTimeImmutable
     {
-        return $this->createdAt;
+        return $this->createdAt ?? null;
     }
 
     public function getUpdatedAt(): ?\DateTimeImmutable
     {
-        return $this->updatedAt;
+        return $this->updatedAt ?? null;
     }
 
     public function setCreatedAt(\DateTimeImmutable $createdAt): void

src/Entity/Trait/TimestampableTrait.php

@@ -4,6 +4,7 @@
 
 namespace ITKDev\EntityBundle\Privacy;
 
+use DH\Auditor\Provider\Doctrine\Configuration as DoctrineAuditConfiguration;
 use DH\Auditor\Provider\Doctrine\DoctrineProvider;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -184,7 +185,9 @@ private function clearDiffValues(array $diffs): array
     private function discoverAuditTables(): array
     {
         $tables = [];
-        foreach ($this->auditProvider->getConfiguration()->getEntities() as $entry) {
+        $configuration = $this->auditProvider->getConfiguration();
+        \assert($configuration instanceof DoctrineAuditConfiguration);
+        foreach ($configuration->getEntities() as $entry) {
             if (!\is_array($entry) || !isset($entry['audit_table_name'])) {
                 continue;
             }