Fix adding array instead of object

biblioverse · Sep 6, 2023 · ad83704 · ad83704
1 parent e43a100
commit ad83704
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Entity/Book.php b/src/Entity/Book.php
@@ -123,7 +123,7 @@ public function setTitle(string $title): self
     {
         $this->title = trim($title);
 
-        if ($title === '') {
+        if ('' === $title) {
             $this->title = 'unknown';
         }
 
@@ -240,7 +240,7 @@ public function getSerie(): ?string
     public function setSerie(?string $serie): static
     {
         $serie = trim($serie ?? '');
-        if ($serie === '') {
+        if ('' === $serie) {
             $serie = null;
         }
         $this->serie = $serie;
@@ -306,6 +306,7 @@ public function getAuthors(): array
 
     /**
      * @param array<string> $authors
+     *
      * @return $this
      */
     public function setAuthors(array $authors): static
@@ -317,9 +318,10 @@ public function setAuthors(array $authors): static
 
     public function addAuthor(string $author): static
     {
-        if (!in_array($author, $this->authors, true)) {
+        if (!in_array($author, $this->authors, true) && '' !== $author) {
             $this->authors[] = $author;
         }
+        $this->authors = array_values($this->authors);
 
         return $this;
     }
@@ -331,32 +333,35 @@ public function removeAuthor(string $author): static
                 unset($this->authors[$key]);
             }
         }
+        $this->authors = array_values($this->authors);
 
         return $this;
     }
 
     public function addTag(string $tag): static
     {
-        if ($this->tags === null) {
+        if (null === $this->tags) {
             $this->tags = [];
         }
         if (!in_array($tag, $this->tags, true)) {
             $this->tags[] = $tag;
         }
+        $this->tags = array_values($this->tags);
 
         return $this;
     }
 
     public function removeTag(string $tag): static
     {
-        if ($this->tags === null) {
+        if (null === $this->tags) {
             $this->tags = [];
         }
         foreach ($this->tags as $key => $value) {
             if ($value === $tag) {
                 unset($this->tags[$key]);
             }
         }
+        $this->tags = array_values($this->tags);
 
         return $this;
     }
@@ -433,6 +438,7 @@ public function getTags(): ?array
 
     /**
      * @param array<string>|null $tags
+     *
      * @return $this
      */
     public function setTags(?array $tags): static

diff --git a/src/Repository/BookRepository.php b/src/Repository/BookRepository.php
@@ -199,6 +199,8 @@ private function convertResults(mixed $intermediateResults): array
             }
         }
 
+        ksort($results);
+
         return $results;
     }
 }
diff --git a/src/Twig/InlineEditBook.php b/src/Twig/InlineEditBook.php
@@ -54,12 +54,12 @@ public function usesuggestion(#[LiveArg] string $field, #[LiveArg] string $sugge
         $to_call = 'set'.ucfirst($field);
         $value = $this->suggestions[$field][$suggestion];
         if (is_callable([$this->book, $to_call])) {
-            /* @phpstan-ignore-next-line */
-            if ($field === 'tags') {
+            if ('tags' === $field) {
                 $this->book->addTag($value);
-            } elseif ($field === 'authors') {
+            } elseif ('authors' === $field) {
                 $this->book->addAuthor($value);
             } else {
+                /* @phpstan-ignore-next-line */
                 $this->book->$to_call($value);
             }
         }