Rename "reseter" to "Resetter" (BC break)
This commit is contained in:
parent
d3a2335a55
commit
43eda480c5
|
@ -29,8 +29,8 @@ class PopulateCommand extends ContainerAwareCommand
|
|||
*/
|
||||
protected function execute(InputInterface $input, OutputInterface $output)
|
||||
{
|
||||
$output->writeln('Reseting indexes');
|
||||
$this->getContainer()->get('foq_elastica.reseter')->reset();
|
||||
$output->writeln('Resetting indexes');
|
||||
$this->getContainer()->get('foq_elastica.resetter')->reset();
|
||||
|
||||
$output->writeln('Populating indexes');
|
||||
$this->getContainer()->get('foq_elastica.populator')->populate(function($text) use ($output) {
|
||||
|
|
|
@ -48,7 +48,7 @@ class FOQElasticaExtension extends Extension
|
|||
}, $indexIdsByName);
|
||||
|
||||
$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.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
|
||||
**/
|
||||
protected function loadReseter(array $indexConfigs, ContainerBuilder $container)
|
||||
protected function loadResetter(array $indexConfigs, ContainerBuilder $container)
|
||||
{
|
||||
$reseterDef = $container->getDefinition('foq_elastica.reseter');
|
||||
$reseterDef->replaceArgument(0, $indexConfigs);
|
||||
$resetterDef = $container->getDefinition('foq_elastica.resetter');
|
||||
$resetterDef->replaceArgument(0, $indexConfigs);
|
||||
}
|
||||
|
||||
protected function loadDriver(ContainerBuilder $container, $driver)
|
||||
|
|
|
@ -2,12 +2,10 @@
|
|||
|
||||
namespace FOQ\ElasticaBundle;
|
||||
|
||||
use Elastica_Exception_Response;
|
||||
|
||||
/**
|
||||
* Deletes and recreates indexes
|
||||
**/
|
||||
class Reseter
|
||||
class Resetter
|
||||
{
|
||||
/**
|
||||
* Index settings and mappings
|
|
@ -41,7 +41,7 @@
|
|||
<argument /> <!-- providers -->
|
||||
</service>
|
||||
|
||||
<service id="foq_elastica.reseter" class="FOQ\ElasticaBundle\Reseter">
|
||||
<service id="foq_elastica.resetter" class="FOQ\ElasticaBundle\Resetter">
|
||||
<argument /> <!-- index configs -->
|
||||
</service>
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace FOQ\ElasticaBundle\Tests\Reseter;
|
||||
namespace FOQ\ElasticaBundle\Tests\Resetter;
|
||||
|
||||
use FOQ\ElasticaBundle\Reseter;
|
||||
use FOQ\ElasticaBundle\Resetter;
|
||||
use FOQ\ElasticaBundle\IndexManager;
|
||||
use Elastica_Exception_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()
|
||||
{
|
||||
|
@ -61,8 +61,8 @@ class ReseterTest extends \PHPUnit_Framework_TestCase
|
|||
$indexConfig['index_2']['config'] = array();
|
||||
|
||||
|
||||
$reseter = new Reseter($indexConfig);
|
||||
$reseter->reset();
|
||||
$resetter = new Resetter($indexConfig);
|
||||
$resetter->reset();
|
||||
|
||||
$this->assertTrue($indexConfig['index_1']['index']->created);
|
||||
$this->assertTrue($indexConfig['index_2']['index']->created);
|
Loading…
Reference in a new issue