Fix phpstan issues

sulu · Dec 3, 2022 · c021552 · c021552
1 parent 6b08021
commit c021552
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 198 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -41,7 +41,7 @@ jobs:
                       dependency-versions: 'highest'
                       php-extensions: 'ctype, iconv, mysql, imagick'
                       tools: 'composer:v2'
-                      phpstan: true
+                      phpstan: false
                       lint: false
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
@@ -66,7 +66,7 @@ jobs:
                       dependency-versions: 'highest'
                       php-extensions: 'ctype, iconv, mysql, imagick'
                       tools: 'composer:v2'
-                      phpstan: false
+                      phpstan: true
                       lint: true
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak

diff --git a/Application/Message/ApplyWorkflowTransitionArticleMessage.php b/Application/Message/ApplyWorkflowTransitionArticleMessage.php
@@ -14,9 +14,9 @@
 class ApplyWorkflowTransitionArticleMessage
 {
     /**
-     * @param array{
-     *     uuid?: string
-     * } $identifier
+     * @var array{
+     *     uuid?: string,
+     * }
      */
     private $identifier;
 
@@ -43,9 +43,9 @@ public function __construct(array $identifier, string $locale, string $transitio
     }
 
     /**
-     * @param array{
+     * @return array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     public function getIdentifier(): array
     {

diff --git a/Application/Message/CopyLocaleArticleMessage.php b/Application/Message/CopyLocaleArticleMessage.php
@@ -5,9 +5,9 @@
 class CopyLocaleArticleMessage
 {
     /**
-     * @param array{
+     * @var array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     private $identifier;
 
@@ -34,9 +34,9 @@ public function __construct($identifier, string $sourceLocale, string $targetLoc
     }
 
     /**
-     * @param array{
+     * @return array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     public function getIdentifier()
     {

diff --git a/Application/Message/CreateArticleMessage.php b/Application/Message/CreateArticleMessage.php
@@ -23,15 +23,28 @@ class CreateArticleMessage
      */
     private $data;
 
+    /**
+     * @var string|null
+     */
+    private $uuid;
+
     /**
      * @param mixed[] $data
      */
     public function __construct(array $data)
     {
+        $uuid = $data['uuid'] ?? null;
+
         Assert::string($data['locale'] ?? null, 'Expected a "locale" string given.');
-        Assert::nullOrString($data['uuid'] ?? null, 'Expected "uuid" to be a string.');
+        Assert::nullOrString($uuid, 'Expected "uuid" to be a string.');
 
         $this->data = $data;
+        $this->uuid = $uuid;
+    }
+
+    public function getUuid(): ?string
+    {
+        return $this->uuid;
     }
 
     /**

diff --git a/Application/Message/ModifyArticleMessage.php b/Application/Message/ModifyArticleMessage.php
@@ -19,9 +19,9 @@
 class ModifyArticleMessage
 {
     /**
-     * @param array{
+     * @var array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     private $identifier;
 
@@ -45,17 +45,17 @@ public function __construct(array $identifier, array $data)
     }
 
     /**
-     * @param array{
+     * @return array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     public function getIdentifier(): array
     {
         return $this->identifier;
     }
 
     /**
-     * @var mixed[]
+     * @return mixed[]
      */
     public function getData(): array
     {

diff --git a/Application/Message/RemoveArticleMessage.php b/Application/Message/RemoveArticleMessage.php
@@ -17,9 +17,9 @@
 class RemoveArticleMessage
 {
     /**
-     * @param array{
+     * @var array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     private $identifier;
 
@@ -34,9 +34,9 @@ public function __construct(array $identifier)
     }
 
     /**
-     * @param array{
+     * @return array{
      *     uuid?: string
-     * } $identifier
+     * }
      */
     public function getIdentifier(): array
     {

diff --git a/Application/MessageHandler/CopyLocaleArticleMessageHandler.php b/Application/MessageHandler/CopyLocaleArticleMessageHandler.php
@@ -44,7 +44,7 @@ public function __construct(
 
     public function __invoke(CopyLocaleArticleMessage $message): void
     {
-        $article = $this->articleRepository->findOneBy($message->getIdentifier());
+        $article = $this->articleRepository->getOneBy($message->getIdentifier());
 
         $this->contentCopier->copy(
             $article,

diff --git a/Application/MessageHandler/CreateArticleMessageHandler.php b/Application/MessageHandler/CreateArticleMessageHandler.php
@@ -34,6 +34,9 @@ final class CreateArticleMessageHandler
      */
     private $articleMappers;
 
+    /**
+     * @param iterable<ArticleMapperInterface> $articleMappers
+     */
     public function __construct(
         ArticleRepositoryInterface $articleRepository,
         iterable $articleMappers
@@ -45,7 +48,7 @@ public function __construct(
     public function __invoke(CreateArticleMessage $message): ArticleInterface
     {
         $data = $message->getData();
-        $article = $this->articleRepository->createNew($data['uuid'] ?? null);
+        $article = $this->articleRepository->createNew($message->getUuid());
 
         foreach ($this->articleMappers as $articleMapper) {
             $articleMapper->mapArticleData($article, $data);

diff --git a/Application/MessageHandler/ModifyArticleMessageHandler.php b/Application/MessageHandler/ModifyArticleMessageHandler.php
@@ -34,6 +34,9 @@ final class ModifyArticleMessageHandler
      */
     private $articleMappers;
 
+    /**
+     * @param iterable<ArticleMapperInterface> $articleMappers
+     */
     public function __construct(
         ArticleRepositoryInterface $articleRepository,
         iterable $articleMappers
@@ -46,7 +49,7 @@ public function __invoke(ModifyArticleMessage $message): ArticleInterface
     {
         $identifier = $message->getIdentifier();
         $data = $message->getData();
-        $article = $this->articleRepository->findOneBy($identifier);
+        $article = $this->articleRepository->getOneBy($identifier);
 
         foreach ($this->articleMappers as $articleMapper) {
             $articleMapper->mapArticleData($article, $data);

diff --git a/Common/MessageBus/Middleware/DoctrineFlushMiddleware.php b/Common/MessageBus/Middleware/DoctrineFlushMiddleware.php
diff --git a/Common/MessageBus/Stamps/EnableFlushStamp.php b/Common/MessageBus/Stamps/EnableFlushStamp.php