Make DB connection lazy initialized

Author: Kirill Nesmeyanov

app/Application/Console/Commands/ArticlesTouchCommand.php

@@ -5,7 +5,6 @@
 namespace App\Application\Console\Commands;
 
 use App\Domain\Article\ArticleRepositoryInterface;
-use App\Infrastructure\Persistence\Doctrine\Repository\ArticleDatabaseRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Clock\ClockInterface;
 
@@ -36,24 +35,18 @@ class ArticlesTouchCommand extends Command
      */
     protected $description = 'Update articles and execute renderer';
 
-    /**
-     * @param EntityManagerInterface $em
-     */
     public function __construct(
-        private readonly EntityManagerInterface $em,
         private readonly ClockInterface $clock,
     ) {
         parent::__construct();
     }
 
-    public function handle(ArticleRepositoryInterface $repository): void
-    {
+    public function handle(
+        EntityManagerInterface $em,
+        ArticleRepositoryInterface $repository,
+    ): void {
         $articles = $repository->all();
-        $count = $articles instanceof \Countable || \is_array($articles)
-            ? \count($articles)
-            : \count([...$articles])
-        ;
-        $progress = $this->progress($count);
+        $progress = $this->progress($this->count($articles));
 
         foreach ($articles as $article) {
             $progress->setMessage($article->title . ' (' . $article->urn . ')');
@@ -64,10 +57,10 @@ public function handle(ArticleRepositoryInterface $repository): void
 
             $article->touch($this->clock);
 
-            $this->em->persist($article);
+            $em->persist($article);
         }
 
         $progress->clear();
-        $this->em->flush();
+        $em->flush();
     }
 }

app/Application/Console/Commands/Command.php

@@ -10,8 +10,7 @@
 abstract class Command extends BaseCommand
 {
     /**
-     * @param int $max
-     * @return ProgressBar
+     * @param int<0, max> $max
      */
     protected function progress(int $max = 0): ProgressBar
     {
@@ -20,4 +19,16 @@ protected function progress(int $max = 0): ProgressBar
 
         return $progress;
     }
+
+    /**
+     * @return int<0, max>
+     */
+    protected function count(iterable $items): int
+    {
+        if ($items instanceof \Countable || \is_array($items)) {
+            return \count($items);
+        }
+
+        return \count([...$items]);
+    }
 }

app/Application/Console/Commands/DocsFetchCommand.php

@@ -39,16 +39,9 @@ class DocsFetchCommand extends Command
      */
     protected $description = 'Download and update source documentation';
 
-    /**
-     * @var Repository
-     */
-    private Repository $source;
+    private readonly Repository $source;
 
-    /**
-     * @param Client $client
-     * @param EntityManagerInterface $em
-     */
-    public function __construct(Client $client, private readonly EntityManagerInterface $em)
+    public function __construct(Client $client)
     {
         parent::__construct();
 
@@ -58,14 +51,15 @@ public function __construct(Client $client, private readonly EntityManagerInterf
     }
 
     public function handle(
+        EntityManagerInterface $em,
         VersionRepositoryInterface $versions,
         DocumentationRepositoryInterface $docs,
     ): void {
         //
         // Синхронизируем все доступные версии из оригинальной документации.
         //
         $this->info('Versions updating');
-        $branches = \iterator_to_array($this->loadVersions($versions));
+        $branches = \iterator_to_array($this->loadVersions($em, $versions));
         $this->comment('Versions updated');
 
         //
@@ -81,7 +75,7 @@ public function handle(
         foreach ($branches as ['branch' => $branch, 'version' => $version]) {
             $this->info(\sprintf('Source %s documentation updating', $branch->getName()));
 
-            foreach($this->loadFiles($docs, $branch, $version) as $_);
+            foreach($this->loadFiles($em, $docs, $branch, $version) as $_);
 
             $this->comment(\sprintf('Source %s documentation updated', $branch->getName()));
         }
@@ -90,7 +84,7 @@ public function handle(
     /**
      * @return \Traversable<non-empty-string, array{branch: BranchInterface, version: Version}>
      */
-    private function loadVersions(VersionRepositoryInterface $versions): \Traversable
+    private function loadVersions(EntityManagerInterface $em, VersionRepositoryInterface $versions): \Traversable
     {
         $branches = $this->source->getBranches();
         $progress = $this->progress($branches->count());
@@ -110,19 +104,20 @@ private function loadVersions(VersionRepositoryInterface $versions): \Traversabl
             $version = $versions->findByName($branch->getName())
                 ?? new Version($branch->getName());
 
-            $this->em->persist($version);
+            $em->persist($version);
 
             yield $branch->getName() => ['branch' => $branch, 'version' => $version];
         }
 
-        $this->em->flush();
+        $em->flush();
         $progress->clear();
     }
 
     /**
      * @return \Traversable<non-empty-string, array{file: FileInterface, page: Documentation}>
      */
     private function loadFiles(
+        EntityManagerInterface $em,
         DocumentationRepositoryInterface $docs,
         BranchInterface $branch,
         Version $ver,
@@ -161,10 +156,10 @@ private function loadFiles(
 
             yield $file->getUrn() => ['file' => $file, 'page' => $page];
 
-            $this->em->persist($page);
+            $em->persist($page);
         }
 
-        $this->em->flush();
         $progress->clear();
+        $em->flush();
     }
 }

app/Application/Console/Commands/DocsTouchCommand.php

@@ -36,14 +36,15 @@ class DocsTouchCommand extends Command
     protected $description = 'Update documentation and execute the page renderer';
 
     public function __construct(
-        private readonly EntityManagerInterface $em,
         private readonly ClockInterface $clock,
     ) {
         parent::__construct();
     }
 
-    public function handle(VersionRepositoryInterface $versions): void
-    {
+    public function handle(
+        EntityManagerInterface $em,
+        VersionRepositoryInterface $versions
+    ): void {
         foreach ($versions->all() as $version) {
             $progress = $this->progress($version->docs->count());
 
@@ -57,10 +58,10 @@ public function handle(VersionRepositoryInterface $versions): void
 
                 $documentation->touch($this->clock);
 
-                $this->em->persist($documentation);
+                $em->persist($documentation);
             }
 
-            $this->em->flush();
+            $em->flush();
             $progress->clear();
         }
     }

app/Application/Console/Commands/DocsTranslationCommand.php

@@ -28,34 +28,16 @@ abstract class DocsTranslationCommand extends Command
     private const NOTICE_TRANSLATION_EXTRA_FILE =
         '<error>Skip the translation file %s, which does not correspond to the source</error>';
 
-    /**
-     * @var Repository
-     */
-    protected Repository $source;
-
-    /**
-     * @var Repository
-     */
-    protected Repository $translation;
+    protected readonly Repository $source;
 
-    /**
-     * @var EntityManagerInterface
-     */
-    protected EntityManagerInterface $em;
+    protected readonly Repository $translation;
 
-    /**
-     * @param Client $client
-     * @param EntityManagerInterface $em
-     * @param Config $config
-     */
-    public function __construct(Client $client, EntityManagerInterface $em, Config $config)
+    public function __construct(Client $client, Config $config)
     {
         parent::__construct();
 
         \ini_set('memory_limit', -1);
 
-        $this->em = $em;
-
         $this->source = new Repository(
             $client,
             $config->get('documentation.laravel-source.user'),
@@ -71,6 +53,7 @@ public function __construct(Client $client, EntityManagerInterface $em, Config $
     }
 
     public function handle(
+        EntityManagerInterface $em,
         VersionRepositoryInterface $versions,
         DocumentationRepositoryInterface $docs,
     ): void {
@@ -79,12 +62,13 @@ public function handle(
         //
         foreach ($this->translation->getBranches() as $branch) {
             $this->info(\sprintf('Translation %s updating', $branch->getName()));
-            $this->loadTranslations($branch, $versions, $docs);
+            $this->loadTranslations($em, $branch, $versions, $docs);
             $this->comment(\sprintf('Translation %s updated', $branch->getName()));
         }
     }
 
     private function loadTranslations(
+        EntityManagerInterface $em,
         BranchInterface $branch,
         VersionRepositoryInterface $versions,
         DocumentationRepositoryInterface $docs
@@ -133,12 +117,12 @@ private function loadTranslations(
 
             $this->each($page, $file);
 
-            $this->em->persist($page);
-            $this->em->flush();
+            $em->persist($page);
+            $em->flush();
         }
 
         $progress->clear();
-        $this->em->flush();
+        $em->flush();
     }
 
     /**