Merge pull request ANSTO#9 from joshpme/master

Fix up logging and imports
joshpme · Sep 28, 2022 · 7bd9739 · 7bd9739
2 parents 18c4f5a + 5ae6763
commit 7bd9739
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/config/packages/prod/monolog.yaml b/config/packages/prod/monolog.yaml
@@ -9,7 +9,7 @@ monolog:
         nested:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
+            level: error
         console:
             type: console
             process_psr_3_messages: false

diff --git a/src/Entity/Author.php b/src/Entity/Author.php
@@ -113,7 +113,7 @@ public function removeReference(Reference $reference)
         $this->references->removeElement($reference);
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             "id"=>$this->getId(),

diff --git a/src/Entity/Conference.php b/src/Entity/Conference.php
@@ -390,7 +390,7 @@ public function getForm($form = "long") {
         }
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $start = $this->getConferenceStart();
         $end = $this->getConferenceEnd();

diff --git a/src/Entity/Favourite.php b/src/Entity/Favourite.php
@@ -101,7 +101,7 @@ public function getUser()
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): int
     {
         return $this->getReference()->getId();
     }

diff --git a/src/Entity/Reference.php b/src/Entity/Reference.php
@@ -549,7 +549,7 @@ public function setCache($cache)
         $this->cache = $cache;
     }
 
-    public function jsonSerialize($full = false)
+    public function jsonSerialize($full = false): array
     {
         $response = [
             "id" => $this->getId()

diff --git a/src/Service/ImportService.php b/src/Service/ImportService.php
@@ -171,15 +171,14 @@ private function calculateAuthors($references) {
                 ->getQuery()
                 ->getResult();
 
-            if (count($dbAuthors) == 1) {
+            if (count($dbAuthors) >= 1) {
                 $dbAuthor = $dbAuthors[0];
+                /** @var Reference $reference */
                 foreach ($newAuthorRefs as $reference) {
                     if (!$dbAuthor->getReferences()->contains($reference)) {
                         $dbAuthor->addReference($reference);
                     }
                 }
-            } elseif (count($dbAuthors) > 1) {
-                throw new Exception("Multiple authors found: " . $name);
             } else {
                 $newAuthor = new Author();
                 $newAuthor->setName($name);