From c97f0f1ddf9a0590bf8a978ee1131ce564860356 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Thu, 19 Jun 2014 11:14:13 +1000 Subject: [PATCH] Fix provider bailing if the indexable service filters an entire batch of objects --- Doctrine/AbstractProvider.php | 5 +++++ Propel/Provider.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Doctrine/AbstractProvider.php b/Doctrine/AbstractProvider.php index 0c43b2d..44be6c7 100644 --- a/Doctrine/AbstractProvider.php +++ b/Doctrine/AbstractProvider.php @@ -64,6 +64,11 @@ abstract class AbstractProvider extends BaseAbstractProvider $stepNbObjects = count($objects); } $objects = array_filter($objects, array($this, 'isObjectIndexable')); + if (!$objects) { + $loggerClosure('Entire batch was filtered away, skipping...'); + + continue; + } if (!$ignoreErrors) { $this->objectPersister->insertMany($objects); diff --git a/Propel/Provider.php b/Propel/Provider.php index c242d47..38f7a61 100644 --- a/Propel/Provider.php +++ b/Propel/Provider.php @@ -36,6 +36,11 @@ class Provider extends AbstractProvider $stepNbObjects = count($objects); } $objects = array_filter($objects, array($this, 'isObjectIndexable')); + if (!$objects) { + $loggerClosure('Entire batch was filtered away, skipping...'); + + continue; + } $this->objectPersister->insertMany($objects);