diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #29744 Replace slave and master by replica and primary (Mx-Glitter)

Browse Source 
This PR was submitted for the master branch but it was merged into the 4.2 branch instead (closes #29744).

Discussion
----------

Replace slave and master by replica and primary

| Q             | A
| ------------- | ---
| Branch?       | 4.2
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #29735
| License       | MIT
| Doc PR        |

I targeted 4.2 branch because the words were introduced in it cf. https://github.com/symfony/symfony/pull/27291

Commits
-------

f06e6b46ef Replace slave and master by replica and primary
This commit is contained in:
Fabien Potencier 2019-01-02 10:25:16 +01:00
commit 816f06a184
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
View File

@ -2181,9 +2181,9 @@ class OptionsResolverTest extends TestCase
->setRequired(array('dbname', 'host')) ->setRequired(array('dbname', 'host'))
->setDefaults(array( ->setDefaults(array(
'port' => 3306, 'port' => 3306,
'slaves' => function (OptionsResolver $resolver) { 'replicas' => function (OptionsResolver $resolver) {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'host' => 'slave1', 'host' => 'replica1',
'port' => 3306, 'port' => 3306,
)); ));
}, },
@ -2196,14 +2196,14 @@ class OptionsResolverTest extends TestCase
'dbname' => 'test', 'dbname' => 'test',
'host' => 'localhost', 'host' => 'localhost',
'port' => null, 'port' => null,
'slaves' => array('host' => 'slave2'), 'replicas' => array('host' => 'replica2'),
), ),
)); ));
$expectedOptions = array( $expectedOptions = array(
'name' => 'custom', 'name' => 'custom',
'database' => array( 'database' => array(
'port' => null, 'port' => null,
'slaves' => array('port' => 3306, 'host' => 'slave2'), 'replicas' => array('port' => 3306, 'host' => 'replica2'),
'dbname' => 'test', 'dbname' => 'test',
'host' => 'localhost', 'host' => 'localhost',
), ),
@ -2332,7 +2332,7 @@ class OptionsResolverTest extends TestCase
public function testFailsIfCyclicDependencyBetweenSameNestedOption() public function testFailsIfCyclicDependencyBetweenSameNestedOption()
{ {
$this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) { $this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('slaves', $parent['database']); $resolver->setDefault('replicas', $parent['database']);
}); });
$this->resolver->resolve(); $this->resolver->resolve();
} }
@ -2375,9 +2375,9 @@ class OptionsResolverTest extends TestCase
public function testFailsIfCyclicDependencyBetweenNestedOptions() public function testFailsIfCyclicDependencyBetweenNestedOptions()
{ {
$this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) { $this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('host', $parent['slave']['host']); $resolver->setDefault('host', $parent['replica']['host']);
}); });
$this->resolver->setDefault('slave', function (OptionsResolver $resolver, Options $parent) { $this->resolver->setDefault('replica', function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('host', $parent['database']['host']); $resolver->setDefault('host', $parent['database']['host']);
}); });
$this->resolver->resolve(); $this->resolver->resolve();
@ -2418,12 +2418,12 @@ class OptionsResolverTest extends TestCase
'ip' => null, 'ip' => null,
'database' => function (OptionsResolver $resolver, Options $parent) { 'database' => function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('host', $parent['ip']); $resolver->setDefault('host', $parent['ip']);
$resolver->setDefault('master_slave', function (OptionsResolver $resolver, Options $parent) { $resolver->setDefault('primary_replica', function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('host', $parent['host']); $resolver->setDefault('host', $parent['host']);
}); });
}, },
'secondary_slave' => function (Options $options) { 'secondary_replica' => function (Options $options) {
return $options['database']['master_slave']['host']; return $options['database']['primary_replica']['host'];
}, },
)); ));
$actualOptions = $this->resolver->resolve(array('ip' => '127.0.0.1')); $actualOptions = $this->resolver->resolve(array('ip' => '127.0.0.1'));
@ -2431,9 +2431,9 @@ class OptionsResolverTest extends TestCase
'ip' => '127.0.0.1', 'ip' => '127.0.0.1',
'database' => array( 'database' => array(
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'master_slave' => array('host' => '127.0.0.1'), 'primary_replica' => array('host' => '127.0.0.1'),
), ),
'secondary_slave' => '127.0.0.1', 'secondary_replica' => '127.0.0.1',
); );
$this->assertSame($expectedOptions, $actualOptions); $this->assertSame($expectedOptions, $actualOptions);
} }