From 8d8b04ead8729f1facf716ecb839d9dcfed46c9c Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Mon, 23 Mar 2015 21:39:13 +1100 Subject: [PATCH 1/5] Fixes populate command error --- Command/PopulateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/PopulateCommand.php b/Command/PopulateCommand.php index 08b501a..adeeaad 100644 --- a/Command/PopulateCommand.php +++ b/Command/PopulateCommand.php @@ -74,7 +74,7 @@ class PopulateCommand extends ContainerAwareCommand $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%"); From b6e01cd332ffa29ab354c9d882b5686f698c1d06 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Fri, 27 Mar 2015 11:45:03 +1100 Subject: [PATCH 2/5] 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, From 69470d7e20181f016d5fb40ed139a12800f888c1 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Fri, 27 Mar 2015 12:01:39 +1100 Subject: [PATCH 3/5] Fix the previous release. --- CHANGELOG-3.1.md | 4 ++++ Provider/AbstractProvider.php | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md index 63da912..1a23ece 100644 --- a/CHANGELOG-3.1.md +++ b/CHANGELOG-3.1.md @@ -9,6 +9,10 @@ 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.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 diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php index af000f0..cf38432 100644 --- a/Provider/AbstractProvider.php +++ b/Provider/AbstractProvider.php @@ -104,12 +104,11 @@ 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, )); + $this->resolver->setAllowedTypes('batch_size', 'int'); $this->resolver->setRequired(array( 'indexName', From e933a49d0741a454fae57f6f2e3779f7a4d0aeae Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Thu, 2 Apr 2015 10:23:30 +1100 Subject: [PATCH 4/5] Use deprecated optionsResolver interface --- Provider/AbstractProvider.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php index cf38432..f05ab98 100644 --- a/Provider/AbstractProvider.php +++ b/Provider/AbstractProvider.php @@ -108,7 +108,9 @@ abstract class AbstractProvider implements ProviderInterface 'batch_size' => 100, 'skip_indexable_check' => false, )); - $this->resolver->setAllowedTypes('batch_size', 'int'); + $this->resolver->setAllowedTypes(array( + 'batch_size' => 'int' + )); $this->resolver->setRequired(array( 'indexName', From 7baf494c565fe22e3030be80fd7f39e3dc10c953 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Thu, 2 Apr 2015 10:34:08 +1100 Subject: [PATCH 5/5] release 3.1.3 --- CHANGELOG-3.1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md index 1a23ece..3ca3c77 100644 --- a/CHANGELOG-3.1.md +++ b/CHANGELOG-3.1.md @@ -9,6 +9,10 @@ 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