From b6e01cd332ffa29ab354c9d882b5686f698c1d06 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 27 Mar 2015 11:45:03 +1100
Subject: [PATCH] Fix issues with Provider's batch_size and PopulateCommand's
 batch_size

---
 CHANGELOG-3.1.md              | 6 ++++++
 Command/PopulateCommand.php   | 4 +++-
 Provider/AbstractProvider.php | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index aa431e3..63da912 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -9,6 +9,12 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/commit/XXX where XXX is
 the commit hash. To get the diff between two versions, go to
 https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.4...v3.1.0
 
+* 3.1.1 (2015-03-27)
+
+ * Fix PopulateCommand trying to set formats for ProgressBar in Symfony < 2.5
+ * Fix Provider implementations that depend on a batch size from going into 
+   infinite loops
+
 * 3.1.0 (2015-03-18)
 
  * BC BREAK: `Doctrine\Listener#scheduleForDeletion` access changed to private.
diff --git a/Command/PopulateCommand.php b/Command/PopulateCommand.php
index adeeaad..42af355 100644
--- a/Command/PopulateCommand.php
+++ b/Command/PopulateCommand.php
@@ -91,11 +91,13 @@ class PopulateCommand extends ContainerAwareCommand
         $type = $input->getOption('type');
         $reset = !$input->getOption('no-reset');
         $options = array(
-            'batch_size' => $input->getOption('batch-size'),
             'ignore_errors' => $input->getOption('ignore-errors'),
             'offset' => $input->getOption('offset'),
             'sleep' => $input->getOption('sleep')
         );
+        if ($input->getOption('batch-size')) {
+            $options['batch_size'] = (int) $input->getOption('batch-size');
+        }
 
         if ($input->isInteractive() && $reset && $input->getOption('offset')) {
             /** @var DialogHelper $dialog */
diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php
index 87614cd..af000f0 100644
--- a/Provider/AbstractProvider.php
+++ b/Provider/AbstractProvider.php
@@ -104,6 +104,8 @@ abstract class AbstractProvider implements ProviderInterface
      */
     protected function configureOptions()
     {
+        $this->resolver->setAllowedTypes('batch_size', 'int');
+
         $this->resolver->setDefaults(array(
             'batch_size' => 100,
             'skip_indexable_check' => false,