Merge branch '4.2'

* 4.2:
  update years in license files
  Fix: Adjust DocBlock
  \"ParserTest->getParserTestData()\" -> only some more tests
  access the container getting it from the kernel
  Replace slave and master by replica and primary
  Fix erasing cookies issue
  [Lock] Pedantic improvements for lock
  [EventDispatcher] Fixed phpdoc on interface
  update year in license files
  [VarExporter] fix exporting array indexes
  [SecurityBundle] Fix traceable voters
  [Console] Fix help text for single command applications
  Fix random test failure on lock
  improve error message when using test client without the BrowserKit component
  Fixed minor typos in an error message
  [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset.
  Fixed minor typos
  Fix: Method can also return null
  [Stopwatch] Fixed phpdoc for category name

Author: xabbuh

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2019 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Tests/OptionsResolverTest.php

@@ -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,
                             ));
                         },
@@ -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',
             ),
@@ -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();
     }
@@ -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();
@@ -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);
     }