Merge branch '3.1.x'

Author: merk

CHANGELOG-3.1.md

@@ -9,6 +9,20 @@ 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.3 (2015-04-02)
+
+ * Fix Symfony 2.3 compatibility
+
+* 3.1.2 (2015-03-27)
+
+ * Fix the previous release
+
+* 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.

Command/PopulateCommand.php

@@ -74,7 +74,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->resetter = $this->getContainer()->get('fos_elastica.resetter');
         $this->progressClosureBuilder = new ProgressClosureBuilder();
 
-        if (!$input->getOption('no-overwrite-format')) {
+        if (!$input->getOption('no-overwrite-format') && class_exists('Symfony\\Component\\Console\\Helper\\ProgressBar')) {
             ProgressBar::setFormatDefinition('normal', " %current%/%max% [%bar%] %percent:3s%%\n%message%");
             ProgressBar::setFormatDefinition('verbose', " %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%\n%message%");
             ProgressBar::setFormatDefinition('very_verbose', " %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%\n%message%");
@@ -91,11 +91,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $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 */

Provider/AbstractProvider.php

@@ -108,6 +108,9 @@ protected function configureOptions()
             'batch_size' => 100,
             'skip_indexable_check' => false,
         ));
+        $this->resolver->setAllowedTypes(array(
+            'batch_size' => 'int'
+        ));
 
         $this->resolver->setRequired(array(
             'indexName',