Remove call_user_func from record factories (extracted from vufind-or…

…g#4126).
EreMaijala · Nov 29, 2024 · 0715d34 · 0715d34
1 parent 0247078
commit 0715d34
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php
@@ -32,7 +32,6 @@
 use VuFindSearch\Exception\InvalidArgumentException;
 use VuFindSearch\Response\RecordCollectionFactoryInterface;
 
-use function call_user_func;
 use function gettype;
 use function is_array;
 use function is_callable;
@@ -104,7 +103,7 @@ public function factory($response)
             ?? $response['Records'] ?? [];
 
         foreach ($records as $record) {
-            $collection->add(call_user_func($this->recordFactory, $record), false);
+            $collection->add(($this->recordFactory)($record), false);
         }
         return $collection;
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EIT/Response/XML/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/EIT/Response/XML/RecordCollectionFactory.php
@@ -33,7 +33,6 @@
 use VuFindSearch\Exception\InvalidArgumentException;
 use VuFindSearch\Response\RecordCollectionFactoryInterface;
 
-use function call_user_func;
 use function gettype;
 use function is_array;
 use function is_callable;
@@ -102,7 +101,7 @@ public function factory($response)
         }
         $collection = new $this->collectionClass($response);
         foreach ($response['docs'] as $doc) {
-            $collection->add(call_user_func($this->recordFactory, $doc), false);
+            $collection->add(($this->recordFactory)($doc), false);
         }
         return $collection;
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/RecordCollectionFactory.php
@@ -32,7 +32,6 @@
 use VuFindSearch\Exception\InvalidArgumentException;
 use VuFindSearch\Response\RecordCollectionFactoryInterface;
 
-use function call_user_func;
 use function is_callable;
 
 /**
@@ -96,7 +95,7 @@ public function factory($response)
             $response['offset']
         );
         foreach ($response['records'] as $doc) {
-            $collection->add(call_user_func($this->recordFactory, $doc), false);
+            $collection->add(($this->recordFactory)($doc), false);
         }
         return $collection;
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollectionFactory.php
@@ -32,7 +32,6 @@
 use VuFindSearch\Exception\InvalidArgumentException;
 use VuFindSearch\Response\RecordCollectionFactoryInterface;
 
-use function call_user_func;
 use function gettype;
 use function is_array;
 use function sprintf;
@@ -108,7 +107,7 @@ public function factory($response)
             if (isset($doc['id']) && ($hl = $hlDetails[$doc['id']] ?? [])) {
                 $doc['__highlight_details'] = $hl;
             }
-            $collection->add(call_user_func($this->recordFactory, $doc), false);
+            $collection->add(($this->recordFactory)($doc), false);
         }
         return $collection;
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat2/Response/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat2/Response/RecordCollectionFactory.php
@@ -33,7 +33,6 @@
 use VuFindSearch\Exception\InvalidArgumentException;
 use VuFindSearch\Response\RecordCollectionFactoryInterface;
 
-use function call_user_func;
 use function gettype;
 use function is_array;
 use function is_callable;
@@ -105,7 +104,7 @@ public function factory($response)
         }
         $collection = new $this->collectionClass($response);
         foreach ($response['docs'] as $doc) {
-            $collection->add(call_user_func($this->recordFactory, $doc), false);
+            $collection->add(($this->recordFactory)($doc), false);
         }
         return $collection;
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Response/AbstractJsonRecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Response/AbstractJsonRecordCollectionFactory.php
@@ -32,7 +32,6 @@
 
 use VuFindSearch\Exception\InvalidArgumentException;
 
-use function call_user_func;
 use function gettype;
 use function is_array;
 use function is_callable;
@@ -104,7 +103,7 @@ public function factory($response)
         }
         $collection = new $this->collectionClass($response);
         foreach ($this->getDocumentListFromResponse($response) as $doc) {
-            $collection->add(call_user_func($this->recordFactory, $doc), false);
+            $collection->add(($this->recordFactory)($doc), false);
         }
         return $collection;
     }