deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename "reseter" to "Resetter" (BC break)

Browse source
This commit is contained in:
Jeremy Mikola 2012-03-02 00:28:38 -05:00
parent d3a2335a55
commit 43eda480c5
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/PopulateCommand.php
View file

@ -29,8 +29,8 @@ class PopulateCommand extends ContainerAwareCommand
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$output->writeln('Reseting indexes'); $output->writeln('Resetting indexes');
$this->getContainer()->get('foq_elastica.reseter')->reset(); $this->getContainer()->get('foq_elastica.resetter')->reset();
$output->writeln('Populating indexes'); $output->writeln('Populating indexes');
$this->getContainer()->get('foq_elastica.populator')->populate(function($text) use ($output) { $this->getContainer()->get('foq_elastica.populator')->populate(function($text) use ($output) {

10
DependencyInjection/FOQElasticaExtension.php
View file

@ -48,7 +48,7 @@ class FOQElasticaExtension extends Extension
}, $indexIdsByName); }, $indexIdsByName);
$this->loadIndexManager($indexRefsByName, $container); $this->loadIndexManager($indexRefsByName, $container);
$this->loadReseter($this->indexConfigs, $container); $this->loadResetter($this->indexConfigs, $container);
$container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client'])); $container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
$container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index'])); $container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
@ -382,14 +382,14 @@ class FOQElasticaExtension extends Extension
} }
/** /**
* Loads the reseter * Loads the resetter
* *
* @return null * @return null
**/ **/
protected function loadReseter(array $indexConfigs, ContainerBuilder $container) protected function loadResetter(array $indexConfigs, ContainerBuilder $container)
{ {
$reseterDef = $container->getDefinition('foq_elastica.reseter'); $resetterDef = $container->getDefinition('foq_elastica.resetter');
$reseterDef->replaceArgument(0, $indexConfigs); $resetterDef->replaceArgument(0, $indexConfigs);
} }
protected function loadDriver(ContainerBuilder $container, $driver) protected function loadDriver(ContainerBuilder $container, $driver)

4
Reseter.php → Resetter.php
View file

@ -2,12 +2,10 @@
namespace FOQ\ElasticaBundle; namespace FOQ\ElasticaBundle;
use Elastica_Exception_Response;
/** /**
* Deletes and recreates indexes * Deletes and recreates indexes
**/ **/
class Reseter class Resetter
{ {
/** /**
* Index settings and mappings * Index settings and mappings

2
Resources/config/config.xml
View file

@ -41,7 +41,7 @@
<argument /> <!-- providers --> <argument /> <!-- providers -->
</service> </service>
<service id="foq_elastica.reseter" class="FOQ\ElasticaBundle\Reseter"> <service id="foq_elastica.resetter" class="FOQ\ElasticaBundle\Resetter">
<argument /> <!-- index configs --> <argument /> <!-- index configs -->
</service> </service>

10
Tests/ReseterTest.php → Tests/ResetterTest.php
View file

@ -1,8 +1,8 @@
<?php <?php
namespace FOQ\ElasticaBundle\Tests\Reseter; namespace FOQ\ElasticaBundle\Tests\Resetter;
use FOQ\ElasticaBundle\Reseter; use FOQ\ElasticaBundle\Resetter;
use FOQ\ElasticaBundle\IndexManager; use FOQ\ElasticaBundle\IndexManager;
use Elastica_Exception_Response; use Elastica_Exception_Response;
use Elastica_Response; use Elastica_Response;
@ -41,7 +41,7 @@ class NewIndex
} }
} }
class ReseterTest extends \PHPUnit_Framework_TestCase class ResetterTest extends \PHPUnit_Framework_TestCase
{ {
public function setUp() public function setUp()
{ {
@ -61,8 +61,8 @@ class ReseterTest extends \PHPUnit_Framework_TestCase
$indexConfig['index_2']['config'] = array(); $indexConfig['index_2']['config'] = array();
$reseter = new Reseter($indexConfig); $resetter = new Resetter($indexConfig);
$reseter->reset(); $resetter->reset();
$this->assertTrue($indexConfig['index_1']['index']->created); $this->assertTrue($indexConfig['index_1']['index']->created);
$this->assertTrue($indexConfig['index_2']['index']->created); $this->assertTrue($indexConfig['index_2']['index']->created);