Merge pull request pkp#219 from pkp/i8092-fix

pkp/pkp-lib#8092 Refactor entity collector to use more intuitive syntax
withanage · Aug 19, 2022 · 21656e2 · 21656e2
2 parents 437ca75 + a284fc5
commit 21656e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/OrcidProfilePlugin.inc.php b/OrcidProfilePlugin.inc.php
@@ -838,11 +838,9 @@ public function handleEditorAction($hookName, $args)
             $publication = $submission->getCurrentPublication();
 
             if (isset($publication)) {
-                $authors = Repo::author()->getMany(
-                    Repo::author()
-                        ->getCollector()
-                        ->filterByPublicationIds([$submission->getCurrentPublication()->getId()])
-                );
+                $authors = Repo::author()->getCollector()
+                    ->filterByPublicationIds([$submission->getCurrentPublication()->getId()])
+                    ->getMany();
 
                 foreach ($authors as $author) {
                     $orcidAccessExpiresOn = Carbon\Carbon::parse($author->getData('orcidAccessExpiresOn'));
@@ -883,11 +881,10 @@ public function sendSubmissionToOrcid($publication, $request)
             $issue = Repo::issue()->get($issueId);
         }
 
-        $authors = Repo::author()->getMany(
-            Repo::author()
-                ->getCollector()
-                ->filterByPublicationIds([$publicationId])
-        );
+        $authors = Repo::author()
+            ->getCollector()
+            ->filterByPublicationIds([$publicationId])
+            ->getMany();
 
         // Collect valid ORCID ids and access tokens from submission contributors
         $authorsWithOrcid = [];

diff --git a/pages/OrcidHandler.inc.php b/pages/OrcidHandler.inc.php
@@ -183,11 +183,10 @@ public function orcidVerify($args, $request)
 
 
         $publicationId = $request->getUserVar('publicationId');
-        $authors = Repo::author()->getMany(
-            Repo::author()
-                ->getCollector()
-                ->filterByPublicationIds([$publicationId])
-        );
+        $authors = Repo::author()
+            ->getCollector()
+            ->filterByPublicationIds([$publicationId])
+            ->getMany();
 
         $publication = Repo::publication()->get($publicationId);