Make Scrutinizer happy

PubPeerFoundation · Jun 20, 2018 · c3bafba · c3bafba
1 parent 287c0cb
commit c3bafba
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 17 deletions.
diff --git a/src/Resources/Extractors/EutilsEfetch.php b/src/Resources/Extractors/EutilsEfetch.php
@@ -66,21 +66,7 @@ public function extractJournalData()
     public function extractAuthorsData()
     {
         try {
-            foreach ($this->searchTree->MedlineCitation->Article->AuthorList->Author as $author) {
-                if (! empty($lastName = get_string($author, 'LastName'))) {
-                    $affiliations = [];
-                    foreach ($author->AffiliationInfo as $affiliation) {
-                        $affiliations[]['name'] = get_string($affiliation, 'Affiliation');
-                    }
-
-                    $this->output['authors'][] = [
-                        'first_name' => get_string($author, 'ForeName'),
-                        'last_name' => $lastName,
-                        'email' => get_string(find_emails_in_array(Arr::pluck($affiliations, 'name')), 0),
-                        'affiliation' => $affiliations,
-                    ];
-                }
-            }
+            $this->loopOverAuthors();
         } catch (\Exception $e) {
             // Empty catch block, don't want anything to happen in case of exception.
         }
@@ -105,4 +91,60 @@ protected function getIssns()
 
         return $issn;
     }
+
+    /**
+     * Loop over authors array.
+     */
+    protected function loopOverAuthors(): void
+    {
+        foreach ($this->searchTree->MedlineCitation->Article->AuthorList->Author as $author) {
+            $this->createAuthorEntry($author);
+        }
+    }
+
+    /**
+     * Create an author entry in output.
+     *
+     * @param $author
+     */
+    protected function createAuthorEntry($author): void
+    {
+        if (! empty($lastName = get_string($author, 'LastName'))) {
+            $affiliations = $this->loopOverAffiliations($author);
+
+            $this->output['authors'][] = [
+                'first_name' => get_string($author, 'ForeName'),
+                'last_name' => $lastName,
+                'email' => $this->getEmailsFromAffiliations($affiliations),
+                'affiliation' => $affiliations,
+            ];
+        }
+    }
+
+    /**
+     * Loop over affiliations.
+     *
+     * @param  array $author
+     * @return array
+     */
+    protected function loopOverAffiliations($author): array
+    {
+        $affiliations = [];
+        foreach ($author->AffiliationInfo as $affiliation) {
+            $affiliations[]['name'] = get_string($affiliation, 'Affiliation');
+        }
+
+        return $affiliations;
+    }
+
+    /**
+     * Get emails from affiliations array.
+     *
+     * @param  array  $affiliations
+     * @return string
+     */
+    protected function getEmailsFromAffiliations($affiliations): string
+    {
+        return get_string(find_emails_in_array(Arr::pluck($affiliations, 'name')), 0);
+    }
 }
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
@@ -62,8 +62,8 @@ function date_from_parseable_format($string)
      *
      * @param array $array
      * @param $key
-     * @param  mixed $default
-     * @return mixed
+     * @param  mixed  $default
+     * @return string
      */
     function get_string($array, $key, $default = null)
     {