Merge branch 'release-4.1'

module/VuFindSearch/src/VuFindSearch/Backend/BrowZine/Backend.php

@@ -107,8 +107,10 @@ class Backend extends AbstractBackend
                 $e
             );
         }
+        // Use array_values and array_filter to strip any nulls out of the
+        // response (these are present sometimes due to an apparent API bug)
         $results = isset($response['data']) && is_array($response['data'])
-            ? $response['data'] : [];
+            ? array_values(array_filter($response['data'])) : [];
         $collection = $this->createRecordCollection(
             [
                 'offset' => $offset,

module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/BrowZine/Response/RecordCollectionFactoryTest.php

@@ -49,7 +49,7 @@ class RecordCollectionFactoryTest extends TestCase
      */
     public function testFactory()
     {
-        $resp = ['data' => [[], [], []]];
+        $resp = ['data' => [['id' => 1], ['id' => 2], ['id' => 3]]];
         $fact = new RecordCollectionFactory();
         $coll = $fact->factory($resp);
         $this->assertEquals(3, count($coll));