Skip to content

Commit

Permalink
minor #29744 Replace slave and master by replica and primary (Mx-Glit…
Browse files Browse the repository at this point in the history
…ter)

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. #27291

Commits
-------

f06e6b4 Replace slave and master by replica and primary
  • Loading branch information
fabpot committed Jan 2, 2019
2 parents 42ac8af + f06e6b4 commit 816f06a
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
Expand Up @@ -2181,9 +2181,9 @@ public function testResolveMultipleNestedOptions()
->setRequired(array('dbname', 'host'))
->setDefaults(array(
'port' => 3306,
'slaves' => function (OptionsResolver $resolver) {
'replicas' => function (OptionsResolver $resolver) {
$resolver->setDefaults(array(
'host' => 'slave1',
'host' => 'replica1',
'port' => 3306,
));
},
Expand All @@ -2196,14 +2196,14 @@ public function testResolveMultipleNestedOptions()
'dbname' => 'test',
'host' => 'localhost',
'port' => null,
'slaves' => array('host' => 'slave2'),
'replicas' => array('host' => 'replica2'),
),
));
$expectedOptions = array(
'name' => 'custom',
'database' => array(
'port' => null,
'slaves' => array('port' => 3306, 'host' => 'slave2'),
'replicas' => array('port' => 3306, 'host' => 'replica2'),
'dbname' => 'test',
'host' => 'localhost',
),
Expand Down Expand Up @@ -2332,7 +2332,7 @@ public function testNormalizeNestedValue()
public function testFailsIfCyclicDependencyBetweenSameNestedOption()
{
$this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
$resolver->setDefault('slaves', $parent['database']);
$resolver->setDefault('replicas', $parent['database']);
});
$this->resolver->resolve();
}
Expand Down Expand Up @@ -2375,9 +2375,9 @@ public function testFailsIfCyclicDependencyBetweenNormalizerAndNestedOption()
public function testFailsIfCyclicDependencyBetweenNestedOptions()
{
$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']);
});
$this->resolver->resolve();
Expand Down Expand Up @@ -2418,22 +2418,22 @@ public function testResolveLazyOptionWithTransitiveDefaultDependency()
'ip' => null,
'database' => function (OptionsResolver $resolver, Options $parent) {
$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']);
});
},
'secondary_slave' => function (Options $options) {
return $options['database']['master_slave']['host'];
'secondary_replica' => function (Options $options) {
return $options['database']['primary_replica']['host'];
},
));
$actualOptions = $this->resolver->resolve(array('ip' => '127.0.0.1'));
$expectedOptions = array(
'ip' => '127.0.0.1',
'database' => array(
'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);
}
Expand Down

0 comments on commit 816f06a

Please sign in to comment.