3666: Refactor rootDir normalization to ensure values are always normalized, fix type errors, fix values not being set

Author: turegjorup

migrations/Version20250205115916.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250205115916 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE package ADD suggests VARCHAR(255) DEFAULT NULL');
+        $this->addSql('UPDATE detection_result SET root_dir = REPLACE(root_dir, \'/public\', \'\') WHERE root_dir LIKE \'%/public\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE package DROP suggests');
+    }
+}

src/Command/ReplayDetectionResultsCommand.php

@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $count = $this->entityManager->getRepository(DetectionResult::class)->count($criteria);
 
-        $this->entityManager->getConnection()->getConfiguration()->setSQLLogger(null);
+        $this->entityManager->getConnection()->getConfiguration()->setMiddlewares([new \Doctrine\DBAL\Logging\Middleware(new \Psr\Log\NullLogger())]);
         $iterable = $queryBuilder->getQuery()->toIterable();
 
         $limit = intval($input->getOption('limit'));

src/Entity/AbstractBaseEntity.php

@@ -11,7 +11,7 @@
 
 #[ORM\MappedSuperclass]
 #[ORM\HasLifecycleCallbacks]
-abstract class AbstractBaseEntity
+abstract class AbstractBaseEntity implements \Stringable
 {
     #[ApiProperty(identifier: true)]
     #[ORM\Id]

src/Entity/AbstractHandlerResult.php

@@ -4,7 +4,6 @@
 
 namespace App\Entity;
 
-use App\Utils\RootDirNormalizer;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
@@ -32,7 +31,7 @@ public function getRootDir(): string
 
     public function setRootDir(string $rootDir): self
     {
-        $this->rootDir = RootDirNormalizer::normalize($rootDir);
+        $this->rootDir = $rootDir;
 
         return $this;
     }

src/Entity/Advisory.php

@@ -48,6 +48,7 @@ public function __construct()
         $this->packageVersions = new ArrayCollection();
     }
 
+    #[\Override]
     public function __toString(): string
     {
         $id = $this->cve ?? $this->advisoryId;

src/Entity/DetectionResult.php

@@ -7,6 +7,7 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Post;
 use App\Repository\DetectionResultRepository;
+use App\Utils\RootDirNormalizer;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -43,6 +44,7 @@ class DetectionResult extends AbstractBaseEntity implements \Stringable
     #[ORM\Column(type: 'datetime_immutable')]
     private \DateTimeImmutable $lastContact;
 
+    #[\Override]
     public function __toString(): string
     {
         return '['.$this->type.'] '.$this->server.$this->rootDir.' @ '.$this->lastContact->format(DATE_ATOM);
@@ -67,7 +69,7 @@ public function getRootDir(): string
 
     public function setRootDir(string $rootDir): self
     {
-        $this->rootDir = $rootDir;
+        $this->rootDir = RootDirNormalizer::normalize($rootDir);
 
         return $this;
     }

src/Entity/DockerImage.php

@@ -30,6 +30,7 @@ public function __construct()
         $this->dockerImageTags = new ArrayCollection();
     }
 
+    #[\Override]
     public function __toString(): string
     {
         $name = $this->organization;

src/Entity/DockerImageTag.php

@@ -31,6 +31,7 @@ public function __construct()
         $this->installations = new ArrayCollection();
     }
 
+    #[\Override]
     public function __toString(): string
     {
         return $this->dockerImage.':'.$this->getTag();

src/Entity/Domain.php

@@ -25,6 +25,7 @@ class Domain extends AbstractHandlerResult implements \Stringable
     #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
     private Site $site;
 
+    #[\Override]
     public function __toString(): string
     {
         return $this->address;

src/Entity/GitRepo.php

@@ -30,6 +30,7 @@ public function __construct()
         $this->gitTags = new ArrayCollection();
     }
 
+    #[\Override]
     public function __toString(): string
     {
         return $this->getOrganization().'/'.$this->getRepo();