Redirecting to %1$s

Listener	Duration	Response
{{ profiler_dump(listener.stub) }}	{{ '%0.2f'\|format(listener.time * 1000) }} ms	{{ listener.response ? profiler_dump(listener.response) : '(none)' }}

Listener

Duration

Response

{{ '%0.2f'|format(listener.time * 1000) }} ms

{{ listener.response ? profiler_dump(listener.response) : '(none)' }}

Validator calls

+ In + {% set caller = call.caller %} + {% if caller.line %} + {% set link = caller.file|file_link(caller.line) %} + {% if link %} + {{ caller.name }} + {% else %} + {{ caller.name }} + {% endif %} + {% else %} + {{ caller.name }} + {% endif %} + line {{ caller.line }} (context): + + + + + + + {% if call.violations|length %} + + + + + + + + + + {% for violation in call.violations %} + + + + + + + {% endfor %} +

Path	Message	Invalid value	Violation
{{ violation.propertyPath }}	{{ violation.message }}	{{ profiler_dump(violation.seek('invalidValue')) }}	{{ profiler_dump(violation) }}

+ {% else %} + No violations + {% endif %} +

No calls to the validator were collected during this request.

+ */ +class ValidatorDataCollector extends DataCollector implements LateDataCollectorInterface +{ + private $validator; + private $cloner; + + public function __construct(TraceableValidator $validator) + { + $this->validator = $validator; + $this->data = array( + 'calls' => array(), + 'violations_count' => 0, + ); + } + + /** + * {@inheritdoc} + */ + public function collect(Request $request, Response $response, \Exception $exception = null) + { + // Everything is collected once, on kernel terminate. + } + + /** + * {@inheritdoc} + */ + public function lateCollect() + { + $collected = $this->validator->getCollectedData(); + $this->data['calls'] = $this->cloneVar($collected); + $this->data['violations_count'] += array_reduce($collected, function ($previous, $item) { + return $previous += count($item['violations']); + }, 0); + } + + public function getCalls() + { + return $this->data['calls']; + } + + public function getViolationsCount() + { + return $this->data['violations_count']; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'validator'; + } + + /** + * {@inheritdoc} + */ + protected function cloneVar($var) + { + if ($var instanceof Data) { + return $var; + } + + if (null === $this->cloner) { + $this->cloner = new VarCloner(); + $this->cloner->setMaxItems(-1); + $this->cloner->addCasters(array( + FormInterface::class => function (FormInterface $f, array $a) { + return array( + Caster::PREFIX_VIRTUAL.'name' => $f->getName(), + Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())), + Caster::PREFIX_VIRTUAL.'data' => $f->getData(), + ); + }, + )); + } + + return $this->cloner->cloneVar($var, Caster::EXCLUDE_VERBOSE); + } +} diff --git a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php new file mode 100644 index 0000000000000..811a55829a479 --- /dev/null +++ b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php @@ -0,0 +1,57 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Tests\DataCollector; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Validator\ConstraintViolation; +use Symfony\Component\Validator\ConstraintViolationList; +use Symfony\Component\Validator\DataCollector\ValidatorDataCollector; +use Symfony\Component\Validator\Validator\TraceableValidator; +use Symfony\Component\Validator\Validator\ValidatorInterface; + +class ValidatorDataCollectorTest extends TestCase +{ + public function testCollectsValidatorCalls() + { + $originalValidator = $this->createMock(ValidatorInterface::class); + $validator = new TraceableValidator($originalValidator); + + $collector = new ValidatorDataCollector($validator); + + $violations = new ConstraintViolationList(array( + $this->createMock(ConstraintViolation::class), + $this->createMock(ConstraintViolation::class), + )); + $originalValidator->method('validate')->willReturn($violations); + + $validator->validate(new \stdClass()); + + $collector->lateCollect(); + + $calls = $collector->getCalls(); + + $this->assertCount(1, $calls); + $this->assertSame(2, $collector->getViolationsCount()); + + $call = $calls[0]; + + $this->assertArrayHasKey('caller', $call); + $this->assertArrayHasKey('context', $call); + $this->assertArrayHasKey('violations', $call); + $this->assertCount(2, $call['violations']); + } + + protected function createMock($classname) + { + return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock(); + } +} diff --git a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php new file mode 100644 index 0000000000000..b2eef769ecf3c --- /dev/null +++ b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php @@ -0,0 +1,104 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Tests\Validator; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintViolation; +use Symfony\Component\Validator\ConstraintViolationList; +use Symfony\Component\Validator\ConstraintViolationListInterface; +use Symfony\Component\Validator\Context\ExecutionContextInterface; +use Symfony\Component\Validator\Mapping\MetadataInterface; +use Symfony\Component\Validator\Validator\ContextualValidatorInterface; +use Symfony\Component\Validator\Validator\TraceableValidator; +use Symfony\Component\Validator\Validator\ValidatorInterface; + +class TraceableValidatorTest extends TestCase +{ + public function testValidate() + { + $originalValidator = $this->createMock(ValidatorInterface::class); + $violations = new ConstraintViolationList(array( + $this->createMock(ConstraintViolation::class), + $this->createMock(ConstraintViolation::class), + )); + $originalValidator->expects($this->exactly(2))->method('validate')->willReturn($violations); + + $validator = new TraceableValidator($originalValidator); + + $object = new \stdClass(); + $constraints = array($this->createMock(Constraint::class)); + $groups = array('Default', 'Create'); + + $validator->validate($object, $constraints, $groups); + $line = __LINE__ - 1; + + $collectedData = $validator->getCollectedData(); + + $this->assertCount(1, $collectedData); + + $callData = $collectedData[0]; + + $this->assertSame(iterator_to_array($violations), $callData['violations']); + + $this->assertSame(array( + 'value' => $object, + 'constraints' => $constraints, + 'groups' => $groups, + ), $callData['context']); + + $this->assertEquals(array( + 'name' => 'TraceableValidatorTest.php', + 'file' => __FILE__, + 'line' => $line, + ), $callData['caller']); + + $validator->validate($object, $constraints, $groups); + $collectedData = $validator->getCollectedData(); + + $this->assertCount(2, $collectedData); + } + + public function testForwardsToOriginalValidator() + { + $originalValidator = $this->createMock(ValidatorInterface::class); + $validator = new TraceableValidator($originalValidator); + + $expects = function ($method) use ($originalValidator) { return $originalValidator->expects($this->once())->method($method); }; + + $expects('getMetadataFor')->willReturn($expected = $this->createMock(MetadataInterface::class)); + $this->assertSame($expected, $validator->getMetadataFor('value'), 'returns original validator getMetadataFor() result'); + + $expects('hasMetadataFor')->willReturn($expected = false); + $this->assertSame($expected, $validator->hasMetadataFor('value'), 'returns original validator hasMetadataFor() result'); + + $expects('inContext')->willReturn($expected = $this->createMock(ContextualValidatorInterface::class)); + $this->assertSame($expected, $validator->inContext($this->createMock(ExecutionContextInterface::class)), 'returns original validator inContext() result'); + + $expects('startContext')->willReturn($expected = $this->createMock(ContextualValidatorInterface::class)); + $this->assertSame($expected, $validator->startContext(), 'returns original validator startContext() result'); + + $expects('validate')->willReturn($expected = $this->createMock(ConstraintViolationListInterface::class)); + $this->assertSame($expected, $validator->validate('value'), 'returns original validator validate() result'); + + $expects('validateProperty')->willReturn($expected = $this->createMock(ConstraintViolationListInterface::class)); + $this->assertSame($expected, $validator->validateProperty(new \stdClass(), 'property'), 'returns original validator validateProperty() result'); + + $expects('validatePropertyValue')->willReturn($expected = $this->createMock(ConstraintViolationListInterface::class)); + $this->assertSame($expected, $validator->validatePropertyValue(new \stdClass(), 'property', 'value'), 'returns original validator validatePropertyValue() result'); + } + + protected function createMock($classname) + { + return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock(); + } +} diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php new file mode 100644 index 0000000000000..019559ae0023d --- /dev/null +++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php @@ -0,0 +1,131 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Validator; + +use Symfony\Component\Validator\ConstraintViolationList; +use Symfony\Component\Validator\Context\ExecutionContextInterface; + +/** + * Collects some data about validator calls. + * + * @author Maxime Steinhausser + */ +class TraceableValidator implements ValidatorInterface +{ + private $validator; + private $collectedData = array(); + + public function __construct(ValidatorInterface $validator) + { + $this->validator = $validator; + } + + /** + * @return ConstraintViolationList[] + */ + public function getCollectedData() + { + return $this->collectedData; + } + + /** + * {@inheritdoc} + */ + public function getMetadataFor($value) + { + return $this->validator->getMetadataFor($value); + } + + /** + * {@inheritdoc} + */ + public function hasMetadataFor($value) + { + return $this->validator->hasMetadataFor($value); + } + + /** + * {@inheritdoc} + */ + public function validate($value, $constraints = null, $groups = null) + { + $violations = $this->validator->validate($value, $constraints, $groups); + + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 7); + + $file = $trace[0]['file']; + $line = $trace[0]['line']; + + for ($i = 1; $i < 7; ++$i) { + if (isset($trace[$i]['class'], $trace[$i]['function']) + && 'validate' === $trace[$i]['function'] + && is_a($trace[$i]['class'], ValidatorInterface::class, true) + ) { + $file = $trace[$i]['file']; + $line = $trace[$i]['line']; + + while (++$i < 7) { + if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) { + $file = $trace[$i]['file']; + $line = $trace[$i]['line']; + + break; + } + } + break; + } + } + + $name = str_replace('\\', '/', $file); + $name = substr($name, strrpos($name, '/') + 1); + + $this->collectedData[] = array( + 'caller' => compact('name', 'file', 'line'), + 'context' => compact('value', 'constraints', 'groups'), + 'violations' => iterator_to_array($violations), + ); + + return $violations; + } + + /** + * {@inheritdoc} + */ + public function validateProperty($object, $propertyName, $groups = null) + { + return $this->validator->validateProperty($object, $propertyName, $groups); + } + + /** + * {@inheritdoc} + */ + public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null) + { + return $this->validator->validatePropertyValue($objectOrClass, $propertyName, $value, $groups); + } + + /** + * {@inheritdoc} + */ + public function startContext() + { + return $this->validator->startContext(); + } + + /** + * {@inheritdoc} + */ + public function inContext(ExecutionContextInterface $context) + { + return $this->validator->inContext($context); + } +} diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 21c0a8a7cd022..2b0a0cab2971f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -22,6 +22,8 @@ }, "require-dev": { "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0.0", + "symfony/var-dumper": "~3.3|~4.0.0", "symfony/intl": "^2.8.18|^3.2.5|~4.0", "symfony/yaml": "~3.3|~4.0", "symfony/config": "~2.8|~3.0|~4.0", From b30fd4f36fbc57e206145570b326cf07e68051b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vasseur?= Date: Thu, 11 May 2017 14:27:21 +0200 Subject: [PATCH 0247/1099] Add support for doctrin/dbal 2.6 types --- src/Symfony/Bridge/Doctrine/CHANGELOG.md | 4 ++++ .../Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php | 2 ++ .../Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php | 9 +++++++++ .../Tests/PropertyInfo/DoctrineExtractorTest.php | 5 +++++ .../Tests/PropertyInfo/Fixtures/DoctrineDummy.php | 10 ++++++++++ 5 files changed, 30 insertions(+) diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md index 3dcb8770ec8cc..5e24a8794f972 100644 --- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md +++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +3.4.0 +----- + * added support for doctrine/dbal v2.6 types + 3.1.0 ----- diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php index 2e6af7a0d6a45..5721528f4d5ff 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php +++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php @@ -60,6 +60,8 @@ public function guessType($class, $property) case Type::DATETIMETZ: case 'vardatetime': return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array(), Guess::HIGH_CONFIDENCE); + case 'dateinterval': + return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateIntervalType', array(), Guess::HIGH_CONFIDENCE); case Type::DATE: return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::HIGH_CONFIDENCE); case Type::TIME: diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php index e07c7b0bc2cba..ddc06806aa559 100644 --- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php +++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php @@ -117,6 +117,15 @@ public function getTypes($class, $property, array $context = array()) case DBALType::TIME: return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime')); + case 'date_immutable': + case 'datetime_immutable': + case 'datetimetz_immutable': + case 'time_immutable': + return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTimeImmutable')); + + case 'dateinterval': + return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateInterval')); + case DBALType::TARRAY: return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)); diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php index 48822d5888fbc..5d09ede2d9ad4 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php @@ -48,6 +48,8 @@ public function testGetProperties() 'id', 'guid', 'time', + 'timeImmutable', + 'dateInterval', 'json', 'simpleArray', 'float', @@ -78,6 +80,9 @@ public function typesProvider() array('id', array(new Type(Type::BUILTIN_TYPE_INT))), array('guid', array(new Type(Type::BUILTIN_TYPE_STRING))), array('bigint', array(new Type(Type::BUILTIN_TYPE_STRING))), + array('time', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))), + array('timeImmutable', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))), + array('dateInterval', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateInterval'))), array('float', array(new Type(Type::BUILTIN_TYPE_FLOAT))), array('decimal', array(new Type(Type::BUILTIN_TYPE_STRING))), array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))), diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php index 580e75803db8f..793be8f9aae8b 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php @@ -55,6 +55,16 @@ class DoctrineDummy */ private $time; + /** + * @Column(type="time_immutable") + */ + private $timeImmutable; + + /** + * @Column(type="dateinterval") + */ + private $dateInterval; + /** * @Column(type="json_array") */ From 78f1fdeb1cc74985b2da91ce6824afb2abf97bc9 Mon Sep 17 00:00:00 2001 From: Nikolay Labinskiy Date: Tue, 20 Jun 2017 10:52:59 +0300 Subject: [PATCH 0248/1099] [WebProfilerBundle] Eliminate line wrap on count columnt (routing) --- .../WebProfilerBundle/Resources/views/Router/panel.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig index 8a6929c4df916..3da1cee28785d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig @@ -54,7 +54,7 @@ {% for trace in traces %} - {{ loop.index }} + {{ loop.index }} {{ trace.name }} {{ trace.path }} From 5a18553bf125452644d961ebeebb079a51cc0b30 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 20 Jun 2017 13:28:19 +0200 Subject: [PATCH 0249/1099] Improved the exception page when there is no message --- .../TwigBundle/Resources/views/Exception/exception.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig index 4b35e4fad77db..8ed5226ad5ffa 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -13,6 +13,7 @@

- - - {{ exception.class\|split('\\')\|slice(0, -1)\|join('\\') }} - {{- exception.class\|split('\\')\|length > 1 ? '\\' }} - - {{ exception.class\|split('\\')\|last }} + + + + + + {{ exception.class\|split('\\')\|slice(0, -1)\|join('\\') }} + {{- exception.class\|split('\\')\|length > 1 ? '\\' }} + + {{ exception.class\|split('\\')\|last }} - {{ include('@Twig/images/icon-minus-square-o.svg') }} - {{ include('@Twig/images/icon-plus-square-o.svg') }} - + {{ include('@Twig/images/icon-minus-square-o.svg') }} + {{ include('@Twig/images/icon-plus-square-o.svg') }} + - {% if exception.message is not empty and index > 1 %} - {{ exception.message }} - {% endif %} -
- {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace }, with_context = false) }} -

- - {{ exception.class|split('\\')|slice(0, -1)|join('\\') }} - {{- exception.class|split('\\')|length > 1 ? '\\' }} - - {{ exception.class|split('\\')|last }} +
+
+ +
+ + {{ exception.class|split('\\')|slice(0, -1)|join('\\') }} + {{- exception.class|split('\\')|length > 1 ? '\\' }} + + {{ exception.class|split('\\')|last }} - {{ include('@Twig/images/icon-minus-square-o.svg') }} - {{ include('@Twig/images/icon-plus-square-o.svg') }} -
+ {{ include('@Twig/images/icon-minus-square-o.svg') }} + {{ include('@Twig/images/icon-plus-square-o.svg') }} +

- {% if exception.message is not empty and index > 1 %} -

- {% endif %} -

- {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace }, with_context = false) }} -

+ {{ helper.set_handler(collector.controller) }} +

Request

@@ -268,7 +272,7 @@ {% for child in profile.children %}

- {{- child.getcollector('request').identifier -}} + {{ helper.set_handler(child.getcollector('request').controller) }} (token = {{ child.token }})

From 2ebc71a61671d30142b1f67989c9c48dff5bf425 Mon Sep 17 00:00:00 2001 From: GDIBass Date: Fri, 18 Aug 2017 08:37:36 -0700 Subject: [PATCH 0648/1099] Created new Exception to throw and modified tests --- .../Workflow/EventListener/GuardListener.php | 3 ++- .../InvalidTokenConfigurationException.php | 21 +++++++++++++++++++ .../Tests/EventListener/GuardListenerTest.php | 8 ++++--- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php index 3e402e9280a95..5d10cbcfceee4 100644 --- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php +++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php @@ -16,6 +16,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; use Symfony\Component\Workflow\Event\GuardEvent; +use Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException; /** * @author Grégoire Pineau @@ -56,7 +57,7 @@ private function getVariables(GuardEvent $event) $token = $this->tokenStorage->getToken(); if (null === $token) { - throw new \Exception('No token is set'); + throw new InvalidTokenConfigurationException('No token is set'); } if (null !== $this->roleHierarchy) { diff --git a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php new file mode 100644 index 0000000000000..367d4c6eb637f --- /dev/null +++ b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Workflow\Exception; + +/** + * Thrown by GuardListener when there is no token set, but guards are placed on a transition + * + * @author Matt Johnson + */ +class InvalidTokenConfigurationException extends LogicException implements ExceptionInterface +{ +} \ No newline at end of file diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php index d72e31931360f..c32aec06a45be 100644 --- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php +++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php @@ -69,12 +69,14 @@ public function testWithSupportedEventAndAccept() $this->assertTrue($event->isBlocked()); } + /** + * @expectedException \Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException + * @expectedExceptionMessage No token is set + */ public function testWithNoTokenStorage() { $event = $this->createEvent(); - $this->tokenStorage = null; - - $this->expectException(\Exception::class); + $this->tokenStorage->setToken(null); $this->listener->onTransition($event, 'event_name_a'); } From 92308b4815b6ab2ee7eb018d9c284faf428b2131 Mon Sep 17 00:00:00 2001 From: GDIBass Date: Fri, 18 Aug 2017 08:40:24 -0700 Subject: [PATCH 0649/1099] Created new Exception to throw and modified tests. --- .../Workflow/Exception/InvalidTokenConfigurationException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php index 367d4c6eb637f..85ada5e78071b 100644 --- a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php +++ b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Workflow\Exception; /** - * Thrown by GuardListener when there is no token set, but guards are placed on a transition + * Thrown by GuardListener when there is no token set, but guards are placed on a transition. * * @author Matt Johnson */ From 2c9d1e2d426673fe5d5ea568c1794ee5e4bf364c Mon Sep 17 00:00:00 2001 From: GDIBass Date: Fri, 18 Aug 2017 08:42:05 -0700 Subject: [PATCH 0650/1099] Removed newline --- .../Component/Workflow/Exception/InvalidDefinitionException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php b/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php index d41170953564c..4ba9b183192ac 100644 --- a/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php +++ b/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php @@ -18,4 +18,4 @@ */ class InvalidDefinitionException extends LogicException { -} +} \ No newline at end of file From 49839e3c286d292a7068c9865cd12d884f299b9e Mon Sep 17 00:00:00 2001 From: GDIBass Date: Fri, 18 Aug 2017 08:43:29 -0700 Subject: [PATCH 0651/1099] Ahh, I see. It actually wants a newline! --- .../Component/Workflow/Exception/InvalidDefinitionException.php | 2 +- .../Workflow/Exception/InvalidTokenConfigurationException.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php b/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php index 4ba9b183192ac..d41170953564c 100644 --- a/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php +++ b/src/Symfony/Component/Workflow/Exception/InvalidDefinitionException.php @@ -18,4 +18,4 @@ */ class InvalidDefinitionException extends LogicException { -} \ No newline at end of file +} diff --git a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php index 85ada5e78071b..681d7a8bba52d 100644 --- a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php +++ b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php @@ -18,4 +18,4 @@ */ class InvalidTokenConfigurationException extends LogicException implements ExceptionInterface { -} \ No newline at end of file +} From ec8f56acd09501ee8ad3ac8538d8e9441b0a4b28 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 18 Aug 2017 18:00:55 +0200 Subject: [PATCH 0652/1099] [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4 --- .../FrameworkBundle/Command/CacheClearCommand.php | 5 +++++ .../CacheClearCommand/CacheClearCommandTest.php | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index b7613f7436b2a..ca119f198d5c1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -15,6 +15,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; +use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Finder\Finder; @@ -56,6 +57,10 @@ protected function execute(InputInterface $input, OutputInterface $output) { $io = new SymfonyStyle($input, $output); + if (Kernel::VERSION_ID >= 30400) { + throw new \LogicException('The "cache:clear" command in Symfony 3.3 is incompatible with HttpKernel 3.4, please upgrade "symfony/framework-bundle" or downgrade "symfony/http-kernel".'); + } + $realCacheDir = $this->getContainer()->getParameter('kernel.cache_dir'); // the old cache dir name must not be longer than the real one to avoid exceeding // the maximum length of a directory or file path within it (esp. Windows MAX_PATH) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php index fd3b611202252..71f2ed551b668 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php @@ -20,6 +20,7 @@ use Symfony\Component\Console\Output\NullOutput; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; +use Symfony\Component\HttpKernel\Kernel; class CacheClearCommandTest extends TestCase { @@ -49,6 +50,17 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup() $application = new Application($this->kernel); $application->setCatchExceptions(false); + if (Kernel::VERSION_ID >= 30400) { + $expectedMsg = 'The "cache:clear" command in Symfony 3.3 is incompatible with HttpKernel 3.4, please upgrade "symfony/framework-bundle" or downgrade "symfony/http-kernel".'; + + if (method_exists($this, 'expectException')) { + $this->expectException(\LogicException::class); + $this->expectExceptionMessage($expectedMsg); + } else { + $this->setExpectedException(\LogicException::class, $expectedMsg); + } + } + $application->doRun($input, new NullOutput()); // Ensure that all *.meta files are fresh From a86bf52068f242b7d81587763161e145a13b54c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulius=20Jarmalavi=C4=8Dius?= Date: Fri, 11 Aug 2017 10:01:09 +0300 Subject: [PATCH 0653/1099] [SecurityBundle] resolve class name parameter inside AddSecurityVotersPass --- .../DependencyInjection/Compiler/AddSecurityVotersPass.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php index 67d0785b475fa..f75d4be192e71 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php @@ -42,7 +42,8 @@ public function process(ContainerBuilder $container) } foreach ($voters as $voter) { - $class = $container->getDefinition((string) $voter)->getClass(); + $definition = $container->getDefinition((string) $voter); + $class = $container->getParameterBag()->resolveValue($definition->getClass()); if (!is_a($class, VoterInterface::class, true)) { @trigger_error(sprintf('Using a security.voter tag on a class without implementing the %1$s is deprecated as of 3.4 and will be removed in 4.0. Implement the %1$s instead.', VoterInterface::class), E_USER_DEPRECATED); From 921959422f791fdd36a455d98ca372c48a7f4956 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 18 Aug 2017 17:51:40 +0200 Subject: [PATCH 0654/1099] [DI] Fix resolving env vars when compiling a ContainerBuilder --- .../MergeExtensionConfigurationPass.php | 10 +++- .../Compiler/ResolveEnvPlaceholdersPass.php | 44 ++++++++++++++++ .../DependencyInjection/ContainerBuilder.php | 50 +++++++++++++++---- .../EnvPlaceholderParameterBag.php | 26 ---------- .../Tests/ContainerBuilderTest.php | 26 ++++++++++ 5 files changed, 120 insertions(+), 36 deletions(-) create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php index bddfa8b0e6bf4..2f1b088f92b66 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php @@ -92,7 +92,15 @@ public function __construct(Extension $extension, parent $resolvingBag) { $this->beforeProcessingEnvPlaceholders = $resolvingBag->getEnvPlaceholders(); $config = $this->resolveEnvPlaceholders($extension->getProcessedConfigs()); - parent::__construct($this->resolveEnvReferences($config)); + parent::__construct($this->resolveValue($config)); + } + + /** + * {@inheritdoc} + */ + public function get($name) + { + return $this->has($name) || (0 === strpos($name, 'env(') && ')' === substr($name, -1) && 'env()' !== $name) ? parent::get($name) : ''; } /** diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php new file mode 100644 index 0000000000000..8e44008317c27 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php @@ -0,0 +1,44 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DependencyInjection\Compiler; + +use Symfony\Component\DependencyInjection\Definition; + +/** + * Replaces env var placeholders by their current values. + */ +class ResolveEnvPlaceholdersPass extends AbstractRecursivePass +{ + protected function processValue($value, $isRoot = false) + { + if (is_string($value)) { + return $this->container->resolveEnvPlaceholders($value, true); + } + if ($value instanceof Definition) { + $changes = $value->getChanges(); + if (isset($changes['class'])) { + $value->setClass($this->container->resolveEnvPlaceholders($value->getClass(), true)); + } + if (isset($changes['file'])) { + $value->setFile($this->container->resolveEnvPlaceholders($value->getFile(), true)); + } + } + + $value = parent::processValue($value, $isRoot); + + if ($value && is_array($value)) { + $value = array_combine($this->container->resolveEnvPlaceholders(array_keys($value), true), $value); + } + + return $value; + } +} diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 2e14caa1f8349..5a3922264554f 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -18,6 +18,7 @@ use Symfony\Component\DependencyInjection\Compiler\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\PassConfig; +use Symfony\Component\DependencyInjection\Compiler\ResolveEnvPlaceholdersPass; use Symfony\Component\DependencyInjection\Exception\BadMethodCallException; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\LogicException; @@ -729,9 +730,7 @@ public function compile(/*$resolveEnvPlaceholders = false*/) $bag = $this->getParameterBag(); if ($resolveEnvPlaceholders && $bag instanceof EnvPlaceholderParameterBag) { - $this->parameterBag = new ParameterBag($bag->resolveEnvReferences($bag->all())); - $this->envPlaceholders = $bag->getEnvPlaceholders(); - $this->parameterBag = $bag = new ParameterBag($this->resolveEnvPlaceholders($this->parameterBag->all(), true)); + $compiler->addPass(new ResolveEnvPlaceholdersPass(), PassConfig::TYPE_AFTER_REMOVING, -1000); } $compiler->compile($this); @@ -744,11 +743,15 @@ public function compile(/*$resolveEnvPlaceholders = false*/) $this->extensionConfigs = array(); - parent::compile(); - if ($bag instanceof EnvPlaceholderParameterBag) { + if ($resolveEnvPlaceholders) { + $this->parameterBag = new ParameterBag($this->resolveEnvPlaceholders($bag->all(), true)); + } + $this->envPlaceholders = $bag->getEnvPlaceholders(); } + + parent::compile(); } /** @@ -1313,12 +1316,19 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs foreach ($envPlaceholders as $env => $placeholders) { foreach ($placeholders as $placeholder) { if (false !== stripos($value, $placeholder)) { - if (true !== $format) { + if (true === $format) { + $resolved = $bag->escapeValue($this->getEnv($env)); + } else { $resolved = sprintf($format, $env); - } elseif ($placeholder === $resolved = $bag->escapeValue($this->getEnv($env))) { - $resolved = $bag->all()[strtolower("env($env)")]; } - $value = str_ireplace($placeholder, $resolved, $value); + if ($placeholder === $value) { + $value = $resolved; + } else { + if (!is_string($resolved) && !is_numeric($resolved)) { + throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type %s inside string value "%s".', $env, gettype($resolved), $value)); + } + $value = str_ireplace($placeholder, $resolved, $value); + } $usedEnvs[$env] = $env; $this->envCounters[$env] = isset($this->envCounters[$env]) ? 1 + $this->envCounters[$env] : 1; } @@ -1393,6 +1403,28 @@ public static function getServiceConditionals($value) return $services; } + /** + * {@inheritdoc} + */ + protected function getEnv($name) + { + $value = parent::getEnv($name); + + if (!is_string($value) || !$this->getParameterBag() instanceof EnvPlaceholderParameterBag) { + return $value; + } + + foreach ($this->getParameterBag()->getEnvPlaceholders() as $env => $placeholders) { + if (isset($placeholders[$value])) { + $bag = new ParameterBag($this->getParameterBag()->all()); + + return $bag->unescapeValue($bag->get("env($name)")); + } + } + + return $value; + } + /** * Retrieves the currently set proxy instantiator or instantiates one. * diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php index 8c80abf26bb76..d20e53531aa3b 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php @@ -20,7 +20,6 @@ class EnvPlaceholderParameterBag extends ParameterBag { private $envPlaceholders = array(); - private $resolveEnvReferences = false; /** * {@inheritdoc} @@ -102,29 +101,4 @@ public function resolve() } } } - - /** - * Replaces "%env(FOO)%" references by their placeholder, keeping regular "%parameters%" references as is. - */ - public function resolveEnvReferences(array $value) - { - $this->resolveEnvReferences = true; - try { - return $this->resolveValue($value); - } finally { - $this->resolveEnvReferences = false; - } - } - - /** - * {@inheritdoc} - */ - public function resolveString($value, array $resolving = array()) - { - if ($this->resolveEnvReferences) { - return preg_replace_callback('/%%|%(env$[^%\s]+$)%/', function ($match) { return isset($match[1]) ? $this->get($match[1]) : '%%'; }, $value); - } - - return parent::resolveString($value, $resolving); - } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php index 7ab2e7c6f6c31..efe9840e42c40 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php @@ -623,19 +623,37 @@ public function testCompileWithResolveEnv() $container = new ContainerBuilder(); $container->setParameter('env(FOO)', 'Foo'); + $container->setParameter('env(DUMMY_ENV_VAR)', 'GHI'); $container->setParameter('bar', '%% %env(DUMMY_ENV_VAR)% %env(DUMMY_SERVER_VAR)% %env(HTTP_DUMMY_VAR)%'); $container->setParameter('foo', '%env(FOO)%'); $container->setParameter('baz', '%foo%'); $container->setParameter('env(HTTP_DUMMY_VAR)', '123'); + $container->register('teatime', 'stdClass') + ->setProperty('foo', '%env(DUMMY_ENV_VAR)%') + ; $container->compile(true); $this->assertSame('% du%%y ABC 123', $container->getParameter('bar')); $this->assertSame('Foo', $container->getParameter('baz')); + $this->assertSame('du%%y', $container->get('teatime')->foo); unset($_SERVER['DUMMY_SERVER_VAR'], $_SERVER['HTTP_DUMMY_VAR']); putenv('DUMMY_ENV_VAR'); } + /** + * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException + * @expectedExceptionMessage A string value must be composed of strings and/or numbers, but found parameter "env(ARRAY)" of type array inside string value "ABC %env(ARRAY)%". + */ + public function testCompileWithArrayResolveEnv() + { + $bag = new TestingEnvPlaceholderParameterBag(); + $container = new ContainerBuilder($bag); + $container->setParameter('foo', '%env(ARRAY)%'); + $container->setParameter('bar', 'ABC %env(ARRAY)%'); + $container->compile(true); + } + /** * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvNotFoundException * @expectedExceptionMessage Environment variable not found: "FOO". @@ -1127,3 +1145,11 @@ public function __construct(A $a) { } } + +class TestingEnvPlaceholderParameterBag extends EnvPlaceholderParameterBag +{ + public function get($name) + { + return 'env(array)' === strtolower($name) ? array(123) : parent::get($name); + } +} From bdae7f530c923427095834afe410d12b17f6827d Mon Sep 17 00:00:00 2001 From: Oleksii Zhurbytskyi Date: Tue, 22 Aug 2017 13:13:34 +0300 Subject: [PATCH 0655/1099] [Validator] Fix Greek translation --- .../Validator/Resources/translations/validators.el.xlf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf index 4fa0d42220500..a3199bcc9d79e 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf @@ -100,7 +100,7 @@ This value is not valid. - Αυτή η τιμή δεν είναι έκγυρη. + Αυτή η τιμή δεν είναι έγκυρη.

This value is not a valid time. @@ -136,11 +136,11 @@

This is not a valid IP address. - Αυτό δεν είναι μια έκγυρη διεύθυνση IP. + Αυτό δεν είναι μια έγκυρη διεύθυνση IP.

This value is not a valid language. - Αυτή η τιμή δεν αντιστοιχεί σε μια έκγυρη γλώσσα. + Αυτή η τιμή δεν αντιστοιχεί σε μια έγκυρη γλώσσα.

This value is not a valid locale. @@ -148,7 +148,7 @@

This value is not a valid country. - Αυτή η τιμή δεν αντιστοιχεί σε μια έκγυρη χώρα. + Αυτή η τιμή δεν αντιστοιχεί σε μια έγκυρη χώρα.

This value is already used. From 048eb186c7b9f3976567c105de25ad0a1022a6e1 Mon Sep 17 00:00:00 2001 From: Valentin Date: Fri, 11 Aug 2017 22:45:37 +0300 Subject: [PATCH 0656/1099] [DI] Use GlobResource for non-tracked directories --- .../DependencyInjection/FrameworkExtension.php | 2 +- .../TwigBundle/DependencyInjection/TwigExtension.php | 10 +++++++--- .../Component/DependencyInjection/ContainerBuilder.php | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 2bd54d731197b..d84255d94e3c9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1346,7 +1346,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder $fileRecorder('yml', $file); } - if ($container->fileExists($dir = $dirname.'/Resources/config/serialization')) { + if ($container->fileExists($dir = $dirname.'/Resources/config/serialization', '/^$/')) { $this->registerMappingFilesFromDir($dir, $fileRecorder); } } diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php index e8c10786c457d..a1ae0caba145d 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php @@ -13,6 +13,7 @@ use Symfony\Bridge\Twig\Extension\WebLinkExtension; use Symfony\Component\Config\FileLocator; +use Symfony\Component\Config\Resource\FileExistenceResource; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; @@ -118,9 +119,10 @@ public function load(array $configs, ContainerBuilder $container) } } - if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/views', false)) { + if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) { $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir)); } + $container->addResource(new FileExistenceResource($dir)); if (!empty($config['globals'])) { $def = $container->getDefinition('twig'); @@ -178,13 +180,15 @@ private function getBundleHierarchy(ContainerBuilder $container) ); } - if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views', false)) { + if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) { $bundleHierarchy[$name]['paths'][] = $dir; } + $container->addResource(new FileExistenceResource($dir)); - if ($container->fileExists($dir = $bundle['path'].'/Resources/views', false)) { + if (file_exists($dir = $bundle['path'].'/Resources/views')) { $bundleHierarchy[$name]['paths'][] = $dir; } + $container->addResource(new FileExistenceResource($dir)); if (null === $bundle['parent']) { continue; diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 555c3b09734b2..803e7937b1740 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -407,9 +407,13 @@ public function fileExists($path, $trackContents = true) return $exists; } - if ($trackContents && is_dir($path)) { - $this->addResource(new DirectoryResource($path, is_string($trackContents) ? $trackContents : null)); - } elseif ($trackContents || is_dir($path)) { + if (is_dir($path)) { + if ($trackContents) { + $this->addResource(new DirectoryResource($path, is_string($trackContents) ? $trackContents : null)); + } else { + $this->addResource(new GlobResource($path, '/*', false)); + } + } elseif ($trackContents) { $this->addResource(new FileResource($path)); } From c4dd11c4e15cb3f4a5e9a7a116a1c04d3279355d Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 14 Aug 2017 21:56:06 +0200 Subject: [PATCH 0657/1099] [Translation] Adding the ability do dump in xliff2.0 --- .../Component/Translation/CHANGELOG.md | 1 + .../Translation/Dumper/XliffFileDumper.php | 18 ++++++++++++++++- .../Tests/Dumper/XliffFileDumperTest.php | 20 +++++++++++++++++++ .../Tests/fixtures/resources-notes-meta.xlf | 16 +++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md index baa791b0ad174..e8bcb2243ea34 100644 --- a/src/Symfony/Component/Translation/CHANGELOG.md +++ b/src/Symfony/Component/Translation/CHANGELOG.md @@ -7,6 +7,7 @@ CHANGELOG * Added `TranslationDumperPass` * Added `TranslationExtractorPass` * Added `TranslatorPass` + * Added section to the Xliff 2.0 dumper. 3.2.0 ----- diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php index 64588b167991d..d7e5ecc78c120 100644 --- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php @@ -146,6 +146,23 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, foreach ($messages->all($domain) as $source => $target) { $translation = $dom->createElement('unit'); $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._')); + $metadata = $messages->getMetadata($source, $domain); + + // Add notes section + if ($this->hasMetadataArrayInfo('notes', $metadata)) { + $notesElement = $dom->createElement('notes'); + foreach ($metadata['notes'] as $note) { + $n = $dom->createElement('note'); + $n->appendChild($dom->createTextNode(isset($note['content']) ? $note['content'] : '')); + unset($note['content']); + + foreach ($note as $name => $value) { + $n->setAttribute($name, $value); + } + $notesElement->appendChild($n); + } + $translation->appendChild($notesElement); + } $segment = $translation->appendChild($dom->createElement('segment')); @@ -156,7 +173,6 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target); $targetElement = $dom->createElement('target'); - $metadata = $messages->getMetadata($source, $domain); if ($this->hasMetadataArrayInfo('target-attributes', $metadata)) { foreach ($metadata['target-attributes'] as $name => $value) { $targetElement->setAttribute($name, $value); diff --git a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php index 5764dff540692..30ca4d3d24868 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php @@ -87,4 +87,24 @@ public function testFormatCatalogueWithTargetAttributesMetadata() $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR')) ); } + + public function testFormatCatalogueWithNotesMetadata() + { + $catalogue = new MessageCatalogue('en_US'); + $catalogue->add(array( + 'foo' => 'bar', + )); + $catalogue->setMetadata('foo', array('notes' => array( + array('category' => 'state', 'content' => 'new'), + array('category' => 'approved', 'content' => 'true'), + array('category' => 'section', 'content' => 'user login', 'priority' => '1'), + ))); + + $dumper = new XliffFileDumper(); + + $this->assertStringEqualsFile( + __DIR__.'/../fixtures/resources-notes-meta.xlf', + $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR', 'xliff_version' => '2.0')) + ); + } } diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf new file mode 100644 index 0000000000000..04f9a0a06e233 --- /dev/null +++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf @@ -0,0 +1,16 @@ + + + + + + new + true + user login + + + foo + bar + + + + From 156cb70edd841aaa347b7273cb03cbc5fa8edecf Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sat, 5 Aug 2017 20:04:34 +0200 Subject: [PATCH 0658/1099] [DI] Don't force lowercase for hasher values --- src/Symfony/Component/DependencyInjection/ContainerBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index ad78df795ca73..c71815c2cbc1c 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -1328,7 +1328,7 @@ public static function hash($value) { $hash = substr(base64_encode(hash('sha256', serialize($value), true)), 0, 7); - return str_replace(array('/', '+'), array('.', '_'), strtolower($hash)); + return str_replace(array('/', '+'), array('.', '_'), $hash); } /** From c25eafa4f3d334c0b88f37c8f58526b48b8b8ece Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Tue, 25 Jul 2017 19:57:30 +0200 Subject: [PATCH 0659/1099] Create an interface for TranslationWriter --- UPGRADE-3.4.md | 7 ++++ UPGRADE-4.0.md | 3 ++ .../Command/TranslationUpdateCommand.php | 14 ++++---- .../Component/Translation/CHANGELOG.md | 2 ++ .../Tests/Writer/TranslationWriterTest.php | 16 +++++++++ .../Translation/Writer/TranslationWriter.php | 23 +++++++++++-- .../Writer/TranslationWriterInterface.php | 34 +++++++++++++++++++ 7 files changed, 89 insertions(+), 10 deletions(-) create mode 100644 src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md index 1f15a45d18ea3..0d5bde4f138ac 100644 --- a/UPGRADE-3.4.md +++ b/UPGRADE-3.4.md @@ -128,6 +128,13 @@ SecurityBundle * `FirewallContext::getListeners()` now returns `\Traversable|array` +Translation +----------- + + * `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations` has been deprecated + and will be removed in 4.0, use `Symfony\Component\Translation\Writer\TranslationWriter::write` + instead. + TwigBridge ---------- diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index e0fdf18eda5c9..45839be11ef65 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -554,6 +554,9 @@ Translation ----------- * Removed the backup feature from the file dumper classes. + + * Removed `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations`, + use `Symfony\Component\Translation\Writer\TranslationWriter::write` instead. TwigBundle ---------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 357902a209305..a580315efdaa1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -21,7 +21,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Translation\Extractor\ExtractorInterface; use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\Writer\TranslationWriter; +use Symfony\Component\Translation\Writer\TranslationWriterInterface; /** * A command that parses templates to extract translation messages and adds them @@ -39,14 +39,14 @@ class TranslationUpdateCommand extends ContainerAwareCommand private $defaultLocale; /** - * @param TranslationWriter $writer - * @param TranslationLoader $loader - * @param ExtractorInterface $extractor - * @param string $defaultLocale + * @param TranslationWriterInterface $writer + * @param TranslationLoader $loader + * @param ExtractorInterface $extractor + * @param string $defaultLocale */ public function __construct($writer = null, TranslationLoader $loader = null, ExtractorInterface $extractor = null, $defaultLocale = null) { - if (!$writer instanceof TranslationWriter) { + if (!$writer instanceof TranslationWriterInterface) { @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); parent::__construct($writer); @@ -276,7 +276,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $bundleTransPath = end($transPaths).'translations'; } - $this->writer->writeTranslations($operation->getResult(), $input->getOption('output-format'), array('path' => $bundleTransPath, 'default_locale' => $this->defaultLocale)); + $this->writer->write($operation->getResult(), $input->getOption('output-format'), array('path' => $bundleTransPath, 'default_locale' => $this->defaultLocale)); if (true === $input->getOption('dump-messages')) { $resultMessage .= ' and translation files were updated'; diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md index baa791b0ad174..ffc5701e64b15 100644 --- a/src/Symfony/Component/Translation/CHANGELOG.md +++ b/src/Symfony/Component/Translation/CHANGELOG.md @@ -7,6 +7,8 @@ CHANGELOG * Added `TranslationDumperPass` * Added `TranslationExtractorPass` * Added `TranslatorPass` + * Added `TranslationWriterInterface` + * Deprecated `TranslationWriter::writeTranslations` in favor of `TranslationWriter::write` 3.2.0 ----- diff --git a/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php b/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php index 2d2aec7c8a054..39da3f7c02396 100644 --- a/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php +++ b/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php @@ -18,6 +18,10 @@ class TranslationWriterTest extends TestCase { + /** + * @group legacy + * @expectedDeprecation Method Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations() is deprecated since version 3.4 and will be removed in 4.0. Use write() instead. + */ public function testWriteTranslations() { $dumper = $this->getMockBuilder('Symfony\Component\Translation\Dumper\DumperInterface')->getMock(); @@ -30,6 +34,18 @@ public function testWriteTranslations() $writer->writeTranslations(new MessageCatalogue(array()), 'test'); } + public function testWrite() + { + $dumper = $this->getMockBuilder('Symfony\Component\Translation\Dumper\DumperInterface')->getMock(); + $dumper + ->expects($this->once()) + ->method('dump'); + + $writer = new TranslationWriter(); + $writer->addDumper('test', $dumper); + $writer->write(new MessageCatalogue(array()), 'test'); + } + public function testDisableBackup() { $nonBackupDumper = new NonBackupDumper(); diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php index 901a8894e1c4c..53bb1cc7a482d 100644 --- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php +++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php @@ -21,7 +21,7 @@ * * @author Michel Salib */ -class TranslationWriter +class TranslationWriter implements TranslationWriterInterface { /** * Dumpers used for export. @@ -66,13 +66,13 @@ public function getFormats() /** * Writes translation from the catalogue according to the selected format. * - * @param MessageCatalogue $catalogue The message catalogue to dump + * @param MessageCatalogue $catalogue The message catalogue to write * @param string $format The format to use to dump the messages * @param array $options Options that are passed to the dumper * * @throws InvalidArgumentException */ - public function writeTranslations(MessageCatalogue $catalogue, $format, $options = array()) + public function write(MessageCatalogue $catalogue, $format, $options = array()) { if (!isset($this->dumpers[$format])) { throw new InvalidArgumentException(sprintf('There is no dumper associated with format "%s".', $format)); @@ -88,4 +88,21 @@ public function writeTranslations(MessageCatalogue $catalogue, $format, $options // save $dumper->dump($catalogue, $options); } + + /** + * Writes translation from the catalogue according to the selected format. + * + * @param MessageCatalogue $catalogue The message catalogue to write + * @param string $format The format to use to dump the messages + * @param array $options Options that are passed to the dumper + * + * @throws InvalidArgumentException + * + * @deprecated since 3.4 will be removed in 4.0. Use write instead. + */ + public function writeTranslations(MessageCatalogue $catalogue, $format, $options = array()) + { + @trigger_error(sprintf('Method %s() is deprecated since version 3.4 and will be removed in 4.0. Use write() instead.', __METHOD__), E_USER_DEPRECATED); + $this->write($catalogue, $format, $options); + } } diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php new file mode 100644 index 0000000000000..992ab769a0d59 --- /dev/null +++ b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php @@ -0,0 +1,34 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Translation\Writer; + +use Symfony\Component\Translation\Exception\InvalidArgumentException; +use Symfony\Component\Translation\MessageCatalogue; + +/** + * TranslationWriter writes translation messages. + * + * @author Michel Salib + */ +interface TranslationWriterInterface +{ + /** + * Writes translation from the catalogue according to the selected format. + * + * @param MessageCatalogue $catalogue The message catalogue to write + * @param string $format The format to use to dump the messages + * @param array $options Options that are passed to the dumper + * + * @throws InvalidArgumentException + */ + public function write(MessageCatalogue $catalogue, $format, $options = array()); +} From c5a1218555f6aa54110d481e1845a39f021daf92 Mon Sep 17 00:00:00 2001 From: Oleg Voronkovich Date: Sun, 6 Aug 2017 03:05:34 +0300 Subject: [PATCH 0660/1099] [Dotenv][WebServerBundle] Override previously loaded variables --- .../Bundle/WebServerBundle/WebServer.php | 5 ++ src/Symfony/Component/Dotenv/Dotenv.php | 16 +++++- .../Component/Dotenv/Tests/DotenvTest.php | 56 +++++++++++++++++++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php index 8edbe2bf56ec2..e3425ec8bb13a 100644 --- a/src/Symfony/Bundle/WebServerBundle/WebServer.php +++ b/src/Symfony/Bundle/WebServerBundle/WebServer.php @@ -154,6 +154,11 @@ private function createServerProcess(WebServerConfig $config) $process->setWorkingDirectory($config->getDocumentRoot()); $process->setTimeout(null); + if (in_array('APP_ENV', explode(',', getenv('SYMFONY_DOTENV_VARS')))) { + $process->setEnv(array('APP_ENV' => false)); + $process->inheritEnvironmentVariables(); + } + return $process; } diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php index 2e907b8c980b8..0d3c01d93639e 100644 --- a/src/Symfony/Component/Dotenv/Dotenv.php +++ b/src/Symfony/Component/Dotenv/Dotenv.php @@ -60,20 +60,32 @@ public function load($path/*, ...$paths*/) /** * Sets values as environment variables (via putenv, $_ENV, and $_SERVER). * - * Note that existing environment variables are never overridden. + * Note that existing environment variables are not overridden. * * @param array $values An array of env variables */ public function populate($values) { + $loadedVars = array_flip(explode(',', getenv('SYMFONY_DOTENV_VARS'))); + unset($loadedVars['']); + foreach ($values as $name => $value) { - if (isset($_ENV[$name]) || isset($_SERVER[$name]) || false !== getenv($name)) { + if (!isset($loadedVars[$name]) && (isset($_ENV[$name]) || isset($_SERVER[$name]) || false !== getenv($name))) { continue; } putenv("$name=$value"); $_ENV[$name] = $value; $_SERVER[$name] = $value; + + $loadedVars[$name] = true; + } + + if ($loadedVars) { + $loadedVars = implode(',', array_keys($loadedVars)); + putenv("SYMFONY_DOTENV_VARS=$loadedVars"); + $_ENV['SYMFONY_DOTENV_VARS'] = $loadedVars; + $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars; } } diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php index 47598030a87f1..dc1a7b5b2c4a7 100644 --- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php +++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php @@ -214,4 +214,60 @@ public function testEnvVarIsNotOverriden() $this->assertSame('original_value', getenv('TEST_ENV_VAR')); } + + public function testMemorizingLoadedVarsNamesInSpecialVar() + { + // Special variable not exists + unset($_ENV['SYMFONY_DOTENV_VARS']); + unset($_SERVER['SYMFONY_DOTENV_VARS']); + putenv('SYMFONY_DOTENV_VARS'); + + unset($_ENV['APP_DEBUG']); + unset($_SERVER['APP_DEBUG']); + putenv('APP_DEBUG'); + unset($_ENV['DATABASE_URL']); + unset($_SERVER['DATABASE_URL']); + putenv('DATABASE_URL'); + + $dotenv = new DotEnv(); + $dotenv->populate(array('APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db')); + + $this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS')); + + // Special variable has a value + $_ENV['SYMFONY_DOTENV_VARS'] = 'APP_ENV'; + $_SERVER['SYMFONY_DOTENV_VARS'] = 'APP_ENV'; + putenv('SYMFONY_DOTENV_VARS=APP_ENV'); + + $_ENV['APP_DEBUG'] = '1'; + $_SERVER['APP_DEBUG'] = '1'; + putenv('APP_DEBUG=1'); + unset($_ENV['DATABASE_URL']); + unset($_SERVER['DATABASE_URL']); + putenv('DATABASE_URL'); + + $dotenv = new DotEnv(); + $dotenv->populate(array('APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db')); + $dotenv->populate(array('DATABASE_URL' => 'sqlite:///somedb.sqlite')); + + $this->assertSame('APP_ENV,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS')); + } + + public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar() + { + putenv('SYMFONY_DOTENV_VARS=FOO,BAR,BAZ'); + + putenv('FOO=foo'); + putenv('BAR=bar'); + putenv('BAZ=baz'); + putenv('DOCUMENT_ROOT=/var/www'); + + $dotenv = new DotEnv(); + $dotenv->populate(array('FOO' => 'foo1', 'BAR' => 'bar1', 'BAZ' => 'baz1', 'DOCUMENT_ROOT' => '/boot')); + + $this->assertSame('foo1', getenv('FOO')); + $this->assertSame('bar1', getenv('BAR')); + $this->assertSame('baz1', getenv('BAZ')); + $this->assertSame('/var/www', getenv('DOCUMENT_ROOT')); + } } From f76e420e0959b52e73f1486a7b99771d6553ff01 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 22 Aug 2017 15:31:38 +0200 Subject: [PATCH 0661/1099] [Dotenv] Get env using $_SERVER to work with fastcgi_param and workaround thread safety issues --- .../DependencyInjection/Container.php | 4 ++-- src/Symfony/Component/Dotenv/Dotenv.php | 18 +++++++++++++++--- .../Component/Dotenv/Tests/DotenvTest.php | 13 +++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 81241e3415cc8..6eceb0defeba9 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -438,13 +438,13 @@ protected function getEnv($name) if (isset($this->envCache[$name]) || array_key_exists($name, $this->envCache)) { return $this->envCache[$name]; } - if (0 !== strpos($name, 'HTTP_') && isset($_SERVER[$name])) { + if (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) { return $this->envCache[$name] = $_SERVER[$name]; } if (isset($_ENV[$name])) { return $this->envCache[$name] = $_ENV[$name]; } - if (false !== $env = getenv($name)) { + if (false !== ($env = getenv($name)) && null !== $env) { // null is a possible value because of thread safety issues return $this->envCache[$name] = $env; } if (!$this->hasParameter("env($name)")) { diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php index 0d3c01d93639e..910a1622f303b 100644 --- a/src/Symfony/Component/Dotenv/Dotenv.php +++ b/src/Symfony/Component/Dotenv/Dotenv.php @@ -70,13 +70,17 @@ public function populate($values) unset($loadedVars['']); foreach ($values as $name => $value) { - if (!isset($loadedVars[$name]) && (isset($_ENV[$name]) || isset($_SERVER[$name]) || false !== getenv($name))) { + $notHttpName = 0 !== strpos($name, 'HTTP_'); + // don't check existence with getenv() because of thread safety issues + if (!isset($loadedVars[$name]) && (isset($_ENV[$name]) || (isset($_SERVER[$name]) && $notHttpName))) { continue; } putenv("$name=$value"); $_ENV[$name] = $value; - $_SERVER[$name] = $value; + if ($notHttpName) { + $_SERVER[$name] = $value; + } $loadedVars[$name] = true; } @@ -363,7 +367,15 @@ private function resolveVariables($value) } $name = $matches[3]; - $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? $_ENV[$name] : (string) getenv($name)); + if (isset($this->values[$name])) { + $value = $this->values[$name]; + } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) { + $value = $_SERVER[$name]; + } elseif (isset($_ENV[$name])) { + $value = $_ENV[$name]; + } else { + $value = (string) getenv($name); + } if (!$matches[2] && isset($matches[4])) { $value .= '}'; diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php index dc1a7b5b2c4a7..ce7d3a93396b2 100644 --- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php +++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php @@ -208,6 +208,7 @@ public function testServerSuperglobalIsNotOverriden() public function testEnvVarIsNotOverriden() { putenv('TEST_ENV_VAR=original_value'); + $_SERVER['TEST_ENV_VAR'] = 'original_value'; $dotenv = new DotEnv(); $dotenv->populate(array('TEST_ENV_VAR' => 'new_value')); @@ -215,6 +216,18 @@ public function testEnvVarIsNotOverriden() $this->assertSame('original_value', getenv('TEST_ENV_VAR')); } + public function testHttpVarIsPartiallyOverriden() + { + $_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value'; + + $dotenv = new DotEnv(); + $dotenv->populate(array('HTTP_TEST_ENV_VAR' => 'env_value')); + + $this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR')); + $this->assertSame('env_value', $_ENV['HTTP_TEST_ENV_VAR']); + $this->assertSame('http_value', $_SERVER['HTTP_TEST_ENV_VAR']); + } + public function testMemorizingLoadedVarsNamesInSpecialVar() { // Special variable not exists From ffd25fb9c2fb705d3f7b608f5cf8799b79ba9512 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Wed, 26 Jul 2017 13:19:59 +0200 Subject: [PATCH 0662/1099] [Webprofiler] Added blocks that allows extension of the profiler page. --- .../views/Collector/translation.html.twig | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig index 31881953d8139..f2ecb1113a04b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig @@ -82,6 +82,8 @@

Translation Messages

+ {% block messages %} + {# sort translation messages in groups #} {% set messages_defined, messages_missing, messages_fallback = [], [], [] %} {% for message in collector.messages %} @@ -108,7 +110,9 @@

None of the used translation messages are defined for the given locale.

{% else %} - {{ helper.render_table(messages_defined) }} + {% block defined_messages %} + {{ helper.render_table(messages_defined) }} + {% endblock %} {% endif %}

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig index f2fe8bf3d2588..b89a788041cae 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig @@ -1,4 +1,4 @@ -{% use "form_div_layout.html.twig" %} +{% use "bootstrap_base_layout.html.twig" %} {# Widgets #} @@ -9,146 +9,10 @@ {{- parent() -}} {%- endblock form_widget_simple %} -{% block textarea_widget -%} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %} - {{- parent() -}} -{%- endblock textarea_widget %} - {% block button_widget -%} {% set attr = attr|merge({class: (attr.class|default('btn-default') ~ ' btn')|trim}) %} {{- parent() -}} -{%- endblock %} - -{% block money_widget -%} -

- {% set append = money_pattern starts with '{{' %} - {% if not append %} - {{ money_pattern|replace({ '{{ widget }}':''}) }} - {% endif %} - {{- block('form_widget_simple') -}} - {% if append %} - {{ money_pattern|replace({ '{{ widget }}':''}) }} - {% endif %} -

-{%- endblock money_widget %} - -{% block percent_widget -%} -

- {{- block('form_widget_simple') -}} - % -

-{%- endblock percent_widget %} - -{% block datetime_widget -%} - {% if widget == 'single_text' %} - {{- block('form_widget_simple') -}} - {% else -%} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} -

- {{- form_errors(form.date) -}} - {{- form_errors(form.time) -}} - {{- form_widget(form.date, { datetime: true } ) -}} - {{- form_widget(form.time, { datetime: true } ) -}} -

- {%- endif %} -{%- endblock datetime_widget %} - -{% block date_widget -%} - {% if widget == 'single_text' %} - {{- block('form_widget_simple') -}} - {% else -%} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} - {% if datetime is not defined or not datetime -%} -

- {%- endif %} - {{- date_pattern|replace({ - '{{ year }}': form_widget(form.year), - '{{ month }}': form_widget(form.month), - '{{ day }}': form_widget(form.day), - })|raw -}} - {% if datetime is not defined or not datetime -%} -

- {%- endif -%} - {% endif %} -{%- endblock date_widget %} - -{% block time_widget -%} - {% if widget == 'single_text' %} - {{- block('form_widget_simple') -}} - {% else -%} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} - {% if datetime is not defined or false == datetime -%} -

- {%- endif -%} - {{- form_widget(form.hour) }}{% if with_minutes %}:{{ form_widget(form.minute) }}{% endif %}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %} - {% if datetime is not defined or false == datetime -%} -

- {%- endif -%} - {% endif %} -{%- endblock time_widget %} - -{%- block dateinterval_widget -%} - {%- if widget == 'single_text' -%} - {{- block('form_widget_simple') -}} - {%- else -%} - {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} -

- {{- form_errors(form) -}} -

- - - - {%- if with_years %}{% endif -%} - {%- if with_months %}{% endif -%} - {%- if with_weeks %}{% endif -%} - {%- if with_days %}{% endif -%} - {%- if with_hours %}{% endif -%} - {%- if with_minutes %}{% endif -%} - {%- if with_seconds %}{% endif -%} - - - - - {%- if with_years %}{% endif -%} - {%- if with_months %}{% endif -%} - {%- if with_weeks %}{% endif -%} - {%- if with_days %}{% endif -%} - {%- if with_hours %}{% endif -%} - {%- if with_minutes %}{% endif -%} - {%- if with_seconds %}{% endif -%} - - -

{{ form_label(form.years) }}	{{ form_label(form.months) }}	{{ form_label(form.weeks) }}	{{ form_label(form.days) }}	{{ form_label(form.hours) }}	{{ form_label(form.minutes) }}	{{ form_label(form.seconds) }}
{{ form_widget(form.years) }}	{{ form_widget(form.months) }}	{{ form_widget(form.weeks) }}	{{ form_widget(form.days) }}	{{ form_widget(form.hours) }}	{{ form_widget(form.minutes) }}	{{ form_widget(form.seconds) }}

- {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%} -

- {%- endif -%} -{%- endblock dateinterval_widget -%} - -{% block choice_widget_collapsed -%} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %} - {{- parent() -}} -{%- endblock %} - -{% block choice_widget_expanded -%} - {% if '-inline' in label_attr.class|default('') -%} - {%- for child in form %} - {{- form_widget(child, { - parent_label_class: label_attr.class|default(''), - translation_domain: choice_translation_domain, - }) -}} - {% endfor -%} - {%- else -%} -

- {%- for child in form %} - {{- form_widget(child, { - parent_label_class: label_attr.class|default(''), - translation_domain: choice_translation_domain, - }) -}} - {% endfor -%} -

- {%- endif %} -{%- endblock choice_widget_expanded %} +{%- endblock button_widget %} {% block checkbox_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig new file mode 100644 index 0000000000000..046cf3cdd1703 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig @@ -0,0 +1,69 @@ +{% use "bootstrap_4_layout.html.twig" %} + +{# Labels #} + +{% block form_label -%} + {%- if label is same as(false) -%} +

+ {%- else -%} + {%- if expanded is not defined or not expanded -%} + {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' col-form-label')|trim}) -%} + {%- endif -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%} + {{- parent() -}} + {%- endif -%} +{%- endblock form_label %} + +{% block form_label_class -%} +col-sm-2 +{%- endblock form_label_class %} + +{# Rows #} + +{% block form_row -%} + {%- if expanded is defined and expanded -%} + {{ block('fieldset_form_row') }} + {%- else -%} +

+ {{- form_label(form) -}} +

+ {{- form_widget(form) -}} + {{- form_errors(form) -}} +

+ {##}

+ {%- endif -%} +{%- endblock form_row %} + +{% block fieldset_form_row -%} +

+ {{- form_label(form) -}} +

+ {{- form_widget(form) -}} + {{- form_errors(form) -}} +

+{##}

+{%- endblock fieldset_form_row %} + +{% block submit_row -%} +

+ {{- form_widget(form) -}} +

+{%- endblock submit_row %} + +{% block reset_row -%} +

+ {{- form_widget(form) -}} +

+{%- endblock reset_row %} + +{% block form_group_class -%} +col-sm-10 +{%- endblock form_group_class %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig new file mode 100644 index 0000000000000..b3c71a74ea5aa --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig @@ -0,0 +1,132 @@ +{% use "bootstrap_base_layout.html.twig" %} + +{# Widgets #} + +{% block form_widget_simple -%} + {% if type is not defined or type != 'hidden' %} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control' ~ (type|default('') == 'file' ? '-file' : ''))|trim}) -%} + {% endif %} + {{- parent() -}} +{%- endblock form_widget_simple %} + +{%- block widget_attributes -%} + {%- if not valid %} + {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) %} + {% endif -%} + {{ parent() }} +{%- endblock widget_attributes -%} + +{% block button_widget -%} + {%- set attr = attr|merge({class: (attr.class|default('btn-secondary') ~ ' btn')|trim}) -%} + {{- parent() -}} +{%- endblock button_widget %} + +{% block checkbox_widget -%} + {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} + {%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%} + {%- if 'checkbox-inline' in parent_label_class -%} + {{- form_label(form, null, { widget: parent() }) -}} + {%- else -%} +

+ {{- form_label(form, null, { widget: parent() }) -}} +

+ {%- endif -%} +{%- endblock checkbox_widget %} + +{% block radio_widget -%} + {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} + {%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%} + {%- if 'radio-inline' in parent_label_class -%} + {{- form_label(form, null, { widget: parent() }) -}} + {%- else -%} +

+ {{- form_label(form, null, { widget: parent() }) -}} +

+ {%- endif -%} +{%- endblock radio_widget %} + +{% block choice_widget_expanded -%} + {% if '-inline' in label_attr.class|default('') -%} + {%- for child in form %} + {{- form_widget(child, { + parent_label_class: label_attr.class|default(''), + translation_domain: choice_translation_domain, + valid: valid, + }) -}} + {% endfor -%} + {%- else -%} +

+ {%- for child in form %} + {{- form_widget(child, { + parent_label_class: label_attr.class|default(''), + translation_domain: choice_translation_domain, + valid: valid, + }) -}} + {% endfor -%} +

+ {%- endif %} +{%- endblock choice_widget_expanded %} + +{# Labels #} + +{% block form_label -%} + {%- if expanded is defined and expanded -%} + {%- set element = 'legend' -%} + {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' col-form-legend')|trim}) -%} + {%- endif -%} + {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' form-control-label')|trim}) -%} + {{- parent() -}} +{%- endblock form_label %} + +{% block checkbox_radio_label -%} + {#- Do not display the label if widget is not defined in order to prevent double label rendering -#} + {%- if widget is defined -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%} + {%- if required -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%} + {%- endif -%} + {%- if parent_label_class is defined -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) -%} + {%- endif -%} + {%- if label is not same as(false) and label is empty -%} + {%- if label_format is not empty -%} + {%- set label = label_format|replace({ + '%name%': name, + '%id%': id, + }) -%} + {%- else -%} + {%- set label = name|humanize -%} + {%- endif -%} + {%- endif -%} + + {{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}} + + {%- endif -%} +{%- endblock checkbox_radio_label %} + +{# Rows #} + +{% block form_row -%} + {%- if expanded is defined and expanded -%} + {%- set element = 'fieldset' -%} + {%- endif -%} + <{{ element|default('div') }} class="form-group"> + {{- form_label(form) -}} + {{- form_widget(form) -}} + {{- form_errors(form) -}} + +{%- endblock form_row %} + +{# Errors #} + +{% block form_errors -%} + {%- if errors|length > 0 -%} +

{{ error.message }}

+ {%- endif %} +{%- endblock form_errors %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig new file mode 100644 index 0000000000000..cdb9dbc88ef96 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig @@ -0,0 +1,183 @@ +{% use "form_div_layout.html.twig" %} + +{# Widgets #} + +{% block textarea_widget -%} + {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %} + {{- parent() -}} +{%- endblock textarea_widget %} + +{% block money_widget -%} +

+ {%- set append = money_pattern starts with '{{' -%} + {%- if not append -%} + {{ money_pattern|replace({ '{{ widget }}':''}) }} + {%- endif -%} + {{- block('form_widget_simple') -}} + {%- if append -%} + {{ money_pattern|replace({ '{{ widget }}':''}) }} + {%- endif -%} +

+{%- endblock money_widget %} + +{% block percent_widget -%} +

+ {{- block('form_widget_simple') -}} + % +

+{%- endblock percent_widget %} + +{% block datetime_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} + {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} +

+ {{- form_errors(form.date) -}} + {{- form_errors(form.time) -}} + {{- form_widget(form.date, { datetime: true } ) -}} + {{- form_widget(form.time, { datetime: true } ) -}} +

+ {%- endif -%} +{%- endblock datetime_widget %} + +{% block date_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} + {%- if datetime is not defined or not datetime -%} +

+ {%- endif %} + {{- date_pattern|replace({ + '{{ year }}': form_widget(form.year), + '{{ month }}': form_widget(form.month), + '{{ day }}': form_widget(form.day), + })|raw -}} + {%- if datetime is not defined or not datetime -%} +

+ {%- endif -%} + {%- endif -%} +{%- endblock date_widget %} + +{% block time_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} + {%- if datetime is not defined or false == datetime -%} +

+ {%- endif -%} + {{- form_widget(form.hour) }}{% if with_minutes %}:{{ form_widget(form.minute) }}{% endif %}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %} + {%- if datetime is not defined or false == datetime -%} +

+ {%- endif -%} + {%- endif -%} +{%- endblock time_widget %} + +{%- block dateinterval_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} +

+ {{- form_errors(form) -}} +

+ + + + {%- if with_years %}{% endif -%} + {%- if with_months %}{% endif -%} + {%- if with_weeks %}{% endif -%} + {%- if with_days %}{% endif -%} + {%- if with_hours %}{% endif -%} + {%- if with_minutes %}{% endif -%} + {%- if with_seconds %}{% endif -%} + + + + + {%- if with_years %}{% endif -%} + {%- if with_months %}{% endif -%} + {%- if with_weeks %}{% endif -%} + {%- if with_days %}{% endif -%} + {%- if with_hours %}{% endif -%} + {%- if with_minutes %}{% endif -%} + {%- if with_seconds %}{% endif -%} + + +

{{ form_label(form.years) }}	{{ form_label(form.months) }}	{{ form_label(form.weeks) }}	{{ form_label(form.days) }}	{{ form_label(form.hours) }}	{{ form_label(form.minutes) }}	{{ form_label(form.seconds) }}
{{ form_widget(form.years) }}	{{ form_widget(form.months) }}	{{ form_widget(form.weeks) }}	{{ form_widget(form.days) }}	{{ form_widget(form.hours) }}	{{ form_widget(form.minutes) }}	{{ form_widget(form.seconds) }}

+ {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%} +

+ {%- endif -%} +{%- endblock dateinterval_widget -%} + +{% block choice_widget_collapsed -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%} + {{- parent() -}} +{%- endblock choice_widget_collapsed %} + +{% block choice_widget_expanded -%} + {%- if '-inline' in label_attr.class|default('') -%} + {%- for child in form %} + {{- form_widget(child, { + parent_label_class: label_attr.class|default(''), + translation_domain: choice_translation_domain, + }) -}} + {% endfor -%} + {%- else -%} +

+ {%- for child in form %} + {{- form_widget(child, { + parent_label_class: label_attr.class|default(''), + translation_domain: choice_translation_domain, + }) -}} + {%- endfor -%} +

+ {%- endif -%} +{%- endblock choice_widget_expanded %} + +{# Labels #} + +{% block choice_label -%} + {# remove the checkbox-inline and radio-inline class, it's only useful for embed labels #} + {%- set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) -%} + {{- block('form_label') -}} +{% endblock choice_label %} + +{% block checkbox_label -%} + {{- block('checkbox_radio_label') -}} +{%- endblock checkbox_label %} + +{% block radio_label -%} + {{- block('checkbox_radio_label') -}} +{%- endblock radio_label %} + +{# Rows #} + +{% block button_row -%} +

+ {{- form_widget(form) -}} +

+{%- endblock button_row %} + +{% block choice_row -%} + {%- set force_error = true -%} + {{- block('form_row') -}} +{%- endblock choice_row %} + +{% block date_row -%} + {%- set force_error = true -%} + {{- block('form_row') -}} +{%- endblock date_row %} + +{% block time_row -%} + {%- set force_error = true -%} + {{- block('form_row') -}} +{%- endblock time_row %} + +{% block datetime_row -%} + {%- set force_error = true -%} + {{- block('form_row') -}} +{%- endblock datetime_row %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 3d8afe2cba602..20e5de35ee9f8 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -259,7 +259,7 @@ {% set label = name|humanize %} {%- endif -%} {%- endif -%} - {{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }} + <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }} {%- endif -%} {%- endblock form_label -%} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig index dc7bec9fb6ccd..d34161ad0c669 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig @@ -20,7 +20,7 @@ {% block button_widget -%} {% set attr = attr|merge({class: (attr.class|default('') ~ ' button')|trim}) %} {{- parent() -}} -{%- endblock %} +{%- endblock button_widget %} {% block money_widget -%}

@@ -228,7 +228,7 @@ {# remove the checkbox-inline and radio-inline class, it's only useful for embed labels #} {% set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) %} {{- block('form_label') -}} -{%- endblock %} +{%- endblock choice_label %} {% block checkbox_label -%} {{- block('checkbox_radio_label') -}} diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php new file mode 100644 index 0000000000000..842150dc5e0fa --- /dev/null +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php @@ -0,0 +1,107 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Twig\Tests\Extension; + +use Symfony\Bridge\Twig\Extension\FormExtension; +use Symfony\Bridge\Twig\Form\TwigRendererEngine; +use Symfony\Bridge\Twig\Extension\TranslationExtension; +use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator; +use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader; +use Symfony\Component\Form\FormRenderer; +use Symfony\Component\Form\FormView; +use Symfony\Component\Form\Tests\AbstractBootstrap4HorizontalLayoutTest; + +/** + * Class providing test cases for the Bootstrap 4 Twig form theme. + * + * @author Hidde Wieringa + */ +class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTest +{ + use RuntimeLoaderProvider; + + protected $testableFeatures = array( + 'choice_attr', + ); + + private $renderer; + + protected function setUp() + { + parent::setUp(); + + $loader = new StubFilesystemLoader(array( + __DIR__.'/../../Resources/views/Form', + __DIR__.'/Fixtures/templates/form', + )); + + $environment = new \Twig_Environment($loader, array('strict_variables' => true)); + $environment->addExtension(new TranslationExtension(new StubTranslator())); + $environment->addExtension(new FormExtension()); + + $rendererEngine = new TwigRendererEngine(array( + 'bootstrap_4_horizontal_layout.html.twig', + 'custom_widgets.html.twig', + ), $environment); + $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock()); + $this->registerTwigRuntimeLoader($environment, $this->renderer); + } + + protected function renderForm(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form', $vars); + } + + protected function renderLabel(FormView $view, $label = null, array $vars = array()) + { + if ($label !== null) { + $vars += array('label' => $label); + } + + return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars); + } + + protected function renderErrors(FormView $view) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'errors'); + } + + protected function renderWidget(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars); + } + + protected function renderRow(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars); + } + + protected function renderRest(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars); + } + + protected function renderStart(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form_start', $vars); + } + + protected function renderEnd(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form_end', $vars); + } + + protected function setTheme(FormView $view, array $themes) + { + $this->renderer->setTheme($view, $themes); + } +} diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php new file mode 100644 index 0000000000000..4650246cda4f7 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php @@ -0,0 +1,129 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Twig\Tests\Extension; + +use Symfony\Bridge\Twig\Extension\FormExtension; +use Symfony\Bridge\Twig\Form\TwigRendererEngine; +use Symfony\Bridge\Twig\Extension\TranslationExtension; +use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator; +use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader; +use Symfony\Component\Form\FormRenderer; +use Symfony\Component\Form\FormView; +use Symfony\Component\Form\Tests\AbstractBootstrap4LayoutTest; + +/** + * Class providing test cases for the Bootstrap 4 horizontal Twig form theme. + * + * @author Hidde Wieringa + */ +class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest +{ + use RuntimeLoaderProvider; + /** + * @var FormRenderer; + */ + private $renderer; + + protected function setUp() + { + parent::setUp(); + + $loader = new StubFilesystemLoader(array( + __DIR__.'/../../Resources/views/Form', + __DIR__.'/Fixtures/templates/form', + )); + + $environment = new \Twig_Environment($loader, array('strict_variables' => true)); + $environment->addExtension(new TranslationExtension(new StubTranslator())); + $environment->addExtension(new FormExtension()); + + $rendererEngine = new TwigRendererEngine(array( + 'bootstrap_4_layout.html.twig', + 'custom_widgets.html.twig', + ), $environment); + $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock()); + $this->registerTwigRuntimeLoader($environment, $this->renderer); + } + + public function testStartTagHasNoActionAttributeWhenActionIsEmpty() + { + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'get', + 'action' => '', + )); + + $html = $this->renderStart($form->createView()); + + $this->assertSame('

', $html); + } + + public function testStartTagHasActionAttributeWhenActionIsZero() + { + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'get', + 'action' => '0', + )); + + $html = $this->renderStart($form->createView()); + + $this->assertSame('', $html); + } + + protected function renderForm(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form', $vars); + } + + protected function renderLabel(FormView $view, $label = null, array $vars = array()) + { + if ($label !== null) { + $vars += array('label' => $label); + } + + return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars); + } + + protected function renderErrors(FormView $view) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'errors'); + } + + protected function renderWidget(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars); + } + + protected function renderRow(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars); + } + + protected function renderRest(FormView $view, array $vars = array()) + { + return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars); + } + + protected function renderStart(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form_start', $vars); + } + + protected function renderEnd(FormView $view, array $vars = array()) + { + return (string) $this->renderer->renderBlock($view, 'form_end', $vars); + } + + protected function setTheme(FormView $view, array $themes) + { + $this->renderer->setTheme($view, $themes); + } +} diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 14f734cdc80ef..e1e86408cff33 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -23,7 +23,7 @@ "fig/link-util": "^1.0", "symfony/asset": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/form": "^3.2.10|^3.3.3|~4.0", + "symfony/form": "~3.4|~4.0", "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.8|~3.0|~4.0", @@ -39,7 +39,7 @@ "symfony/web-link": "~3.3|~4.0" }, "conflict": { - "symfony/form": "<3.2.10|~3.3,<3.3.3", + "symfony/form": "<3.4", "symfony/console": "<3.4" }, "suggest": { diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php new file mode 100644 index 0000000000000..990fffbe94689 --- /dev/null +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php @@ -0,0 +1,181 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Form\Tests; + +/** + * Abstract class providing test cases for the Bootstrap 4 horizontal Twig form theme. + * + * @author Hidde Wieringa + */ +abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4LayoutTest +{ + public function testLabelOnForm() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType'); + $view = $form->createView(); + $this->renderWidget($view, array('label' => 'foo')); + $html = $this->renderLabel($view); + + $this->assertMatchesXpath($html, +'/label + [@class="col-form-label col-sm-2 form-control-label required"] + [.="[trans]Name[/trans]"] +' + ); + } + + public function testLabelDoesNotRenderFieldAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), null, array( + 'attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="col-form-label col-sm-2 form-control-label required"] +' + ); + } + + public function testLabelWithCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), null, array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class col-form-label col-sm-2 form-control-label required"] +' + ); + } + + public function testLabelWithCustomTextAndCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), 'Custom label', array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class col-form-label col-sm-2 form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array( + 'label' => 'Custom label', + )); + $html = $this->renderLabel($form->createView(), null, array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class col-form-label col-sm-2 form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testLegendOnExpandedType() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( + 'label' => 'Custom label', + 'expanded' => true, + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + )); + $view = $form->createView(); + $this->renderWidget($view); + $html = $this->renderLabel($view); + + $this->assertMatchesXpath($html, +'/legend + [@class="col-sm-2 col-form-legend form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testStartTag() + { + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'get', + 'action' => 'http://example.com/directory', + )); + + $html = $this->renderStart($form->createView()); + + $this->assertSame('', $html); + } + + public function testStartTagWithOverriddenVars() + { + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'put', + 'action' => 'http://example.com/directory', + )); + + $html = $this->renderStart($form->createView(), array( + 'method' => 'post', + 'action' => 'http://foo.com/directory', + )); + + $this->assertSame('', $html); + } + + public function testStartTagForMultipartForm() + { + $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'get', + 'action' => 'http://example.com/directory', + )) + ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType') + ->getForm(); + + $html = $this->renderStart($form->createView()); + + $this->assertSame('', $html); + } + + public function testStartTagWithExtraAttributes() + { + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array( + 'method' => 'get', + 'action' => 'http://example.com/directory', + )); + + $html = $this->renderStart($form->createView(), array( + 'attr' => array('class' => 'foobar'), + )); + + $this->assertSame('', $html); + } +} diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php new file mode 100644 index 0000000000000..35bd1203b3f80 --- /dev/null +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php @@ -0,0 +1,978 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Form\Tests; + +use Symfony\Component\Form\FormError; + +/** + * Abstract class providing test cases for the Bootstrap 4 Twig form theme. + * + * @author Hidde Wieringa + */ +abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest +{ + public function testLabelOnForm() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType'); + $view = $form->createView(); + $this->renderWidget($view, array('label' => 'foo')); + $html = $this->renderLabel($view); + + $this->assertMatchesXpath($html, +'/label + [@class="form-control-label required"] + [.="[trans]Name[/trans]"] +' + ); + } + + public function testLabelDoesNotRenderFieldAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), null, array( + 'attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="form-control-label required"] +' + ); + } + + public function testLabelWithCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), null, array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class form-control-label required"] +' + ); + } + + public function testLabelWithCustomTextAndCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $html = $this->renderLabel($form->createView(), 'Custom label', array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array( + 'label' => 'Custom label', + )); + $html = $this->renderLabel($form->createView(), null, array( + 'label_attr' => array( + 'class' => 'my&class', + ), + )); + + $this->assertMatchesXpath($html, +'/label + [@for="name"] + [@class="my&class form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testLegendOnExpandedType() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( + 'label' => 'Custom label', + 'expanded' => true, + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + )); + $view = $form->createView(); + $this->renderWidget($view); + $html = $this->renderLabel($view); + + $this->assertMatchesXpath($html, +'/legend + [@class="col-form-legend form-control-label required"] + [.="[trans]Custom label[/trans]"] +' + ); + } + + public function testErrors() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType'); + $form->addError(new FormError('[trans]Error 1[/trans]')); + $form->addError(new FormError('[trans]Error 2[/trans]')); + $view = $form->createView(); + $html = $this->renderErrors($view); + + $this->assertMatchesXpath($html, +'/div + [@class="alert alert-danger"] + [ + ./ul + [@class="list-unstyled mb-0"] + [ + ./li + [.="[trans]Error 1[/trans]"] + /following-sibling::li + [.="[trans]Error 2[/trans]"] + ] + [count(./li)=2] + ] +' + ); + } + + public function testCheckedCheckbox() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', true); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [.=" [trans]Name[/trans]"] + [@class="form-check-label required"] + [ + ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@checked="checked"][@value="1"] + ] + ] +' + ); + } + + public function testSingleChoiceAttributesWithMainAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => false, + 'attr' => array('class' => 'bar&baz'), + )); + + $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')), +'/select + [@name="name"] + [@class="bar&baz form-control"] + [not(@required)] + [ + ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"] + /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"] + ] + [count(./option)=2] +' + ); + } + + public function testSingleExpandedChoiceAttributesWithMainAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => true, + 'attr' => array('class' => 'bar&baz'), + )); + + $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')), +'/div + [@class="bar&baz"] + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testUncheckedCheckbox() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [.=" [trans]Name[/trans]"] + [ + ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][not(@checked)] + ] + ] +' + ); + } + + public function testCheckboxWithValue() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, array( + 'value' => 'foo&bar', + )); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [.=" [trans]Name[/trans]"] + [ + ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@value="foo&bar"] + ] + ] +' + ); + } + + public function testSingleChoiceExpanded() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithLabelsAsFalse() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'choice_label' => false, + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithLabelsSetByCallable() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'), + 'choice_label' => function ($choice, $label, $value) { + if ('&b' === $choice) { + return false; + } + + return 'label.'.$value; + }, + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]label.&a[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]label.&c[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_2"][@value="&c"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithLabelsSetFalseByCallable() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'choice_label' => function () { + return false; + }, + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithoutTranslation() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => true, + 'choice_translation_domain' => false, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" Choice&A"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" Choice&B"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')), + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar"] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithPlaceholder() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => true, + 'placeholder' => 'Test&Me', + 'required' => false, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Test&Me[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'multiple' => false, + 'expanded' => true, + 'required' => false, + 'choice_translation_domain' => false, + 'placeholder' => 'Placeholder&Not&Translated', + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" Placeholder&Not&Translated"] + [ + ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" Choice&A"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" Choice&B"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testSingleChoiceExpandedWithBooleanValue() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, array( + 'choices' => array('Choice&A' => '1', 'Choice&B' => '0'), + 'multiple' => false, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_0"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpanded() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'), + 'multiple' => true, + 'expanded' => true, + 'required' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&C[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpandedWithLabelsAsFalse() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'choice_label' => false, + 'multiple' => true, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpandedWithLabelsSetByCallable() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'), + 'choice_label' => function ($choice, $label, $value) { + if ('&b' === $choice) { + return false; + } + + return 'label.'.$value; + }, + 'multiple' => true, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), + '/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]label.&a[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]label.&c[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@value="&c"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'), + 'choice_label' => function () { + return false; + }, + 'multiple' => true, + 'expanded' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpandedWithoutTranslation() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'), + 'multiple' => true, + 'expanded' => true, + 'required' => true, + 'choice_translation_domain' => false, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" Choice&A"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" Choice&B"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" Choice&C"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testMultipleChoiceExpandedAttributes() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array( + 'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'), + 'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')), + 'multiple' => true, + 'expanded' => true, + 'required' => true, + )); + + $this->assertWidgetMatchesXpath($form->createView(), array(), +'/div + [ + ./div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&A[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&B[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)][@class="foo&bar"] + ] + ] + /following-sibling::div + [@class="form-check"] + [ + ./label + [.=" [trans]Choice&C[/trans]"] + [ + ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)] + ] + ] + /following-sibling::input[@type="hidden"][@id="name__token"] + ] +' + ); + } + + public function testCheckedRadio() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', true); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [@class="form-check-label required"] + [ + ./input + [@id="my&id"] + [@type="radio"] + [@name="name"] + [@class="my&class"] + [@checked="checked"] + [@value="1"] + ] + ] +' + ); + } + + public function testUncheckedRadio() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [@class="form-check-label required"] + [ + ./input + [@id="my&id"] + [@type="radio"] + [@name="name"] + [@class="my&class"] + [not(@checked)] + ] + ] +' + ); + } + + public function testRadioWithValue() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, array( + 'value' => 'foo&bar', + )); + + $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')), +'/div + [@class="form-check"] + [ + ./label + [@class="form-check-label required"] + [ + ./input + [@id="my&id"] + [@type="radio"] + [@name="name"] + [@class="my&class"] + [@value="foo&bar"] + ] + ] +' + ); + } + + public function testButtonAttributeNameRepeatedIfTrue() + { + $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array( + 'attr' => array('foo' => true), + )); + + $html = $this->renderWidget($form->createView()); + + // foo="foo" + $this->assertSame('', $html); + } + + public function testFile() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\FileType'); + + $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class form-control-file')), +'/input + [@type="file"] +' + ); + } +} From a2af9a940f24f157bf0256dc4af1af9b9f4516e6 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 1 Sep 2017 15:23:39 +0200 Subject: [PATCH 0742/1099] Improved how links are displayed in exception messages --- .../Bundle/TwigBundle/Resources/views/exception.css.twig | 4 ++-- src/Symfony/Component/Debug/ExceptionHandler.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig index 84112fad6ed94..9f12edece1e71 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig @@ -84,8 +84,8 @@ header .container { display: flex; justify-content: space-between; } .exception-message { flex-grow: 1; } .exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; } .exception-message.long { font-size: 18px; } -.exception-message a { text-decoration: none; } -.exception-message a:hover { text-decoration: underline; } +.exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; } +.exception-message a:hover { border-bottom-color: #ffffff; } .exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; } diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php index 0ecd2a5347f27..a82a3246d9eaa 100644 --- a/src/Symfony/Component/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/Debug/ExceptionHandler.php @@ -310,8 +310,8 @@ public function getStylesheet(FlattenException $exception) .exception-message { flex-grow: 1; padding: 30px 0; } .exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; } .exception-message.long { font-size: 18px; } - .exception-message a { text-decoration: none; } - .exception-message a:hover { text-decoration: underline; } + .exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; } + .exception-message a:hover { border-bottom-color: #ffffff; } .exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; } From fb5135b742c482ca981ade0db56db7440ed224e6 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 1 Sep 2017 15:44:20 +0200 Subject: [PATCH 0743/1099] Improved the design of the redirection method in the web toolbar --- .../WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig index 7ef299437bb5f..3a65e1d0537d6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig @@ -250,6 +250,7 @@ font-size: 12px; height: 17px; line-height: 17px; + margin-right: 5px; } .sf-toolbar-status-green .sf-toolbar-label, From 2f292c247eef1b47dd6d2abc7760ab8a515470d9 Mon Sep 17 00:00:00 2001 From: Oleg Andreyev Date: Thu, 31 Aug 2017 12:18:43 +0300 Subject: [PATCH 0744/1099] #24046 added check for ext-dom to XmlUtil::loadFile --- src/Symfony/Component/Config/Util/XmlUtils.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php index 25d9b0a0abe5d..0f16fc080bf05 100644 --- a/src/Symfony/Component/Config/Util/XmlUtils.php +++ b/src/Symfony/Component/Config/Util/XmlUtils.php @@ -37,9 +37,14 @@ private function __construct() * @return \DOMDocument * * @throws \InvalidArgumentException When loading of XML file returns error + * @throws \RuntimeException When DOM extension is missing */ public static function loadFile($file, $schemaOrCallable = null) { + if (!extension_loaded('dom')) { + throw new \RuntimeException('Extension DOM is required.'); + } + $content = @file_get_contents($file); if ('' === trim($content)) { throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file)); From 26948cf565709d3a5524a52b5d1b5d65b3c88f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Sun, 3 Sep 2017 14:43:23 +0200 Subject: [PATCH 0745/1099] Fix race condition in tests between cache and lock --- .../Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php | 1 - .../Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php | 1 - .../Component/Cache/Tests/Simple/AbstractRedisCacheTest.php | 1 - 3 files changed, 3 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php index 86b16d436f23f..d9353821ae6ef 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php @@ -41,7 +41,6 @@ public static function setupBeforeClass() public static function tearDownAfterClass() { - self::$redis->flushDB(); self::$redis = null; } } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php index 6ed1c7d6a9f3b..38915397da993 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php @@ -21,7 +21,6 @@ public static function setupBeforeClass() public static function tearDownAfterClass() { - self::$redis->getConnection()->getConnectionByKey('foo')->executeCommand(self::$redis->createCommand('FLUSHDB')); self::$redis = null; } } diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php index 1d097fff85fcd..f70f49d5dbaa6 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php @@ -41,7 +41,6 @@ public static function setupBeforeClass() public static function tearDownAfterClass() { - self::$redis->flushDB(); self::$redis = null; } } From f74ef3577812be2fcbb5fe6382186b937bd22ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Wed, 26 Apr 2017 22:57:15 +0200 Subject: [PATCH 0746/1099] [Lock] Check TTL expiration in lock acquisition --- .../Lock/Exception/LockExpiredException.php | 21 ++++++++++++++ src/Symfony/Component/Lock/Key.php | 28 +++++++++++++------ src/Symfony/Component/Lock/Lock.php | 27 ++++++++++++------ .../Component/Lock/Store/CombinedStore.php | 14 +++++++++- .../Component/Lock/Store/MemcachedStore.php | 16 +++++++---- .../Component/Lock/Store/RedisStore.php | 9 ++++++ src/Symfony/Component/Lock/Tests/LockTest.php | 12 ++++---- .../Lock/Tests/Store/CombinedStoreTest.php | 10 +++---- .../Tests/Store/ExpiringStoreTestTrait.php | 23 +++++++++++++-- .../Lock/Tests/Store/MemcachedStoreTest.php | 5 ++++ 10 files changed, 128 insertions(+), 37 deletions(-) create mode 100644 src/Symfony/Component/Lock/Exception/LockExpiredException.php diff --git a/src/Symfony/Component/Lock/Exception/LockExpiredException.php b/src/Symfony/Component/Lock/Exception/LockExpiredException.php new file mode 100644 index 0000000000000..9b712ae0b715b --- /dev/null +++ b/src/Symfony/Component/Lock/Exception/LockExpiredException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Lock\Exception; + +/** + * LockExpiredException is thrown when a lock may conflict due to a TTL expiration. + * + * @author Jérémy Derussé + */ +class LockExpiredException extends \RuntimeException implements ExceptionInterface +{ +} diff --git a/src/Symfony/Component/Lock/Key.php b/src/Symfony/Component/Lock/Key.php index 5069901761820..1f5a7de740ef9 100644 --- a/src/Symfony/Component/Lock/Key.php +++ b/src/Symfony/Component/Lock/Key.php @@ -19,7 +19,7 @@ final class Key { private $resource; - private $expiringDate; + private $expiringTime; private $state = array(); /** @@ -72,28 +72,38 @@ public function getState($stateKey) return $this->state[$stateKey]; } + public function resetLifetime() + { + $this->expiringTime = null; + } + /** * @param float $ttl The expiration delay of locks in seconds. */ public function reduceLifetime($ttl) { - $newExpiringDate = \DateTimeImmutable::createFromFormat('U.u', (string) (microtime(true) + $ttl)); + $newTime = microtime(true) + $ttl; - if (null === $this->expiringDate || $newExpiringDate < $this->expiringDate) { - $this->expiringDate = $newExpiringDate; + if (null === $this->expiringTime || $this->expiringTime > $newTime) { + $this->expiringTime = $newTime; } } - public function resetExpiringDate() + /** + * Returns the remaining lifetime. + * + * @return float|null Remaining lifetime in seconds. Null when the key won't expire. + */ + public function getRemainingLifetime() { - $this->expiringDate = null; + return null === $this->expiringTime ? null : $this->expiringTime - microtime(true); } /** - * @return \DateTimeImmutable + * @return bool */ - public function getExpiringDate() + public function isExpired() { - return $this->expiringDate; + return null !== $this->expiringTime && $this->expiringTime <= microtime(true); } } diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php index c42bd2255cf5f..d8271569d8c05 100644 --- a/src/Symfony/Component/Lock/Lock.php +++ b/src/Symfony/Component/Lock/Lock.php @@ -17,6 +17,7 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockAcquiringException; use Symfony\Component\Lock\Exception\LockConflictedException; +use Symfony\Component\Lock\Exception\LockExpiredException; use Symfony\Component\Lock\Exception\LockReleasingException; /** @@ -64,6 +65,10 @@ public function acquire($blocking = false) $this->refresh(); } + if ($this->key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to store the "%s" lock.', $this->key)); + } + return true; } catch (LockConflictedException $e) { $this->logger->warning('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', array('resource' => $this->key)); @@ -89,8 +94,13 @@ public function refresh() } try { - $this->key->resetExpiringDate(); + $this->key->resetLifetime(); $this->store->putOffExpiration($this->key, $this->ttl); + + if ($this->key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $this->key)); + } + $this->logger->info('Expiration defined for "{resource}" lock for "{ttl}" seconds.', array('resource' => $this->key, 'ttl' => $this->ttl)); } catch (LockConflictedException $e) { $this->logger->warning('Failed to define an expiration for the "{resource}" lock, someone else acquired the lock.', array('resource' => $this->key)); @@ -127,15 +137,16 @@ public function release() */ public function isExpired() { - if (null === $expireDate = $this->key->getExpiringDate()) { - return false; - } - - return $expireDate <= new \DateTime(); + return $this->key->isExpired(); } - public function getExpiringDate() + /** + * Returns the remaining lifetime. + * + * @return float|null Remaining lifetime in seconds. Null when the lock won't expire. + */ + public function getRemainingLifetime() { - return $this->key->getExpiringDate(); + return $this->key->getRemainingLifetime(); } } diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php index 0f5a78cef6455..50258fe694d6d 100644 --- a/src/Symfony/Component/Lock/Store/CombinedStore.php +++ b/src/Symfony/Component/Lock/Store/CombinedStore.php @@ -16,6 +16,7 @@ use Psr\Log\NullLogger; use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; +use Symfony\Component\Lock\Exception\LockExpiredException; use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\Strategy\StrategyInterface; @@ -102,10 +103,17 @@ public function putOffExpiration(Key $key, $ttl) $successCount = 0; $failureCount = 0; $storesCount = count($this->stores); + $expireAt = microtime(true) + $ttl; foreach ($this->stores as $store) { try { - $store->putOffExpiration($key, $ttl); + if (0.0 >= $adjustedTtl = $expireAt - microtime(true)) { + $this->logger->warning('Stores took to long to put off the expiration of the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'ttl' => $ttl)); + $key->reduceLifetime(0); + break; + } + + $store->putOffExpiration($key, $adjustedTtl); ++$successCount; } catch (\Exception $e) { $this->logger->warning('One store failed to put off the expiration of the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'exception' => $e)); @@ -117,6 +125,10 @@ public function putOffExpiration(Key $key, $ttl) } } + if ($key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key)); + } + if ($this->strategy->isMet($successCount, $storesCount)) { return; } diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index 4f8d6f5ff7159..dc34bdf846695 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -13,6 +13,7 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; +use Symfony\Component\Lock\Exception\LockExpiredException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\StoreInterface; @@ -57,14 +58,15 @@ public function __construct(\Memcached $memcached, $initialTtl = 300) public function save(Key $key) { $token = $this->getToken($key); - $key->reduceLifetime($this->initialTtl); - if ($this->memcached->add((string) $key, $token, (int) ceil($this->initialTtl))) { - return; + if (!$this->memcached->add((string) $key, $token, (int) ceil($this->initialTtl))) { + // the lock is already acquired. It could be us. Let's try to put off. + $this->putOffExpiration($key, $this->initialTtl); } - // the lock is already acquire. It could be us. Let's try to put off. - $this->putOffExpiration($key, $this->initialTtl); + if ($key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to store the "%s" lock.', $key)); + } } public function waitAndSave(Key $key) @@ -107,6 +109,10 @@ public function putOffExpiration(Key $key, $ttl) if (!$this->memcached->cas($cas, (string) $key, $token, $ttl)) { throw new LockConflictedException(); } + + if ($key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key)); + } } /** diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index d67120fe0c0c3..88b15938997c9 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -13,6 +13,7 @@ use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\LockConflictedException; +use Symfony\Component\Lock\Exception\LockExpiredException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\StoreInterface; @@ -61,6 +62,10 @@ public function save(Key $key) if (!$this->evaluate($script, (string) $key, array($this->getToken($key), (int) ceil($this->initialTtl * 1000)))) { throw new LockConflictedException(); } + + if ($key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to store the "%s" lock.', $key)); + } } public function waitAndSave(Key $key) @@ -85,6 +90,10 @@ public function putOffExpiration(Key $key, $ttl) if (!$this->evaluate($script, (string) $key, array($this->getToken($key), (int) ceil($ttl * 1000)))) { throw new LockConflictedException(); } + + if ($key->isExpired()) { + throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key)); + } } /** diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php index fb107232efba6..97b376621169a 100644 --- a/src/Symfony/Component/Lock/Tests/LockTest.php +++ b/src/Symfony/Component/Lock/Tests/LockTest.php @@ -165,7 +165,7 @@ public function testExpiration($ttls, $expected) foreach ($ttls as $ttl) { if (null === $ttl) { - $key->resetExpiringDate(); + $key->resetLifetime(); } else { $key->reduceLifetime($ttl); } @@ -175,12 +175,12 @@ public function testExpiration($ttls, $expected) public function provideExpiredDates() { - yield array(array(-1.0), true); - yield array(array(1, -1.0), true); - yield array(array(-1.0, 1), true); + yield array(array(-0.1), true); + yield array(array(0.1, -0.1), true); + yield array(array(-0.1, 0.1), true); yield array(array(), false); - yield array(array(1), false); - yield array(array(-1.0, null), false); + yield array(array(0.1), false); + yield array(array(-0.1, null), false); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php index debe06183dc35..c7232d407feee 100644 --- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php @@ -175,12 +175,12 @@ public function testputOffExpirationThrowsExceptionOnFailure() $this->store1 ->expects($this->once()) ->method('putOffExpiration') - ->with($key, $ttl) + ->with($key, $this->lessThanOrEqual($ttl)) ->willThrowException(new LockConflictedException()); $this->store2 ->expects($this->once()) ->method('putOffExpiration') - ->with($key, $ttl) + ->with($key, $this->lessThanOrEqual($ttl)) ->willThrowException(new LockConflictedException()); $this->strategy @@ -203,12 +203,12 @@ public function testputOffExpirationCleanupOnFailure() $this->store1 ->expects($this->once()) ->method('putOffExpiration') - ->with($key, $ttl) + ->with($key, $this->lessThanOrEqual($ttl)) ->willThrowException(new LockConflictedException()); $this->store2 ->expects($this->once()) ->method('putOffExpiration') - ->with($key, $ttl) + ->with($key, $this->lessThanOrEqual($ttl)) ->willThrowException(new LockConflictedException()); $this->store1 @@ -242,7 +242,7 @@ public function testputOffExpirationAbortWhenStrategyCantBeMet() $this->store1 ->expects($this->once()) ->method('putOffExpiration') - ->with($key, $ttl) + ->with($key, $this->lessThanOrEqual($ttl)) ->willThrowException(new LockConflictedException()); $this->store2 ->expects($this->never()) diff --git a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php index f862f0d4aa300..10b13273870e7 100644 --- a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php +++ b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php @@ -52,6 +52,22 @@ public function testExpiration() $this->assertFalse($store->exists($key)); } + /** + * Tests the store thrown exception when TTL expires. + * + * @expectedException \Symfony\Component\Lock\Exception\LockExpiredException + */ + public function testAbortAfterExpiration() + { + $key = new Key(uniqid(__METHOD__, true)); + + /** @var StoreInterface $store */ + $store = $this->getStore(); + + $store->save($key); + $store->putOffExpiration($key, 1 / 1000000); + } + /** * Tests the refresh can push the limits to the expiration. * @@ -69,10 +85,10 @@ public function testRefreshLock() $store = $this->getStore(); $store->save($key); - $store->putOffExpiration($key, 1.0 * $clockDelay / 1000000); + $store->putOffExpiration($key, $clockDelay / 1000000); $this->assertTrue($store->exists($key)); - usleep(2.1 * $clockDelay); + usleep(2 * $clockDelay); $this->assertFalse($store->exists($key)); } @@ -85,6 +101,7 @@ public function testSetExpiration() $store->save($key); $store->putOffExpiration($key, 1); - $this->assertNotNull($key->getExpiringDate()); + $this->assertGreaterThanOrEqual(0, $key->getRemainingLifetime()); + $this->assertLessThanOrEqual(1, $key->getRemainingLifetime()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php index 72615baae2ce8..eb030fba0f9de 100644 --- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php @@ -49,4 +49,9 @@ public function getStore() return new MemcachedStore($memcached); } + + public function testAbortAfterExpiration() + { + $this->markTestSkipped('Memcached expects a TTL greater than 1 sec. Simulating a slow network is too hard'); + } } From 99e95c3d2dd0fee9f7bed43fa10e786121b92b48 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 3 Sep 2017 01:52:02 +0200 Subject: [PATCH 0747/1099] Fix BC break in console.command.ids parameter --- .../Bundle/FrameworkBundle/Console/Application.php | 3 ++- .../Tests/Console/ApplicationTest.php | 12 ++++++------ .../DependencyInjection/AddConsoleCommandPass.php | 5 ++++- .../AddConsoleCommandPassTest.php | 6 ++++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 09c61933ee207..7182fc1b934a7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -173,8 +173,9 @@ protected function registerCommands() } if ($container->hasParameter('console.command.ids')) { + $lazyCommandIds = $container->hasParameter('console.lazy_command.ids') ? $container->getParameter('console.lazy_command.ids') : array(); foreach ($container->getParameter('console.command.ids') as $id) { - if (false !== $id) { + if (!isset($lazyCommandIds[$id])) { try { $this->add($container->get($id)); } catch (\Exception $e) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php index ce7ebad1f158e..9396b68212d9d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php @@ -183,16 +183,16 @@ private function getKernel(array $bundles, $useDispatcher = false) } $container - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('hasParameter') - ->with($this->equalTo('console.command.ids')) - ->will($this->returnValue(true)) + ->withConsecutive(array('console.command.ids'), array('console.lazy_command.ids')) + ->willReturnOnConsecutiveCalls(true, true) ; $container - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getParameter') - ->with($this->equalTo('console.command.ids')) - ->will($this->returnValue(array())) + ->withConsecutive(array('console.lazy_command.ids'), array('console.command.ids')) + ->willReturnOnConsecutiveCalls(array(), array()) ; $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock(); diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php index add7c5d0df491..dcc023cb222da 100644 --- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php +++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php @@ -41,6 +41,7 @@ public function process(ContainerBuilder $container) $lazyCommandMap = array(); $lazyCommandRefs = array(); $serviceIds = array(); + $lazyServiceIds = array(); foreach ($commandServices as $id => $tags) { $definition = $container->getDefinition($id); @@ -73,7 +74,8 @@ public function process(ContainerBuilder $container) continue; } - $serviceIds[$commandId] = false; + $serviceIds[$commandId] = $id; + $lazyServiceIds[$id] = true; unset($tags[0]); $lazyCommandMap[$commandName] = $id; $lazyCommandRefs[$id] = new TypedReference($id, $class); @@ -98,5 +100,6 @@ public function process(ContainerBuilder $container) ->setArguments(array(ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap)); $container->setParameter('console.command.ids', $serviceIds); + $container->setParameter('console.lazy_command.ids', $lazyServiceIds); } } diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php index 807eb389730fe..34f648610836a 100644 --- a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php +++ b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php @@ -73,7 +73,8 @@ public function testProcessRegistersLazyCommands() $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass()); $this->assertSame(array('my:command' => 'my-command', 'my:alias' => 'my-command'), $commandLoader->getArgument(1)); $this->assertEquals(array(array('my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class)))), $commandLocator->getArguments()); - $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_mycommand' => false), $container->getParameter('console.command.ids')); + $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_mycommand' => 'my-command'), $container->getParameter('console.command.ids')); + $this->assertSame(array('my-command' => true), $container->getParameter('console.lazy_command.ids')); $this->assertSame(array(array('setName', array('my:command')), array('setAliases', array(array('my:alias')))), $command->getMethodCalls()); } @@ -95,7 +96,8 @@ public function testProcessFallsBackToDefaultName() $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass()); $this->assertSame(array('default' => 'with-default-name'), $commandLoader->getArgument(1)); $this->assertEquals(array(array('with-default-name' => new ServiceClosureArgument(new TypedReference('with-default-name', NamedCommand::class)))), $commandLocator->getArguments()); - $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_namedcommand' => false), $container->getParameter('console.command.ids')); + $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_namedcommand' => 'with-default-name'), $container->getParameter('console.command.ids')); + $this->assertSame(array('with-default-name' => true), $container->getParameter('console.lazy_command.ids')); $container = new ContainerBuilder(); $container From 46599759441d5c5a32f2735c9f446258f846cf62 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sat, 12 Aug 2017 12:12:58 +0200 Subject: [PATCH 0748/1099] Fix deprecations regarding core commands registered as services --- UPGRADE-3.4.md | 56 ++++++++++++++++++- UPGRADE-4.0.md | 50 +++++++++++++++-- src/Symfony/Bridge/Twig/CHANGELOG.md | 6 +- .../Bundle/FrameworkBundle/CHANGELOG.md | 27 +++++++++ .../Command/AssetsInstallCommand.php | 2 +- .../Command/CacheClearCommand.php | 2 +- .../Command/CachePoolClearCommand.php | 2 +- .../Command/EventDispatcherDebugCommand.php | 2 +- .../Command/RouterDebugCommand.php | 2 +- .../Command/RouterMatchCommand.php | 2 +- .../Command/TranslationDebugCommand.php | 2 +- .../Command/TranslationUpdateCommand.php | 2 +- .../Tests/Command/RouterDebugCommandTest.php | 2 +- .../Tests/Command/RouterMatchCommandTest.php | 4 +- .../Command/TranslationDebugCommandTest.php | 2 +- .../Command/TranslationUpdateCommandTest.php | 2 +- .../Functional/CachePoolClearCommandTest.php | 2 +- .../Bundle/SecurityBundle/CHANGELOG.md | 5 ++ .../SecurityBundle/Command/InitAclCommand.php | 2 +- .../SecurityBundle/Command/SetAclCommand.php | 2 +- 20 files changed, 152 insertions(+), 24 deletions(-) diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md index 5a677088acd9f..ea8acec4f5c51 100644 --- a/UPGRADE-3.4.md +++ b/UPGRADE-3.4.md @@ -120,7 +120,52 @@ FrameworkBundle class has been deprecated and will be removed in 4.0. Use the `Symfony\Component\Translation\Reader\TranslationReader` class instead. - * The `translation.loader` service has been deprecated and will be removed in 4.0. Use the `translation.reader` service instead. + * The `translation.loader` service has been deprecated and will be removed in 4.0. + Use the `translation.reader` service instead.. + + * `AssetsInstallCommand::__construct()` now takes an instance of + `Symfony\Component\Filesystem\Filesystem` as first argument. + Not passing it is deprecated and will throw a `TypeError` in 4.0. + + * `CacheClearCommand::__construct()` now takes an instance of + `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `CachePoolClearCommand::__construct()` now takes an instance of + `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `EventDispatcherDebugCommand::__construct()` now takes an instance of + `Symfony\Component\EventDispatcher\EventDispatcherInterface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `RouterDebugCommand::__construct()` now takes an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `RouterMatchCommand::__construct()` now takes an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `TranslationDebugCommand::__construct()` now takes an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `TranslationUpdateCommand::__construct()` now takes an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument. Not passing it is deprecated and will throw + a `TypeError` in 4.0. + + * `AssetsInstallCommand`, `CacheClearCommand`, `CachePoolClearCommand`, + `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`, + `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand` + and `YamlLintCommand` classes have been marked as final HttpKernel ---------- @@ -168,6 +213,15 @@ SecurityBundle * `FirewallContext::getListeners()` now returns `\Traversable|array` + * `InitAclCommand::__construct()` now takes an instance of + `Doctrine\DBAL\Connection` as first argument. Not passing it is + deprecated and will throw a `TypeError` in 4.0. + + * `SetAclCommand::__construct()` now takes an instance of + `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection` + as first argument. Not passing it is deprecated and will throw a `TypeError` + in 4.0. + Translation ----------- diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 0b9a727a17368..e54f77c228bad 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -419,8 +419,40 @@ FrameworkBundle class has been deprecated and will be removed in 4.0. Use the `Symfony\Component\Translation\Reader\TranslationReader` class instead. - * The `translation.loader` service has been deprecated and will be removed in 4.0. Use the `translation.reader` service instead. + * The `translation.loader` service has been removed. + Use the `translation.reader` service instead. + * `AssetsInstallCommand::__construct()` now requires an instance of + `Symfony\Component\Filesystem\Filesystem` as first argument. + + * `CacheClearCommand::__construct()` now requires an instance of + `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as + first argument. + + * `CachePoolClearCommand::__construct()` now requires an instance of + `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as + first argument. + + * `EventDispatcherDebugCommand::__construct()` now requires an instance of + `Symfony\Component\EventDispatcher\EventDispatcherInterface` as + first argument. + + * `RouterDebugCommand::__construct()` now requires an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument. + + * `RouterMatchCommand::__construct()` now requires an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument. + + * `TranslationDebugCommand::__construct()` now requires an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument. + + * `TranslationUpdateCommand::__construct()` now requires an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument. + HttpFoundation -------------- @@ -568,6 +600,13 @@ SecurityBundle * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` nor implement `ContainerAwareInterface` anymore. + * `InitAclCommand::__construct()` now requires an instance of + `Doctrine\DBAL\Connection` as first argument. + + * `SetAclCommand::__construct()` now requires an instance of + `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection` + as first argument. + Serializer ---------- @@ -642,11 +681,12 @@ TwigBridge * The `TwigRendererEngine::setEnvironment()` method has been removed. Pass the Twig Environment as second argument of the constructor instead. - * Removed `Symfony\Bridge\Twig\Command\DebugCommand::set/getTwigEnvironment` and the ability - to pass a command name as first argument. + * Removed `DebugCommand::set/getTwigEnvironment`. Pass an instance of + `Twig\Environment` as first argument of the constructor instead. + + * Removed `LintCommand::set/getTwigEnvironment`. Pass an instance of + `Twig\Environment` as first argument of the constructor instead. - * Removed `Symfony\Bridge\Twig\Command\LintCommand::set/getTwigEnvironment` and the ability - to pass a command name as first argument. Validator --------- diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md index c9cfec886177a..397134150c318 100644 --- a/src/Symfony/Bridge/Twig/CHANGELOG.md +++ b/src/Symfony/Bridge/Twig/CHANGELOG.md @@ -5,8 +5,10 @@ CHANGELOG ----- * deprecated `Symfony\Bridge\Twig\Form\TwigRenderer` - * deprecated `Symfony\Bridge\Twig\Command\DebugCommand::set/getTwigEnvironment` and the ability to pass a command name as first argument - * deprecated `Symfony\Bridge\Twig\Command\LintCommand::set/getTwigEnvironment` and the ability to pass a command name as first argument + * deprecated `DebugCommand::set/getTwigEnvironment`. Pass an instance of + `Twig\Environment` as first argument of the constructor instead + * deprecated `LintCommand::set/getTwigEnvironment`. Pass an instance of + `Twig\Environment` as first argument of the constructor instead 3.3.0 ----- diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 4a51222f7e90d..dafd4c46bb0fc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -26,6 +26,33 @@ CHANGELOG * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use `Symfony\Component\Translation\Reader\TranslationReader` instead * Deprecated `translation.loader` service, use `translation.reader` instead + * `AssetsInstallCommand::__construct()` now takes an instance of + `Symfony\Component\Filesystem\Filesystem` as first argument + * `CacheClearCommand::__construct()` now takes an instance of + `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as + first argument + * `CachePoolClearCommand::__construct()` now takes an instance of + `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as + first argument + * `EventDispatcherDebugCommand::__construct()` now takes an instance of + `Symfony\Component\EventDispatcher\EventDispatcherInterface` as + first argument + * `RouterDebugCommand::__construct()` now takes an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument + * `RouterMatchCommand::__construct()` now takes an instance of + `Symfony\Component\Routing\RouterInteface` as + first argument + * `TranslationDebugCommand::__construct()` now takes an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument + * `TranslationUpdateCommand::__construct()` now takes an instance of + `Symfony\Component\Translation\TranslatorInterface` as + first argument + * `AssetsInstallCommand`, `CacheClearCommand`, `CachePoolClearCommand`, + `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`, + `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand` + and `YamlLintCommand` classes have been marked as final 3.3.0 ----- diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php index e1adbe9e9325a..1669b3d3addd5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php @@ -45,7 +45,7 @@ class AssetsInstallCommand extends ContainerAwareCommand public function __construct($filesystem = null) { if (!$filesystem instanceof Filesystem) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Filesystem::class), E_USER_DEPRECATED); parent::__construct($filesystem); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index 29fa61a5f44af..4080d2a3d2de6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -45,7 +45,7 @@ class CacheClearCommand extends ContainerAwareCommand public function __construct($cacheClearer = null, Filesystem $filesystem = null) { if (!$cacheClearer instanceof CacheClearerInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, CacheClearerInterface::class), E_USER_DEPRECATED); parent::__construct($cacheClearer); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php index dedd61e668116..04719b75d7fd2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php @@ -35,7 +35,7 @@ final class CachePoolClearCommand extends ContainerAwareCommand public function __construct($poolClearer = null) { if (!$poolClearer instanceof Psr6CacheClearer) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Psr6CacheClearer::class), E_USER_DEPRECATED); parent::__construct($poolClearer); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php index a36878d44533c..51f769b21dd3d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php @@ -37,7 +37,7 @@ class EventDispatcherDebugCommand extends ContainerAwareCommand public function __construct($dispatcher = null) { if (!$dispatcher instanceof EventDispatcherInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, EventDispatcherInterface::class), E_USER_DEPRECATED); parent::__construct($dispatcher); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php index 03b227a731ce7..929264139a172 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php @@ -41,7 +41,7 @@ class RouterDebugCommand extends ContainerAwareCommand public function __construct($router = null) { if (!$router instanceof RouterInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED); parent::__construct($router); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php index ee5c4990a487b..1e2720669fd67 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php @@ -39,7 +39,7 @@ class RouterMatchCommand extends ContainerAwareCommand public function __construct($router = null) { if (!$router instanceof RouterInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED); parent::__construct($router); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php index e4e16960fc577..d80e2f4de9e69 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php @@ -54,7 +54,7 @@ class TranslationDebugCommand extends ContainerAwareCommand public function __construct($translator = null, TranslationReaderInterface $reader = null, ExtractorInterface $extractor = null) { if (!$translator instanceof TranslatorInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, TranslatorInterface::class), E_USER_DEPRECATED); parent::__construct($translator); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index ff35fda56e1ef..b2f75db5ca19a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -49,7 +49,7 @@ class TranslationUpdateCommand extends ContainerAwareCommand public function __construct($writer = null, TranslationReaderInterface $reader = null, ExtractorInterface $extractor = null, $defaultLocale = null) { if (!$writer instanceof TranslationWriterInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, TranslationWriterInterface::class), E_USER_DEPRECATED); parent::__construct($writer); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php index c201fe9db7248..1eaca79a8ba72 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php @@ -49,7 +49,7 @@ public function testDebugInvalidRoute() /** * @group legacy - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. */ public function testLegacyDebugCommand() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php index 2570d41d78745..4a4fe29720c6d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php @@ -43,8 +43,8 @@ public function testWithNotMatchPath() /** * @group legacy - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. */ public function testLegacyMatchCommand() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php index ff7cab4589b02..55ed4c7449f27 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php @@ -176,7 +176,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag /** * @group legacy - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand::__construct() expects an instance of "Symfony\Component\Translation\TranslatorInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. */ public function testLegacyDebugCommand() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php index b0804503eb79f..c7c93d533a301 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php @@ -155,7 +155,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag /** * @group legacy - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand::__construct() expects an instance of "Symfony\Component\Translation\Writer\TranslationWriterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. */ public function testLegacyUpdateCommand() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php index 9a2d198a72ba2..a9a5959848e67 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php @@ -77,7 +77,7 @@ public function testClearUnexistingPool() /** * @group legacy - * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead. + * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand::__construct() expects an instance of "Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0. */ public function testLegacyClearCommand() { diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md index 8690a0a13968d..0c62ce6e2aa9e 100644 --- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md @@ -8,6 +8,11 @@ CHANGELOG `VoterInterface` on the class is now deprecated and will be removed in 4.0. * [BC BREAK] `FirewallContext::getListeners()` now returns `\Traversable|array` * added info about called security listeners in profiler + * `InitAclCommand::__construct()` now takes an instance of + `Doctrine\DBAL\Connection` as first argument + * `SetAclCommand::__construct()` now takes an instance of + `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection` + as first argument 3.3.0 ----- diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php index c8ccac32cab5b..72e62c3f48d10 100644 --- a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php +++ b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php @@ -39,7 +39,7 @@ class InitAclCommand extends ContainerAwareCommand public function __construct($connection = null, Schema $schema = null) { if (!$connection instanceof Connection) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Connection::class), E_USER_DEPRECATED); parent::__construct($connection); diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php index bdb293a4ec6fd..0955129f072d2 100644 --- a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php +++ b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php @@ -42,7 +42,7 @@ class SetAclCommand extends ContainerAwareCommand public function __construct($provider = null) { if (!$provider instanceof MutableAclProviderInterface) { - @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, MutableAclProviderInterface::class), E_USER_DEPRECATED); parent::__construct($provider); From 76ea6dfd3398ed64c2bee9e382ec1299482f027e Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Fri, 1 Sep 2017 20:06:13 +0200 Subject: [PATCH 0749/1099] [HttpKernel] Deprecate EnvParametersResource --- UPGRADE-3.4.md | 2 ++ UPGRADE-4.0.md | 2 ++ src/Symfony/Component/HttpKernel/CHANGELOG.md | 1 + .../Component/HttpKernel/Config/EnvParametersResource.php | 2 ++ .../HttpKernel/Tests/Config/EnvParametersResourceTest.php | 3 +++ 5 files changed, 10 insertions(+) diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md index 5a677088acd9f..70cc26f976e1c 100644 --- a/UPGRADE-3.4.md +++ b/UPGRADE-3.4.md @@ -154,6 +154,8 @@ HttpKernel * The `getCacheDir()` method of your kernel should not be called while building the container. Use the `%kernel.cache_dir%` parameter instead. Not doing so may break the `cache:clear` command. + * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been deprecated and will be removed in 4.0. + Process ------- diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 0b9a727a17368..6b061a582db77 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -519,6 +519,8 @@ HttpKernel * The `getCacheDir()` method of your kernel should not be called while building the container. Use the `%kernel.cache_dir%` parameter instead. Not doing so may break the `cache:clear` command. + * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been removed. + Ldap ---- diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index be467b407b00c..4a4c81dac096a 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -8,6 +8,7 @@ CHANGELOG * deprecated commands auto registration * added `AddCacheClearerPass` * added `AddCacheWarmerPass` + * deprecated `EnvParametersResource` 3.3.0 ----- diff --git a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php index 0fe6aca8c1d8d..0f48869c6375c 100644 --- a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php +++ b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php @@ -17,6 +17,8 @@ * EnvParametersResource represents resources stored in prefixed environment variables. * * @author Chris Wilkinson + * + * @deprecated since version 3.4, to be removed in 4.0 */ class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable { diff --git a/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php b/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php index 6fe8a6756899d..986e05d8b888a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php @@ -14,6 +14,9 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\HttpKernel\Config\EnvParametersResource; +/** + * @group legacy + */ class EnvParametersResourceTest extends TestCase { protected $prefix = '__DUMMY_'; From 484d278f50e740c72224db7af94c7342be382331 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Thu, 26 Jan 2017 11:39:46 +0100 Subject: [PATCH 0750/1099] [Console] Display file and line on Exception --- src/Symfony/Component/Console/Application.php | 27 +++++++++---------- .../Fixtures/application_renderexception1.txt | 8 +++--- .../Fixtures/application_renderexception2.txt | 8 +++--- .../Fixtures/application_renderexception3.txt | 6 ++--- .../application_renderexception3decorated.txt | 6 ++--- .../Fixtures/application_renderexception4.txt | 10 +++---- ...plication_renderexception_doublewidth1.txt | 2 +- ..._renderexception_doublewidth1decorated.txt | 2 +- ...plication_renderexception_doublewidth2.txt | 2 +- ...plication_renderexception_escapeslines.txt | 2 +- 10 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index c1731843e6eb2..41c2a238e08a1 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -736,13 +736,13 @@ public function renderException(\Exception $e, OutputInterface $output) protected function doRenderException(\Exception $e, OutputInterface $output) { do { - $title = sprintf( - ' [%s%s] ', - get_class($e), - $output->isVerbose() && 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : '' - ); - - $len = Helper::strlen($title); + $message = $e->getMessage(); + if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) { + $title = sprintf(' [%s%s] ', get_class($e), 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : ''); + $len = Helper::strlen($title); + } else { + $len = 0; + } $width = $this->terminal->getWidth() ? $this->terminal->getWidth() - 1 : PHP_INT_MAX; // HHVM only accepts 32 bits integer in str_split, even when PHP_INT_MAX is a 64 bit integer: https://github.com/facebook/hhvm/issues/1327 @@ -750,7 +750,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output) $width = 1 << 31; } $lines = array(); - foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) { + foreach ('' !== $message ? preg_split('/\r?\n/', $message) : array() as $line) { foreach ($this->splitStringByWidth($line, $width - 4) as $line) { // pre-format lines to get the right string length $lineLength = Helper::strlen($line) + 4; @@ -761,8 +761,11 @@ protected function doRenderException(\Exception $e, OutputInterface $output) } $messages = array(); + $messages[] = sprintf('%s', OutputFormatter::escape(sprintf('In %s line %s:', basename($e->getFile()) ?: 'n/a', $e->getLine() ?: 'n/a'))); $messages[] = $emptyLine = sprintf('%s', str_repeat(' ', $len)); - $messages[] = sprintf('%s%s', $title, str_repeat(' ', max(0, $len - Helper::strlen($title)))); + if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) { + $messages[] = sprintf('%s%s', $title, str_repeat(' ', max(0, $len - Helper::strlen($title)))); + } foreach ($lines as $line) { $messages[] = sprintf(' %s %s', OutputFormatter::escape($line[0]), str_repeat(' ', $len - $line[1])); } @@ -776,12 +779,6 @@ protected function doRenderException(\Exception $e, OutputInterface $output) // exception related properties $trace = $e->getTrace(); - array_unshift($trace, array( - 'function' => '', - 'file' => $e->getFile() !== null ? $e->getFile() : 'n/a', - 'line' => $e->getLine() !== null ? $e->getLine() : 'n/a', - 'args' => array(), - )); for ($i = 0, $count = count($trace); $i < $count; ++$i) { $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : ''; diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt index 919cec4214a97..700ffada3d2fa 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt @@ -1,6 +1,6 @@ - - [Symfony\Component\Console\Exception\CommandNotFoundException] - Command "foo" is not defined. - +In Application.php line 615: + + Command "foo" is not defined. + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt index 64561715e04fb..9d0cacb81aedc 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt @@ -1,8 +1,8 @@ - - [Symfony\Component\Console\Exception\InvalidOptionException] - The "--foo" option does not exist. - +In ArrayInput.php line 172: + + The "--foo" option does not exist. + list [--raw] [--format FORMAT] [--] [] diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt index f41925f52a6ea..5366b84f82304 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt @@ -1,16 +1,16 @@ +In Foo3Command.php line 26: - [Exception] Third exception comment +In Foo3Command.php line 23: - [Exception] Second exception comment +In Foo3Command.php line 21: - [Exception] First exception

this is html

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt index 5adccdd70245f..59937092e78da 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt @@ -1,16 +1,16 @@ +[33mIn Foo3Command.php line 26:[39m [37;41m [39;49m -[37;41m [Exception] [39;49m [37;41m Third exception comment [39;49m [37;41m [39;49m +[33mIn Foo3Command.php line 23:[39m [37;41m [39;49m -[37;41m [Exception] [39;49m [37;41m Second exception comment [39;49m [37;41m [39;49m +[33mIn Foo3Command.php line 21:[39m [37;41m [39;49m -[37;41m [Exception] [39;49m [37;41m First exception

this is html

[39;49m [37;41m [39;49m diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt index cb080e9cb53b8..040564447f57b 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt @@ -1,7 +1,7 @@ - - [Symfony\Component\Console\Exception\CommandNotFoundException] - Command "foo" is not define - d. - +In Application.php line 615: + + Command "foo" is not define + d. + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt index 1ba5f8fdd914d..01986c917b545 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt @@ -1,6 +1,6 @@ +In ApplicationTest.php line 716: - [Exception] エラーメッセージ diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt index 20644251c2f9b..ba057d8cc77ff 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt @@ -1,6 +1,6 @@ +[33mIn ApplicationTest.php line 716:[39m [37;41m [39;49m -[37;41m [Exception] [39;49m [37;41m エラーメッセージ [39;49m [37;41m [39;49m diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt index e41fcfcf675af..66b52c879a66a 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt @@ -1,6 +1,6 @@ +In ApplicationTest.php line 730: - [Exception] コマンドの実行中にエラーが発生しました。 diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt index cf79b37a92d6e..326ee42f6d741 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt @@ -1,6 +1,6 @@ +In ApplicationTest.php line 744: - [Exception] dont break here < info>! From 263b95e1d1b071d6660d11732844313db80374e7 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 3 Sep 2017 20:01:57 +0200 Subject: [PATCH 0751/1099] [DI] Minor fix in dumped code --- .../Component/DependencyInjection/Dumper/PhpDumper.php | 8 ++------ .../DependencyInjection/Tests/Fixtures/php/services9.php | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 6e2230ea6cb14..ef56da6bdcebd 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1579,13 +1579,9 @@ private function getServiceCall($id, Reference $reference = null) $code = sprintf('$this->get(\'%s\')', $id); } - if ($this->container->hasDefinition($id) && $this->container->getDefinition($id)->isShared()) { - // The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? $code)" on PHP>=7.0 + // The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? $code)" on PHP>=7.0 - $code = "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : $code) && false ?: '_'}"; - } - - return $code; + return "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : $code) && false ?: '_'}"; } /** diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 4998b60f4c719..77cc57604c770 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -280,7 +280,7 @@ protected function getLazyContextIgnoreInvalidRefService() return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () { yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; if ($this->has('invalid')) { - yield 1 => $this->get('invalid', ContainerInterface::NULL_ON_INVALID_REFERENCE); + yield 1 => ${($_ = isset($this->services['invalid']) ? $this->services['invalid'] : $this->get('invalid', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}; } }, function () { return 1 + (int) ($this->has('invalid')); @@ -301,12 +301,12 @@ protected function getMethodCall1Service() $this->services['method_call1'] = $instance = new \Bar\FooClass(); $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}); - $instance->setBar($this->get('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)); + $instance->setBar(${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : $this->get('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); if ($this->has('foo3')) { - $instance->setBar($this->get('foo3', ContainerInterface::NULL_ON_INVALID_REFERENCE)); + $instance->setBar(${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : $this->get('foo3', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); } if ($this->has('foobaz')) { - $instance->setBar($this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE)); + $instance->setBar(${($_ = isset($this->services['foobaz']) ? $this->services['foobaz'] : $this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); } $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default")))); From fc918693768405d211f2244446a613d0598a58c2 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 3 Sep 2017 21:27:51 +0200 Subject: [PATCH 0752/1099] Fix ability to deprecate a config node --- .../Definition/Builder/ArrayNodeDefinition.php | 1 + .../Component/Config/Definition/VariableNode.php | 4 ++++ .../Config/Tests/Definition/ArrayNodeTest.php | 9 +++++++++ .../Definition/Builder/ArrayNodeDefinitionTest.php | 14 ++++++++++++++ .../Builder/BooleanNodeDefinitionTest.php | 11 +++++++++++ .../Definition/Builder/EnumNodeDefinitionTest.php | 12 ++++++++++++ .../Config/Tests/Definition/ScalarNodeTest.php | 9 +++++++++ 7 files changed, 60 insertions(+) diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index cac53044a9a10..7e345aa89fff5 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -453,6 +453,7 @@ protected function createNode() $node->addEquivalentValue(false, $this->falseEquivalent); $node->setPerformDeepMerging($this->performDeepMerging); $node->setRequired($this->required); + $node->setDeprecated($this->deprecationMessage); $node->setIgnoreExtraKeys($this->ignoreExtraKeys, $this->removeExtraKeys); $node->setNormalizeKeys($this->normalizeKeys); diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php index a9c35284cdcdb..f37ced901b553 100644 --- a/src/Symfony/Component/Config/Definition/VariableNode.php +++ b/src/Symfony/Component/Config/Definition/VariableNode.php @@ -84,6 +84,10 @@ protected function validateType($value) */ protected function finalizeValue($value) { + if ($this->deprecationMessage) { + @trigger_error($this->getDeprecationMessage($this->getName(), $this->getPath()), E_USER_DEPRECATED); + } + if (!$this->allowEmptyValue && $this->isValueEmpty($value)) { $ex = new InvalidConfigurationException(sprintf( 'The path "%s" cannot contain an empty value, but got %s.', diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php index 0b5565e0b379b..7a5bf30373acd 100644 --- a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php @@ -216,4 +216,13 @@ public function testGetDefaultValueWithoutDefaultValue() $node = new ArrayNode('foo'); $node->getDefaultValue(); } + + public function testSetDeprecated() + { + $node = new ArrayNode('foo'); + $node->setDeprecated('"%node%" is deprecated'); + + $this->assertTrue($node->isDeprecated()); + $this->assertSame('"foo" is deprecated', $node->getDeprecationMessage($node->getName(), $node->getPath())); + } } diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php index 4c2a397cff6df..e32c093eeb31b 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php @@ -298,6 +298,20 @@ public function testRequiresAtLeastOneElement() $this->addToAssertionCount(1); } + public function testSetDeprecated() + { + $node = new ArrayNodeDefinition('root'); + $node + ->children() + ->arrayNode('foo')->setDeprecated('The "%path%" node is deprecated.')->end() + ->end() + ; + $deprecatedNode = $node->getNode()->getChildren()['foo']; + + $this->assertTrue($deprecatedNode->isDeprecated()); + $this->assertSame('The "root.foo" node is deprecated.', $deprecatedNode->getDeprecationMessage($deprecatedNode->getName(), $deprecatedNode->getPath())); + } + /** * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException * @expectedExceptionMessage The path "root" should have at least 1 element(s) defined. diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php index 291dd602d9393..c0d347f3d3191 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php @@ -25,4 +25,15 @@ public function testCannotBeEmptyThrowsAnException() $def = new BooleanNodeDefinition('foo'); $def->cannotBeEmpty(); } + + public function testSetDeprecated() + { + $def = new BooleanNodeDefinition('foo'); + $def->setDeprecated('The "%path%" node is deprecated.'); + + $node = $def->getNode(); + + $this->assertTrue($node->isDeprecated()); + $this->assertSame('The "foo" node is deprecated.', $node->getDeprecationMessage($node->getName(), $node->getPath())); + } } diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php index 0f09b78e7968b..9c0aa0e11cf97 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php @@ -62,4 +62,16 @@ public function testGetNode() $node = $def->getNode(); $this->assertEquals(array('foo', 'bar'), $node->getValues()); } + + public function testSetDeprecated() + { + $def = new EnumNodeDefinition('foo'); + $def->values(array('foo', 'bar')); + $def->setDeprecated('The "%path%" node is deprecated.'); + + $node = $def->getNode(); + + $this->assertTrue($node->isDeprecated()); + $this->assertSame('The "foo" node is deprecated.', $def->getNode()->getDeprecationMessage($node->getName(), $node->getPath())); + } } diff --git a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php index a402a61ef951d..1981ac9459aac 100644 --- a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php @@ -40,6 +40,15 @@ public function getValidValues() ); } + public function testSetDeprecated() + { + $node = new ScalarNode('foo'); + $node->setDeprecated('"%node%" is deprecated'); + + $this->assertTrue($node->isDeprecated()); + $this->assertSame('"foo" is deprecated', $node->getDeprecationMessage($node->getName(), $node->getPath())); + } + /** * @dataProvider getInvalidValues * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException From 012e381e16f9d23d2a0a235da2df2cef1b16de26 Mon Sep 17 00:00:00 2001 From: Sanpi Date: Tue, 29 Aug 2017 20:08:05 +0200 Subject: [PATCH 0753/1099] Use new configuration node depreciation method --- .../DependencyInjection/Configuration.php | 10 ++++++---- .../DependencyInjection/FrameworkExtension.php | 4 ---- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index fcc0e714c8cb6..87685e3241992 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -66,10 +66,9 @@ public function getConfigTreeBuilder() ->defaultTrue() ->end() ->arrayNode('trusted_proxies') + ->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.') ->beforeNormalization() ->ifTrue(function ($v) { - @trigger_error('The "framework.trusted_proxies" configuration key has been deprecated in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.', E_USER_DEPRECATED); - return !is_array($v) && null !== $v; }) ->then(function ($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); }) @@ -663,8 +662,9 @@ private function addValidationSection(ArrayNodeDefinition $rootNode) ->{!class_exists(FullStack::class) && class_exists(Validation::class) ? 'canBeDisabled' : 'canBeEnabled'}() ->children() ->scalarNode('cache') + // Can be removed in 4.0, when validator.mapping.cache.doctrine.apc is removed + ->setDeprecated('The "%path%.%node%" option is deprecated since Symfony 3.2 and will be removed in 4.0. Configure the "cache.validator" service under "framework.cache.pools" instead.') ->beforeNormalization() - // Can be removed in 4.0, when validator.mapping.cache.doctrine.apc is removed ->ifString()->then(function ($v) { if ('validator.mapping.cache.doctrine.apc' === $v && !class_exists('Doctrine\Common\Cache\ApcCache')) { throw new LogicException('Doctrine APC cache for the validator cannot be enabled as the Doctrine Cache package is not installed.'); @@ -727,7 +727,9 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode) ->{!class_exists(FullStack::class) && class_exists(Serializer::class) ? 'canBeDisabled' : 'canBeEnabled'}() ->children() ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end() - ->scalarNode('cache')->end() + ->scalarNode('cache') + ->setDeprecated('The "%path%.%node%" option is deprecated since Symfony 3.1 and will be removed in 4.0. Configure the "cache.serializer" service under "framework.cache.pools" instead.') + ->end() ->scalarNode('name_converter')->end() ->scalarNode('circular_reference_handler')->end() ->arrayNode('mapping') diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index f54b74abb6051..16f13ac79ad51 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1198,8 +1198,6 @@ private function registerValidationConfiguration(array $config, ContainerBuilder } if (isset($config['cache']) && $config['cache']) { - @trigger_error('The "framework.validation.cache" option is deprecated since Symfony 3.2 and will be removed in 4.0. Configure the "cache.validator" service under "framework.cache.pools" instead.', E_USER_DEPRECATED); - $container->setParameter( 'validator.mapping.cache.prefix', 'validator_'.$this->getKernelRootHash($container) @@ -1454,8 +1452,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder $container->getDefinition('serializer.mapping.cache_warmer')->replaceArgument(0, $serializerLoaders); if (isset($config['cache']) && $config['cache']) { - @trigger_error('The "framework.serializer.cache" option is deprecated since Symfony 3.1 and will be removed in 4.0. Configure the "cache.serializer" service under "framework.cache.pools" instead.', E_USER_DEPRECATED); - $container->setParameter( 'serializer.mapping.cache.prefix', 'serializer_'.$this->getKernelRootHash($container) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index afe1961d95670..3e0354ec625c1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -21,7 +21,7 @@ "symfony/cache": "~3.4|~4.0", "symfony/class-loader": "~3.2", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/config": "~3.3|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/event-dispatcher": "^3.3.1|~4.0", "symfony/http-foundation": "~3.3|~4.0", "symfony/http-kernel": "~3.4|~4.0", From 1be23c2a86e98e2f7f45917090c2d7f9e519358c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 1 Sep 2017 08:00:27 +0200 Subject: [PATCH 0754/1099] [Yaml] add inline parser context initializer Calling the parser to initialize some internal context does not look like a good idea. Additionally, this change allows to not accept null values in `Inline::parse()` in 3.4 anymore. --- src/Symfony/Component/Yaml/Inline.php | 21 +++++++++++++++++---- src/Symfony/Component/Yaml/Parser.php | 4 +--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index c78c811baa5a7..fee21eb34ecc2 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -33,6 +33,22 @@ class Inline private static $objectForMap = false; private static $constantSupport = false; + /** + * @param int $flags + * @param int|null $parsedLineNumber + */ + public static function initialize($flags, $parsedLineNumber = null) + { + self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags); + self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags); + self::$objectForMap = (bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags); + self::$constantSupport = (bool) (Yaml::PARSE_CONSTANT & $flags); + + if (null !== $parsedLineNumber) { + self::$parsedLineNumber = $parsedLineNumber; + } + } + /** * Converts a YAML string to a PHP value. * @@ -78,10 +94,7 @@ public static function parse($value, $flags = 0, $references = array()) } } - self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags); - self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags); - self::$objectForMap = (bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags); - self::$constantSupport = (bool) (Yaml::PARSE_CONSTANT & $flags); + self::initialize($flags); $value = trim($value); diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php index b39512c869d14..042d9d186d273 100644 --- a/src/Symfony/Component/Yaml/Parser.php +++ b/src/Symfony/Component/Yaml/Parser.php @@ -222,10 +222,8 @@ private function doParse($value, $flags) } $context = 'mapping'; - // force correct settings - Inline::parse(null, $flags, $this->refs); + Inline::initialize($flags, $this->getRealCurrentLineNb()); try { - Inline::$parsedLineNumber = $this->getRealCurrentLineNb(); $i = 0; $evaluateKey = !(Yaml::PARSE_KEYS_AS_STRINGS & $flags); From eaa506f562281e4152aea2fbae79e38b1a5c7e82 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sun, 3 Sep 2017 12:36:19 +0200 Subject: [PATCH 0755/1099] be able to enable workflow support explicitly --- .../DependencyInjection/Configuration.php | 250 ++++++++++-------- .../FrameworkExtension.php | 8 +- .../Resources/config/schema/symfony-1.0.xsd | 9 +- .../DependencyInjection/ConfigurationTest.php | 5 +- .../Fixtures/php/workflows_enabled.php | 5 + .../Fixtures/xml/workflows_enabled.xml | 11 + .../Fixtures/yml/workflows_enabled.yml | 2 + .../FrameworkExtensionTest.php | 10 + 8 files changed, 178 insertions(+), 122 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index fcc0e714c8cb6..66934aba6a419 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -247,141 +247,165 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode) ->fixXmlConfig('workflow') ->children() ->arrayNode('workflows') - ->useAttributeAsKey('name') - ->prototype('array') - ->fixXmlConfig('support') - ->fixXmlConfig('place') - ->fixXmlConfig('transition') - ->children() - ->arrayNode('audit_trail') - ->canBeEnabled() - ->end() - ->enumNode('type') - ->values(array('workflow', 'state_machine')) - ->end() - ->arrayNode('marking_store') - ->fixXmlConfig('argument') + ->canBeEnabled() + ->beforeNormalization() + ->always(function ($v) { + if (true === $v['enabled']) { + $workflows = $v; + unset($workflows['enabled']); + + if (count($workflows) === 1 && isset($workflows[0]['enabled'])) { + $workflows = array(); + } + + $v = array( + 'enabled' => true, + 'workflows' => $workflows, + ); + } + + return $v; + }) + ->end() + ->children() + ->arrayNode('workflows') + ->useAttributeAsKey('name') + ->prototype('array') + ->fixXmlConfig('support') + ->fixXmlConfig('place') + ->fixXmlConfig('transition') ->children() + ->arrayNode('audit_trail') + ->canBeEnabled() + ->end() ->enumNode('type') - ->values(array('multiple_state', 'single_state')) + ->values(array('workflow', 'state_machine')) + ->end() + ->arrayNode('marking_store') + ->fixXmlConfig('argument') + ->children() + ->enumNode('type') + ->values(array('multiple_state', 'single_state')) + ->end() + ->arrayNode('arguments') + ->beforeNormalization() + ->ifString() + ->then(function ($v) { return array($v); }) + ->end() + ->requiresAtLeastOneElement() + ->prototype('scalar') + ->end() + ->end() + ->scalarNode('service') + ->cannotBeEmpty() + ->end() + ->end() + ->validate() + ->ifTrue(function ($v) { return isset($v['type']) && isset($v['service']); }) + ->thenInvalid('"type" and "service" cannot be used together.') + ->end() + ->validate() + ->ifTrue(function ($v) { return !empty($v['arguments']) && isset($v['service']); }) + ->thenInvalid('"arguments" and "service" cannot be used together.') + ->end() ->end() - ->arrayNode('arguments') + ->arrayNode('supports') ->beforeNormalization() ->ifString() ->then(function ($v) { return array($v); }) ->end() - ->requiresAtLeastOneElement() ->prototype('scalar') + ->cannotBeEmpty() + ->validate() + ->ifTrue(function ($v) { return !class_exists($v); }) + ->thenInvalid('The supported class %s does not exist.') + ->end() ->end() ->end() - ->scalarNode('service') + ->scalarNode('support_strategy') ->cannotBeEmpty() ->end() - ->end() - ->validate() - ->ifTrue(function ($v) { return isset($v['type']) && isset($v['service']); }) - ->thenInvalid('"type" and "service" cannot be used together.') - ->end() - ->validate() - ->ifTrue(function ($v) { return !empty($v['arguments']) && isset($v['service']); }) - ->thenInvalid('"arguments" and "service" cannot be used together.') - ->end() - ->end() - ->arrayNode('supports') - ->beforeNormalization() - ->ifString() - ->then(function ($v) { return array($v); }) - ->end() - ->prototype('scalar') - ->cannotBeEmpty() - ->validate() - ->ifTrue(function ($v) { return !class_exists($v); }) - ->thenInvalid('The supported class %s does not exist.') + ->scalarNode('initial_place') + ->defaultNull() ->end() - ->end() - ->end() - ->scalarNode('support_strategy') - ->cannotBeEmpty() - ->end() - ->scalarNode('initial_place') - ->defaultNull() - ->end() - ->arrayNode('places') - ->isRequired() - ->requiresAtLeastOneElement() - ->prototype('scalar') - ->cannotBeEmpty() - ->end() - ->end() - ->arrayNode('transitions') - ->beforeNormalization() - ->always() - ->then(function ($transitions) { - // It's an indexed array, we let the validation occurs - if (isset($transitions[0])) { - return $transitions; - } - - foreach ($transitions as $name => $transition) { - if (array_key_exists('name', $transition)) { - continue; - } - $transition['name'] = $name; - $transitions[$name] = $transition; - } - - return $transitions; - }) - ->end() - ->isRequired() - ->requiresAtLeastOneElement() - ->prototype('array') - ->children() - ->scalarNode('name') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('guard') + ->arrayNode('places') + ->isRequired() + ->requiresAtLeastOneElement() + ->prototype('scalar') ->cannotBeEmpty() - ->info('An expression to block the transition') - ->example('is_fully_authenticated() and has_role(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'') ->end() - ->arrayNode('from') - ->beforeNormalization() - ->ifString() - ->then(function ($v) { return array($v); }) - ->end() - ->requiresAtLeastOneElement() - ->prototype('scalar') - ->cannotBeEmpty() - ->end() + ->end() + ->arrayNode('transitions') + ->beforeNormalization() + ->always() + ->then(function ($transitions) { + // It's an indexed array, we let the validation occurs + if (isset($transitions[0])) { + return $transitions; + } + + foreach ($transitions as $name => $transition) { + if (array_key_exists('name', $transition)) { + continue; + } + $transition['name'] = $name; + $transitions[$name] = $transition; + } + + return $transitions; + }) ->end() - ->arrayNode('to') - ->beforeNormalization() - ->ifString() - ->then(function ($v) { return array($v); }) - ->end() - ->requiresAtLeastOneElement() - ->prototype('scalar') - ->cannotBeEmpty() + ->isRequired() + ->requiresAtLeastOneElement() + ->prototype('array') + ->children() + ->scalarNode('name') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->scalarNode('guard') + ->cannotBeEmpty() + ->info('An expression to block the transition') + ->example('is_fully_authenticated() and has_role(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'') + ->end() + ->arrayNode('from') + ->beforeNormalization() + ->ifString() + ->then(function ($v) { return array($v); }) + ->end() + ->requiresAtLeastOneElement() + ->prototype('scalar') + ->cannotBeEmpty() + ->end() + ->end() + ->arrayNode('to') + ->beforeNormalization() + ->ifString() + ->then(function ($v) { return array($v); }) + ->end() + ->requiresAtLeastOneElement() + ->prototype('scalar') + ->cannotBeEmpty() + ->end() + ->end() ->end() ->end() ->end() ->end() + ->validate() + ->ifTrue(function ($v) { + return $v['supports'] && isset($v['support_strategy']); + }) + ->thenInvalid('"supports" and "support_strategy" cannot be used together.') + ->end() + ->validate() + ->ifTrue(function ($v) { + return !$v['supports'] && !isset($v['support_strategy']); + }) + ->thenInvalid('"supports" or "support_strategy" should be configured.') + ->end() ->end() ->end() - ->validate() - ->ifTrue(function ($v) { - return $v['supports'] && isset($v['support_strategy']); - }) - ->thenInvalid('"supports" and "support_strategy" cannot be used together.') - ->end() - ->validate() - ->ifTrue(function ($v) { - return !$v['supports'] && !isset($v['support_strategy']); - }) - ->thenInvalid('"supports" or "support_strategy" should be configured.') - ->end() ->end() ->end() ->end() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index f54b74abb6051..2d382712911ef 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -530,13 +530,13 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ /** * Loads the workflow configuration. * - * @param array $workflows A workflow configuration array + * @param array $config A workflow configuration array * @param ContainerBuilder $container A ContainerBuilder instance * @param XmlFileLoader $loader An XmlFileLoader instance */ - private function registerWorkflowConfiguration(array $workflows, ContainerBuilder $container, XmlFileLoader $loader) + private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { - if (!$workflows) { + if (!$config['enabled']) { if (!class_exists(Workflow\Workflow::class)) { $container->removeDefinition(WorkflowDumpCommand::class); } @@ -552,7 +552,7 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde $registryDefinition = $container->getDefinition('workflow.registry'); - foreach ($workflows as $name => $workflow) { + foreach ($config['workflows'] as $name => $workflow) { if (!array_key_exists('type', $workflow)) { $workflow['type'] = 'workflow'; @trigger_error(sprintf('The "type" option of the "framework.workflows.%s" configuration entry must be defined since Symfony 3.3. The default value will be "state_machine" in Symfony 4.0.', $name), E_USER_DEPRECATED); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd index d6138133cf2ea..481c469e36164 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd @@ -254,15 +254,16 @@ - + - - + + - + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index 0d2578db040af..1835625da8611 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -331,7 +331,10 @@ protected static function getBundleDefaultConfig() 'default_redis_provider' => 'redis://localhost', 'default_memcached_provider' => 'memcached://localhost', ), - 'workflows' => array(), + 'workflows' => array( + 'enabled' => false, + 'workflows' => array(), + ), 'php_errors' => array( 'log' => true, 'throw' => true, diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php new file mode 100644 index 0000000000000..9a2fe9136a4b3 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php @@ -0,0 +1,5 @@ +loadFromExtension('framework', array( + 'workflows' => null, +)); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml new file mode 100644 index 0000000000000..51da644be1f9e --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml new file mode 100644 index 0000000000000..2a716ff0a1b14 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml @@ -0,0 +1,2 @@ +framework: + workflows: ~ diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index d63a74c874f02..991eda1ea6ac6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -12,6 +12,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection; use Doctrine\Common\Annotations\Annotation; +use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand; use Symfony\Bundle\FullStack; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass; @@ -42,6 +43,7 @@ use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer; use Symfony\Component\Translation\DependencyInjection\TranslatorPass; use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass; +use Symfony\Component\Workflow\Registry; abstract class FrameworkExtensionTest extends TestCase { @@ -307,6 +309,14 @@ public function testWorkflowMultipleTransitionsWithSameName() $this->assertSame(array('draft'), $transitions[4]->getArgument(1)); } + public function testWorkflowServicesCanBeEnabled() + { + $container = $this->createContainerFromFile('workflows_enabled'); + + $this->assertTrue($container->has(Registry::class)); + $this->assertTrue($container->hasDefinition(WorkflowDumpCommand::class)); + } + public function testRouter() { $container = $this->createContainerFromFile('full'); From 5c030dd2404bb6bd1c245745f99d95a77a9efa93 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 4 Sep 2017 16:58:03 +0200 Subject: [PATCH 0756/1099] sync upgrade file for Symfony 4.0 between branches --- UPGRADE-4.0.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 0b9a727a17368..3697f0dbf87ad 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -146,7 +146,7 @@ DependencyInjection ``` - * Service identifiers are now case sensitive. + * Service identifiers and parameter names are now case sensitive. * The `Reference` and `Alias` classes do not make service identifiers lowercase anymore. @@ -391,6 +391,9 @@ FrameworkBundle fully-qualified class name of your Kernel or override the `KernelTestCase::createKernel()` or `KernelTestCase::getKernelClass()` method instead. + * The methods `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` + have been removed. + * The `Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory` class has been removed. Use `Symfony\Component\Validator\ContainerConstraintValidatorFactory` instead. @@ -541,6 +544,8 @@ Process * Extending `Process::run()`, `Process::mustRun()` and `Process::restart()` is not supported anymore. + * The `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class have been removed. + ProxyManager ------------ @@ -557,6 +562,8 @@ Security * The `AccessDecisionManager::setVoters()` method has been removed. Pass the voters to the constructor instead. + * Support for defining voters that don't implement the `VoterInterface` has been removed. + SecurityBundle -------------- @@ -683,6 +690,21 @@ Validator } ``` + * Setting the `checkDNS` option of the `Url` constraint to `true` is dropped + in favor of `Url::CHECK_DNS_TYPE_*` constants values. + + Before: + + ```php + $constraint = new Url(['checkDNS' => true]); + ``` + + After: + + ```php + $constraint = new Url(['checkDNS' => Url::CHECK_DNS_TYPE_ANY]); + ``` + VarDumper --------- @@ -716,6 +738,12 @@ VarDumper VarDumperTestTrait::assertDumpMatchesFormat($dump, $data, $filter = 0, $message = ''); ``` +WebProfilerBundle +----------------- + + * Removed the `getTemplates()` method of the `TemplateManager` class in favor + of the `getNames()` method + Workflow -------- From 479b5d639a307552b1e4eb40e7e765e9c8acf789 Mon Sep 17 00:00:00 2001 From: Dany Maillard Date: Tue, 29 Aug 2017 22:11:03 +0200 Subject: [PATCH 0757/1099] Improve microseconds support in date caster --- .../Component/VarDumper/Caster/DateCaster.php | 15 ++- .../VarDumper/Tests/Caster/DateCasterTest.php | 112 ++++++++++-------- 2 files changed, 71 insertions(+), 56 deletions(-) diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php index 0b6f551e0b57b..db62b7586da3e 100644 --- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php @@ -32,7 +32,7 @@ public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, ; $a = array(); - $a[$prefix.'date'] = new ConstStub($d->format('Y-m-d H:i:'.self::formatSeconds($d->format('s'), $d->format('u')).($location ? ' e (P)' : ' P')), $title); + $a[$prefix.'date'] = new ConstStub(self::formatDateTime($d, $location ? ' e (P)' : ' P'), $title); $stub->class .= $d->format(' @U'); @@ -62,7 +62,7 @@ private static function formatInterval(\DateInterval $i) } if (\PHP_VERSION_ID >= 70100 && isset($i->f)) { - $format .= $i->h || $i->i || $i->s || $i->f ? '%H:%I:'.self::formatSeconds($i->s, $i->f) : ''; + $format .= $i->h || $i->i || $i->s || $i->f ? '%H:%I:'.self::formatSeconds($i->s, substr($i->f, 2)) : ''; } else { $format .= $i->h || $i->i || $i->s ? '%H:%I:%S' : ''; } @@ -100,16 +100,16 @@ public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, $isNeste ); break; } - $dates[] = sprintf('%s) %s', $i + 1, $d->format('Y-m-d H:i:s')); + $dates[] = sprintf('%s) %s', $i + 1, self::formatDateTime($d)); } } $period = sprintf( 'every %s, from %s (%s) %s', self::formatInterval($p->getDateInterval()), - $p->getStartDate()->format('Y-m-d H:i:s'), + self::formatDateTime($p->getStartDate()), $p->include_start_date ? 'included' : 'excluded', - ($end = $p->getEndDate()) ? 'to '.$end->format('Y-m-d H:i:s') : 'recurring '.$p->recurrences.' time/s' + ($end = $p->getEndDate()) ? 'to '.self::formatDateTime($end) : 'recurring '.$p->recurrences.' time/s' ); $p = array(Caster::PREFIX_VIRTUAL.'period' => new ConstStub($period, implode("\n", $dates))); @@ -117,6 +117,11 @@ public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, $isNeste return $filter & Caster::EXCLUDE_VERBOSE ? $p : $p + $a; } + private static function formatDateTime(\DateTimeInterface $d, $extra = '') + { + return $d->format('Y-m-d H:i:'.self::formatSeconds($d->format('s'), $d->format('u')).$extra); + } + private static function formatSeconds($s, $us) { return sprintf('%02d.%s', $s, 0 === ($len = strlen($t = rtrim($us, '0'))) ? '0' : ($len <= 3 ? str_pad($t, 3, '0') : $us)); diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php index 2acea527f0dc4..8df1765a378cb 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php @@ -100,10 +100,9 @@ public function provideDateTimes() /** * @dataProvider provideIntervals */ - public function testDumpInterval($intervalSpec, $invert, $expected) + public function testDumpInterval($intervalSpec, $ms, $invert, $expected) { - $interval = new \DateInterval($intervalSpec); - $interval->invert = $invert; + $interval = $this->createInterval($intervalSpec, $ms, $invert); $xDump = <<invert = $invert; + $interval = $this->createInterval($intervalSpec, $ms, $invert); $xDump = <<invert = $invert; + $interval = $this->createInterval($intervalSpec, $ms, $invert); $stub = new Stub(); $cast = DateCaster::castInterval($interval, array('foo' => 'bar'), $stub, false, Caster::EXCLUDE_VERBOSE); @@ -167,40 +164,42 @@ public function testCastInterval($intervalSpec, $invert, $xInterval, $xSeconds) } EODUMP; - $this->assertDumpEquals($xDump, $cast["\0~\0interval"]); + $this->assertDumpMatchesFormat($xDump, $cast["\0~\0interval"]); } public function provideIntervals() { $i = new \DateInterval('PT0S'); - $ms = \PHP_VERSION_ID >= 70100 && isset($i->f) ? '.0' : ''; + $ms = ($withMs = \PHP_VERSION_ID >= 70100 && isset($i->f)) ? '.0' : ''; return array( - array('PT0S', 0, '0s', '0s'), - array('PT1S', 0, '+ 00:00:01'.$ms, '1s'), - array('PT2M', 0, '+ 00:02:00'.$ms, '120s'), - array('PT3H', 0, '+ 03:00:00'.$ms, '10 800s'), - array('P4D', 0, '+ 4d', '345 600s'), - array('P5M', 0, '+ 5m', null), - array('P6Y', 0, '+ 6y', null), - array('P1Y2M3DT4H5M6S', 0, '+ 1y 2m 3d 04:05:06'.$ms, null), - array('PT1M60S', 0, '+ 00:02:00'.$ms, null), - array('PT1H60M', 0, '+ 02:00:00'.$ms, null), - array('P1DT24H', 0, '+ 2d', null), - array('P1M32D', 0, '+ 1m 32d', null), - - array('PT0S', 1, '0s', '0s'), - array('PT1S', 1, '- 00:00:01'.$ms, '-1s'), - array('PT2M', 1, '- 00:02:00'.$ms, '-120s'), - array('PT3H', 1, '- 03:00:00'.$ms, '-10 800s'), - array('P4D', 1, '- 4d', '-345 600s'), - array('P5M', 1, '- 5m', null), - array('P6Y', 1, '- 6y', null), - array('P1Y2M3DT4H5M6S', 1, '- 1y 2m 3d 04:05:06'.$ms, null), - array('PT1M60S', 1, '- 00:02:00'.$ms, null), - array('PT1H60M', 1, '- 02:00:00'.$ms, null), - array('P1DT24H', 1, '- 2d', null), - array('P1M32D', 1, '- 1m 32d', null), + array('PT0S', 0, 0, '0s', '0s'), + array('PT0S', 0.1, 0, $withMs ? '+ 00:00:00.100' : '0s', '%is'), + array('PT1S', 0, 0, '+ 00:00:01'.$ms, '1s'), + array('PT2M', 0, 0, '+ 00:02:00'.$ms, '120s'), + array('PT3H', 0, 0, '+ 03:00:00'.$ms, '10 800s'), + array('P4D', 0, 0, '+ 4d', '345 600s'), + array('P5M', 0, 0, '+ 5m', null), + array('P6Y', 0, 0, '+ 6y', null), + array('P1Y2M3DT4H5M6S', 0, 0, '+ 1y 2m 3d 04:05:06'.$ms, null), + array('PT1M60S', 0, 0, '+ 00:02:00'.$ms, null), + array('PT1H60M', 0, 0, '+ 02:00:00'.$ms, null), + array('P1DT24H', 0, 0, '+ 2d', null), + array('P1M32D', 0, 0, '+ 1m 32d', null), + + array('PT0S', 0, 1, '0s', '0s'), + array('PT0S', 0.1, 1, $withMs ? '- 00:00:00.100' : '0s', '%is'), + array('PT1S', 0, 1, '- 00:00:01'.$ms, '-1s'), + array('PT2M', 0, 1, '- 00:02:00'.$ms, '-120s'), + array('PT3H', 0, 1, '- 03:00:00'.$ms, '-10 800s'), + array('P4D', 0, 1, '- 4d', '-345 600s'), + array('P5M', 0, 1, '- 5m', null), + array('P6Y', 0, 1, '- 6y', null), + array('P1Y2M3DT4H5M6S', 0, 1, '- 1y 2m 3d 04:05:06'.$ms, null), + array('PT1M60S', 0, 1, '- 00:02:00'.$ms, null), + array('PT1H60M', 0, 1, '- 02:00:00'.$ms, null), + array('P1DT24H', 0, 1, '- 2d', null), + array('P1M32D', 0, 1, '- 1m 32d', null), ); } @@ -349,7 +348,7 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa ] EODUMP; - $this->assertDumpMatchesFormat($xDump, $cast); + $this->assertDumpEquals($xDump, $cast); $xDump = <<= 70100 && isset($i->f) ? '.0' : ''; $periods = array( - array('2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from 2017-01-01 00:00:00 (included) to 2017-01-03 00:00:00', '1) 2017-01-01%a2) 2017-01-02'), - array('2017-01-01', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 00:00:00 (included) recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'), + array('2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02'), + array('2017-01-01', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'), - array('2017-01-01', 'P1D', '2017-01-04', 0, 'every + 1d, from 2017-01-01 00:00:00 (included) to 2017-01-04 00:00:00', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'), - array('2017-01-01', 'P1D', 2, 0, 'every + 1d, from 2017-01-01 00:00:00 (included) recurring 3 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'), + array('2017-01-01', 'P1D', '2017-01-04', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-04 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'), + array('2017-01-01', 'P1D', 2, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 3 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'), - array('2017-01-01', 'P1D', '2017-01-05', 0, 'every + 1d, from 2017-01-01 00:00:00 (included) to 2017-01-05 00:00:00', '1) 2017-01-01%a2) 2017-01-02%a1 more'), - array('2017-01-01', 'P1D', 3, 0, 'every + 1d, from 2017-01-01 00:00:00 (included) recurring 4 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03%a1 more'), + array('2017-01-01', 'P1D', '2017-01-05', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-05 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a1 more'), + array('2017-01-01', 'P1D', 3, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 4 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03%a1 more'), - array('2017-01-01', 'P1D', '2017-01-21', 0, 'every + 1d, from 2017-01-01 00:00:00 (included) to 2017-01-21 00:00:00', '1) 2017-01-01%a17 more'), - array('2017-01-01', 'P1D', 19, 0, 'every + 1d, from 2017-01-01 00:00:00 (included) recurring 20 time/s', '1) 2017-01-01%a17 more'), + array('2017-01-01', 'P1D', '2017-01-21', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-21 00:00:00.0', '1) 2017-01-01%a17 more'), + array('2017-01-01', 'P1D', 19, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 20 time/s', '1) 2017-01-01%a17 more'), - array('2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00 (included) to 2017-01-03 01:00:00', '1) 2017-01-01 01:00:00%a2) 2017-01-02 01:00:00'), - array('2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00%a2) 2017-01-02 01:00:00'), + array('2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) to 2017-01-03 01:00:00.0', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'), + array('2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'), - array('2017-01-01', 'P1DT1H', '2017-01-03', 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00 (included) to 2017-01-03 00:00:00", '1) 2017-01-01 00:00:00%a2) 2017-01-02 01:00:00'), - array('2017-01-01', 'P1DT1H', 1, 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00 (included) recurring 2 time/s", '1) 2017-01-01 00:00:00%a2) 2017-01-02 01:00:00'), + array('2017-01-01', 'P1DT1H', '2017-01-03', 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'), + array('2017-01-01', 'P1DT1H', 1, 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'), - array('2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00 (excluded) to 2017-01-04 00:00:00', '1) 2017-01-02%a2) 2017-01-03'), - array('2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'), + array('2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) to 2017-01-04 00:00:00.0', '1) 2017-01-02%a2) 2017-01-03'), + array('2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'), ); if (\PHP_VERSION_ID < 70107) { @@ -401,4 +400,15 @@ public function providePeriods() return $periods; } + + private function createInterval($intervalSpec, $ms, $invert) + { + $interval = new \DateInterval($intervalSpec); + if (\PHP_VERSION_ID >= 70100 && isset($interval->f)) { + $interval->f = $ms; + } + $interval->invert = $invert; + + return $interval; + } } From 4a62cc6668b7cbdeecf9064ace5b79d84fcc1379 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Mon, 4 Sep 2017 15:08:32 +0200 Subject: [PATCH 0758/1099] Do not trigger deprecation if node has not been explicitly filled --- .../Component/Config/Definition/ArrayNode.php | 8 ++--- .../Config/Definition/VariableNode.php | 4 --- .../Config/Tests/Definition/ArrayNodeTest.php | 31 ++++++++++++++++--- .../Tests/Definition/ScalarNodeTest.php | 31 ++++++++++++++++--- 4 files changed, 58 insertions(+), 16 deletions(-) diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index 2ffa2a2137fa8..ef068c9f34f78 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -234,10 +234,6 @@ protected function finalizeValue($value) } foreach ($this->children as $name => $child) { - if ($child->isDeprecated()) { - @trigger_error($child->getDeprecationMessage($name, $this->getPath()), E_USER_DEPRECATED); - } - if (!array_key_exists($name, $value)) { if ($child->isRequired()) { $msg = sprintf('The child node "%s" at path "%s" must be configured.', $name, $this->getPath()); @@ -254,6 +250,10 @@ protected function finalizeValue($value) continue; } + if ($child->isDeprecated()) { + @trigger_error($child->getDeprecationMessage($name, $this->getPath()), E_USER_DEPRECATED); + } + try { $value[$name] = $child->finalize($value[$name]); } catch (UnsetKeyException $e) { diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php index f37ced901b553..a9c35284cdcdb 100644 --- a/src/Symfony/Component/Config/Definition/VariableNode.php +++ b/src/Symfony/Component/Config/Definition/VariableNode.php @@ -84,10 +84,6 @@ protected function validateType($value) */ protected function finalizeValue($value) { - if ($this->deprecationMessage) { - @trigger_error($this->getDeprecationMessage($this->getName(), $this->getPath()), E_USER_DEPRECATED); - } - if (!$this->allowEmptyValue && $this->isValueEmpty($value)) { $ex = new InvalidConfigurationException(sprintf( 'The path "%s" cannot contain an empty value, but got %s.', diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php index 7a5bf30373acd..58d2939300f71 100644 --- a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php @@ -219,10 +219,33 @@ public function testGetDefaultValueWithoutDefaultValue() public function testSetDeprecated() { - $node = new ArrayNode('foo'); - $node->setDeprecated('"%node%" is deprecated'); + $childNode = new ArrayNode('foo'); + $childNode->setDeprecated('"%node%" is deprecated'); + + $this->assertTrue($childNode->isDeprecated()); + $this->assertSame('"foo" is deprecated', $childNode->getDeprecationMessage($childNode->getName(), $childNode->getPath())); + + $node = new ArrayNode('root'); + $node->addChild($childNode); + + $deprecationTriggered = false; + $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) { + if (E_USER_DEPRECATED === $level) { + return $deprecationTriggered = true; + } + + return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false; + }; + + $prevErrorHandler = set_error_handler($deprecationHandler); + $node->finalize(array()); + restore_error_handler(); + + $this->assertFalse($deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set'); - $this->assertTrue($node->isDeprecated()); - $this->assertSame('"foo" is deprecated', $node->getDeprecationMessage($node->getName(), $node->getPath())); + $prevErrorHandler = set_error_handler($deprecationHandler); + $node->finalize(array('foo' => array())); + restore_error_handler(); + $this->assertTrue($deprecationTriggered, '->finalize() should trigger if the deprecated node is set'); } } diff --git a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php index 1981ac9459aac..481ef3f4969cf 100644 --- a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Config\Tests\Definition; use PHPUnit\Framework\TestCase; +use Symfony\Component\Config\Definition\ArrayNode; use Symfony\Component\Config\Definition\ScalarNode; class ScalarNodeTest extends TestCase @@ -42,11 +43,33 @@ public function getValidValues() public function testSetDeprecated() { - $node = new ScalarNode('foo'); - $node->setDeprecated('"%node%" is deprecated'); + $childNode = new ScalarNode('foo'); + $childNode->setDeprecated('"%node%" is deprecated'); - $this->assertTrue($node->isDeprecated()); - $this->assertSame('"foo" is deprecated', $node->getDeprecationMessage($node->getName(), $node->getPath())); + $this->assertTrue($childNode->isDeprecated()); + $this->assertSame('"foo" is deprecated', $childNode->getDeprecationMessage($childNode->getName(), $childNode->getPath())); + + $node = new ArrayNode('root'); + $node->addChild($childNode); + + $deprecationTriggered = 0; + $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) { + if (E_USER_DEPRECATED === $level) { + return ++$deprecationTriggered; + } + + return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false; + }; + + $prevErrorHandler = set_error_handler($deprecationHandler); + $node->finalize(array()); + restore_error_handler(); + $this->assertSame(0, $deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set'); + + $prevErrorHandler = set_error_handler($deprecationHandler); + $node->finalize(array('foo' => '')); + restore_error_handler(); + $this->assertSame(1, $deprecationTriggered, '->finalize() should trigger if the deprecated node is set'); } /** From 2a7f86f85b62799794e8d4ada3246672fefe10c0 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 26 Jul 2017 09:41:52 +0200 Subject: [PATCH 0759/1099] [3.4][DI] Inline trivial services --- .../DependencyInjection/Dumper/PhpDumper.php | 57 +++++++++++++++++-- .../Tests/Fixtures/containers/container9.php | 1 + .../Tests/Fixtures/php/services9.php | 30 +++++----- .../Tests/Fixtures/php/services9_as_files.txt | 17 +++++- .../Tests/Fixtures/php/services9_compiled.php | 44 +++++++++----- .../Tests/Fixtures/php/services_locator.php | 16 +++--- .../Fixtures/php/services_private_frozen.php | 4 +- .../php/services_private_in_expression.php | 2 +- .../Fixtures/php/services_subscriber.php | 8 +-- .../php/services_uninitialized_ref.php | 8 +-- .../Tests/Fixtures/xml/services9.xml | 1 + .../Tests/Fixtures/yaml/services9.yml | 1 + 12 files changed, 139 insertions(+), 50 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 5bd1c2a20ce70..add4e7c616f57 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -475,6 +475,50 @@ private function isSimpleInstance($id, Definition $definition) return true; } + /** + * Checks if the definition is a trivial instance. + * + * @param Definition $definition + * + * @return bool + */ + private function isTrivialInstance(Definition $definition) + { + if ($definition->isSynthetic() || $definition->getFile() || $definition->getMethodCalls() || $definition->getProperties() || $definition->getConfigurator()) { + return false; + } + if ($definition->isDeprecated() || $definition->isLazy() || $definition->getFactory() || 3 < count($definition->getArguments())) { + return false; + } + + foreach ($definition->getArguments() as $arg) { + if (!$arg || ($arg instanceof Reference && 'service_container' !== (string) $arg)) { + continue; + } + if (is_array($arg) && 3 >= count($arg)) { + foreach ($arg as $k => $v) { + if ($this->dumpValue($k) !== $this->dumpValue($k, false)) { + return false; + } + if (!$v || ($v instanceof Reference && 'service_container' !== (string) $v)) { + continue; + } + if (!is_scalar($v) || $this->dumpValue($v) !== $this->dumpValue($v, false)) { + return false; + } + } + } elseif (!is_scalar($arg) || $this->dumpValue($arg) !== $this->dumpValue($arg, false)) { + return false; + } + } + + if (false !== strpos($this->dumpLiteralClass($this->dumpValue($definition->getClass())), '$')) { + return false; + } + + return true; + } + /** * Adds method calls to a service definition. * @@ -1669,14 +1713,19 @@ private function getServiceCall($id, Reference $reference = null) if (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) { $code = 'null'; - } elseif ($this->asFiles && $this->container->hasDefinition($id)) { - if ($this->container->getDefinition($id)->isShared()) { + } elseif ($this->container->hasDefinition($id)) { + $definition = $this->container->getDefinition($id); + + if ($this->isTrivialInstance($definition)) { + $code = substr($this->addNewInstance($definition, '', '', $id), 8, -2); + if ($definition->isShared()) { + $code = sprintf('$this->services[\'%s\'] = %s', $id, $code); + } + } elseif ($this->asFiles && $definition->isShared()) { $code = sprintf("\$this->load(__DIR__.'/%s.php')", $this->generateMethodName($id)); } else { $code = sprintf('$this->%s()', $this->generateMethodName($id)); } - } elseif ($this->container->hasDefinition($id) && !$this->container->getDefinition($id)->isPublic()) { - $code = sprintf('$this->%s()', $this->generateMethodName($id)); } elseif (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) { $code = sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id); } else { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php index 6445e0f427e06..2906004828a59 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php @@ -126,6 +126,7 @@ $container ->register('factory_simple', 'SimpleFactoryClass') ->addArgument('foo') + ->setDeprecated(true) ->setPublic(false) ; $container diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index b4e3965743a2b..ec7c57a8dfb41 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -79,7 +79,7 @@ public function __construct() */ protected function getBarService() { - $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar')); @@ -97,7 +97,7 @@ protected function getBazService() { $this->services['baz'] = $instance = new \Baz(); - $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->get('foo_with_inline')) && false ?: '_'}); + $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->getFooWithInlineService()) && false ?: '_'}); return $instance; } @@ -125,7 +125,7 @@ protected function getConfiguredServiceSimpleService() { $this->services['configured_service_simple'] = $instance = new \stdClass(); - ${($_ = isset($this->services['configurator_service_simple']) ? $this->services['configurator_service_simple'] : $this->getConfiguratorServiceSimpleService()) && false ?: '_'}->configureStdClass($instance); + ${($_ = isset($this->services['configurator_service_simple']) ? $this->services['configurator_service_simple'] : $this->services['configurator_service_simple'] = new \ConfClass('bar')) && false ?: '_'}->configureStdClass($instance); return $instance; } @@ -181,7 +181,7 @@ protected function getDeprecatedServiceService() */ protected function getFactoryServiceService() { - return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}->getInstance(); + return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}->getInstance(); } /** @@ -201,14 +201,14 @@ protected function getFactoryServiceSimpleService() */ protected function getFooService() { - $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this); $instance->foo = 'bar'; $instance->moo = $a; $instance->qux = array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')); - $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->get('bar')) && false ?: '_'}); + $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'}); $instance->initialize(); sc_configure($instance); @@ -238,7 +238,7 @@ protected function getFooBarService() { $class = $this->getParameter('foo_class'); - return new $class(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->get('deprecated_service')) && false ?: '_'}); + return new $class(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->getDeprecatedServiceService()) && false ?: '_'}); } /** @@ -263,7 +263,7 @@ protected function getFooWithInlineService() protected function getLazyContextService() { return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () { - yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; yield 'k2' => $this; }, 2), new RewindableGenerator(function () { return new \EmptyIterator(); @@ -278,7 +278,7 @@ protected function getLazyContextService() protected function getLazyContextIgnoreInvalidRefService() { return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () { - yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; if ($this->has('invalid')) { yield 1 => ${($_ = isset($this->services['invalid']) ? $this->services['invalid'] : $this->get('invalid', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}; } @@ -300,7 +300,7 @@ protected function getMethodCall1Service() $this->services['method_call1'] = $instance = new \Bar\FooClass(); - $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}); + $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}); $instance->setBar(${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : $this->get('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); if ($this->has('foo3')) { $instance->setBar(${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : $this->get('foo3', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); @@ -308,7 +308,7 @@ protected function getMethodCall1Service() if ($this->has('foobaz')) { $instance->setBar(${($_ = isset($this->services['foobaz']) ? $this->services['foobaz'] : $this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE)) && false ?: '_'}); } - $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default")))); + $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default")))); return $instance; } @@ -346,7 +346,7 @@ protected function getConfiguratorServiceService() { $this->services['configurator_service'] = $instance = new \ConfClass(); - $instance->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->get('baz')) && false ?: '_'}); + $instance->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'}); return $instance; } @@ -365,9 +365,13 @@ protected function getConfiguratorServiceSimpleService() * Gets the private 'factory_simple' shared service. * * @return \SimpleFactoryClass + * + * @deprecated The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed. */ protected function getFactorySimpleService() { + @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED); + return $this->services['factory_simple'] = new \SimpleFactoryClass('foo'); } @@ -381,7 +385,7 @@ protected function getInlinedService() $this->services['inlined'] = $instance = new \Bar(); $instance->pub = 'pub'; - $instance->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->get('baz')) && false ?: '_'}); + $instance->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'}); return $instance; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt index 2793610bae8ca..059f0912815ca 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt @@ -102,7 +102,18 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; // This file has been auto-generated by the Symfony Dependency Injection Component for internal use. // Returns the public 'factory_service_simple' shared service. -return $this->services['factory_service_simple'] = (new \SimpleFactoryClass('foo'))->getInstance(); +return $this->services['factory_service_simple'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->load(__DIR__.'/getFactorySimpleService.php')) && false ?: '_'}->getInstance(); + + [Container%s/getFactorySimpleService.php] => services['factory_simple'] = new \SimpleFactoryClass('foo'); [Container%s/getFooService.php] => __DIR__.'/getDeprecatedServiceService.php', 'factory_service' => __DIR__.'/getFactoryServiceService.php', 'factory_service_simple' => __DIR__.'/getFactoryServiceSimpleService.php', + 'factory_simple' => __DIR__.'/getFactorySimpleService.php', 'foo' => __DIR__.'/getFooService.php', 'foo.baz' => __DIR__.'/getFoo_BazService.php', 'foo_with_inline' => __DIR__.'/getFooWithInlineService.php', @@ -281,6 +293,9 @@ class Container%s extends Container 'new_factory_service' => __DIR__.'/getNewFactoryServiceService.php', 'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php', ); + $this->privates = array( + 'factory_simple' => true, + ); $this->aliases = array( 'alias_for_alias' => 'foo', 'alias_for_foo' => 'foo', diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index e77bc565792a8..103bb0de34d88 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -39,6 +39,7 @@ public function __construct() 'deprecated_service' => 'getDeprecatedServiceService', 'factory_service' => 'getFactoryServiceService', 'factory_service_simple' => 'getFactoryServiceSimpleService', + 'factory_simple' => 'getFactorySimpleService', 'foo' => 'getFooService', 'foo.baz' => 'getFoo_BazService', 'foo_bar' => 'getFooBarService', @@ -49,6 +50,9 @@ public function __construct() 'new_factory_service' => 'getNewFactoryServiceService', 'service_from_static_method' => 'getServiceFromStaticMethodService', ); + $this->privates = array( + 'factory_simple' => true, + ); $this->aliases = array( 'alias_for_alias' => 'foo', 'alias_for_foo' => 'foo', @@ -89,7 +93,7 @@ public function isFrozen() */ protected function getBarService() { - $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar')); @@ -107,7 +111,7 @@ protected function getBazService() { $this->services['baz'] = $instance = new \Baz(); - $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->get('foo_with_inline')) && false ?: '_'}); + $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->getFooWithInlineService()) && false ?: '_'}); return $instance; } @@ -120,7 +124,7 @@ protected function getBazService() protected function getConfiguredServiceService() { $a = new \ConfClass(); - $a->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->get('baz')) && false ?: '_'}); + $a->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'}); $this->services['configured_service'] = $instance = new \stdClass(); @@ -184,7 +188,7 @@ protected function getDeprecatedServiceService() */ protected function getFactoryServiceService() { - return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}->getInstance(); + return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}->getInstance(); } /** @@ -194,7 +198,7 @@ protected function getFactoryServiceService() */ protected function getFactoryServiceSimpleService() { - return $this->services['factory_service_simple'] = (new \SimpleFactoryClass('foo'))->getInstance(); + return $this->services['factory_service_simple'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->getFactorySimpleService()) && false ?: '_'}->getInstance(); } /** @@ -204,14 +208,14 @@ protected function getFactoryServiceSimpleService() */ protected function getFooService() { - $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this); $instance->foo = 'bar'; $instance->moo = $a; $instance->qux = array('bar' => 'foo is bar', 'foobar' => 'bar'); - $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->get('bar')) && false ?: '_'}); + $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'}); $instance->initialize(); sc_configure($instance); @@ -239,7 +243,7 @@ protected function getFoo_BazService() */ protected function getFooBarService() { - return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->get('deprecated_service')) && false ?: '_'}); + return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->getDeprecatedServiceService()) && false ?: '_'}); } /** @@ -254,7 +258,7 @@ protected function getFooWithInlineService() $this->services['foo_with_inline'] = $instance = new \Foo(); $a->pub = 'pub'; - $a->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->get('baz')) && false ?: '_'}); + $a->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'}); $instance->setBar($a); @@ -269,7 +273,7 @@ protected function getFooWithInlineService() protected function getLazyContextService() { return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () { - yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; yield 'k2' => $this; }, 2), new RewindableGenerator(function () { return new \EmptyIterator(); @@ -284,7 +288,7 @@ protected function getLazyContextService() protected function getLazyContextIgnoreInvalidRefService() { return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () { - yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->get('foo.baz')) && false ?: '_'}; + yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}; }, 1), new RewindableGenerator(function () { return new \EmptyIterator(); }, 0)); @@ -301,9 +305,9 @@ protected function getMethodCall1Service() $this->services['method_call1'] = $instance = new \Bar\FooClass(); - $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}); + $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}); $instance->setBar(NULL); - $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default")))); + $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default")))); return $instance; } @@ -335,6 +339,20 @@ protected function getServiceFromStaticMethodService() return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance(); } + /** + * Gets the private 'factory_simple' shared service. + * + * @return \SimpleFactoryClass + * + * @deprecated The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed. + */ + protected function getFactorySimpleService() + { + @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED); + + return $this->services['factory_simple'] = new \SimpleFactoryClass('foo'); + } + /** * {@inheritdoc} */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php index 0bbb83ae88d4a..751ad8e4fa454 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php @@ -78,7 +78,7 @@ public function isFrozen() */ protected function getBarServiceService() { - return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'}); + return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->services['baz_service'] = new \stdClass()) && false ?: '_'}); } /** @@ -89,9 +89,9 @@ protected function getBarServiceService() protected function getFooServiceService() { return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(array('bar' => function () { - return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->get('bar_service')) && false ?: '_'}; + return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->services['baz_service'] = new \stdClass()) && false ?: '_'})) && false ?: '_'}; }, 'baz' => function () { - $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'}); + $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->services['baz_service'] = new \stdClass()) && false ?: '_'}); }, 'nil' => function () { return NULL; })); @@ -135,7 +135,7 @@ protected function getTranslator_Loader3Service() protected function getTranslator1Service() { return $this->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(array('translator.loader_1' => function () { - return ${($_ = isset($this->services['translator.loader_1']) ? $this->services['translator.loader_1'] : $this->get('translator.loader_1')) && false ?: '_'}; + return ${($_ = isset($this->services['translator.loader_1']) ? $this->services['translator.loader_1'] : $this->services['translator.loader_1'] = new \stdClass()) && false ?: '_'}; }))); } @@ -147,10 +147,10 @@ protected function getTranslator1Service() protected function getTranslator2Service() { $this->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(array('translator.loader_2' => function () { - return ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : $this->get('translator.loader_2')) && false ?: '_'}; + return ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : $this->services['translator.loader_2'] = new \stdClass()) && false ?: '_'}; }))); - $instance->addResource('db', ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : $this->get('translator.loader_2')) && false ?: '_'}, 'nl'); + $instance->addResource('db', ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : $this->services['translator.loader_2'] = new \stdClass()) && false ?: '_'}, 'nl'); return $instance; } @@ -162,10 +162,10 @@ protected function getTranslator2Service() */ protected function getTranslator3Service() { - $a = ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : $this->get('translator.loader_3')) && false ?: '_'}; + $a = ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : $this->services['translator.loader_3'] = new \stdClass()) && false ?: '_'}; $this->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(array('translator.loader_3' => function () { - return ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : $this->get('translator.loader_3')) && false ?: '_'}; + return ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : $this->services['translator.loader_3'] = new \stdClass()) && false ?: '_'}; }))); $instance->addResource('db', $a, 'nl'); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php index 782e17c2a4e84..a6717fd6abf8f 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php @@ -72,7 +72,7 @@ public function isFrozen() */ protected function getBarServiceService() { - return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'}); + return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->services['baz_service'] = new \stdClass()) && false ?: '_'}); } /** @@ -82,7 +82,7 @@ protected function getBarServiceService() */ protected function getFooServiceService() { - return $this->services['foo_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'}); + return $this->services['foo_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->services['baz_service'] = new \stdClass()) && false ?: '_'}); } /** diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php index bd334df048711..e5129d4f36566 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php @@ -71,7 +71,7 @@ public function isFrozen() */ protected function getPublicFooService() { - return $this->services['public_foo'] = new \stdClass(${($_ = isset($this->services['private_foo']) ? $this->services['private_foo'] : $this->getPrivateFooService()) && false ?: '_'}); + return $this->services['public_foo'] = new \stdClass(${($_ = isset($this->services['private_foo']) ? $this->services['private_foo'] : $this->services['private_foo'] = new \stdClass()) && false ?: '_'}); } /** diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php index 0f87da56175d8..3d7cc80336831 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php @@ -87,13 +87,13 @@ protected function getTestServiceSubscriberService() protected function getFooServiceService() { return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber(new \Symfony\Component\DependencyInjection\ServiceLocator(array('Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function () { - $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] : $this->getCustomDefinitionService()) && false ?: '_'}); + $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] : $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition()) && false ?: '_'}); }, 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => function () { - $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] : $this->get('Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber')) && false ?: '_'}); + $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] : $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber()) && false ?: '_'}); }, 'bar' => function () { - $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] : $this->get('Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber')) && false ?: '_'}); + $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] : $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber()) && false ?: '_'}); }, 'baz' => function () { - $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] : $this->getCustomDefinitionService()) && false ?: '_'}); + $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] : $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition()) && false ?: '_'}); }))); } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php index df0d74c07cbeb..71b19e0303d63 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php @@ -76,12 +76,12 @@ protected function getBarService() $this->services['bar'] = $instance = new \stdClass(); $instance->foo1 = ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; - $instance->foo2 = null; + $instance->foo2 = ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; $instance->closures = array(0 => function () { return ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; }, 1 => function () { - return null; + return ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; }, 2 => function () { return ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; }); @@ -90,7 +90,7 @@ protected function getBarService() yield 'foo1' => ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; } if (false) { - yield 'foo2' => null; + yield 'foo2' => ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; } if (isset($this->services['foo3'])) { yield 'foo3' => ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; @@ -111,7 +111,7 @@ protected function getBazService() { $this->services['baz'] = $instance = new \stdClass(); - $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : $this->getFoo3Service()) && false ?: '_'}; + $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : $this->services['foo3'] = new \stdClass()) && false ?: '_'}; return $instance; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml index fb2050ab6191f..c7884fb11d6ab 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml @@ -114,6 +114,7 @@ foo + The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed. diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml index 984f2136700c0..01b67d78ac553 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml @@ -106,6 +106,7 @@ services: factory: [Bar\FooClass, getInstance] factory_simple: class: SimpleFactoryClass + deprecated: The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed. public: false arguments: ['foo'] factory_service_simple: From 61966df131568db58c579e408b4ad9ab15903ffc Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 4 Sep 2017 19:49:50 +0200 Subject: [PATCH 0760/1099] [DI] There are no initialized-only refs to undeclared services --- .../Component/DependencyInjection/Dumper/PhpDumper.php | 10 ++++++---- .../Tests/Fixtures/php/services_uninitialized_ref.php | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index add4e7c616f57..2f70d59d819ec 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1711,12 +1711,12 @@ private function getServiceCall($id, Reference $reference = null) return '$this'; } - if (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) { - $code = 'null'; - } elseif ($this->container->hasDefinition($id)) { + if ($this->container->hasDefinition($id)) { $definition = $this->container->getDefinition($id); - if ($this->isTrivialInstance($definition)) { + if (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) { + $code = 'null'; + } elseif ($this->isTrivialInstance($definition)) { $code = substr($this->addNewInstance($definition, '', '', $id), 8, -2); if ($definition->isShared()) { $code = sprintf('$this->services[\'%s\'] = %s', $id, $code); @@ -1726,6 +1726,8 @@ private function getServiceCall($id, Reference $reference = null) } else { $code = sprintf('$this->%s()', $this->generateMethodName($id)); } + } elseif (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) { + return 'null'; } elseif (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) { $code = sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id); } else { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php index 71b19e0303d63..4c26d58d70c28 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php @@ -76,12 +76,12 @@ protected function getBarService() $this->services['bar'] = $instance = new \stdClass(); $instance->foo1 = ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; - $instance->foo2 = ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; + $instance->foo2 = null; $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; $instance->closures = array(0 => function () { return ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; }, 1 => function () { - return ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; + return null; }, 2 => function () { return ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; }); @@ -90,7 +90,7 @@ protected function getBarService() yield 'foo1' => ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'}; } if (false) { - yield 'foo2' => ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : null) && false ?: '_'}; + yield 'foo2' => null; } if (isset($this->services['foo3'])) { yield 'foo3' => ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'}; From b635b62463b6d12682e3cbae7fbeca14f38e295d Mon Sep 17 00:00:00 2001 From: Yanick Witschi Date: Sun, 3 Sep 2017 13:14:53 +0200 Subject: [PATCH 0761/1099] Implemented PruneableInterface on TagAwareAdapter --- .../Cache/Adapter/TagAwareAdapter.php | 15 ++++- src/Symfony/Component/Cache/CHANGELOG.md | 2 +- .../Tests/Adapter/TagAwareAdapterTest.php | 57 +++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php index 1e0617ebe271d..96df1128bb895 100644 --- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php @@ -14,11 +14,12 @@ use Psr\Cache\CacheItemInterface; use Psr\Cache\InvalidArgumentException; use Symfony\Component\Cache\CacheItem; +use Symfony\Component\Cache\PruneableInterface; /** * @author Nicolas Grekas */ -class TagAwareAdapter implements TagAwareAdapterInterface +class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface { const TAGS_PREFIX = "\0tags\0"; @@ -334,4 +335,16 @@ private function getTagVersions(array $tagsByKey) return $tagVersions; } + + /** + * {@inheritdoc} + */ + public function prune() + { + if ($this->itemsAdapter instanceof PruneableInterface) { + return $this->itemsAdapter->prune(); + } + + return false; + } } diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md index bd637f10df0b0..7389a7edcc57d 100644 --- a/src/Symfony/Component/Cache/CHANGELOG.md +++ b/src/Symfony/Component/Cache/CHANGELOG.md @@ -5,7 +5,7 @@ CHANGELOG ----- * added PruneableInterface so PSR-6 or PSR-16 cache implementations can declare support for manual stale cache pruning - * added prune logic to FilesystemTrait, PhpFilesTrait, PdoTrait, and ChainTrait + * added prune logic to FilesystemTrait, PhpFilesTrait, PdoTrait, TagAwareAdapter and ChainTrait * now FilesystemAdapter, PhpFilesAdapter, FilesystemCache, PhpFilesCache, PdoAdapter, PdoCache, ChainAdapter, and ChainCache implement PruneableInterface and support manual stale cache pruning diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php index deca227c47dd0..0e4e07a16d51b 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use Symfony\Component\Cache\Adapter\AdapterInterface; use Symfony\Component\Cache\Adapter\FilesystemAdapter; use Symfony\Component\Cache\Adapter\TagAwareAdapter; @@ -125,4 +126,60 @@ public function testGetPreviousTags() $i = $pool->getItem('k'); $this->assertSame(array('foo' => 'foo'), $i->getPreviousTags()); } + + public function testPrune() + { + $cache = new TagAwareAdapter($this->getPruneableMock()); + $this->assertTrue($cache->prune()); + + $cache = new TagAwareAdapter($this->getNonPruneableMock()); + $this->assertFalse($cache->prune()); + + $cache = new TagAwareAdapter($this->getFailingPruneableMock()); + $this->assertFalse($cache->prune()); + } + + /** + * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + */ + private function getPruneableMock() + { + $pruneable = $this + ->getMockBuilder(PruneableCacheInterface::class) + ->getMock(); + + $pruneable + ->expects($this->atLeastOnce()) + ->method('prune') + ->will($this->returnValue(true)); + + return $pruneable; + } + + /** + * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + */ + private function getFailingPruneableMock() + { + $pruneable = $this + ->getMockBuilder(PruneableCacheInterface::class) + ->getMock(); + + $pruneable + ->expects($this->atLeastOnce()) + ->method('prune') + ->will($this->returnValue(false)); + + return $pruneable; + } + + /** + * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface + */ + private function getNonPruneableMock() + { + return $this + ->getMockBuilder(AdapterInterface::class) + ->getMock(); + } } From 1cad4696daddd5124346ada2e38d17c336c323bd Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 4 Sep 2017 20:35:21 +0200 Subject: [PATCH 0762/1099] fix merge --- .../Component/VarDumper/Tests/Caster/DateCasterTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php index cb6b6a6b16b71..0298c8b3cb5a9 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php @@ -360,6 +360,10 @@ public function providePeriods() array('2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'), ); + if (\PHP_VERSION_ID < 70107) { + array_walk($periods, function (&$i) { $i[5] = ''; }); + } + return $periods; } From 2ba5005830187a01fdeb033edf6ae96d0bfcd643 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Mon, 4 Sep 2017 22:01:21 +0200 Subject: [PATCH 0763/1099] Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args --- src/Symfony/Component/Console/Input/ArrayInput.php | 10 ++++++++-- .../Component/Console/Tests/Input/ArrayInputTest.php | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index e9d4f8e842a9f..4937860b83204 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -101,9 +101,15 @@ public function __toString() $params = array(); foreach ($this->parameters as $param => $val) { if ($param && '-' === $param[0]) { - $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : ''); + if (is_array($val)) { + foreach ($val as $v) { + $params[] = $param.('' != $v ? '='.$this->escapeToken($v) : ''); + } + } else { + $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : ''); + } } else { - $params[] = $this->escapeToken($val); + $params[] = is_array($val) ? array_map(array($this, 'escapeToken'), $val) : $this->escapeToken($val); } } diff --git a/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php index 06e65f7398bdc..608020a5caa55 100644 --- a/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php +++ b/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php @@ -140,5 +140,8 @@ public function testToString() { $input = new ArrayInput(array('-f' => null, '-b' => 'bar', '--foo' => 'b a z', '--lala' => null, 'test' => 'Foo', 'test2' => "A\nB'C")); $this->assertEquals('-f -b=bar --foo='.escapeshellarg('b a z').' --lala Foo '.escapeshellarg("A\nB'C"), (string) $input); + + $input = new ArrayInput(array('-b' => array('bval_1', 'bval_2'), '--f' => array('fval_1', 'fval_2'))); + $this->assertSame('-b=bval_1 -b=bval_2 --f=fval_1 --f=fval_2', (string) $input); } } From 5798dd6beccd9587339358c63420a1e7222f6959 Mon Sep 17 00:00:00 2001 From: Denis Golubovskiy Date: Thu, 24 Aug 2017 21:57:21 +0300 Subject: [PATCH 0764/1099] [Cache] Use options from Memcached DSN --- src/Symfony/Component/Cache/CHANGELOG.md | 1 + .../Tests/Adapter/MemcachedAdapterTest.php | 30 +++++++++++++ .../Component/Cache/Traits/MemcachedTrait.php | 45 ++++++++++--------- 3 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md index e8172d94988d4..58b737dc950f3 100644 --- a/src/Symfony/Component/Cache/CHANGELOG.md +++ b/src/Symfony/Component/Cache/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 3.4.0 ----- + * added using options from Memcached DSN * added PruneableInterface so PSR-6 or PSR-16 cache implementations can declare support for manual stale cache pruning * added FilesystemTrait::prune() and PhpFilesTrait::prune() implementations * now FilesystemAdapter, PhpFilesAdapter, FilesystemCache, and PhpFilesCache implement PruneableInterface and support diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php index 82b41c3b4d870..a506108c7bc03 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php @@ -162,4 +162,34 @@ public function provideServersSetting() ); } } + + /** + * @dataProvider provideDsnWithOptions + */ + public function testDsnWithOptions($dsn, array $options, array $expectedOptions) + { + $client = MemcachedAdapter::createConnection($dsn, $options); + + foreach ($expectedOptions as $option => $expect) { + $this->assertSame($expect, $client->getOption($option)); + } + } + + public function provideDsnWithOptions() + { + if (!class_exists('\Memcached')) { + self::markTestSkipped('Extension memcached required.'); + } + + yield array( + 'memcached://localhost:11222?retry_timeout=10', + array(\Memcached::OPT_RETRY_TIMEOUT => 8), + array(\Memcached::OPT_RETRY_TIMEOUT => 10), + ); + yield array( + 'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2', + array(\Memcached::OPT_RETRY_TIMEOUT => 8), + array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8), + ); + } } diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php index c2832946f98c2..ee990163a3d65 100644 --- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php +++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php @@ -83,28 +83,6 @@ public static function createConnection($servers, array $options = array()) $client = new \Memcached($options['persistent_id']); $username = $options['username']; $password = $options['password']; - unset($options['persistent_id'], $options['username'], $options['password']); - $options = array_change_key_case($options, CASE_UPPER); - - // set client's options - $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true); - $client->setOption(\Memcached::OPT_NO_BLOCK, true); - if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) { - $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true); - } - foreach ($options as $name => $value) { - if (is_int($name)) { - continue; - } - if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) { - $value = constant('Memcached::'.$name.'_'.strtoupper($value)); - } - $opt = constant('Memcached::OPT_'.$name); - - unset($options[$name]); - $options[$opt] = $value; - } - $client->setOptions($options); // parse any DSN in $servers foreach ($servers as $i => $dsn) { @@ -139,11 +117,34 @@ public static function createConnection($servers, array $options = array()) if (isset($params['query'])) { parse_str($params['query'], $query); $params += $query; + $options = $query + $options; } $servers[$i] = array($params['host'], $params['port'], $params['weight']); } + // set client's options + unset($options['persistent_id'], $options['username'], $options['password'], $options['weight']); + $options = array_change_key_case($options, CASE_UPPER); + $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true); + $client->setOption(\Memcached::OPT_NO_BLOCK, true); + if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) { + $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true); + } + foreach ($options as $name => $value) { + if (is_int($name)) { + continue; + } + if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) { + $value = constant('Memcached::'.$name.'_'.strtoupper($value)); + } + $opt = constant('Memcached::OPT_'.$name); + + unset($options[$name]); + $options[$opt] = $value; + } + $client->setOptions($options); + // set client's servers, taking care of persistent connections if (!$client->isPristine()) { $oldServers = array(); From 36d2a45d1d1d373292226a47c2be9828ec072149 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Fri, 1 Sep 2017 18:34:37 +0200 Subject: [PATCH 0765/1099] [HttpKernel] Dont register env parameter resource --- .../Config/EnvParametersResource.php | 97 --------------- src/Symfony/Component/HttpKernel/Kernel.php | 2 - .../Config/EnvParametersResourceTest.php | 110 ------------------ .../Component/HttpKernel/Tests/KernelTest.php | 37 ------ 4 files changed, 246 deletions(-) delete mode 100644 src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php delete mode 100644 src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php diff --git a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php deleted file mode 100644 index c2b73cea94f61..0000000000000 --- a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php +++ /dev/null @@ -1,97 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\HttpKernel\Config; - -use Symfony\Component\Config\Resource\SelfCheckingResourceInterface; - -/** - * EnvParametersResource represents resources stored in prefixed environment variables. - * - * @author Chris Wilkinson - * - * @deprecated since version 3.4, to be removed in 4.0 - */ -class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable -{ - /** - * @var string - */ - private $prefix; - - /** - * @var string - */ - private $variables; - - /** - * Constructor. - * - * @param string $prefix - */ - public function __construct($prefix) - { - $this->prefix = $prefix; - $this->variables = $this->findVariables(); - } - - /** - * {@inheritdoc} - */ - public function __toString() - { - return serialize($this->getResource()); - } - - /** - * @return array An array with two keys: 'prefix' for the prefix used and 'variables' containing all the variables watched by this resource - */ - public function getResource() - { - return array('prefix' => $this->prefix, 'variables' => $this->variables); - } - - /** - * {@inheritdoc} - */ - public function isFresh($timestamp) - { - return $this->findVariables() === $this->variables; - } - - public function serialize() - { - return serialize(array('prefix' => $this->prefix, 'variables' => $this->variables)); - } - - public function unserialize($serialized) - { - $unserialized = unserialize($serialized, array('allowed_classes' => false)); - - $this->prefix = $unserialized['prefix']; - $this->variables = $unserialized['variables']; - } - - private function findVariables() - { - $variables = array(); - - foreach ($_SERVER as $key => $value) { - if (0 === strpos($key, $this->prefix)) { - $variables[$key] = $value; - } - } - - ksort($variables); - - return $variables; - } -} diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index d97de8a722a4b..913ba1a81ea18 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -26,7 +26,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Bundle\BundleInterface; -use Symfony\Component\HttpKernel\Config\EnvParametersResource; use Symfony\Component\HttpKernel\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass; @@ -625,7 +624,6 @@ protected function buildContainer() } $container->addCompilerPass(new AddAnnotatedClassesToCachePass($this)); - $container->addResource(new EnvParametersResource('SYMFONY__')); return $container; } diff --git a/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php b/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php deleted file mode 100644 index 986e05d8b888a..0000000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php +++ /dev/null @@ -1,110 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\HttpKernel\Tests\Config; - -use PHPUnit\Framework\TestCase; -use Symfony\Component\HttpKernel\Config\EnvParametersResource; - -/** - * @group legacy - */ -class EnvParametersResourceTest extends TestCase -{ - protected $prefix = '__DUMMY_'; - protected $initialEnv; - protected $resource; - - protected function setUp() - { - $this->initialEnv = array( - $this->prefix.'1' => 'foo', - $this->prefix.'2' => 'bar', - ); - - foreach ($this->initialEnv as $key => $value) { - $_SERVER[$key] = $value; - } - - $this->resource = new EnvParametersResource($this->prefix); - } - - protected function tearDown() - { - foreach ($_SERVER as $key => $value) { - if (0 === strpos($key, $this->prefix)) { - unset($_SERVER[$key]); - } - } - } - - public function testGetResource() - { - $this->assertSame( - array('prefix' => $this->prefix, 'variables' => $this->initialEnv), - $this->resource->getResource(), - '->getResource() returns the resource' - ); - } - - public function testToString() - { - $this->assertSame( - serialize(array('prefix' => $this->prefix, 'variables' => $this->initialEnv)), - (string) $this->resource - ); - } - - public function testIsFreshNotChanged() - { - $this->assertTrue( - $this->resource->isFresh(time()), - '->isFresh() returns true if the variables have not changed' - ); - } - - public function testIsFreshValueChanged() - { - reset($this->initialEnv); - $_SERVER[key($this->initialEnv)] = 'baz'; - - $this->assertFalse( - $this->resource->isFresh(time()), - '->isFresh() returns false if a variable has been changed' - ); - } - - public function testIsFreshValueRemoved() - { - reset($this->initialEnv); - unset($_SERVER[key($this->initialEnv)]); - - $this->assertFalse( - $this->resource->isFresh(time()), - '->isFresh() returns false if a variable has been removed' - ); - } - - public function testIsFreshValueAdded() - { - $_SERVER[$this->prefix.'3'] = 'foo'; - - $this->assertFalse( - $this->resource->isFresh(time()), - '->isFresh() returns false if a variable has been added' - ); - } - - public function testSerializeUnserialize() - { - $this->assertEquals($this->resource, unserialize(serialize($this->resource))); - } -} diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php index 613c6f990202d..8b49ab9c984c4 100644 --- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -16,7 +16,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpKernel\Bundle\BundleInterface; -use Symfony\Component\HttpKernel\Config\EnvParametersResource; use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpFoundation\Request; @@ -104,42 +103,6 @@ public function testClassCacheIsNotLoadedByDefault() $kernel->boot(); } - public function testEnvParametersResourceIsAdded() - { - $container = new ContainerBuilder(); - $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest') - ->disableOriginalConstructor() - ->setMethods(array('getContainerBuilder', 'prepareContainer', 'getCacheDir', 'getLogDir')) - ->getMock(); - $kernel->expects($this->any()) - ->method('getContainerBuilder') - ->will($this->returnValue($container)); - $kernel->expects($this->any()) - ->method('prepareContainer') - ->will($this->returnValue(null)); - $kernel->expects($this->any()) - ->method('getCacheDir') - ->will($this->returnValue(sys_get_temp_dir())); - $kernel->expects($this->any()) - ->method('getLogDir') - ->will($this->returnValue(sys_get_temp_dir())); - - $reflection = new \ReflectionClass(get_class($kernel)); - $method = $reflection->getMethod('buildContainer'); - $method->setAccessible(true); - $method->invoke($kernel); - - $found = false; - foreach ($container->getResources() as $resource) { - if ($resource instanceof EnvParametersResource) { - $found = true; - break; - } - } - - $this->assertTrue($found); - } - public function testBootKernelSeveralTimesOnlyInitializesBundlesOnce() { $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer')); From 66621cc559b08889f11a559d47ecb4fd01183320 Mon Sep 17 00:00:00 2001 From: Oleg Voronkovich Date: Sun, 3 Sep 2017 20:54:53 +0300 Subject: [PATCH 0766/1099] [Dotenv] Add a BC break note --- src/Symfony/Component/Dotenv/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Dotenv/CHANGELOG.md b/src/Symfony/Component/Dotenv/CHANGELOG.md index 2204282c26ca6..f04cc1bdf7bba 100644 --- a/src/Symfony/Component/Dotenv/CHANGELOG.md +++ b/src/Symfony/Component/Dotenv/CHANGELOG.md @@ -4,4 +4,5 @@ CHANGELOG 3.3.0 ----- + * [BC BREAK] Since v3.3.7, the latest Dotenv files override the previous ones. Real env vars are not affected and are not overridden. * added the component From 0caeeff48a5d09d4b1dcddb8d9ca0ee0a0c1cde5 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Tue, 5 Sep 2017 13:23:06 +0200 Subject: [PATCH 0767/1099] Create directories recursively in the PHPUnit bridge --- src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit index c19d30f4af9e6..a2747f3be2a09 100755 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit @@ -41,7 +41,7 @@ $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rt if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".getenv('SYMFONY_PHPUNIT_REMOVE') !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) { // Build a standalone phpunit without symfony/yaml nor prophecy by default - @mkdir($PHPUNIT_DIR); + @mkdir($PHPUNIT_DIR, 0777, true); chdir($PHPUNIT_DIR); if (file_exists("phpunit-$PHPUNIT_VERSION")) { passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? '(del /S /F /Q %s & rmdir %1$s) >nul': 'rm -rf %s', "phpunit-$PHPUNIT_VERSION")); From 76c42175b97f13a155282ee1f4591a59d35228b4 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 5 Sep 2017 17:39:41 +0200 Subject: [PATCH 0768/1099] [FrameworkBundle] Fix Di config to allow for more private services --- .../Compiler/CachePoolClearerPass.php | 27 ++++------------ .../Compiler/CachePoolPass.php | 32 +++++++++++++------ .../Compiler/TemplatingPass.php | 7 ++++ .../Compiler/UnusedTagsPass.php | 1 + .../FrameworkExtension.php | 6 ++-- .../FrameworkBundle/FrameworkBundle.php | 2 +- .../Resources/config/templating_debug.xml | 2 +- .../Resources/config/templating_php.xml | 7 +++- .../Templating/Helper/FormHelper.php | 2 +- .../Controller/SubRequestController.php | 4 +-- .../Tests/Functional/app/Session/config.yml | 5 +++ .../WebProfilerExtensionTest.php | 23 ++++++------- .../Component/Form/FormRendererInterface.php | 2 +- 13 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php index 882f9b2dccf67..094712ded69d3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php @@ -27,29 +27,16 @@ final class CachePoolClearerPass implements CompilerPassInterface public function process(ContainerBuilder $container) { $container->getParameterBag()->remove('cache.prefix.seed'); - $poolsByClearer = array(); - $pools = array(); - foreach ($container->findTaggedServiceIds('cache.pool') as $id => $attributes) { - $pools[$id] = new Reference($id); - foreach (array_reverse($attributes) as $attr) { - if (isset($attr['clearer'])) { - $poolsByClearer[$attr['clearer']][$id] = $pools[$id]; - } - if (!empty($attr['unlazy'])) { - $container->getDefinition($id)->setLazy(false); - } - if (array_key_exists('clearer', $attr) || array_key_exists('unlazy', $attr)) { - break; + foreach ($container->findTaggedServiceIds('cache.pool.clearer') as $id => $attr) { + $clearer = $container->getDefinition($id); + $pools = array(); + foreach ($clearer->getArgument(0) as $id => $ref) { + if ($container->hasDefinition($id)) { + $pools[$id] = new Reference($id); } } - } - - $container->getDefinition('cache.global_clearer')->addArgument($pools); - - foreach ($poolsByClearer as $clearer => $pools) { - $clearer = $container->getDefinition($clearer); - $clearer->addArgument($pools); + $clearer->replaceArgument(0, $pools); } if (!$container->has('cache.annotations')) { diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php index c63175e2d3ac0..6a633c7b25361 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php @@ -37,6 +37,8 @@ public function process(ContainerBuilder $container) } $seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment'); + $pools = array(); + $clearers = array(); $attributes = array( 'provider', 'namespace', @@ -47,10 +49,8 @@ public function process(ContainerBuilder $container) if ($pool->isAbstract()) { continue; } - $isLazy = $pool->isLazy(); while ($adapter instanceof ChildDefinition) { $adapter = $container->findDefinition($adapter->getParent()); - $isLazy = $isLazy || $adapter->isLazy(); if ($t = $adapter->getTag('cache.pool')) { $tags[0] += $t[0]; } @@ -82,17 +82,29 @@ public function process(ContainerBuilder $container) throw new InvalidArgumentException(sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "clearer", "provider", "namespace" and "default_lifetime", found "%s".', $id, implode('", "', array_keys($tags[0])))); } - $attr = array(); if (null !== $clearer) { - $attr['clearer'] = $clearer; + $clearers[$clearer][$id] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE); } - if (!$isLazy) { - $pool->setLazy(true); - $attr['unlazy'] = true; - } - if ($attr) { - $pool->addTag('cache.pool', $attr); + + $pools[$id] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE); + } + + $clearer = 'cache.global_clearer'; + while ($container->hasAlias($clearer)) { + $clearer = (string) $container->getAlias($clearer); + } + if ($container->hasDefinition($clearer)) { + $clearers['cache.global_clearer'] = $pools; + } + + foreach ($clearers as $id => $pools) { + $clearer = $container->getDefinition($id); + if ($clearer instanceof ChilDefinition) { + $clearer->replaceArgument(0, $pools); + } else { + $clearer->setArgument(0, $pools); } + $clearer->addTag('cache.pool.clearer'); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php index 8e2e4d0dbfb34..b916a27a6d619 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php @@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface; class TemplatingPass implements CompilerPassInterface @@ -31,16 +32,22 @@ public function process(ContainerBuilder $container) } if ($container->hasDefinition('templating.engine.php')) { + $refs = array(); $helpers = array(); foreach ($container->findTaggedServiceIds('templating.helper', true) as $id => $attributes) { if (isset($attributes[0]['alias'])) { $helpers[$attributes[0]['alias']] = $id; + $refs[$id] = new Reference($id); } } if (count($helpers) > 0) { $definition = $container->getDefinition('templating.engine.php'); $definition->addMethodCall('setHelpers', array($helpers)); + + if ($container->hasDefinition('templating.engine.php.helpers_locator')) { + $container->getDefinition('templating.engine.php.helpers_locator')->replaceArgument(0, $refs); + } } } } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php index ffc19c49dfeff..1ebb5562986ab 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php @@ -22,6 +22,7 @@ class UnusedTagsPass implements CompilerPassInterface { private $whitelist = array( + 'cache.pool.clearer', 'console.command', 'container.service_locator', 'container.service_subscriber', diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 16f13ac79ad51..3b59ec9ef4583 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -597,15 +597,15 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde } // Create Workflow + $workflowId = sprintf('%s.%s', $type, $name); $workflowDefinition = new ChildDefinition(sprintf('%s.abstract', $type)); - $workflowDefinition->replaceArgument(0, $definitionDefinition); + $workflowDefinition->replaceArgument(0, new Reference(sprintf('%s.definition', $workflowId))); if (isset($markingStoreDefinition)) { $workflowDefinition->replaceArgument(1, $markingStoreDefinition); } $workflowDefinition->replaceArgument(3, $name); // Store to container - $workflowId = sprintf('%s.%s', $type, $name); $container->setDefinition($workflowId, $workflowDefinition); $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition); @@ -680,7 +680,7 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con if (class_exists(Stopwatch::class)) { $container->register('debug.stopwatch', Stopwatch::class)->addArgument(true); - $container->setAlias(Stopwatch::class, 'debug.stopwatch'); + $container->setAlias(Stopwatch::class, new Alias('debug.stopwatch', false)); } $debug = $container->getParameter('kernel.debug'); diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php index 47129136d7920..ba117ceeb82a2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php @@ -106,7 +106,7 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new AddExpressionLanguageProvidersPass()); $this->addCompilerPassIfExists($container, TranslationExtractorPass::class); $this->addCompilerPassIfExists($container, TranslationDumperPass::class); - $container->addCompilerPass(new FragmentRendererPass(), PassConfig::TYPE_AFTER_REMOVING); + $container->addCompilerPass(new FragmentRendererPass()); $this->addCompilerPassIfExists($container, SerializerPass::class); $this->addCompilerPassIfExists($container, PropertyInfoPass::class); $container->addCompilerPass(new DataCollectorTranslatorPass()); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml index cc478a03eb349..0bdfbe24ea3bd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml @@ -9,7 +9,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml index 09a00c78e44a5..5eb7233592f65 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml @@ -9,12 +9,17 @@ - + %kernel.charset% + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 68d46c2c3facb..bc6c255f09d07 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -226,7 +226,7 @@ public function block(FormView $view, $blockName, array $variables = array()) * Check the token in your action using the same CSRF token id. * *


-     * $csrfProvider = $this->get('security.csrf.token_generator');
+     * // $csrfProvider being an instance of Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface
      * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
      *     throw new \RuntimeException('CSRF attack detected.');
      * }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
index 5df6e29590a5b..1df462992be30 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
@@ -21,10 +21,8 @@ class SubRequestController implements ContainerAwareInterface
 {
     use ContainerAwareTrait;
 
-    public function indexAction()
+    public function indexAction($handler)
     {
-        $handler = $this->container->get('fragment.handler');
-
         $errorUrl = $this->generateUrl('subrequest_fragment_error', array('_locale' => 'fr', '_format' => 'json'));
         $altUrl = $this->generateUrl('subrequest_fragment', array('_locale' => 'fr', '_format' => 'json'));
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml
index 65dd6c7fa91f1..ad6bdb691ca52 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml
@@ -1,2 +1,7 @@
 imports:
     - { resource: ./../config/default.yml }
+
+services:
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController:
+        tags:
+            - { name: controller.service_arguments, action: indexAction, argument: handler, id: fragment.handler }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index af0573e5a362d..25e352e7124ce 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -17,7 +17,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class WebProfilerExtensionTest extends TestCase
 {
@@ -51,6 +52,7 @@ protected function setUp()
         $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
+        $this->container->register('event_dispatcher', EventDispatcher::class);
         $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'));
         $this->container->register('twig', 'Twig\Environment');
         $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array());
@@ -66,6 +68,7 @@ protected function setUp()
             ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
         $this->container->setParameter('data_collector.templates', array());
         $this->container->set('kernel', $this->kernel);
+        $this->container->addCompilerPass(new RegisterListenersPass());
     }
 
     protected function tearDown()
@@ -88,7 +91,7 @@ public function testDefaultConfig($debug)
 
         $this->assertFalse($this->container->has('web_profiler.debug_toolbar'));
 
-        $this->assertSaneContainer($this->getDumpedContainer());
+        $this->assertSaneContainer($this->getCompiledContainer());
     }
 
     /**
@@ -101,7 +104,7 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
 
         $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
 
-        $this->assertSaneContainer($this->getDumpedContainer(), '', array('web_profiler.csp.handler'));
+        $this->assertSaneContainer($this->getCompiledContainer(), '', array('web_profiler.csp.handler'));
 
         if ($listenerInjected) {
             $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
@@ -118,19 +121,11 @@ public function getDebugModes()
         );
     }
 
-    private function getDumpedContainer()
+    private function getCompiledContainer()
     {
-        static $i = 0;
-        $class = 'WebProfilerExtensionTestContainer'.$i++;
-
         $this->container->compile();
+        $this->container->set('kernel', $this->kernel);
 
-        $dumper = new PhpDumper($this->container);
-        eval('?>'.$dumper->dump(array('class' => $class)));
-
-        $container = new $class();
-        $container->set('kernel', $this->kernel);
-
-        return $container;
+        return $this->container;
     }
 }
diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php
index f0f51e4f59251..34c7822455c19 100644
--- a/src/Symfony/Component/Form/FormRendererInterface.php
+++ b/src/Symfony/Component/Form/FormRendererInterface.php
@@ -76,7 +76,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
      * Check the token in your action using the same token ID.
      *
      * 
-     * $csrfProvider = $this->get('security.csrf.token_generator');
+     * // $csrfProvider being an instance of Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface
      * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
      *     throw new \RuntimeException('CSRF attack detected.');
      * }

From 3fdcb40df3bb5039022bce5581c31e6bac52c588 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Fri, 1 Sep 2017 10:02:44 -0400
Subject: [PATCH 0769/1099] [TwigBridge] Show Twig's loader paths on debug:twig
 command

---
 .../Bridge/Twig/Command/DebugCommand.php      | 52 ++++++++++++++++++-
 .../TwigBundle/Resources/config/console.xml   |  1 +
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index da98feb7632bb..258387173a540 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
 
 /**
  * Lists twig functions, filters, globals and tests present in the current project.
@@ -29,11 +30,13 @@ class DebugCommand extends Command
     protected static $defaultName = 'debug:twig';
 
     private $twig;
+    private $projectDir;
 
     /**
      * @param Environment $twig
+     * @param string|null $projectDir
      */
-    public function __construct($twig = null)
+    public function __construct($twig = null, $projectDir = null)
     {
         if (!$twig instanceof Environment) {
             @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
@@ -46,6 +49,7 @@ public function __construct($twig = null)
         parent::__construct();
 
         $this->twig = $twig;
+        $this->projectDir = $projectDir;
     }
 
     public function setTwigEnvironment(Environment $twig)
@@ -120,6 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
             $data['tests'] = array_keys($data['tests']);
+            $data['loader_paths'] = $this->getLoaderPaths();
             $io->writeln(json_encode($data));
 
             return 0;
@@ -145,9 +150,54 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $io->listing($items);
         }
 
+        $rows = array();
+        foreach ($this->getLoaderPaths() as $namespace => $paths) {
+            if (count($paths) > 1) {
+                $rows[] = array('', '');
+            }
+            foreach ($paths as $path) {
+                $rows[] = array($namespace, '- '.$path);
+                $namespace = '';
+            }
+            if (count($paths) > 1) {
+                $rows[] = array('', '');
+            }
+        }
+        array_pop($rows);
+        $io->section('Loader Paths');
+        $io->table(array('Namespace', 'Paths'), $rows);
+
         return 0;
     }
 
+    private function getLoaderPaths()
+    {
+        if (!($loader = $this->twig->getLoader()) instanceof FilesystemLoader) {
+            return array();
+        }
+
+        $loaderPaths = array();
+        foreach ($loader->getNamespaces() as $namespace) {
+            $paths = array_map(function ($path) use ($namespace) {
+                if (null !== $this->projectDir && 0 === strpos($path, $this->projectDir)) {
+                    $path = ltrim(substr($path, strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+                }
+
+                return $path;
+            }, $loader->getPaths($namespace));
+
+            if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {
+                $namespace = '(None)';
+            } else {
+                $namespace = '@'.$namespace;
+            }
+
+            $loaderPaths[$namespace] = $paths;
+        }
+
+        return $loaderPaths;
+    }
+
     private function getMetadata($type, $entity)
     {
         if ($type === 'globals') {
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml
index a8997823749fe..d716f309f451d 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml
@@ -9,6 +9,7 @@
 
         
             
+            %kernel.project_dir%
             
         
 

From 9cadeb8af2986f00134a5107e368f32b876aef91 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Tue, 5 Sep 2017 22:39:38 +0200
Subject: [PATCH 0770/1099] Don't use return on Assert::markTestSkipped.

---
 .../DependencyInjection/Tests/Loader/IniFileLoaderTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
index 003cd714b1fa9..d3c2dfc76fc5e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -51,7 +51,7 @@ public function testTypeConversions($key, $value, $supported)
     public function testTypeConversionsWithNativePhp($key, $value, $supported)
     {
         if (defined('HHVM_VERSION_ID')) {
-            return $this->markTestSkipped();
+            $this->markTestSkipped();
         }
 
         if (!$supported) {

From f8afe02a49b46a28254be1a988761825c9bdd9fb Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Wed, 6 Sep 2017 08:10:51 -0400
Subject: [PATCH 0771/1099] Add help description to debug:form command

---
 src/Symfony/Component/Form/Command/DebugCommand.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index 3cb4904ab3a7d..d646ffa154305 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -51,6 +51,16 @@ protected function configure()
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt or json)', 'txt'),
             ))
             ->setDescription('Displays form type information')
+            ->setHelp(<<<'EOF'
+The %command.name% command displays information about a form type.
+
+Either the fully-qualified class name or the short class name can be used:
+
+  php %command.full_name% Symfony\Component\Form\Extension\Core\Type\ChoiceType
+  php %command.full_name% ChoiceType
+
+EOF
+            )
         ;
     }
 

From cfc9346f660d6c8917a6e60a41935268e73a43b7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 10:30:21 +0200
Subject: [PATCH 0772/1099] [travis] update to trusty

---
 .travis.yml                                      |  8 ++------
 appveyor.yml                                     |  6 +++---
 src/Symfony/Bundle/SecurityBundle/composer.json  | 16 ++++++++--------
 .../Component/HttpFoundation/JsonResponse.php    |  4 ++--
 .../HttpFoundation/Tests/JsonResponseTest.php    |  7 +++++--
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b7ce58bd8ffbb..e01ab63ab3227 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 
-dist: precise
+dist: trusty
 sudo: false
 
 git:
@@ -13,17 +13,14 @@ addons:
 
 env:
     global:
-        - MIN_PHP=5.3.9
+        - MIN_PHP=5.4.9
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
 
 matrix:
     include:
-        # Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
         - php: hhvm-3.18
           sudo: required
-          dist: trusty
           group: edge
-        - php: 5.3
         - php: 5.4
         - php: 5.5
         - php: 5.6
@@ -99,7 +96,6 @@ before_install:
       echo opcache.enable_cli = 1 >> $INI
       echo hhvm.jit = 0 >> $INI
       echo apc.enable_cli = 1 >> $INI
-      echo extension = ldap.so >> $INI
       [[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
       if [[ $PHP = 5.* ]]; then
           echo extension = mongo.so >> $INI
diff --git a/appveyor.yml b/appveyor.yml
index ae43082f82fd8..6d869967263bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,8 +17,8 @@ init:
 install:
     - mkdir c:\php && cd c:\php
     - appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.3.11-nts-Win32-VC9-x86.zip
-    - 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.3.9-nts-Win32-VC9-x86.zip
+    - 7z x php-5.3.9-nts-Win32-VC9-x86.zip -y >nul
     - appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/ICU-51.2-dlls.zip
     - 7z x ICU-51.2-dlls.zip -y >nul
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
@@ -61,7 +61,7 @@ test_script:
     - cd c:\php && 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul && copy /Y php.ini-min php.ini
     - cd c:\projects\symfony
     - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
-    - cd c:\php && 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul && copy /Y php.ini-min php.ini
+    - cd c:\php && 7z x php-5.3.9-nts-Win32-VC9-x86.zip -y >nul && copy /Y php.ini-min php.ini
     - cd c:\projects\symfony
     - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
     - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 6d6073f7f0bc3..69091f5269c32 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -23,20 +23,20 @@
         "symfony/http-kernel": "~2.7"
     },
     "require-dev": {
-        "symfony/browser-kit": "~2.4",
+        "symfony/browser-kit": "~2.7",
         "symfony/console": "~2.7",
-        "symfony/css-selector": "^2.0.5",
-        "symfony/dependency-injection": "^2.6.6",
-        "symfony/dom-crawler": "^2.0.5",
+        "symfony/css-selector": "^2.7",
+        "symfony/dependency-injection": "^2.7",
+        "symfony/dom-crawler": "^2.7",
         "symfony/form": "~2.7.15|^2.8.8",
         "symfony/framework-bundle": "~2.7.25|^2.8.18",
         "symfony/http-foundation": "~2.7",
         "symfony/twig-bundle": "~2.7",
         "symfony/twig-bridge": "^2.7.4",
-        "symfony/process": "^2.0.5",
-        "symfony/validator": "~2.5",
-        "symfony/yaml": "^2.0.5",
-        "symfony/expression-language": "~2.6",
+        "symfony/process": "^2.7",
+        "symfony/validator": "~2.7",
+        "symfony/yaml": "^2.7",
+        "symfony/expression-language": "~2.7",
         "doctrine/doctrine-bundle": "~1.2",
         "twig/twig": "~1.34|~2.4",
         "ircmaxell/password-compat": "~1.0"
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index c6e0ba6541061..621c8410c2c21 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -121,7 +121,7 @@ public function setData($data = array())
             $data = json_encode($data, $this->encodingOptions);
         } else {
             try {
-                if (\PHP_VERSION_ID < 50400) {
+                if (!interface_exists('JsonSerializable', false)) {
                     // PHP 5.3 triggers annoying warnings for some
                     // types that can't be serialized as JSON (INF, resources, etc.)
                     // but doesn't provide the JsonSerializable interface.
@@ -153,7 +153,7 @@ public function setData($data = array())
                 if (\PHP_VERSION_ID < 50500) {
                     restore_error_handler();
                 }
-                if (\PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+                if (interface_exists('JsonSerializable', false) && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
                     throw $e->getPrevious() ?: $e;
                 }
                 throw $e;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
index 8156da06939e4..e15505cc6948e 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -206,10 +206,13 @@ public function testSetContent()
     /**
      * @expectedException \Exception
      * @expectedExceptionMessage This error is expected
-     * @requires PHP 5.4
      */
     public function testSetContentJsonSerializeError()
     {
+        if (!interface_exists('JsonSerializable', false)) {
+            $this->markTestSkipped('JsonSerializable is required.');
+        }
+
         $serializable = new JsonSerializableObject();
 
         JsonResponse::create($serializable);
@@ -224,7 +227,7 @@ public function testSetComplexCallback()
     }
 }
 
-if (interface_exists('JsonSerializable')) {
+if (interface_exists('JsonSerializable', false)) {
     class JsonSerializableObject implements \JsonSerializable
     {
         public function jsonSerialize()

From a0f9f2c53739ef336064e9e3d5ecd0c0d2046418 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 5 Sep 2017 19:39:30 +0200
Subject: [PATCH 0773/1099] check permissions if dump target dir is missing

`is_dir()` returns `false` if the parent directory misses the executable
bit even when the directory itself is present.
---
 src/Symfony/Component/Filesystem/Filesystem.php  | 10 ++++++++++
 .../Filesystem/Tests/FilesystemTest.php          | 16 ++++++++++++++++
 .../Filesystem/Tests/FilesystemTestCase.php      |  1 +
 3 files changed, 27 insertions(+)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index bc2e3dcc2d897..bbef48b466885 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -532,6 +532,16 @@ public function dumpFile($filename, $content, $mode = 0666)
         $dir = dirname($filename);
 
         if (!is_dir($dir)) {
+            $oldCwd = getcwd();
+
+            if (!@chdir(dirname($dir))) {
+                // When the parent directory misses the executable permission bit, we are unable to enter it and thus
+                // cannot check if the target directory exists.
+                throw new IOException(sprintf('Unable to detect if the target directory "%s" exists.', $dir));
+            }
+
+            chdir($oldCwd);
+
             $this->mkdir($dir);
         }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index b7bdfac4155e0..44eeceabd9f49 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1102,6 +1102,22 @@ public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
         $this->assertFilePermissions(745, $filename);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
+     * @expectedExceptionMessageRegExp /^Unable to detect if the target directory ".*" exists\.$/
+     */
+    public function testDumpFailsWithExceptionIfExecutablePermissionsForTheParentDirectoryAreMissing()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $target = $this->workspace.DIRECTORY_SEPARATOR.'foo';
+        $file = $target.DIRECTORY_SEPARATOR.'foobar';
+        mkdir($target);
+        chmod($this->workspace, 0666);
+
+        $this->filesystem->dumpFile($file, 'baz');
+    }
+
     public function testCopyShouldKeepExecutionPermission()
     {
         $this->markAsSkippedIfChmodIsMissing();
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
index 5586a00547a68..47598b29427da 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -61,6 +61,7 @@ protected function tearDown()
             $this->longPathNamesWindows = array();
         }
 
+        chmod($this->workspace, 0777);
         $this->filesystem->remove($this->workspace);
         umask($this->umask);
     }

From d1fe4153a16489d153e5660c8407789929d32ef1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 18:53:48 +0200
Subject: [PATCH 0774/1099] [HttpFoundation] Fix logic when JsonSerializable is
 missing

---
 .../Component/HttpFoundation/JsonResponse.php | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index 621c8410c2c21..8837175df8d10 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -127,30 +127,31 @@ public function setData($data = array())
                     // but doesn't provide the JsonSerializable interface.
                     set_error_handler(function () { return false; });
                     $data = @json_encode($data, $this->encodingOptions);
-                } else {
+                    restore_error_handler();
+                } elseif (\PHP_VERSION_ID < 50500) {
                     // PHP 5.4 and up wrap exceptions thrown by JsonSerializable
                     // objects in a new exception that needs to be removed.
                     // Fortunately, PHP 5.5 and up do not trigger any warning anymore.
-                    if (\PHP_VERSION_ID < 50500) {
-                        // Clear json_last_error()
-                        json_encode(null);
-                        $errorHandler = set_error_handler('var_dump');
-                        restore_error_handler();
-                        set_error_handler(function () use ($errorHandler) {
-                            if (JSON_ERROR_NONE === json_last_error()) {
-                                return $errorHandler && false !== call_user_func_array($errorHandler, func_get_args());
-                            }
-                        });
-                    }
-
+                    // Clear json_last_error()
+                    json_encode(null);
+                    $errorHandler = set_error_handler('var_dump');
+                    restore_error_handler();
+                    set_error_handler(function () use ($errorHandler) {
+                        if (JSON_ERROR_NONE === json_last_error()) {
+                            return $errorHandler && false !== call_user_func_array($errorHandler, func_get_args());
+                        }
+                    });
+                    $data = json_encode($data, $this->encodingOptions);
+                    restore_error_handler();
+                } else {
                     $data = json_encode($data, $this->encodingOptions);
                 }
-
-                if (\PHP_VERSION_ID < 50500) {
+            } catch (\Error $e) {
+                if (\PHP_VERSION_ID < 50500 || !interface_exists('JsonSerializable', false)) {
                     restore_error_handler();
                 }
             } catch (\Exception $e) {
-                if (\PHP_VERSION_ID < 50500) {
+                if (\PHP_VERSION_ID < 50500 || !interface_exists('JsonSerializable', false)) {
                     restore_error_handler();
                 }
                 if (interface_exists('JsonSerializable', false) && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {

From e4ce14d0737495ab76d3d580b79c9c8e5be6bf53 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 19:03:33 +0200
Subject: [PATCH 0775/1099] [travis] add ldap.so for php70

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e01ab63ab3227..1d31503dcbd77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,6 +120,11 @@ before_install:
 
     - |
       # Install extra PHP extensions
+      if [[ ! $skip && $PHP = 7.0 ]]; then
+          wget https://github.com/symfony/binary-utils/releases/download/v0.1/ldap-php70.tar.bz2
+          tar -xjf ldap-php70.tar.bz2
+          echo extension = $(pwd)/ldap.so >> $INI
+      fi
       if [[ ! $skip && $PHP = 5.* ]]; then
           ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
           tfold ext.memcached pecl install -f memcached-2.1.0 &&

From 07933655e868303a46db98475162aed9c872e500 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 19:21:48 +0200
Subject: [PATCH 0776/1099] [travis] fix minor php7.0 version

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5aa9c01c74ff..a9b4bb229554e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
           group: edge
         - php: 5.5
         - php: 5.6
-        - php: 7.0
+        - php: 7.0.8
           env: deps=high
         - php: 7.1
           env: deps=low
@@ -128,7 +128,7 @@ before_install:
 
     - |
       # Install extra PHP extensions
-      if [[ ! $skip && $PHP = 7.0 ]]; then
+      if [[ ! $skip && $PHP = 7.0.* ]]; then
           wget https://github.com/symfony/binary-utils/releases/download/v0.1/ldap-php70.tar.bz2
           tar -xjf ldap-php70.tar.bz2
           echo extension = $(pwd)/ldap.so >> $INI
@@ -197,10 +197,7 @@ install:
           elif [[ $deps = high ]]; then
               echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
           elif [[ $deps = low ]]; then
-              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'" &&
-              # Test the PhpUnit bridge on PHP 5.3, using the original phpunit script
-              tfold src/Symfony/Bridge/PhpUnit \
-              "cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar && phpenv global 5.3 && composer update --no-progress --ansi && php phpunit-4.8.phar"
+              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'"
           elif [[ $PHP = hhvm* ]]; then
               $PHPUNIT --exclude-group benchmark,intl-data
           else

From 73cdb68308670ea6e9caede76738aa31adbcf8b7 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Wed, 6 Sep 2017 15:05:48 -0400
Subject: [PATCH 0777/1099] Get KERNEL_CLASS through $_ENV too

---
 src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 26781cdf2285c..af8f4300f2961 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -106,8 +106,9 @@ private static function getPhpUnitCliConfigArgument()
      */
     protected static function getKernelClass()
     {
-        if (isset($_SERVER['KERNEL_CLASS'])) {
-            if (!class_exists($class = $_SERVER['KERNEL_CLASS'])) {
+        if (isset($_SERVER['KERNEL_CLASS']) || isset($_ENV['KERNEL_CLASS'])) {
+            $class = isset($_SERVER['KERNEL_CLASS']) ? $_SERVER['KERNEL_CLASS'] : $_ENV['KERNEL_CLASS'];
+            if (!class_exists($class)) {
                 throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the %s::createKernel() method.', $class, static::class));
             }
 

From 8015ad60ccf07b8a27c251197717c53fde5ff472 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 21:47:44 +0200
Subject: [PATCH 0778/1099] Fix merge

---
 .../Console/Tests/Fixtures/application_renderexception2.txt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index 9d0cacb81aedc..457e6df46c0a9 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -1,5 +1,5 @@
 
-In ArrayInput.php line 172:
+In ArrayInput.php line 178:
                                       
   The "--foo" option does not exist.  
                                       

From 367c4d981064170000d4799da9606ec69812c6bf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 22:50:21 +0200
Subject: [PATCH 0779/1099] Fix deps=low tests

---
 .../Tests/DependencyInjection/WebProfilerExtensionTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index 25e352e7124ce..cc229cd37fea9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 
 class WebProfilerExtensionTest extends TestCase
 {
@@ -52,7 +52,7 @@ protected function setUp()
         $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
-        $this->container->register('event_dispatcher', EventDispatcher::class);
+        $this->container->register('event_dispatcher', ContainerAwareEventDispatcher::class)->addArgument(new Reference('service_container'));
         $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'));
         $this->container->register('twig', 'Twig\Environment');
         $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array());

From 2fde0942ace81ae5f4481cd9a0a7998c42e9f10e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 6 Sep 2017 23:01:01 +0200
Subject: [PATCH 0780/1099] fix the fix

---
 .../Tests/DependencyInjection/WebProfilerExtensionTest.php    | 4 ++--
 src/Symfony/Bundle/WebProfilerBundle/composer.json            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index cc229cd37fea9..25e352e7124ce 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class WebProfilerExtensionTest extends TestCase
 {
@@ -52,7 +52,7 @@ protected function setUp()
         $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
-        $this->container->register('event_dispatcher', ContainerAwareEventDispatcher::class)->addArgument(new Reference('service_container'));
+        $this->container->register('event_dispatcher', EventDispatcher::class);
         $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'));
         $this->container->register('twig', 'Twig\Environment');
         $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array());
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index b7e2014c97348..c49d793016e04 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -32,7 +32,7 @@
     },
     "conflict": {
         "symfony/dependency-injection": "<3.3",
-        "symfony/event-dispatcher": "<3.2",
+        "symfony/event-dispatcher": "<3.3",
         "symfony/var-dumper": "<3.3"
     },
     "autoload": {

From cf11fb9652f6c41c986d740a20429a1523cb65a5 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Wed, 6 Sep 2017 18:24:46 -0400
Subject: [PATCH 0781/1099] Get KERNEL_DIR through $_ENV too for KernelTestCase

---
 src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 351a8cc80a15d..5dadca83f2e1b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -105,8 +105,8 @@ private static function getPhpUnitCliConfigArgument()
      */
     protected static function getKernelClass()
     {
-        if (isset($_SERVER['KERNEL_DIR'])) {
-            $dir = $_SERVER['KERNEL_DIR'];
+        if (isset($_SERVER['KERNEL_DIR']) || isset($_ENV['KERNEL_DIR'])) {
+            $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : $_ENV['KERNEL_DIR'];
 
             if (!is_dir($dir)) {
                 $phpUnitDir = static::getPhpUnitXmlDir();

From 1f92e459db0efd2576eaa63a4fa0fe39e68b32dd Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sat, 22 Oct 2016 18:25:15 +0200
Subject: [PATCH 0782/1099] [DI] Allow processing env vars

---
 .../FrameworkExtension.php                    |   3 +
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../Compiler/PassConfig.php                   |   1 +
 .../Compiler/RegisterEnvVarProcessorsPass.php |  72 +++++++
 .../DependencyInjection/Container.php         |  37 +++-
 .../DependencyInjection/ContainerBuilder.php  |  14 +-
 .../DependencyInjection/Dumper/PhpDumper.php  |  15 +-
 .../DependencyInjection/EnvVarProcessor.php   | 160 ++++++++++++++
 .../EnvVarProcessorInterface.php              |  38 ++++
 .../EnvPlaceholderParameterBag.php            |  21 +-
 .../RegisterEnvVarProcessorsPassTest.php      |  75 +++++++
 .../Tests/ContainerBuilderTest.php            |  64 ++++++
 .../Tests/Dumper/PhpDumperTest.php            | 110 +++++++++-
 .../Tests/Fixtures/array.json                 |   1 +
 .../Tests/Fixtures/php/services26.php         |  21 +-
 .../Fixtures/php/services_base64_env.php      | 167 +++++++++++++++
 .../Tests/Fixtures/php/services_rot13_env.php | 196 ++++++++++++++++++
 .../Tests/Fixtures/yaml/services26.yml        |   6 +
 18 files changed, 977 insertions(+), 25 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/array.json
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index d3d10fd97f4af..72d66442c62c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -36,6 +36,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -283,6 +284,8 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('console.command');
         $container->registerForAutoconfiguration(ResourceCheckerInterface::class)
             ->addTag('config_cache.resource_checker');
+        $container->registerForAutoconfiguration(EnvVarProcessorInterface::class)
+            ->addTag('container.env_var_processor');
         $container->registerForAutoconfiguration(ServiceSubscriberInterface::class)
             ->addTag('container.service_subscriber');
         $container->registerForAutoconfiguration(ArgumentValueResolverInterface::class)
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 4232369e2e007..09bc2ce361e36 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added `EnvVarProcessorInterface` and corresponding "container.env_var_processor" tag for processing env vars
  * added support for ignore-on-uninitialized references
  * deprecated service auto-registration while autowiring
  * deprecated the ability to check for the initialization of a private service with the `Container::initialized()` method
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 184c7b25a0883..63659ed8927c2 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -43,6 +43,7 @@ public function __construct()
             100 => array(
                 $resolveClassPass = new ResolveClassPass(),
                 new ResolveInstanceofConditionalsPass(),
+                new RegisterEnvVarProcessorsPass(),
             ),
         );
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
new file mode 100644
index 0000000000000..247f5b69ad40f
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -0,0 +1,72 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Creates the container.env_var_processors_locator service.
+ *
+ * @author Nicolas Grekas 
+ */
+class RegisterEnvVarProcessorsPass implements CompilerPassInterface
+{
+    private static $allowedTypes = array('array', 'bool', 'float', 'int', 'string');
+
+    public function process(ContainerBuilder $container)
+    {
+        $bag = $container->getParameterBag();
+        $types = array();
+        $processors = array();
+        foreach ($container->findTaggedServiceIds('container.env_var_processor') as $id => $tags) {
+            foreach ($tags as $attr) {
+                if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
+                    throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                } elseif (!$r->isSubclassOf(EnvVarProcessorInterface::class)) {
+                    throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EnvVarProcessorInterface::class));
+                }
+                foreach ($class::getProvidedTypes() as $prefix => $type) {
+                    $processors[$prefix] = new ServiceClosureArgument(new Reference($id));
+                    $types[$prefix] = self::validateProvidedTypes($type, $class);
+                }
+            }
+        }
+
+        if ($processors) {
+            if ($bag instanceof EnvPlaceholderParameterBag) {
+                $bag->setProvidedTypes($types);
+            }
+            $container->register('container.env_var_processors_locator', ServiceLocator::class)
+                ->setArguments(array($processors))
+            ;
+        }
+    }
+
+    private static function validateProvidedTypes($types, $class)
+    {
+        $types = explode('|', $types);
+
+        foreach ($types as $type) {
+            if (!in_array($type, self::$allowedTypes)) {
+                throw new InvalidArgumentException(sprintf('Invalid type "%s" returned by "%s::getProvidedTypes()", expected one of "%s".', $type, $class, implode('", "', self::$allowedTypes)));
+            }
+        }
+
+        return $types;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index ac423bd4a4739..75ba8a2bdb630 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -48,6 +49,7 @@ class Container implements ResettableContainerInterface
     protected $methodMap = array();
     protected $aliases = array();
     protected $loading = array();
+    protected $resolving = array();
 
     /**
      * @internal
@@ -62,6 +64,7 @@ class Container implements ResettableContainerInterface
     private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
     private $envCache = array();
     private $compiled = false;
+    private $getEnv;
 
     /**
      * @param ParameterBagInterface $parameterBag A ParameterBagInterface instance
@@ -438,23 +441,37 @@ protected function load($file)
      */
     protected function getEnv($name)
     {
+        if (isset($this->resolving[$envName = "env($name)"])) {
+            throw new ParameterCircularReferenceException(array_keys($this->resolving));
+        }
         if (isset($this->envCache[$name]) || array_key_exists($name, $this->envCache)) {
             return $this->envCache[$name];
         }
-        if (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
-            return $this->envCache[$name] = $_SERVER[$name];
-        }
-        if (isset($_ENV[$name])) {
-            return $this->envCache[$name] = $_ENV[$name];
+        if (!$this->has($id = 'container.env_var_processors_locator')) {
+            $this->set($id, new ServiceLocator(array()));
         }
-        if (false !== ($env = getenv($name)) && null !== $env) { // null is a possible value because of thread safety issues
-            return $this->envCache[$name] = $env;
+        if (!$this->getEnv) {
+            $this->getEnv = new \ReflectionMethod($this, __FUNCTION__);
+            $this->getEnv->setAccessible(true);
+            $this->getEnv = $this->getEnv->getClosure($this);
         }
-        if (!$this->hasParameter("env($name)")) {
-            throw new EnvNotFoundException($name);
+        $processors = $this->get($id);
+
+        if (false !== $i = strpos($name, ':')) {
+            $prefix = substr($name, 0, $i);
+            $localName = substr($name, 1 + $i);
+        } else {
+            $prefix = 'string';
+            $localName = $name;
         }
+        $processor = $processors->has($prefix) ? $processors->get($prefix) : new EnvVarProcessor($this);
 
-        return $this->envCache[$name] = $this->getParameter("env($name)");
+        $this->resolving[$envName] = true;
+        try {
+            return $this->envCache[$name] = $processor->getEnv($prefix, $localName, $this->getEnv);
+        } finally {
+            unset($this->resolving[$envName]);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 2b8dfd6a3e520..63a7c2b33176b 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1472,20 +1472,26 @@ public static function hash($value)
     protected function getEnv($name)
     {
         $value = parent::getEnv($name);
+        $bag = $this->getParameterBag();
 
-        if (!is_string($value) || !$this->getParameterBag() instanceof EnvPlaceholderParameterBag) {
+        if (!is_string($value) || !$bag instanceof EnvPlaceholderParameterBag) {
             return $value;
         }
 
-        foreach ($this->getParameterBag()->getEnvPlaceholders() as $env => $placeholders) {
+        foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
             if (isset($placeholders[$value])) {
-                $bag = new ParameterBag($this->getParameterBag()->all());
+                $bag = new ParameterBag($bag->all());
 
                 return $bag->unescapeValue($bag->get("env($name)"));
             }
         }
 
-        return $value;
+        $this->resolving["env($name)"] = true;
+        try {
+            return $bag->unescapeValue($this->resolveEnvPlaceholders($bag->escapeValue($value), true));
+        } finally {
+            unset($this->resolving["env($name)"]);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2f70d59d819ec..87835ee44008e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1112,7 +1112,7 @@ private function addDefaultParametersMethod()
             $export = $this->exportParameters(array($value));
             $export = explode('0 => ', substr(rtrim($export, " )\n"), 7, -1), 2);
 
-            if (preg_match("/\\\$this->(?:getEnv\('\w++'\)|targetDirs\[\d++\])/", $export[1])) {
+            if (preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)|targetDirs\[\d++\])/", $export[1])) {
                 $dynamicPhp[$key] = sprintf('%scase %s: $value = %s; break;', $export[0], $this->export($key), $export[1]);
             } else {
                 $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
@@ -1685,7 +1685,7 @@ private function dumpParameter($name)
                 return $dumpedValue;
             }
 
-            if (!preg_match("/\\\$this->(?:getEnv\('\w++'\)|targetDirs\[\d++\])/", $dumpedValue)) {
+            if (!preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)|targetDirs\[\d++\])/", $dumpedValue)) {
                 return sprintf("\$this->parameters['%s']", $name);
             }
         }
@@ -1880,13 +1880,16 @@ private function doExport($value)
     {
         $export = var_export($value, true);
 
-        if ("'" === $export[0] && $export !== $resolvedExport = $this->container->resolveEnvPlaceholders($export, "'.\$this->getEnv('%s').'")) {
+        if ("'" === $export[0] && $export !== $resolvedExport = $this->container->resolveEnvPlaceholders($export, "'.\$this->getEnv('string:%s').'")) {
             $export = $resolvedExport;
-            if ("'" === $export[1]) {
-                $export = substr($export, 3);
-            }
             if (".''" === substr($export, -3)) {
                 $export = substr($export, 0, -3);
+                if ("'" === $export[1]) {
+                    $export = substr_replace($export, '', 18, 7);
+                }
+            }
+            if ("'" === $export[1]) {
+                $export = substr($export, 3);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
new file mode 100644
index 0000000000000..51a19367e2179
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -0,0 +1,160 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection;
+
+use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
+class EnvVarProcessor implements EnvVarProcessorInterface
+{
+    private $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getProvidedTypes()
+    {
+        return array(
+            'base64' => 'string',
+            'bool' => 'bool',
+            'const' => 'bool|int|float|string|array',
+            'file' => 'string',
+            'float' => 'float',
+            'int' => 'int',
+            'json' => 'array',
+            'resolve' => 'string',
+            'string' => 'string',
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEnv($prefix, $name, \Closure $getEnv)
+    {
+        $i = strpos($name, ':');
+
+        if ('file' === $prefix) {
+            if (!is_scalar($file = $getEnv($name))) {
+                throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
+            }
+            if (!file_exists($file)) {
+                throw new RuntimeException(sprintf('Env "file:%s" not found: %s does not exist.', $name, $file));
+            }
+
+            return file_get_contents($file);
+        }
+
+        if (false !== $i || 'string' !== $prefix) {
+            if (null === $env = $getEnv($name)) {
+                return;
+            }
+        } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
+            $env = $_SERVER[$name];
+        } elseif (isset($_ENV[$name])) {
+            $env = $_ENV[$name];
+        } elseif (false === ($env = getenv($name)) || null === $env) { // null is a possible value because of thread safety issues
+            if (!$this->container->hasParameter("env($name)")) {
+                throw new EnvNotFoundException($name);
+            }
+
+            if (null === $env = $this->container->getParameter("env($name)")) {
+                return;
+            }
+        }
+
+        if (!is_scalar($env)) {
+            throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to %s.', $name, $prefix));
+        }
+
+        if ('string' === $prefix) {
+            return (string) $env;
+        }
+
+        if ('bool' === $prefix) {
+            return (bool) self::phpize($env);
+        }
+
+        if ('int' === $prefix) {
+            if (!is_numeric($env = self::phpize($env))) {
+                throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
+            }
+
+            return (int) $env;
+        }
+
+        if ('float' === $prefix) {
+            if (!is_numeric($env = self::phpize($env))) {
+                throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
+            }
+
+            return (float) $env;
+        }
+
+        if ('const' === $prefix) {
+            if (!defined($env)) {
+                throw new RuntimeException(sprintf('Env var "%s" maps to undefined constant "%s".', $name, $env));
+            }
+
+            return constant($name);
+        }
+
+        if ('base64' === $prefix) {
+            return base64_decode($env);
+        }
+
+        if ('json' === $prefix) {
+            $env = json_decode($env, true, JSON_BIGINT_AS_STRING);
+
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                throw new RuntimeException(sprintf('Invalid JSON in env var "%s": '.json_last_error_msg(), $name));
+            }
+
+            if (!is_array($env)) {
+                throw new RuntimeException(sprintf('Invalid JSON env var "%s": array expected, %s given.', $name, gettype($env)));
+            }
+
+            return $env;
+        }
+
+        if ('resolve' === $prefix) {
+            return preg_replace_callback('/%%|%([^%\s]+)%/', function ($match) use ($name) {
+                if (!isset($match[1])) {
+                    return '%';
+                }
+                $value = $this->container->getParameter($match[1]);
+                if (!is_scalar($value)) {
+                    throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, gettype($value)));
+                }
+
+                return $value;
+            }, $env);
+        }
+
+        throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
+    }
+
+    private static function phpize($value)
+    {
+        if (!class_exists(XmlUtils::class)) {
+            throw new RuntimeException('The Symfony Config component is required to cast env vars to "bool", "int" or "float".');
+        }
+
+        return XmlUtils::phpize($value);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
new file mode 100644
index 0000000000000..fce9f5cd7a998
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
@@ -0,0 +1,38 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection;
+
+/**
+ * The EnvVarProcessorInterface is implemented by objects that manage environment-like variables.
+ *
+ * @author Nicolas Grekas 
+ */
+interface EnvVarProcessorInterface
+{
+    /**
+     * Returns the value of the given variable as managed by the current instance.
+     *
+     * @param string   $prefix The namespace of the variable
+     * @param string   $name   The name of the variable within the namespace
+     * @param \Closure $getEnv A closure that allows fetching more env vars
+     *
+     * @return mixed
+     *
+     * @throws RuntimeException on error
+     */
+    public function getEnv($prefix, $name, \Closure $getEnv);
+
+    /**
+     * @return string[] The PHP-types managed by getEnv(), keyed by prefixes
+     */
+    public static function getProvidedTypes();
+}
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
index fd859068be33c..e0fe4c7cdfc57 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -20,6 +20,7 @@
 class EnvPlaceholderParameterBag extends ParameterBag
 {
     private $envPlaceholders = array();
+    private $providedTypes = array();
 
     /**
      * {@inheritdoc}
@@ -34,7 +35,7 @@ public function get($name)
                     return $placeholder; // return first result
                 }
             }
-            if (preg_match('/\W/', $env)) {
+            if (!preg_match('/^(?:\w++:)*+\w++$/', $env)) {
                 throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
             }
 
@@ -80,6 +81,24 @@ public function mergeEnvPlaceholders(self $bag)
         }
     }
 
+    /**
+     * Maps env prefixes to their corresponding PHP types.
+     */
+    public function setProvidedTypes(array $providedTypes)
+    {
+        $this->providedTypes = $providedTypes;
+    }
+
+    /**
+     * Gets the PHP types corresponding to env() parameter prefixes.
+     *
+     * @return string[][]
+     */
+    public function getProvidedTypes()
+    {
+        return $this->providedTypes;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
new file mode 100644
index 0000000000000..dc3a1f1834f5e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -0,0 +1,75 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\RegisterEnvVarProcessorsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+
+class RegisterEnvVarProcessorsPassTest extends TestCase
+{
+    public function testSimpleProcessor()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', SimpleProcessor::class)->addTag('container.env_var_processor');
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+
+        $this->assertTrue($container->has('container.env_var_processors_locator'));
+        $this->assertInstanceof(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
+
+        $this->assertSame(array('foo' => array('string')), $container->getParameterBag()->getProvidedTypes());
+    }
+
+    public function testNoProcessor()
+    {
+        $container = new ContainerBuilder();
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+
+        $this->assertFalse($container->has('container.env_var_processors_locator'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid type "foo" returned by "Symfony\Component\DependencyInjection\Tests\Compiler\BadProcessor::getProvidedTypes()", expected one of "array", "bool", "float", "int", "string".
+     */
+    public function testBadProcessor()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', BadProcessor::class)->addTag('container.env_var_processor');
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+    }
+}
+
+class SimpleProcessor implements EnvVarProcessorInterface
+{
+    public function getEnv($prefix, $name, \Closure $getEnv)
+    {
+        return $getEnv($name);
+    }
+
+    public static function getProvidedTypes()
+    {
+        return array('foo' => 'string');
+    }
+}
+
+class BadProcessor extends SimpleProcessor
+{
+    public static function getProvidedTypes()
+    {
+        return array('foo' => 'string|foo');
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 54e3227d23f18..d074189cbeab7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -665,6 +665,70 @@ public function testCompileWithResolveMissingEnv()
         $container->compile(true);
     }
 
+    public function testDynamicEnv()
+    {
+        putenv('DUMMY_FOO=some%foo%');
+        putenv('DUMMY_BAR=%bar%');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', 'Foo%env(resolve:DUMMY_BAR)%');
+        $container->setParameter('bar', 'Bar');
+        $container->setParameter('baz', '%env(resolve:DUMMY_FOO)%');
+
+        $container->compile(true);
+        putenv('DUMMY_FOO');
+        putenv('DUMMY_BAR');
+
+        $this->assertSame('someFooBar', $container->getParameter('baz'));
+    }
+
+    public function testCastEnv()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FAKE)', '123');
+
+        $container->register('foo', 'stdClass')->setProperties(array(
+            'fake' => '%env(int:FAKE)%',
+        ));
+
+        $container->compile(true);
+
+        $this->assertSame(123, $container->get('foo')->fake);
+    }
+
+    public function testEnvAreNullable()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FAKE)', null);
+
+        $container->register('foo', 'stdClass')->setProperties(array(
+            'fake' => '%env(int:FAKE)%',
+        ));
+
+        $container->compile(true);
+
+        $this->assertNull($container->get('foo')->fake);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException
+     * @expectedExceptionMessage Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").
+     */
+    public function testCircularDynamicEnv()
+    {
+        putenv('DUMMY_ENV_VAR=some%foo%');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%bar%');
+        $container->setParameter('bar', '%env(resolve:DUMMY_ENV_VAR)%');
+
+        try {
+            $container->compile(true);
+        } finally {
+            putenv('DUMMY_ENV_VAR');
+        }
+    }
+
     /**
      * @expectedException \LogicException
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 62213ee2804bc..ac8aee2fc596c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator;
@@ -338,13 +339,82 @@ public function testDumpAutowireData()
 
     public function testEnvParameter()
     {
+        $rand = mt_rand();
+        putenv('Baz='.$rand);
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services26.yml');
+        $container->setParameter('env(json_file)', self::$fixturesPath.'/array.json');
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(), '->dump() dumps inline definitions which reference service_container');
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php')));
+
+        require self::$fixturesPath.'/php/services26.php';
+        $container = new \Symfony_DI_PhpDumper_Test_EnvParameters();
+        $this->assertSame($rand, $container->getParameter('baz'));
+        $this->assertSame(array(123, 'abc'), $container->getParameter('json'));
+        $this->assertSame('sqlite:///foo/bar/var/data.db', $container->getParameter('db_dsn'));
+        putenv('Baz');
+    }
+
+    public function testResolvedBase64EnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', base64_encode('world'));
+        $container->setParameter('hello', '%env(base64:foo)%');
+        $container->compile(true);
+
+        $expected = array(
+          'env(foo)' => 'd29ybGQ=',
+          'hello' => 'world',
+        );
+        $this->assertSame($expected, $container->getParameterBag()->all());
+    }
+
+    public function testDumpedBase64EnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', base64_encode('world'));
+        $container->setParameter('hello', '%env(base64:foo)%');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_base64_env.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Base64Parameters')));
+
+        require self::$fixturesPath.'/php/services_base64_env.php';
+        $container = new \Symfony_DI_PhpDumper_Test_Base64Parameters();
+        $this->assertSame('world', $container->getParameter('hello'));
+    }
+
+    public function testCustomEnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', str_rot13('world'));
+        $container->setParameter('hello', '%env(rot13:foo)%');
+        $container->register(Rot13EnvVarProcessor::class)->addTag('container.env_var_processor');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_rot13_env.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Rot13Parameters')));
+
+        require self::$fixturesPath.'/php/services_rot13_env.php';
+        $container = new \Symfony_DI_PhpDumper_Test_Rot13Parameters();
+        $this->assertSame('world', $container->getParameter('hello'));
+    }
+
+    public function testFileEnvProcessor()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', __FILE__);
+        $container->setParameter('random', '%env(file:foo)%');
+        $container->compile(true);
+
+        $this->assertStringEqualsFile(__FILE__, $container->getParameter('random'));
     }
 
     /**
@@ -360,6 +430,31 @@ public function testUnusedEnvParameter()
         $dumper->dump();
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException
+     * @expectedExceptionMessage Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").
+     */
+    public function testCircularDynamicEnv()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%bar%');
+        $container->setParameter('bar', '%env(resolve:DUMMY_ENV_VAR)%');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(array('class' => $class = __FUNCTION__));
+
+        eval('?>'.$dump);
+        $container = new $class();
+
+        putenv('DUMMY_ENV_VAR=%foo%');
+        try {
+            $container->getParameter('bar');
+        } finally {
+            putenv('DUMMY_ENV_VAR');
+        }
+    }
+
     public function testInlinedDefinitionReferencingServiceContainer()
     {
         $container = new ContainerBuilder();
@@ -748,3 +843,16 @@ public function testParameterWithLowerCase()
         $this->assertSame('bar', $container->getParameter('FOO'));
     }
 }
+
+class Rot13EnvVarProcessor implements EnvVarProcessorInterface
+{
+    public function getEnv($prefix, $name, \Closure $getEnv)
+    {
+        return str_rot13($getEnv($name));
+    }
+
+    public static function getProvidedTypes()
+    {
+        return array('rot13' => 'string');
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/array.json b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/array.json
new file mode 100644
index 0000000000000..dc27f0fa15907
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/array.json
@@ -0,0 +1 @@
+[123, "abc"]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index 0998b23a75b9a..3a38cff1a1539 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -9,14 +9,14 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer.
+ * Symfony_DI_PhpDumper_Test_EnvParameters.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  *
  * @final since Symfony 3.3
  */
-class ProjectServiceContainer extends Container
+class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
 {
     private $parameters;
     private $targetDirs = array();
@@ -26,6 +26,10 @@ class ProjectServiceContainer extends Container
      */
     public function __construct()
     {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = dirname($dir);
+        }
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
@@ -71,7 +75,7 @@ protected function getTestService()
     {
         $class = $this->getEnv('FOO');
 
-        return $this->services['test'] = new $class($this->getEnv('Bar'), 'foo'.$this->getEnv('FOO').'baz');
+        return $this->services['test'] = new $class($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
     }
 
     /**
@@ -129,6 +133,10 @@ public function getParameterBag()
 
     private $loadedDynamicParameters = array(
         'bar' => false,
+        'baz' => false,
+        'json' => false,
+        'db_dsn' => false,
+        'env(json_file)' => false,
     );
     private $dynamicParameters = array();
 
@@ -145,6 +153,10 @@ private function getDynamicParameter($name)
     {
         switch ($name) {
             case 'bar': $value = $this->getEnv('FOO'); break;
+            case 'baz': $value = $this->getEnv('int:Baz'); break;
+            case 'json': $value = $this->getEnv('json:file:json_file'); break;
+            case 'db_dsn': $value = $this->getEnv('resolve:DB'); break;
+            case 'env(json_file)': $value = ($this->targetDirs[1].'/array.json'); break;
             default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
         }
         $this->loadedDynamicParameters[$name] = true;
@@ -154,6 +166,7 @@ private function getDynamicParameter($name)
 
     private $normalizedParameterNames = array(
         'env(foo)' => 'env(FOO)',
+        'env(db)' => 'env(DB)',
     );
 
     private function normalizeParameterName($name)
@@ -178,7 +191,9 @@ private function normalizeParameterName($name)
     protected function getDefaultParameters()
     {
         return array(
+            'project_dir' => '/foo/bar',
             'env(FOO)' => 'foo',
+            'env(DB)' => 'sqlite://%project_dir%/var/data.db',
         );
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
new file mode 100644
index 0000000000000..4f4c7e79df38b
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -0,0 +1,167 @@
+parameters = $this->getDefaultParameters();
+
+        $this->services = array();
+
+        $this->aliases = array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParameter($name)
+    {
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasParameter($name)
+    {
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = array(
+        'hello' => false,
+    );
+    private $dynamicParameters = array();
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'hello': $value = $this->getEnv('base64:foo'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = array();
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since version 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return array(
+            'env(foo)' => 'd29ybGQ=',
+        );
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
new file mode 100644
index 0000000000000..2e08cdcb42f92
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -0,0 +1,196 @@
+parameters = $this->getDefaultParameters();
+
+        $this->services = array();
+        $this->normalizedIds = array(
+            'symfony\\component\\dependencyinjection\\tests\\dumper\\rot13envvarprocessor' => 'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor',
+        );
+        $this->methodMap = array(
+            'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor' => 'getRot13EnvVarProcessorService',
+            'container.env_var_processors_locator' => 'getContainer_EnvVarProcessorsLocatorService',
+        );
+
+        $this->aliases = array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor
+     */
+    protected function getRot13EnvVarProcessorService()
+    {
+        return $this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
+    }
+
+    /**
+     * Gets the public 'container.env_var_processors_locator' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\ServiceLocator
+     */
+    protected function getContainer_EnvVarProcessorsLocatorService()
+    {
+        return $this->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\ServiceLocator(array('rot13' => function () {
+            return ${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] : $this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor()) && false ?: '_'};
+        }));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParameter($name)
+    {
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasParameter($name)
+    {
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = array(
+        'hello' => false,
+    );
+    private $dynamicParameters = array();
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'hello': $value = $this->getEnv('rot13:foo'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = array();
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since version 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return array(
+            'env(foo)' => 'jbeyq',
+        );
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
index 2ef23c1af545f..d573e810dbe23 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
@@ -1,6 +1,11 @@
 parameters:
+    project_dir: '/foo/bar'
     env(FOO): foo
+    env(DB): 'sqlite://%%project_dir%%/var/data.db'
     bar: '%env(FOO)%'
+    baz: '%env(int:Baz)%'
+    json: '%env(json:file:json_file)%'
+    db_dsn: '%env(resolve:DB)%'
 
 services:
     test:
@@ -8,3 +13,4 @@ services:
         arguments:
             - '%env(Bar)%'
             - 'foo%bar%baz'
+            - '%baz%'

From b884c6612d80f723e5954a53c7d5e84c2d8ae61f Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Thu, 7 Sep 2017 10:19:55 +0200
Subject: [PATCH 0783/1099] Throw a meaningful exception when an undefined user
 provider is used inside a firewall

---
 .../DependencyInjection/SecurityExtension.php | 16 ++++++++++++---
 .../CompleteConfigurationTest.php             | 18 +++++++++++++++++
 .../php/firewall_undefined_provider.php       | 17 ++++++++++++++++
 .../php/listener_undefined_provider.php       | 16 +++++++++++++++
 .../xml/firewall_undefined_provider.xml       | 20 +++++++++++++++++++
 .../xml/listener_undefined_provider.xml       | 20 +++++++++++++++++++
 .../yml/firewall_undefined_provider.yml       | 10 ++++++++++
 .../yml/listener_undefined_provider.yml       | 10 ++++++++++
 8 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index dffe9d36879b2..adfe5b235752b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -332,6 +332,9 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         // Provider id (take the first registered provider if none defined)
         if (isset($firewall['provider'])) {
             $defaultProvider = $this->getUserProviderId($firewall['provider']);
+            if (!in_array($defaultProvider, $providerIds, true)) {
+                throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall['provider']));
+            }
         } else {
             $defaultProvider = reset($providerIds);
         }
@@ -422,7 +425,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         $configuredEntryPoint = isset($firewall['entry_point']) ? $firewall['entry_point'] : null;
 
         // Authentication listeners
-        list($authListeners, $defaultEntryPoint) = $this->createAuthenticationListeners($container, $id, $firewall, $authenticationProviders, $defaultProvider, $configuredEntryPoint);
+        list($authListeners, $defaultEntryPoint) = $this->createAuthenticationListeners($container, $id, $firewall, $authenticationProviders, $defaultProvider, $providerIds, $configuredEntryPoint);
 
         $config->replaceArgument(7, $configuredEntryPoint ?: $defaultEntryPoint);
 
@@ -477,7 +480,7 @@ private function createContextListener($container, $contextKey)
         return $this->contextListeners[$contextKey] = $listenerId;
     }
 
-    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, $defaultEntryPoint)
+    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $providerIds, $defaultEntryPoint)
     {
         $listeners = array();
         $hasListeners = false;
@@ -487,7 +490,14 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
                 $key = str_replace('-', '_', $factory->getKey());
 
                 if (isset($firewall[$key])) {
-                    $userProvider = isset($firewall[$key]['provider']) ? $this->getUserProviderId($firewall[$key]['provider']) : $defaultProvider;
+                    if (isset($firewall[$key]['provider'])) {
+                        if (!in_array($firewall[$key]['provider'], $providerIds, true)) {
+                            throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall[$key]['provider']));
+                        }
+                        $userProvider = $this->getUserProviderId($firewall[$key]['provider']);
+                    } else {
+                        $userProvider = $defaultProvider;
+                    }
 
                     list($provider, $listenerId, $defaultEntryPoint) = $factory->create($container, $id, $firewall[$key], $userProvider, $defaultEntryPoint);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 4f000d3aee0f8..202107a57abf2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -387,6 +387,24 @@ public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSame
         $container = $this->getContainer('access_decision_manager_service_and_strategy');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Invalid firewall "main": user provider "undefined" not found.
+     */
+    public function testFirewallUndefinedUserProvider()
+    {
+        $this->getContainer('firewall_undefined_provider');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Invalid firewall "main": user provider "undefined" not found.
+     */
+    public function testFirewallListenerUndefinedProvider()
+    {
+        $this->getContainer('listener_undefined_provider');
+    }
+
     protected function getContainer($file)
     {
         $file = $file.'.'.$this->getFileExtension();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
new file mode 100644
index 0000000000000..78d461efe38d1
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
@@ -0,0 +1,17 @@
+loadFromExtension('security', array(
+    'providers' => array(
+        'default' => array(
+            'memory' => array(
+                'users' => array('foo' => array('password' => 'foo', 'roles' => 'ROLE_USER')),
+            ),
+        ),
+    ),
+    'firewalls' => array(
+        'main' => array(
+            'provider' => 'undefined',
+            'form_login' => true,
+        ),
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
new file mode 100644
index 0000000000000..da54f025d1a70
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
@@ -0,0 +1,16 @@
+loadFromExtension('security', array(
+    'providers' => array(
+        'default' => array(
+            'memory' => array(
+                'users' => array('foo' => array('password' => 'foo', 'roles' => 'ROLE_USER')),
+            ),
+        ),
+    ),
+    'firewalls' => array(
+        'main' => array(
+            'form_login' => array('provider' => 'undefined'),
+        ),
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
new file mode 100644
index 0000000000000..f596ac5a6240b
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
@@ -0,0 +1,20 @@
+
+
+
+
+    
+        
+            
+        
+
+        
+            
+                
+            
+        
+    
+
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
new file mode 100644
index 0000000000000..725e85a1d0f27
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
@@ -0,0 +1,20 @@
+
+
+
+
+    
+        
+            
+        
+
+        
+            
+                
+            
+        
+    
+
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
new file mode 100644
index 0000000000000..ec2664054009c
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
@@ -0,0 +1,10 @@
+security:
+    providers:
+        default:
+            memory:
+                users: { foo: { password: foo, roles: ROLE_USER } }
+
+    firewalls:
+        main:
+            provider: undefined
+            form_login: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml
new file mode 100644
index 0000000000000..1916df4c2e7ca
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml
@@ -0,0 +1,10 @@
+security:
+    providers:
+        default:
+            memory:
+                users: { foo: { password: foo, roles: ROLE_USER } }
+
+    firewalls:
+        main:
+            form_login:
+                provider: undefined

From a7f98c60d93bad22bc36fbf308dcb4d46cdda9e3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 7 Sep 2017 10:34:20 +0200
Subject: [PATCH 0784/1099] [DI] rename ResolveDefinitionTemplatesPass to
 ResolveChildDefinitionsPass

---
 UPGRADE-3.4.md                                |   3 +
 UPGRADE-4.0.md                                |   3 +
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../Compiler/PassConfig.php                   |   2 +-
 .../Compiler/ResolveChildDefinitionsPass.php  | 183 ++++++++
 .../ResolveDefinitionTemplatesPass.php        | 166 +------
 .../ResolveChildDefinitionsPassTest.php       | 413 ++++++++++++++++++
 .../ResolveDefinitionTemplatesPassTest.php    |   3 +
 .../ResolveInstanceofConditionalsPassTest.php |  12 +-
 9 files changed, 620 insertions(+), 166 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 5b55f2ece170c..20114937efc26 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -52,6 +52,9 @@ DependencyInjection
 
  * Case insensitivity of parameter names is deprecated and will be removed in 4.0.
 
+ * The `ResolveDefinitionTemplatesPass` class is deprecated and will be removed in 4.0.
+   Use the `ResolveChildDefinitionsPass` class instead.
+
 Debug
 -----
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 219bc8f807dd7..5d404598f7ec0 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -159,6 +159,9 @@ DependencyInjection
  * The `DefinitionDecorator` class has been removed. Use the `ChildDefinition`
    class instead.
 
+ * The `ResolveDefinitionTemplatesPass` class has been removed.
+   Use the `ResolveChildDefinitionsPass` class instead.
+
  * Using unsupported configuration keys in YAML configuration files raises an
    exception.
 
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 4232369e2e007..c6258405b1a34 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * deprecated the ability to check for the initialization of a private service with the `Container::initialized()` method
  * deprecated support for top-level anonymous services in XML
  * deprecated case insensitivity of parameter names
+ * deprecated the `ResolveDefinitionTemplatesPass` class in favor of `ResolveChildDefinitionsPass`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 184c7b25a0883..f016ac64df205 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -48,7 +48,7 @@ public function __construct()
 
         $this->optimizationPasses = array(array(
             new ExtensionCompilerPass(),
-            new ResolveDefinitionTemplatesPass(),
+            new ResolveChildDefinitionsPass(),
             new ServiceLocatorTagPass(),
             new DecoratorServicePass(),
             new ResolveParameterPlaceHoldersPass(false),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
new file mode 100644
index 0000000000000..4e09ae630f52c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -0,0 +1,183 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
+/**
+ * This replaces all ChildDefinition instances with their equivalent fully
+ * merged Definition instance.
+ *
+ * @author Johannes M. Schmitt 
+ * @author Nicolas Grekas 
+ */
+class ResolveChildDefinitionsPass extends AbstractRecursivePass
+{
+    protected function processValue($value, $isRoot = false)
+    {
+        if (!$value instanceof Definition) {
+            return parent::processValue($value, $isRoot);
+        }
+        if ($isRoot) {
+            // yes, we are specifically fetching the definition from the
+            // container to ensure we are not operating on stale data
+            $value = $this->container->getDefinition($this->currentId);
+        }
+        if ($value instanceof ChildDefinition) {
+            $value = $this->resolveDefinition($value);
+            if ($isRoot) {
+                $this->container->setDefinition($this->currentId, $value);
+            }
+        }
+
+        return parent::processValue($value, $isRoot);
+    }
+
+    /**
+     * Resolves the definition.
+     *
+     * @return Definition
+     *
+     * @throws RuntimeException When the definition is invalid
+     */
+    private function resolveDefinition(ChildDefinition $definition)
+    {
+        try {
+            return $this->doResolveDefinition($definition);
+        } catch (ExceptionInterface $e) {
+            $r = new \ReflectionProperty($e, 'message');
+            $r->setAccessible(true);
+            $r->setValue($e, sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
+
+            throw $e;
+        }
+    }
+
+    private function doResolveDefinition(ChildDefinition $definition)
+    {
+        if (!$this->container->has($parent = $definition->getParent())) {
+            throw new RuntimeException(sprintf('Parent definition "%s" does not exist.', $parent));
+        }
+
+        $parentDef = $this->container->findDefinition($parent);
+        if ($parentDef instanceof ChildDefinition) {
+            $id = $this->currentId;
+            $this->currentId = $parent;
+            $parentDef = $this->resolveDefinition($parentDef);
+            $this->container->setDefinition($parent, $parentDef);
+            $this->currentId = $id;
+        }
+
+        $this->container->log($this, sprintf('Resolving inheritance for "%s" (parent: %s).', $this->currentId, $parent));
+        $def = new Definition();
+
+        // merge in parent definition
+        // purposely ignored attributes: abstract, shared, tags, autoconfigured
+        $def->setClass($parentDef->getClass());
+        $def->setArguments($parentDef->getArguments());
+        $def->setMethodCalls($parentDef->getMethodCalls());
+        $def->setProperties($parentDef->getProperties());
+        if ($parentDef->getAutowiringTypes(false)) {
+            $def->setAutowiringTypes($parentDef->getAutowiringTypes(false));
+        }
+        if ($parentDef->isDeprecated()) {
+            $def->setDeprecated(true, $parentDef->getDeprecationMessage('%service_id%'));
+        }
+        $def->setFactory($parentDef->getFactory());
+        $def->setConfigurator($parentDef->getConfigurator());
+        $def->setFile($parentDef->getFile());
+        $def->setPublic($parentDef->isPublic());
+        $def->setLazy($parentDef->isLazy());
+        $def->setAutowired($parentDef->isAutowired());
+        $def->setChanges($parentDef->getChanges());
+
+        $def->setBindings($parentDef->getBindings());
+
+        // overwrite with values specified in the decorator
+        $changes = $definition->getChanges();
+        if (isset($changes['class'])) {
+            $def->setClass($definition->getClass());
+        }
+        if (isset($changes['factory'])) {
+            $def->setFactory($definition->getFactory());
+        }
+        if (isset($changes['configurator'])) {
+            $def->setConfigurator($definition->getConfigurator());
+        }
+        if (isset($changes['file'])) {
+            $def->setFile($definition->getFile());
+        }
+        if (isset($changes['public'])) {
+            $def->setPublic($definition->isPublic());
+        }
+        if (isset($changes['lazy'])) {
+            $def->setLazy($definition->isLazy());
+        }
+        if (isset($changes['deprecated'])) {
+            $def->setDeprecated($definition->isDeprecated(), $definition->getDeprecationMessage('%service_id%'));
+        }
+        if (isset($changes['autowired'])) {
+            $def->setAutowired($definition->isAutowired());
+        }
+        if (isset($changes['shared'])) {
+            $def->setShared($definition->isShared());
+        }
+        if (isset($changes['decorated_service'])) {
+            $decoratedService = $definition->getDecoratedService();
+            if (null === $decoratedService) {
+                $def->setDecoratedService($decoratedService);
+            } else {
+                $def->setDecoratedService($decoratedService[0], $decoratedService[1], $decoratedService[2]);
+            }
+        }
+
+        // merge arguments
+        foreach ($definition->getArguments() as $k => $v) {
+            if (is_numeric($k)) {
+                $def->addArgument($v);
+            } elseif (0 === strpos($k, 'index_')) {
+                $def->replaceArgument((int) substr($k, strlen('index_')), $v);
+            } else {
+                $def->setArgument($k, $v);
+            }
+        }
+
+        // merge properties
+        foreach ($definition->getProperties() as $k => $v) {
+            $def->setProperty($k, $v);
+        }
+
+        // append method calls
+        if ($calls = $definition->getMethodCalls()) {
+            $def->setMethodCalls(array_merge($def->getMethodCalls(), $calls));
+        }
+
+        // merge autowiring types
+        foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
+            $def->addAutowiringType($autowiringType);
+        }
+
+        // these attributes are always taken from the child
+        $def->setAbstract($definition->isAbstract());
+        $def->setTags($definition->getTags());
+        // autoconfigure is never taken from parent (on purpose)
+        // and it's not legal on an instanceof
+        $def->setAutoconfigured($definition->isAutoconfigured());
+
+        return $def;
+    }
+}
+
+class_alias(ResolveChildDefinitionsPass::class, ResolveDefinitionTemplatesPass::class);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
index 89ca74c459b48..30678fa704c03 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -11,171 +11,19 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+@trigger_error('The '.__NAMESPACE__.'\ResolveDefinitionTemplatesPass class is deprecated since version 3.4 and will be removed in 4.0. Use the ResolveChildDefinitionsPass class instead.', E_USER_DEPRECATED);
 
-/**
- * This replaces all ChildDefinition instances with their equivalent fully
- * merged Definition instance.
- *
- * @author Johannes M. Schmitt 
- * @author Nicolas Grekas 
- */
-class ResolveDefinitionTemplatesPass extends AbstractRecursivePass
-{
-    protected function processValue($value, $isRoot = false)
-    {
-        if (!$value instanceof Definition) {
-            return parent::processValue($value, $isRoot);
-        }
-        if ($isRoot) {
-            // yes, we are specifically fetching the definition from the
-            // container to ensure we are not operating on stale data
-            $value = $this->container->getDefinition($this->currentId);
-        }
-        if ($value instanceof ChildDefinition) {
-            $value = $this->resolveDefinition($value);
-            if ($isRoot) {
-                $this->container->setDefinition($this->currentId, $value);
-            }
-        }
-
-        return parent::processValue($value, $isRoot);
-    }
+class_exists(ResolveChildDefinitionsPass::class);
 
+if (false) {
     /**
-     * Resolves the definition.
+     * This definition decorates another definition.
      *
-     * @return Definition
+     * @author Johannes M. Schmitt 
      *
-     * @throws RuntimeException When the definition is invalid
+     * @deprecated The ResolveDefinitionTemplatesPass class is deprecated since version 3.4 and will be removed in 4.0. Use the ResolveChildDefinitionsPass class instead.
      */
-    private function resolveDefinition(ChildDefinition $definition)
+    class ResolveDefinitionTemplatesPass extends AbstractRecursivePass
     {
-        try {
-            return $this->doResolveDefinition($definition);
-        } catch (ExceptionInterface $e) {
-            $r = new \ReflectionProperty($e, 'message');
-            $r->setAccessible(true);
-            $r->setValue($e, sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
-
-            throw $e;
-        }
-    }
-
-    private function doResolveDefinition(ChildDefinition $definition)
-    {
-        if (!$this->container->has($parent = $definition->getParent())) {
-            throw new RuntimeException(sprintf('Parent definition "%s" does not exist.', $parent));
-        }
-
-        $parentDef = $this->container->findDefinition($parent);
-        if ($parentDef instanceof ChildDefinition) {
-            $id = $this->currentId;
-            $this->currentId = $parent;
-            $parentDef = $this->resolveDefinition($parentDef);
-            $this->container->setDefinition($parent, $parentDef);
-            $this->currentId = $id;
-        }
-
-        $this->container->log($this, sprintf('Resolving inheritance for "%s" (parent: %s).', $this->currentId, $parent));
-        $def = new Definition();
-
-        // merge in parent definition
-        // purposely ignored attributes: abstract, shared, tags, autoconfigured
-        $def->setClass($parentDef->getClass());
-        $def->setArguments($parentDef->getArguments());
-        $def->setMethodCalls($parentDef->getMethodCalls());
-        $def->setProperties($parentDef->getProperties());
-        if ($parentDef->getAutowiringTypes(false)) {
-            $def->setAutowiringTypes($parentDef->getAutowiringTypes(false));
-        }
-        if ($parentDef->isDeprecated()) {
-            $def->setDeprecated(true, $parentDef->getDeprecationMessage('%service_id%'));
-        }
-        $def->setFactory($parentDef->getFactory());
-        $def->setConfigurator($parentDef->getConfigurator());
-        $def->setFile($parentDef->getFile());
-        $def->setPublic($parentDef->isPublic());
-        $def->setLazy($parentDef->isLazy());
-        $def->setAutowired($parentDef->isAutowired());
-        $def->setChanges($parentDef->getChanges());
-
-        $def->setBindings($parentDef->getBindings());
-
-        // overwrite with values specified in the decorator
-        $changes = $definition->getChanges();
-        if (isset($changes['class'])) {
-            $def->setClass($definition->getClass());
-        }
-        if (isset($changes['factory'])) {
-            $def->setFactory($definition->getFactory());
-        }
-        if (isset($changes['configurator'])) {
-            $def->setConfigurator($definition->getConfigurator());
-        }
-        if (isset($changes['file'])) {
-            $def->setFile($definition->getFile());
-        }
-        if (isset($changes['public'])) {
-            $def->setPublic($definition->isPublic());
-        }
-        if (isset($changes['lazy'])) {
-            $def->setLazy($definition->isLazy());
-        }
-        if (isset($changes['deprecated'])) {
-            $def->setDeprecated($definition->isDeprecated(), $definition->getDeprecationMessage('%service_id%'));
-        }
-        if (isset($changes['autowired'])) {
-            $def->setAutowired($definition->isAutowired());
-        }
-        if (isset($changes['shared'])) {
-            $def->setShared($definition->isShared());
-        }
-        if (isset($changes['decorated_service'])) {
-            $decoratedService = $definition->getDecoratedService();
-            if (null === $decoratedService) {
-                $def->setDecoratedService($decoratedService);
-            } else {
-                $def->setDecoratedService($decoratedService[0], $decoratedService[1], $decoratedService[2]);
-            }
-        }
-
-        // merge arguments
-        foreach ($definition->getArguments() as $k => $v) {
-            if (is_numeric($k)) {
-                $def->addArgument($v);
-            } elseif (0 === strpos($k, 'index_')) {
-                $def->replaceArgument((int) substr($k, strlen('index_')), $v);
-            } else {
-                $def->setArgument($k, $v);
-            }
-        }
-
-        // merge properties
-        foreach ($definition->getProperties() as $k => $v) {
-            $def->setProperty($k, $v);
-        }
-
-        // append method calls
-        if ($calls = $definition->getMethodCalls()) {
-            $def->setMethodCalls(array_merge($def->getMethodCalls(), $calls));
-        }
-
-        // merge autowiring types
-        foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
-            $def->addAutowiringType($autowiringType);
-        }
-
-        // these attributes are always taken from the child
-        $def->setAbstract($definition->isAbstract());
-        $def->setTags($definition->getTags());
-        // autoconfigure is never taken from parent (on purpose)
-        // and it's not legal on an instanceof
-        $def->setAutoconfigured($definition->isAutoconfigured());
-
-        return $def;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
new file mode 100644
index 0000000000000..23a1915fd777c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -0,0 +1,413 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolveChildDefinitionsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('parent', 'foo')->setArguments(array('moo', 'b'))->setProperty('foo', 'moo');
+        $container->setDefinition('child', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+            ->setProperty('foo', 'bar')
+            ->setClass('bar')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNotInstanceOf(ChildDefinition::class, $def);
+        $this->assertEquals('bar', $def->getClass());
+        $this->assertEquals(array('a', 'b'), $def->getArguments());
+        $this->assertEquals(array('foo' => 'bar'), $def->getProperties());
+    }
+
+    public function testProcessAppendsMethodCallsAlways()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addMethodCall('foo', array('bar'))
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addMethodCall('bar', array('foo'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals(array(
+            array('foo', array('bar')),
+            array('bar', array('foo')),
+        ), $def->getMethodCalls());
+    }
+
+    public function testProcessDoesNotCopyAbstract()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setAbstract(true)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isAbstract());
+    }
+
+    public function testProcessDoesNotCopyShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setShared(false)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertTrue($def->isShared());
+    }
+
+    public function testProcessDoesNotCopyTags()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addTag('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals(array(), $def->getTags());
+    }
+
+    public function testProcessDoesNotCopyDecoratedService()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setDecoratedService('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNull($def->getDecoratedService());
+    }
+
+    public function testProcessDoesNotDropShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->setShared(false)
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isShared());
+    }
+
+    public function testProcessHandlesMultipleInheritance()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent', 'foo')
+            ->setArguments(array('foo', 'bar', 'c'))
+        ;
+
+        $container
+            ->setDefinition('child2', new ChildDefinition('child1'))
+            ->replaceArgument(1, 'b')
+        ;
+
+        $container
+            ->setDefinition('child1', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child2');
+        $this->assertEquals(array('a', 'b', 'c'), $def->getArguments());
+        $this->assertEquals('foo', $def->getClass());
+    }
+
+    public function testSetLazyOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setLazy(true)
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetLazyOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setLazy(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetAutowiredOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setAutowired(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testSetAutowiredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testDeepDefinitionsResolving()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'parentClass');
+        $container->register('sibling', 'siblingClass')
+            ->setConfigurator(new ChildDefinition('parent'), 'foo')
+            ->setFactory(array(new ChildDefinition('parent'), 'foo'))
+            ->addArgument(new ChildDefinition('parent'))
+            ->setProperty('prop', new ChildDefinition('parent'))
+            ->addMethodCall('meth', array(new ChildDefinition('parent')))
+        ;
+
+        $this->process($container);
+
+        $configurator = $container->getDefinition('sibling')->getConfigurator();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($configurator));
+        $this->assertSame('parentClass', $configurator->getClass());
+
+        $factory = $container->getDefinition('sibling')->getFactory();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($factory[0]));
+        $this->assertSame('parentClass', $factory[0]->getClass());
+
+        $argument = $container->getDefinition('sibling')->getArgument(0);
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($argument));
+        $this->assertSame('parentClass', $argument->getClass());
+
+        $properties = $container->getDefinition('sibling')->getProperties();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($properties['prop']));
+        $this->assertSame('parentClass', $properties['prop']->getClass());
+
+        $methodCalls = $container->getDefinition('sibling')->getMethodCalls();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($methodCalls[0][1][0]));
+        $this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
+    }
+
+    public function testSetDecoratedServiceOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setDecoratedService('foo', 'foo_inner', 5)
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(array('foo', 'foo_inner', 5), $container->getDefinition('child1')->getDecoratedService());
+    }
+
+    public function testDecoratedServiceCopiesDeprecatedStatusFromParent()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    public function testDecoratedServiceCanOverwriteDeprecatedParentStatus()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'))
+            ->setDeprecated(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testProcessMergeAutowiringTypes()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addAutowiringType('Bar')
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        $this->assertEquals(array('Foo', 'Bar'), $childDef->getAutowiringTypes());
+
+        $parentDef = $container->getDefinition('parent');
+        $this->assertSame(array('Foo'), $parentDef->getAutowiringTypes());
+    }
+
+    public function testProcessResolvesAliases()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass');
+        $container->setAlias('parent_alias', 'parent');
+        $container->setDefinition('child', new ChildDefinition('parent_alias'));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame('ParentClass', $def->getClass());
+    }
+
+    public function testProcessSetsArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass')->setArguments(array(0));
+        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments(array(
+            1,
+            'index_0' => 2,
+            'foo' => 3,
+        )));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame(array(2, 1, 'foo' => 3), $def->getArguments());
+    }
+
+    public function testSetAutoconfiguredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutoconfigured(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutoconfigured());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testAliasExistsForBackwardsCompatibility()
+    {
+        $this->assertInstanceOf(ResolveChildDefinitionsPass::class, new ResolveDefinitionTemplatesPass());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ResolveChildDefinitionsPass();
+        $pass->process($container);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
index 9c64c502f659a..3d83694840e4a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -16,6 +16,9 @@
 use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+/**
+ * @group legacy
+ */
 class ResolveDefinitionTemplatesPassTest extends TestCase
 {
     public function testProcess()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index 164ab25941d64..c97fe1dabac9b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
-use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ResolveInstanceofConditionalsPassTest extends TestCase
@@ -57,7 +57,7 @@ public function testProcessInheritance()
         $container->setDefinition('child', $def);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
-        (new ResolveDefinitionTemplatesPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
 
         $expected = array(
             array('foo', array('bar')),
@@ -95,7 +95,7 @@ public function testProcessHandlesMultipleInheritance()
         ));
 
         (new ResolveInstanceofConditionalsPass())->process($container);
-        (new ResolveDefinitionTemplatesPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
 
         $def = $container->getDefinition('foo');
         $this->assertTrue($def->isAutowired());
@@ -119,7 +119,7 @@ public function testProcessUsesAutoconfiguredInstanceof()
             ->setFactory('autoconfigured_factory');
 
         (new ResolveInstanceofConditionalsPass())->process($container);
-        (new ResolveDefinitionTemplatesPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
 
         $def = $container->getDefinition('normal_service');
         // autowired thanks to the autoconfigured instanceof
@@ -147,7 +147,7 @@ public function testAutoconfigureInstanceofDoesNotDuplicateTags()
         ;
 
         (new ResolveInstanceofConditionalsPass())->process($container);
-        (new ResolveDefinitionTemplatesPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
 
         $def = $container->getDefinition('normal_service');
         $this->assertSame(array('duplicated_tag' => array(array(), array('and_attributes' => 1))), $def->getTags());
@@ -165,7 +165,7 @@ public function testProcessDoesNotUseAutoconfiguredInstanceofIfNotEnabled()
             ->setAutowired(true);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
-        (new ResolveDefinitionTemplatesPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
 
         $def = $container->getDefinition('normal_service');
         $this->assertFalse($def->isAutowired());

From b9c6928d7e3070d6ae07c55505ac7f333f82d98c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 7 Sep 2017 14:05:56 +0200
Subject: [PATCH 0785/1099] [HttpKernel] "controller.service_arguments"
 services should be public

---
 .../RegisterControllerArgumentLocatorsPass.php    |  1 +
 ...RegisterControllerArgumentLocatorsPassTest.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index 222185f52766f..9c00f99b7b003 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -50,6 +50,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
             $def = $container->getDefinition($id);
+            $def->setPublic(true);
             $class = $def->getClass();
             $autowire = $def->isAutowired();
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 0542698d694ef..83a07cb4663d2 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -266,6 +266,21 @@ public function testArgumentWithNoTypeHintIsOk()
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
         $this->assertEmpty(array_keys($locator));
     }
+
+    public function testControllersAreMadePublic()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->setPublic(false)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $this->assertTrue($container->getDefinition('foo')->isPublic());
+    }
 }
 
 class RegisterTestController

From a29e0694de139965a1e8e1f69dd84b46cca8ce89 Mon Sep 17 00:00:00 2001
From: Sergey Linnik 
Date: Tue, 5 Sep 2017 10:54:44 +0300
Subject: [PATCH 0786/1099] [Security] Fix exception when use_referer option is
 true and referer is not set or empty

---
 .../DefaultAuthenticationSuccessHandler.php            |  5 ++---
 .../DefaultAuthenticationSuccessHandlerTest.php        | 10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 7da6e35572b47..b7411e2c11d6c 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -118,12 +118,11 @@ protected function determineTargetUrl(Request $request)
             return $targetUrl;
         }
 
-        if ($this->options['use_referer']) {
-            $targetUrl = $request->headers->get('Referer');
+        if ($this->options['use_referer'] && $targetUrl = $request->headers->get('Referer')) {
             if (false !== $pos = strpos($targetUrl, '?')) {
                 $targetUrl = substr($targetUrl, 0, $pos);
             }
-            if ($targetUrl !== $this->httpUtils->generateUri($request, $this->options['login_path'])) {
+            if ($targetUrl && $targetUrl !== $this->httpUtils->generateUri($request, $this->options['login_path'])) {
                 return $targetUrl;
             }
         }
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
index b42f840358e03..a7b8547b6b53d 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
@@ -83,6 +83,16 @@ public function getRequestRedirections()
                 array(),
                 '/',
             ),
+            'target path as referer when referer not set' => array(
+                Request::create('/'),
+                array('use_referer' => true),
+                '/',
+            ),
+            'target path as referer when referer is ?' => array(
+                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => '?')),
+                array('use_referer' => true),
+                '/',
+            ),
             'target path should be different than login URL' => array(
                 Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/login')),
                 array('use_referer' => true, 'login_path' => '/login'),

From 53387b4335f0c80604f09c3a8b588a0aca351138 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Sun, 3 Sep 2017 19:39:07 +0200
Subject: [PATCH 0787/1099] Deprecated the web_profiler.position option

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md                 | 2 ++
 .../WebProfilerBundle/DependencyInjection/Configuration.php     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index dafd4c46bb0fc..c081103a8071e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -53,6 +53,8 @@ CHANGELOG
    `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`,
    `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
     and `YamlLintCommand` classes have been marked as final
+ * Deprecated the `web_profiler.position` config option (in Symfony 4.0 the toolbar
+   will always be displayed at the bottom).
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
index 957a683ca3563..e07b28925de41 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
@@ -39,6 +39,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('toolbar')->defaultFalse()->end()
                 ->scalarNode('position')
                     ->defaultValue('bottom')
+                    ->setDeprecated('The "web_profiler.position" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
                     ->validate()
                         ->ifNotInArray(array('bottom', 'top'))
                         ->thenInvalid('The CSS position %s is not supported')

From f19cf8a9164183614c69fa3180d51281ff765ac5 Mon Sep 17 00:00:00 2001
From: Florent Mata 
Date: Mon, 28 Aug 2017 15:28:19 +0200
Subject: [PATCH 0788/1099] [ExpressionLanguage] make a proposal in SyntaxError
 message

---
 .../Component/ExpressionLanguage/Parser.php     |  4 ++--
 .../ExpressionLanguage/SyntaxError.php          | 17 ++++++++++++++++-
 .../ExpressionLanguage/Tests/ParserTest.php     | 12 ++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index c75972447dedf..3b367030155d2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -195,13 +195,13 @@ public function parsePrimaryExpression()
                     default:
                         if ('(' === $this->stream->current->value) {
                             if (false === isset($this->functions[$token->value])) {
-                                throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression());
+                                throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
                             }
 
                             $node = new Node\FunctionNode($token->value, $this->parseArguments());
                         } else {
                             if (!in_array($token->value, $this->names, true)) {
-                                throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression());
+                                throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
                             }
 
                             // is the name used in the compiled code different
diff --git a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php
index 9373e9980b8f5..12348e6830836 100644
--- a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php
+++ b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php
@@ -13,7 +13,7 @@
 
 class SyntaxError extends \LogicException
 {
-    public function __construct($message, $cursor = 0, $expression = '')
+    public function __construct($message, $cursor = 0, $expression = '', $subject = null, array $proposals = null)
     {
         $message = sprintf('%s around position %d', $message, $cursor);
         if ($expression) {
@@ -21,6 +21,21 @@ public function __construct($message, $cursor = 0, $expression = '')
         }
         $message .= '.';
 
+        if (null !== $subject && null !== $proposals) {
+            $minScore = INF;
+            foreach ($proposals as $proposal) {
+                $distance = levenshtein($subject, $proposal);
+                if ($distance < $minScore) {
+                    $guess = $proposal;
+                    $minScore = $distance;
+                }
+            }
+
+            if (isset($guess) && $minScore < 3) {
+                $message .= sprintf(' Did you mean "%s"?', $guess);
+            }
+        }
+
         parent::__construct($message);
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
index 13b80cd64fbed..11464abd23e13 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -195,4 +195,16 @@ public function getInvalidPostfixData()
             ),
         );
     }
+
+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Did you mean "baz"?
+     */
+    public function testNameProposal()
+    {
+        $lexer = new Lexer();
+        $parser = new Parser(array());
+
+        $parser->parse($lexer->tokenize('foo > bar'), array('foo', 'baz'));
+    }
 }

From 47b11068683f9750729d87f6b7c24524ae46607a Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Thu, 7 Sep 2017 11:35:49 -0400
Subject: [PATCH 0789/1099] Do not display short exception trace for built-in
 console exceptions

---
 src/Symfony/Component/Console/Application.php                 | 4 +++-
 .../Console/Tests/Fixtures/application_renderexception1.txt   | 1 -
 .../Console/Tests/Fixtures/application_renderexception2.txt   | 1 -
 .../Console/Tests/Fixtures/application_renderexception4.txt   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 41c2a238e08a1..9cebe5768b26e 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -761,7 +761,9 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
             }
 
             $messages = array();
-            $messages[] = sprintf('%s', OutputFormatter::escape(sprintf('In %s line %s:', basename($e->getFile()) ?: 'n/a', $e->getLine() ?: 'n/a')));
+            if (!$e instanceof ExceptionInterface || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $messages[] = sprintf('%s', OutputFormatter::escape(sprintf('In %s line %s:', basename($e->getFile()) ?: 'n/a', $e->getLine() ?: 'n/a')));
+            }
             $messages[] = $emptyLine = sprintf('%s', str_repeat(' ', $len));
             if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $messages[] = sprintf('%s%s', $title, str_repeat(' ', max(0, $len - Helper::strlen($title))));
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
index 700ffada3d2fa..1df5bd6494bbf 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
@@ -1,5 +1,4 @@
 
-In Application.php line 615:
                                  
   Command "foo" is not defined.  
                                  
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index 457e6df46c0a9..932063d730d67 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -1,5 +1,4 @@
 
-In ArrayInput.php line 178:
                                       
   The "--foo" option does not exist.  
                                       
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
index 040564447f57b..548a13e56f22e 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
@@ -1,5 +1,4 @@
 
-In Application.php line 615:
                                
   Command "foo" is not define  
   d.                           

From 3eb79e5197c8b4184bf4a250fc04bf4175bf65c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Fri, 8 Sep 2017 15:50:13 +0200
Subject: [PATCH 0790/1099] [Fabbot] Do not run php-cs-fixer if there are no
 change in src/

---
 .php_cs.dist | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.php_cs.dist b/.php_cs.dist
index 140fd3265011c..6282431a419d4 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -1,5 +1,9 @@
 setRules(array(
         '@Symfony' => true,

From 1605ce1f074d96c3e62eeb297b00a66ce9a28c53 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 8 Sep 2017 16:43:09 +0200
Subject: [PATCH 0791/1099] [Filesystem] skip tests if not applicable

---
 src/Symfony/Component/Filesystem/Tests/FilesystemTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 44eeceabd9f49..67ccdd1eb06d2 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1115,6 +1115,10 @@ public function testDumpFailsWithExceptionIfExecutablePermissionsForTheParentDir
         mkdir($target);
         chmod($this->workspace, 0666);
 
+        if (false !== @chdir($this->workspace)) {
+            $this->markTestSkipped('Test skipped as the used PHP version does not prevent entering directories without the required permissions.');
+        }
+
         $this->filesystem->dumpFile($file, 'baz');
     }
 

From 7793b797afbbe07d34b3ade2a4a368ddc5654af4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Fri, 8 Sep 2017 18:12:06 -0700
Subject: [PATCH 0792/1099] Revert "bug #24105 [Filesystem] check permissions
 if dump target dir is missing (xabbuh)"

This reverts commit d74144fc0b588bb8d7e0f73e6063e4022946f8e5, reversing
changes made to 2b79f484058bd3265a39709e97a8787044b2ae7d.
---
 .../Component/Filesystem/Filesystem.php       | 10 ----------
 .../Filesystem/Tests/FilesystemTest.php       | 20 -------------------
 .../Filesystem/Tests/FilesystemTestCase.php   |  1 -
 3 files changed, 31 deletions(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index bbef48b466885..bc2e3dcc2d897 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -532,16 +532,6 @@ public function dumpFile($filename, $content, $mode = 0666)
         $dir = dirname($filename);
 
         if (!is_dir($dir)) {
-            $oldCwd = getcwd();
-
-            if (!@chdir(dirname($dir))) {
-                // When the parent directory misses the executable permission bit, we are unable to enter it and thus
-                // cannot check if the target directory exists.
-                throw new IOException(sprintf('Unable to detect if the target directory "%s" exists.', $dir));
-            }
-
-            chdir($oldCwd);
-
             $this->mkdir($dir);
         }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 67ccdd1eb06d2..b7bdfac4155e0 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1102,26 +1102,6 @@ public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
         $this->assertFilePermissions(745, $filename);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     * @expectedExceptionMessageRegExp /^Unable to detect if the target directory ".*" exists\.$/
-     */
-    public function testDumpFailsWithExceptionIfExecutablePermissionsForTheParentDirectoryAreMissing()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $target = $this->workspace.DIRECTORY_SEPARATOR.'foo';
-        $file = $target.DIRECTORY_SEPARATOR.'foobar';
-        mkdir($target);
-        chmod($this->workspace, 0666);
-
-        if (false !== @chdir($this->workspace)) {
-            $this->markTestSkipped('Test skipped as the used PHP version does not prevent entering directories without the required permissions.');
-        }
-
-        $this->filesystem->dumpFile($file, 'baz');
-    }
-
     public function testCopyShouldKeepExecutionPermission()
     {
         $this->markAsSkippedIfChmodIsMissing();
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
index 47598b29427da..5586a00547a68 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -61,7 +61,6 @@ protected function tearDown()
             $this->longPathNamesWindows = array();
         }
 
-        chmod($this->workspace, 0777);
         $this->filesystem->remove($this->workspace);
         umask($this->umask);
     }

From cafdf2b8e52418622ee3073d82e4c414e3479fd7 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Mon, 31 Jul 2017 15:10:19 +0200
Subject: [PATCH 0793/1099] [WebProfilerBundle] Deprecated the
 web_profiler.position option

---
 .../Bundle/WebProfilerBundle/CHANGELOG.md     |  2 ++
 .../Controller/ProfilerController.php         | 23 +++++----------
 .../DependencyInjection/Configuration.php     |  8 ------
 .../WebProfilerExtension.php                  |  5 ++--
 .../EventListener/WebDebugToolbarListener.php |  5 +---
 .../Resources/config/profiler.xml             |  1 -
 .../config/schema/webprofiler-1.0.xsd         |  8 ------
 .../Resources/config/toolbar.xml              |  1 -
 .../Resources/views/Profiler/toolbar.css.twig | 28 -------------------
 .../views/Profiler/toolbar_js.html.twig       | 10 +------
 .../Controller/ProfilerControllerTest.php     |  2 +-
 .../DependencyInjection/ConfigurationTest.php | 12 ++++----
 .../WebDebugToolbarListenerTest.php           |  6 ++--
 13 files changed, 23 insertions(+), 88 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
index 260dbdae05c67..a7b7d840f89db 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -6,6 +6,8 @@ CHANGELOG
 
  * removed the `WebProfilerExtension::dumpValue()` method
  * removed the `getTemplates()` method of the `TemplateManager` class in favor of the ``getNames()`` method
+ * removed the `web_profiler.position` config option and the
+   `web_profiler.debug_toolbar.position` container parameter
 
 3.1.0
 -----
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 7ebd04b574c22..4761eda00f938 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -34,28 +34,25 @@ class ProfilerController
     private $profiler;
     private $twig;
     private $templates;
-    private $toolbarPosition;
     private $cspHandler;
     private $baseDir;
 
     /**
      * Constructor.
      *
-     * @param UrlGeneratorInterface        $generator       The URL Generator
-     * @param Profiler                     $profiler        The profiler
-     * @param Environment                  $twig            The twig environment
-     * @param array                        $templates       The templates
-     * @param string                       $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
-     * @param ContentSecurityPolicyHandler $cspHandler      The Content-Security-Policy handler
-     * @param string                       $baseDir         The project root directory
+     * @param UrlGeneratorInterface        $generator  The URL Generator
+     * @param Profiler                     $profiler   The profiler
+     * @param Environment                  $twig       The twig environment
+     * @param array                        $templates  The templates
+     * @param ContentSecurityPolicyHandler $cspHandler The Content-Security-Policy handler
+     * @param string                       $baseDir    The project root directory
      */
-    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, Environment $twig, array $templates, $toolbarPosition = 'bottom', ContentSecurityPolicyHandler $cspHandler = null, $baseDir = null)
+    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, Environment $twig, array $templates, ContentSecurityPolicyHandler $cspHandler = null, $baseDir = null)
     {
         $this->generator = $generator;
         $this->profiler = $profiler;
         $this->twig = $twig;
         $this->templates = $templates;
-        $this->toolbarPosition = $toolbarPosition;
         $this->cspHandler = $cspHandler;
         $this->baseDir = $baseDir;
     }
@@ -161,11 +158,6 @@ public function toolbarAction(Request $request, $token)
             return new Response('', 404, array('Content-Type' => 'text/html'));
         }
 
-        // the toolbar position (top, bottom, normal, or null -- use the configuration)
-        if (null === $position = $request->query->get('position')) {
-            $position = $this->toolbarPosition;
-        }
-
         $url = null;
         try {
             $url = $this->generator->generate('_profiler', array('token' => $token));
@@ -175,7 +167,6 @@ public function toolbarAction(Request $request, $token)
 
         return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/toolbar.html.twig', array(
             'request' => $request,
-            'position' => $position,
             'profile' => $profile,
             'templates' => $this->getTemplateManager()->getNames($profile),
             'profiler_url' => $url,
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
index e07b28925de41..812e311195993 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
@@ -37,14 +37,6 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->booleanNode('toolbar')->defaultFalse()->end()
-                ->scalarNode('position')
-                    ->defaultValue('bottom')
-                    ->setDeprecated('The "web_profiler.position" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
-                    ->validate()
-                        ->ifNotInArray(array('bottom', 'top'))
-                        ->thenInvalid('The CSS position %s is not supported')
-                    ->end()
-                ->end()
                 ->booleanNode('intercept_redirects')->defaultFalse()->end()
                 ->scalarNode('excluded_ajax_paths')->defaultValue('^/(app(_[\\w]+)?\\.php/)?_wdt')->end()
             ->end()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index e507bf2d22b70..e8e3ee87e9c1c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -44,11 +44,10 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('profiler.xml');
-        $container->setParameter('web_profiler.debug_toolbar.position', $config['position']);
 
         if ($config['toolbar'] || $config['intercept_redirects']) {
             $loader->load('toolbar.xml');
-            $container->getDefinition('web_profiler.debug_toolbar')->replaceArgument(5, $config['excluded_ajax_paths']);
+            $container->getDefinition('web_profiler.debug_toolbar')->replaceArgument(4, $config['excluded_ajax_paths']);
             $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
             $container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
         }
@@ -66,7 +65,7 @@ public function load(array $configs, ContainerBuilder $container)
         $baseDir = implode(DIRECTORY_SEPARATOR, $baseDir);
 
         $profilerController = $container->getDefinition('web_profiler.controller.profiler');
-        $profilerController->replaceArgument(6, $baseDir);
+        $profilerController->replaceArgument(5, $baseDir);
 
         $fileLinkFormatter = $container->getDefinition('debug.file_link_formatter');
         $fileLinkFormatter->replaceArgument(2, $baseDir);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index 6ffdbc7ad0764..d99f9d5b32d9c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -40,17 +40,15 @@ class WebDebugToolbarListener implements EventSubscriberInterface
     protected $urlGenerator;
     protected $interceptRedirects;
     protected $mode;
-    protected $position;
     protected $excludedAjaxPaths;
     private $cspHandler;
 
-    public function __construct(Environment $twig, $interceptRedirects = false, $mode = self::ENABLED, $position = 'bottom', UrlGeneratorInterface $urlGenerator = null, $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null)
+    public function __construct(Environment $twig, $interceptRedirects = false, $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null)
     {
         $this->twig = $twig;
         $this->urlGenerator = $urlGenerator;
         $this->interceptRedirects = (bool) $interceptRedirects;
         $this->mode = (int) $mode;
-        $this->position = $position;
         $this->excludedAjaxPaths = $excludedAjaxPaths;
         $this->cspHandler = $cspHandler;
     }
@@ -124,7 +122,6 @@ protected function injectToolbar(Response $response, Request $request, array $no
             $toolbar = "\n".str_replace("\n", '', $this->twig->render(
                 '@WebProfiler/Profiler/toolbar_js.html.twig',
                 array(
-                    'position' => $this->position,
                     'excluded_ajax_paths' => $this->excludedAjaxPaths,
                     'token' => $response->headers->get('X-Debug-Token'),
                     'request' => $request,
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
index 4c659b628144d..538bea8ef3087 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -12,7 +12,6 @@
             
             
             %data_collector.templates%
-            %web_profiler.debug_toolbar.position%
             
             null


diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
index 84cc8ae9a97f3..e22105a178fa7 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
@@ -10,13 +10,5 @@
     
         
         
-        
     
-
-    
-        
-            
-            
-        
-    
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
index 25f49fc2cd069..da06324ac6ede 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
@@ -12,7 +12,6 @@
             
             %web_profiler.debug_toolbar.intercept_redirects%
             %web_profiler.debug_toolbar.mode%
-            %web_profiler.debug_toolbar.position%
             
              
             
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index ac2e38eea1842..74d3c8b5b3e56 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -416,34 +416,6 @@
     display: none;
 }
 
-/* Override the setting when the toolbar is on the top */
-{% if position == 'top' %}
-    .sf-minitoolbar {
-        border-bottom-left-radius: 4px;
-        border-top-left-radius: 0;
-        bottom: auto;
-        right: 0;
-        top: 0;
-    }
-
-    .sf-toolbarreset {
-        bottom: auto;
-        box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
-        top: 0;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info {
-        bottom: auto;
-        top: 36px;
-    }
-{% endif %}
-
-{% if not floatable %}
-    .sf-toolbarreset {
-        position: static;
-    }
-{% endif %}
-
 /* Responsive Design */
 .sf-toolbar-icon .sf-toolbar-label,
 .sf-toolbar-icon .sf-toolbar-value {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index 33a59d4322925..c2b91f5261057 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -1,18 +1,10 @@
 
 {{ include('@WebProfiler/Profiler/base_js.html.twig') }}
 
-    {{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}
+    {{ include('@WebProfiler/Profiler/toolbar.css.twig') }}
 
 /*getMockBuilder('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator')->getMock();
 
-            return new ProfilerController($urlGenerator, $profiler, $twig, array(), 'bottom', new ContentSecurityPolicyHandler($nonceGenerator));
+            return new ProfilerController($urlGenerator, $profiler, $twig, array(), new ContentSecurityPolicyHandler($nonceGenerator));
         }
 
         return new ProfilerController($urlGenerator, $profiler, $twig, array());
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
index b11f6928b4e92..d10c56a167ae3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -32,12 +32,12 @@ public function testConfigTree($options, $results)
     public function getDebugModes()
     {
         return array(
-            array(array(), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('intercept_redirects' => true), array('intercept_redirects' => true, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('intercept_redirects' => false), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('toolbar' => true), array('intercept_redirects' => false, 'toolbar' => true, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('position' => 'top'), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'top', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('excluded_ajax_paths' => 'test'), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => 'test')),
+            array(array(), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
+            array(array('intercept_redirects' => true), array('intercept_redirects' => true, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
+            array(array('intercept_redirects' => false), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
+            array(array('toolbar' => true), array('intercept_redirects' => false, 'toolbar' => true, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
+            array(array(), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
+            array(array('excluded_ajax_paths' => 'test'), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => 'test')),
         );
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
index 5e5e7a21fe76b..6b2f11e36b542 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -219,7 +219,7 @@ public function testXDebugUrlHeader()
 
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
-        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
 
         $this->assertEquals('http://mydomain.com/_profiler/xxxxxxxx', $response->headers->get('X-Debug-Token-Link'));
@@ -240,7 +240,7 @@ public function testThrowingUrlGenerator()
 
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
-        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
 
         $this->assertEquals('Exception: foo', $response->headers->get('X-Debug-Error'));
@@ -261,7 +261,7 @@ public function testThrowingErrorCleanup()
 
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
-        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
 
         $this->assertEquals('Exception: This multiline tabbed text should come out on a single plain line', $response->headers->get('X-Debug-Error'));

From 2a696d3a1e1e5b23f916384b3a5ff1145b1284d6 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Thu, 7 Sep 2017 17:53:58 +0200
Subject: [PATCH 0794/1099] Fixed deprecations in WebProfiler tests

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  2 --
 .../Bundle/WebProfilerBundle/CHANGELOG.md     |  7 ++++++
 .../DependencyInjection/ConfigurationTest.php | 23 ++++++++++++++++++-
 .../Bundle/WebProfilerBundle/composer.json    |  3 ++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index c081103a8071e..dafd4c46bb0fc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -53,8 +53,6 @@ CHANGELOG
    `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`,
    `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
     and `YamlLintCommand` classes have been marked as final
- * Deprecated the `web_profiler.position` config option (in Symfony 4.0 the toolbar
-   will always be displayed at the bottom).
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
index 64102cc761c34..c1259b0a20e1d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * Deprecated the `web_profiler.position` config option (in 4.0 version the toolbar
+   will always be displayed at the bottom) and the `web_profiler.debug_toolbar.position`
+   container parameter.
+
 3.1.0
 -----
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
index b11f6928b4e92..afbecf9b381e9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -29,6 +29,20 @@ public function testConfigTree($options, $results)
         $this->assertEquals($results, $config);
     }
 
+    /**
+     * @dataProvider getPositionConfig
+     * @group legacy
+     * @expectedDeprecation The "web_profiler.position" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.
+     */
+    public function testPositionConfig($options, $results)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration();
+        $config = $processor->processConfiguration($configuration, array($options));
+
+        $this->assertEquals($results, $config);
+    }
+
     public function getDebugModes()
     {
         return array(
@@ -36,8 +50,15 @@ public function getDebugModes()
             array(array('intercept_redirects' => true), array('intercept_redirects' => true, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
             array(array('intercept_redirects' => false), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
             array(array('toolbar' => true), array('intercept_redirects' => false, 'toolbar' => true, 'position' => 'bottom', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
-            array(array('position' => 'top'), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'top', 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt')),
             array(array('excluded_ajax_paths' => 'test'), array('intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => 'test')),
         );
     }
+
+    public function getPositionConfig()
+    {
+        return array(
+            array(array('position' => 'top'), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt', 'position' => 'top')),
+            array(array('position' => 'bottom'), array('intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/(app(_[\\w]+)?\\.php/)?_wdt', 'position' => 'bottom')),
+        );
+    }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index c49d793016e04..40ead3bff2564 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -25,12 +25,13 @@
         "twig/twig": "~1.34|~2.4"
     },
     "require-dev": {
-        "symfony/config": "~2.8|~3.0|~4.0",
+        "symfony/config": "~3.4|~4.0",
         "symfony/console": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~3.3|~4.0",
         "symfony/stopwatch": "~2.8|~3.0|~4.0"
     },
     "conflict": {
+        "symfony/config": "<3.4",
         "symfony/dependency-injection": "<3.3",
         "symfony/event-dispatcher": "<3.3",
         "symfony/var-dumper": "<3.3"

From efa4cb9a66eca0f3bc533b6253a441b57e510e8a Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Sat, 9 Sep 2017 08:49:11 +0200
Subject: [PATCH 0795/1099] [SecurityBundle] Fix valid provider considered
 undefined

---
 .../DependencyInjection/SecurityExtension.php | 10 ++++----
 .../CompleteConfigurationTest.php             | 12 ++++++++++
 .../Fixtures/php/firewall_provider.php        | 24 +++++++++++++++++++
 .../Fixtures/php/listener_provider.php        | 16 +++++++++++++
 .../Fixtures/xml/firewall_provider.xml        | 20 ++++++++++++++++
 .../Fixtures/xml/listener_provider.xml        | 20 ++++++++++++++++
 .../Fixtures/yml/firewall_provider.yml        | 16 +++++++++++++
 .../Fixtures/yml/listener_provider.yml        | 10 ++++++++
 8 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index adfe5b235752b..73a1cef128dd8 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -331,10 +331,10 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
 
         // Provider id (take the first registered provider if none defined)
         if (isset($firewall['provider'])) {
-            $defaultProvider = $this->getUserProviderId($firewall['provider']);
-            if (!in_array($defaultProvider, $providerIds, true)) {
+            if (!isset($providerIds[$normalizedName = str_replace('-', '_', $firewall['provider'])])) {
                 throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall['provider']));
             }
+            $defaultProvider = $providerIds[$normalizedName];
         } else {
             $defaultProvider = reset($providerIds);
         }
@@ -491,10 +491,10 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
 
                 if (isset($firewall[$key])) {
                     if (isset($firewall[$key]['provider'])) {
-                        if (!in_array($firewall[$key]['provider'], $providerIds, true)) {
+                        if (!isset($providerIds[$normalizedName = str_replace('-', '_', $firewall[$key]['provider'])])) {
                             throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall[$key]['provider']));
                         }
-                        $userProvider = $this->getUserProviderId($firewall[$key]['provider']);
+                        $userProvider = $providerIds[$normalizedName];
                     } else {
                         $userProvider = $defaultProvider;
                     }
@@ -596,7 +596,7 @@ private function createUserProviders($config, ContainerBuilder $container)
         $providerIds = array();
         foreach ($config['providers'] as $name => $provider) {
             $id = $this->createUserDaoProvider($name, $provider, $container);
-            $providerIds[] = $id;
+            $providerIds[str_replace('-', '_', $name)] = $id;
         }
 
         return $providerIds;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 202107a57abf2..1cb5a6acda066 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -405,6 +405,18 @@ public function testFirewallListenerUndefinedProvider()
         $this->getContainer('listener_undefined_provider');
     }
 
+    public function testFirewallWithUserProvider()
+    {
+        $this->getContainer('firewall_provider');
+        $this->addToAssertionCount(1);
+    }
+
+    public function testFirewallListenerWithProvider()
+    {
+        $this->getContainer('listener_provider');
+        $this->addToAssertionCount(1);
+    }
+
     protected function getContainer($file)
     {
         $file = $file.'.'.$this->getFileExtension();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
new file mode 100644
index 0000000000000..ff9d9f6b89df6
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
@@ -0,0 +1,24 @@
+loadFromExtension('security', array(
+    'providers' => array(
+        'default' => array(
+            'memory' => $memory = array(
+                'users' => array('foo' => array('password' => 'foo', 'roles' => 'ROLE_USER')),
+            ),
+        ),
+        'with-dash' => array(
+            'memory' => $memory,
+        ),
+    ),
+    'firewalls' => array(
+        'main' => array(
+            'provider' => 'default',
+            'form_login' => true,
+        ),
+        'other' => array(
+            'provider' => 'with-dash',
+            'form_login' => true,
+        ),
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
new file mode 100644
index 0000000000000..d7f1cd6973f36
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
@@ -0,0 +1,16 @@
+loadFromExtension('security', array(
+    'providers' => array(
+        'default' => array(
+            'memory' => array(
+                'users' => array('foo' => array('password' => 'foo', 'roles' => 'ROLE_USER')),
+            ),
+        ),
+    ),
+    'firewalls' => array(
+        'main' => array(
+            'form_login' => array('provider' => 'default'),
+        ),
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
new file mode 100644
index 0000000000000..bd87fee4abae9
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
@@ -0,0 +1,20 @@
+
+
+
+
+    
+        
+            
+        
+
+        
+            
+                
+            
+        
+    
+
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
new file mode 100644
index 0000000000000..b1bcd8eae8155
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
@@ -0,0 +1,20 @@
+
+
+
+
+    
+        
+            
+        
+
+        
+            
+                
+            
+        
+    
+
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
new file mode 100644
index 0000000000000..11c329aa8e2fe
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
@@ -0,0 +1,16 @@
+security:
+    providers:
+        default:
+            memory:
+                users: { foo: { password: foo, roles: ROLE_USER } }
+        with-dash:
+            memory:
+                users: { foo: { password: foo, roles: ROLE_USER } }
+
+    firewalls:
+        main:
+            provider: default
+            form_login: true
+        other:
+            provider: with-dash
+            form_login: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml
new file mode 100644
index 0000000000000..652f23b5f0425
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml
@@ -0,0 +1,10 @@
+security:
+    providers:
+        default:
+            memory:
+                users: { foo: { password: foo, roles: ROLE_USER } }
+
+    firewalls:
+        main:
+            form_login:
+                provider: default

From bfae4549680358a6fd4d9fb82f047048efdc57d6 Mon Sep 17 00:00:00 2001
From: SpacePossum 
Date: Mon, 11 Sep 2017 07:17:31 +0200
Subject: [PATCH 0796/1099] Remove `protected_to_private` rule.

---
 .php_cs.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php_cs.dist b/.php_cs.dist
index 2e432b791eed0..04d9ec5bdc5a8 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -13,6 +13,7 @@ return PhpCsFixer\Config::create()
         'braces' => array('allow_single_line_closure' => true),
         'heredoc_to_nowdoc' => false,
         'phpdoc_annotation_without_dot' => false,
+        'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(

From 122da5add5fd298983503e82fb8a47a10f258d79 Mon Sep 17 00:00:00 2001
From: Mara Blaga 
Date: Mon, 11 Sep 2017 15:10:51 +0100
Subject: [PATCH 0797/1099] [DomCrawler] Fix conversion to int on GetPhpFiles

---
 src/Symfony/Component/DomCrawler/Form.php           | 12 ++++++++++++
 src/Symfony/Component/DomCrawler/Tests/FormTest.php |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index bad1b34935d04..db4d60dd3d141 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -172,6 +172,18 @@ public function getPhpFiles()
             if (!empty($qs)) {
                 parse_str($qs, $expandedValue);
                 $varName = substr($name, 0, strlen(key($expandedValue)));
+
+                array_walk_recursive(
+                    $expandedValue,
+                    function (&$value, $key) {
+                        if (ctype_digit($value) && ('size' === $key || 'error' === $key)) {
+                            $value = (int) $value;
+                        }
+                    }
+                );
+
+                reset($expandedValue);
+
                 $values = array_replace_recursive($values, array($varName => current($expandedValue)));
             }
         }
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
index 0a4cd7201e1bb..437a5ddaf0cbf 100644
--- a/src/Symfony/Component/DomCrawler/Tests/FormTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -456,6 +456,15 @@ public function testGetPhpFiles()
 
         $form = $this->createForm('');
         $this->assertEquals(array('f.o o' => array('bar' => array('ba.z' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0), array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)))), $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names recursively');
+
+        $form = $this->createForm('');
+        $files = $form->getPhpFiles();
+
+        $this->assertSame(0, $files['foo']['bar']['size'], '->getPhpFiles() converts size to int');
+        $this->assertSame(4, $files['foo']['bar']['error'], '->getPhpFiles() converts error to int');
+
+        $form = $this->createForm('');
+        $this->assertEquals(array('size' => array('error' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))), $form->getPhpFiles(), '->getPhpFiles() int conversion does not collide with file names');
     }
 
     /**

From 4fa6fcfb93e0adda06a8136dc3870f84fc48dceb Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 09:13:13 -0700
Subject: [PATCH 0798/1099] updated CHANGELOG for 3.3.9

---
 CHANGELOG-3.3.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index 3331ea2a1d1fa..320bf84f1dc7d 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -7,6 +7,23 @@ in 3.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.3.0...v3.3.1
 
+* 3.3.9 (2017-09-11)
+
+ * bug #24141 [DomCrawler] Fix conversion to int on GetPhpFiles (MaraBlaga)
+ * bug #23853 Filtering empty uuids in ORMQueryBuilderLoader. (mlazovla)
+ * bug #24101 [Security] Fix exception when use_referer option is true and referer is not set or empty (linniksa)
+ * bug #24105 [Filesystem] check permissions if dump target dir is missing (xabbuh)
+ * bug #24126 [HttpKernel] "controller.service_arguments" services should be public (nicolas-grekas)
+ * bug #24113 [FrameworkBundle] Get KERNEL_CLASS through $_ENV too for KernelTestCase (yceruto)
+ * bug #24115 [FrameworkBundle] Get KERNEL_DIR through $_ENV too for KernelTestCase (yceruto)
+ * bug #24041 [ExpressionLanguage] throws an exception on calling uncallable method (fmata)
+ * bug #24096 Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args (chalasr)
+ * bug #24082 [DI] Minor fix in dumped code (nicolas-grekas)
+ * bug #23969 [Cache] Use namespace versioning for backends that dont support clearing by keys (nicolas-grekas)
+ * bug #24021 [DI] Don't track merged configs when the extension doesn't expose it (nicolas-grekas)
+ * bug #24011 [Cache] Always require symfony/polyfill-apcu to provide APCuIterator everywhere (guillaumelecerf)
+ * bug #23730 Fixed the escaping of back slashes and << in console output (javiereguiluz)
+
 * 3.3.8 (2017-08-28)
 
  * bug #24016 [DI] Fix tracking env var placeholders nested in object graphs (nicolas-grekas)

From b9c93f1faa5e0555e2f768fc974fc05d4080a07d Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 09:13:23 -0700
Subject: [PATCH 0799/1099] updated VERSION for 3.3.9

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index f8ed2b08b4b63..5f986cf4f9f09 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,12 +61,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
 
     private $projectDir;
 
-    const VERSION = '3.3.9-DEV';
+    const VERSION = '3.3.9';
     const VERSION_ID = 30309;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 3;
     const RELEASE_VERSION = 9;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '01/2018';
     const END_OF_LIFE = '07/2018';

From 9570a454ef805419cc1f3f7cedc11afd5a176ce1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 09:45:56 -0700
Subject: [PATCH 0800/1099] bumped Symfony version to 3.3.10

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 5f986cf4f9f09..89352961adc4e 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,12 +61,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
 
     private $projectDir;
 
-    const VERSION = '3.3.9';
-    const VERSION_ID = 30309;
+    const VERSION = '3.3.10-DEV';
+    const VERSION_ID = 30310;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 3;
-    const RELEASE_VERSION = 9;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 10;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '01/2018';
     const END_OF_LIFE = '07/2018';

From 98a8a6c735c7ff65d739df1478d565a32e037585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20LEFEBVRE?= 
Date: Sat, 22 Jul 2017 14:19:22 +0200
Subject: [PATCH 0801/1099] Feature #23583  Add current and fallback locales in
 WDT / Profiler

---
 .../views/Collector/translation.html.twig     | 20 +++++++++++++++++++
 .../TranslationDataCollector.php              | 13 ++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
index f2ecb1113a04b..bed53f349f40f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
@@ -12,6 +12,12 @@
         {% endset %}
 
         {% set text %}
+            
+                Locale
+                
+                    {{ collector.locale|default('-') }}
+                
+            
             
                 Missing messages
                 
@@ -61,6 +67,20 @@
 {% endblock %}
 
 {% block panelContent %}
+
+    Translation Locales
+
+    
+        
+            {{ collector.locale|default('-') }}
+            Locale
+        
+        
+            {{ collector.fallbackLocales|join(', ')|default('-') }}
+            Fallback locales
+        
+    
+
     Translation Metrics
 
     
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index b99a49f7ff124..1696fc71ffeea 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -45,6 +45,9 @@ public function lateCollect()
         $this->data = $this->computeCount($messages);
         $this->data['messages'] = $messages;
 
+        $this->data['locale'] = $this->translator->getLocale();
+        $this->data['fallback_locales'] = $this->translator->getFallbackLocales();
+
         $this->data = $this->cloneVar($this->data);
     }
 
@@ -87,6 +90,16 @@ public function getCountDefines()
         return isset($this->data[DataCollectorTranslator::MESSAGE_DEFINED]) ? $this->data[DataCollectorTranslator::MESSAGE_DEFINED] : 0;
     }
 
+    public function getLocale()
+    {
+        return !empty($this->data['locale']) ? $this->data['locale'] : null;
+    }
+
+    public function getFallbackLocales()
+    {
+        return (isset($this->data['fallback_locales']) && count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
+    }
+
     /**
      * {@inheritdoc}
      */

From 2c62ba815076cd1b8ae7164efe206da50ed6280c Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 10:58:01 -0700
Subject: [PATCH 0802/1099] fixed CS

---
 .../FrameworkBundle/DependencyInjection/Configuration.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index a9c5ec462dcd2..cf24be14d9ff0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -253,7 +253,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                 $workflows = $v;
                                 unset($workflows['enabled']);
 
-                                if (count($workflows) === 1 && isset($workflows[0]['enabled'])) {
+                                if (1 === count($workflows) && isset($workflows[0]['enabled'])) {
                                     $workflows = array();
                                 }
 

From 6eff3e5b559feb151720fe76d695750227945fd4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 10:47:15 -0700
Subject: [PATCH 0803/1099] deprecated profiler.matcher configuration

---
 UPGRADE-3.4.md                                               | 5 +++++
 UPGRADE-4.0.md                                               | 5 +++++
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md              | 1 +
 .../FrameworkBundle/DependencyInjection/Configuration.php    | 1 +
 4 files changed, 12 insertions(+)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 20114937efc26..f5ae0f7b23a35 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -210,6 +210,11 @@ Process
  * The `Symfony\Component\Process\ProcessBuilder` class has been deprecated,
    use the `Symfony\Component\Process\Process` class directly instead.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been deprecated.
+
 SecurityBundle
 --------------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 5d404598f7ec0..c6e11a198f8b9 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -583,6 +583,11 @@ Process
 
  * The `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class have been removed.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been removed.
+
 ProxyManager
 ------------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index dafd4c46bb0fc..0c7581e7c0b7d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
  * Removed `doctrine/cache` from the list of required dependencies in `composer.json`
  * Deprecated `validator.mapping.cache.doctrine.apc` service
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index cf24be14d9ff0..6b98ef7cd444f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -219,6 +219,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                         ->arrayNode('matcher')
+                            ->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
                             ->canBeEnabled()
                             ->performNoDeepMerging()
                             ->fixXmlConfig('ip')

From 7a97b49436b20c9664f3e286f8c174bc1aae0364 Mon Sep 17 00:00:00 2001
From: Dariusz 
Date: Mon, 11 Sep 2017 11:28:55 +0200
Subject: [PATCH 0804/1099] [CS] Apply phpdoc_annotation_without_dot

---
 .php_cs.dist                                  |  1 -
 .../AbstractDoctrineExtension.php             |  2 +-
 .../CompilerPass/RegisterMappingsPass.php     | 16 +++---
 .../Form/ChoiceList/DoctrineChoiceLoader.php  |  4 +-
 .../Form/ChoiceList/EntityChoiceList.php      |  4 +-
 .../Doctrine/Form/ChoiceList/IdReader.php     | 10 ++--
 .../Templating/Helper/FormHelper.php          |  2 +-
 .../Component/Config/Definition/BaseNode.php  |  2 +-
 .../Builder/ArrayNodeDefinition.php           |  4 +-
 .../Component/Console/Question/Question.php   |  2 +-
 .../Debug/Tests/DebugClassLoaderTest.php      |  2 +-
 .../Debug/Tests/Fixtures/DeprecatedClass.php  |  2 +-
 .../Tests/Fixtures/DeprecatedInterface.php    |  2 +-
 .../Compiler/CheckCircularReferencesPass.php  |  2 +-
 .../Compiler/CheckReferenceValidityPass.php   |  2 +-
 .../DependencyInjection/Definition.php        |  2 +-
 .../ParameterBag/ParameterBag.php             |  4 +-
 src/Symfony/Component/DomCrawler/Crawler.php  |  2 +-
 .../EventDispatcherInterface.php              |  4 +-
 .../EventDispatcher/GenericEvent.php          |  4 +-
 .../Component/Filesystem/Filesystem.php       |  2 +-
 src/Symfony/Component/Finder/Finder.php       |  2 +-
 .../Component/Form/AbstractRendererEngine.php | 16 +++---
 src/Symfony/Component/Form/Button.php         |  2 +-
 src/Symfony/Component/Form/ButtonBuilder.php  |  2 +-
 .../Form/ChoiceList/ArrayChoiceList.php       |  4 +-
 .../Factory/CachingFactoryDecorator.php       |  2 +-
 .../Form/ChoiceList/View/ChoiceGroupView.php  |  4 +-
 .../Form/ChoiceList/View/ChoiceListView.php   |  4 +-
 .../Component/Form/DataMapperInterface.php    |  4 +-
 .../Form/DataTransformerInterface.php         |  4 +-
 .../Extension/Core/ChoiceList/ChoiceList.php  | 42 ++++++++--------
 .../Core/ChoiceList/ObjectChoiceList.php      |  8 +--
 .../Core/ChoiceList/SimpleChoiceList.php      | 12 ++---
 .../BooleanToStringTransformer.php            |  4 +-
 .../ChoiceToBooleanArrayTransformer.php       | 12 ++---
 .../ChoicesToBooleanArrayTransformer.php      |  8 +--
 .../ChoicesToValuesTransformer.php            |  6 +--
 .../DateTimeToLocalizedStringTransformer.php  |  8 +--
 .../MoneyToLocalizedStringTransformer.php     |  8 +--
 .../NumberToLocalizedStringTransformer.php    |  8 +--
 .../PercentToLocalizedStringTransformer.php   |  8 +--
 .../ValueToDuplicatesTransformer.php          |  4 +-
 .../EventListener/MergeCollectionListener.php |  8 +--
 .../Validator/ValidatorTypeGuesser.php        |  4 +-
 .../ViolationMapperInterface.php              |  8 +--
 .../ViolationMapper/ViolationPath.php         |  6 +--
 src/Symfony/Component/Form/Form.php           |  8 +--
 .../Component/Form/FormConfigBuilder.php      |  8 +--
 .../Form/FormConfigBuilderInterface.php       |  9 ++--
 .../Component/Form/FormConfigInterface.php    |  4 +-
 .../Component/Form/FormErrorIterator.php      |  4 +-
 src/Symfony/Component/Form/FormInterface.php  | 26 +++++-----
 .../Form/FormRendererEngineInterface.php      | 18 +++----
 src/Symfony/Component/Form/SubmitButton.php   |  2 +-
 .../Form/Util/OrderedHashMapIterator.php      |  8 +--
 .../Component/HttpFoundation/Response.php     |  6 +--
 .../Session/SessionInterface.php              |  2 +-
 .../Storage/SessionStorageInterface.php       |  6 +--
 .../EventListener/FragmentListener.php        |  2 +-
 .../Data/Bundle/Compiler/GenrbCompiler.php    |  2 +-
 .../Bundle/Reader/BufferedBundleReader.php    |  4 +-
 .../Reader/BundleEntryReaderInterface.php     |  4 +-
 .../Bundle/Reader/BundleReaderInterface.php   |  4 +-
 .../Data/Bundle/Writer/TextBundleWriter.php   | 20 ++++----
 .../Intl/DateFormatter/IntlDateFormatter.php  |  6 +--
 .../Intl/NumberFormatter/NumberFormatter.php  | 18 +++----
 .../Intl/Resources/stubs/functions.php        |  8 +--
 .../Component/Intl/Util/IcuVersion.php        |  4 +-
 src/Symfony/Component/Intl/Util/SvnCommit.php |  4 +-
 .../Component/Intl/Util/SvnRepository.php     |  4 +-
 src/Symfony/Component/Intl/Util/Version.php   |  4 +-
 .../OptionsResolverInterface.php              | 50 +++++++++----------
 src/Symfony/Component/Process/Process.php     |  4 +-
 .../PropertyAccess/PropertyAccessor.php       |  6 +--
 .../PropertyAccess/PropertyPathBuilder.php    | 16 +++---
 .../Routing/Loader/XmlFileLoader.php          |  4 +-
 .../Component/Routing/RouteCompiler.php       |  4 +-
 .../Authorization/AuthorizationChecker.php    |  2 +-
 .../Core/User/InMemoryUserProvider.php        |  2 +-
 .../Http/Logout/LogoutUrlGenerator.php        |  2 +-
 .../Serializer/Encoder/ChainDecoder.php       |  2 +-
 .../Normalizer/NormalizableInterface.php      | 10 ++--
 .../Translation/Loader/MoFileLoader.php       |  2 +-
 .../Component/Validator/Constraint.php        |  2 +-
 .../ConstraintViolationInterface.php          |  8 +--
 .../ConstraintViolationListInterface.php      |  2 +-
 .../Component/Validator/DefaultTranslator.php |  4 +-
 .../Validator/ExecutionContextInterface.php   | 12 ++---
 .../Component/Validator/Validation.php        |  2 +-
 .../Validator/ValidationVisitorInterface.php  |  4 +-
 src/Symfony/Component/Validator/Validator.php |  4 +-
 .../Validator/ValidatorInterface.php          |  4 +-
 93 files changed, 301 insertions(+), 303 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 6282431a419d4..25f1f4c931bdc 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -12,7 +12,6 @@ return PhpCsFixer\Config::create()
         'no_unreachable_default_argument_value' => false,
         'braces' => array('allow_single_line_closure' => true),
         'heredoc_to_nowdoc' => false,
-        'phpdoc_annotation_without_dot' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 940ca6fdf9fbd..b3fecad9df233 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -301,7 +301,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
      * @param ContainerBuilder $container     A ContainerBuilder instance
      * @param string           $cacheName
      *
-     * @throws \InvalidArgumentException In case of unknown driver type.
+     * @throws \InvalidArgumentException in case of unknown driver type
      */
     protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
     {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
index e37e4f66c29aa..7f169fe1ae696 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -108,15 +108,15 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *
      * @param Definition|Reference $driver                  Driver DI definition or reference
      * @param string[]             $namespaces              List of namespaces handled by $driver
-     * @param string[]             $managerParameters       List of container parameters that could
-     *                                                      hold the manager name.
+     * @param string[]             $managerParameters       list of container parameters that could
+     *                                                      hold the manager name
      * @param string               $driverPattern           Pattern for the metadata driver service name
      * @param string|false         $enabledParameter        Service container parameter that must be
      *                                                      present to enable the mapping. Set to false
      *                                                      to not do any check, optional.
      * @param string               $configurationPattern    Pattern for the Configuration service name
-     * @param string               $registerAliasMethodName Name of Configuration class method to
-     *                                                      register alias.
+     * @param string               $registerAliasMethodName name of Configuration class method to
+     *                                                      register alias
      * @param string[]             $aliasMap                Map of alias to namespace
      */
     public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
@@ -174,7 +174,7 @@ public function process(ContainerBuilder $container)
      * @return string The name of the chain driver service
      *
      * @throws ParameterNotFoundException if non of the managerParameters has a
-     *                                    non-empty value.
+     *                                    non-empty value
      */
     protected function getChainDriverServiceName(ContainerBuilder $container)
     {
@@ -185,7 +185,7 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
      * Create the service definition for the metadata driver.
      *
      * @param ContainerBuilder $container passed on in case an extending class
-     *                                    needs access to the container.
+     *                                    needs access to the container
      *
      * @return Definition|Reference the metadata driver to add to all chain drivers
      */
@@ -202,7 +202,7 @@ protected function getDriver(ContainerBuilder $container)
      * @return string a service definition name
      *
      * @throws ParameterNotFoundException if none of the managerParameters has a
-     *                                    non-empty value.
+     *                                    non-empty value
      */
     private function getConfigurationServiceName(ContainerBuilder $container)
     {
@@ -219,7 +219,7 @@ private function getConfigurationServiceName(ContainerBuilder $container)
      *
      * @return string The name of the active manager
      *
-     * @throws ParameterNotFoundException If none of the managerParameters is found in the container.
+     * @throws ParameterNotFoundException if none of the managerParameters is found in the container
      */
     private function getManagerName(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
index 9343876ef35b5..02280c4fe8785 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -65,8 +65,8 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      * @param ObjectManager              $manager      The object manager
      * @param string                     $class        The class name of the
      *                                                 loaded objects
-     * @param IdReader                   $idReader     The reader for the object
-     *                                                 IDs.
+     * @param IdReader                   $idReader     the reader for the object
+     *                                                 IDs
      * @param null|EntityLoaderInterface $objectLoader The objects loader
      */
     public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
index d22a85466f972..72d7a6f10bd4f 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -389,8 +389,8 @@ public function getIndicesForValues(array $values)
      *
      * @param mixed $entity The choice to create an index for
      *
-     * @return int|string A unique index containing only ASCII letters,
-     *                    digits and underscores.
+     * @return int|string a unique index containing only ASCII letters,
+     *                    digits and underscores
      */
     protected function createIndex($entity)
     {
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
index cd966ea986f79..0161adf3b4c0a 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
@@ -20,7 +20,7 @@
  *
  * @author Bernhard Schussek 
  *
- * @internal This class is meant for internal use only.
+ * @internal this class is meant for internal use only
  */
 class IdReader
 {
@@ -79,8 +79,8 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)
     /**
      * Returns whether the class has a single-column ID.
      *
-     * @return bool Returns `true` if the class has a single-column ID and
-     *              `false` otherwise.
+     * @return bool returns `true` if the class has a single-column ID and
+     *              `false` otherwise
      */
     public function isSingleId()
     {
@@ -90,8 +90,8 @@ public function isSingleId()
     /**
      * Returns whether the class has a single-column integer ID.
      *
-     * @return bool Returns `true` if the class has a single-column integer ID
-     *              and `false` otherwise.
+     * @return bool returns `true` if the class has a single-column integer ID
+     *              and `false` otherwise
      */
     public function isIntId()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index 47c434aa476da..8375fb0235a0c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -257,7 +257,7 @@ public function block(FormView $view, $blockName, array $variables = array())
      *
      * @return string A CSRF token
      *
-     * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.
+     * @throws \BadMethodCallException when no CSRF provider was injected in the constructor
      */
     public function csrfToken($intention)
     {
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index dbf36335b69e3..09d047994ae08 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -38,7 +38,7 @@ abstract class BaseNode implements NodeInterface
      * @param string        $name   The name of the node
      * @param NodeInterface $parent The parent of this node
      *
-     * @throws \InvalidArgumentException if the name contains a period.
+     * @throws \InvalidArgumentException if the name contains a period
      */
     public function __construct($name, NodeInterface $parent = null)
     {
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index 03bb0cfdeeb3c..f2d22fd1f5c54 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -97,10 +97,10 @@ public function addDefaultsIfNotSet()
     /**
      * Adds children with a default value when none are defined.
      *
-     * @param int|string|array|null $children The number of children|The child name|The children names to be added
-     *
      * This method is applicable to prototype nodes only.
      *
+     * @param int|string|array|null $children the number of children|The child name|The children names to be added
+     *
      * @return $this
      */
     public function addDefaultChildrenIfNoneSet($children = null)
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index 373501d691f8c..f466254324583 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -187,7 +187,7 @@ public function getValidator()
      *
      * @return $this
      *
-     * @throws \InvalidArgumentException In case the number of attempts is invalid.
+     * @throws \InvalidArgumentException in case the number of attempts is invalid
      */
     public function setMaxAttempts($attempts)
     {
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
index 1843418e919c9..437f1e2ecfa72 100644
--- a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+++ b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -208,7 +208,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
 
         $xError = array(
             'type' => E_USER_DEPRECATED,
-            'message' => 'The Test\Symfony\Component\Debug\Tests\\'.$class.' class '.$type.' Symfony\Component\Debug\Tests\Fixtures\\'.$super.' that is deprecated but this is a test deprecation notice.',
+            'message' => 'The Test\Symfony\Component\Debug\Tests\\'.$class.' class '.$type.' Symfony\Component\Debug\Tests\Fixtures\\'.$super.' that is deprecated but this is a test deprecation notice',
         );
 
         $this->assertSame($xError, $lastError);
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedClass.php b/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedClass.php
index b4c78cd140f13..51fde5af8a1d0 100644
--- a/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedClass.php
+++ b/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedClass.php
@@ -4,7 +4,7 @@
 
 /**
  * @deprecated but this is a test
- *             deprecation notice.
+ *             deprecation notice
  * @foobar
  */
 class DeprecatedClass
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedInterface.php b/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedInterface.php
index 505eccae751b9..6bab62f9563b8 100644
--- a/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedInterface.php
+++ b/src/Symfony/Component/Debug/Tests/Fixtures/DeprecatedInterface.php
@@ -4,7 +4,7 @@
 
 /**
  * @deprecated but this is a test
- *             deprecation notice.
+ *             deprecation notice
  * @foobar
  */
 interface DeprecatedInterface
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index f39a89af2be71..0b9c573acfbdb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
      *
      * @param ServiceReferenceGraphEdge[] $edges An array of Edges
      *
-     * @throws ServiceCircularReferenceException When a circular reference is found.
+     * @throws ServiceCircularReferenceException when a circular reference is found
      */
     private function checkOutEdges(array $edges)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
index 82202a9fb6007..f8c09d42f0c61 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
@@ -85,7 +85,7 @@ public function process(ContainerBuilder $container)
      *
      * @param array $arguments An array of Reference objects
      *
-     * @throws RuntimeException when there is a reference to an abstract definition.
+     * @throws RuntimeException when there is a reference to an abstract definition
      */
     private function validateReferences(array $arguments)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index cad6398f7fb8e..780ad187cdba5 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -140,7 +140,7 @@ public function setFactoryMethod($factoryMethod)
      *
      * @return $this
      *
-     * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
+     * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
      */
     public function setDecoratedService($id, $renamedId = null)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index 0611b1f69e322..dbfa5b6ae594c 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -151,7 +151,7 @@ public function resolve()
      *
      * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
      * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
+     * @throws RuntimeException                    when a given parameter has a type problem
      */
     public function resolveValue($value, array $resolving = array())
     {
@@ -181,7 +181,7 @@ public function resolveValue($value, array $resolving = array())
      *
      * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
      * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
+     * @throws RuntimeException                    when a given parameter has a type problem
      */
     public function resolveString($value, array $resolving = array())
     {
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index ed9b0b02398f5..f711c02bfff83 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -71,7 +71,7 @@ public function clear()
      *
      * @param \DOMNodeList|\DOMNode|array|string|null $node A node
      *
-     * @throws \InvalidArgumentException When node is not the expected type.
+     * @throws \InvalidArgumentException when node is not the expected type
      */
     public function add($node)
     {
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index abe8d2895ebc3..b1f976cdf20ab 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -26,8 +26,8 @@ interface EventDispatcherInterface
      * @param string $eventName The name of the event to dispatch. The name of
      *                          the event is the name of the method that is
      *                          invoked on listeners.
-     * @param Event  $event     The event to pass to the event handlers/listeners
-     *                          If not supplied, an empty Event instance is created.
+     * @param Event  $event     the event to pass to the event handlers/listeners
+     *                          If not supplied, an empty Event instance is created
      *
      * @return Event
      */
diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
index e8e4cc050266e..a7520a0f34567 100644
--- a/src/Symfony/Component/EventDispatcher/GenericEvent.php
+++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -63,7 +63,7 @@ public function getSubject()
      *
      * @return mixed Contents of array key
      *
-     * @throws \InvalidArgumentException If key is not found.
+     * @throws \InvalidArgumentException if key is not found
      */
     public function getArgument($key)
     {
@@ -132,7 +132,7 @@ public function hasArgument($key)
      *
      * @return mixed
      *
-     * @throws \InvalidArgumentException If key does not exist in $this->args.
+     * @throws \InvalidArgumentException if key does not exist in $this->args
      */
     public function offsetGet($key)
     {
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index bc2e3dcc2d897..3a8316573160c 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -525,7 +525,7 @@ public function isAbsolutePath($file)
      * @param null|int $mode     The file mode (octal). If null, file permissions are not modified
      *                           Deprecated since version 2.3.12, to be removed in 3.0.
      *
-     * @throws IOException If the file cannot be written to.
+     * @throws IOException if the file cannot be written to
      */
     public function dumpFile($filename, $content, $mode = 0666)
     {
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index edbdcd6402074..d8408d1f3c90d 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -681,7 +681,7 @@ public function getIterator()
      *
      * @return $this
      *
-     * @throws \InvalidArgumentException When the given argument is not iterable.
+     * @throws \InvalidArgumentException when the given argument is not iterable
      */
     public function append($iterator)
     {
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index ae9938a0f004c..7519011225282 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -139,14 +139,14 @@ abstract protected function loadResourceForBlockName($cacheKey, FormView $view,
      *
      * @see getResourceForBlockHierarchy()
      *
-     * @param string   $cacheKey           The cache key used for storing the
-     *                                     resource.
-     * @param FormView $view               The form view for finding the applying
-     *                                     themes.
-     * @param array    $blockNameHierarchy The block hierarchy, with the most
-     *                                     specific block name at the end.
-     * @param int      $hierarchyLevel     The level in the block hierarchy that
-     *                                     should be loaded.
+     * @param string   $cacheKey           the cache key used for storing the
+     *                                     resource
+     * @param FormView $view               the form view for finding the applying
+     *                                     themes
+     * @param array    $blockNameHierarchy the block hierarchy, with the most
+     *                                     specific block name at the end
+     * @param int      $hierarchyLevel     the level in the block hierarchy that
+     *                                     should be loaded
      *
      * @return bool True if the resource could be loaded, false otherwise
      */
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index efc14c063932b..9a5f8a60bd433 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -371,7 +371,7 @@ public function handleRequest($request = null)
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the button has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the button has already been submitted
      */
     public function submit($submittedData, $clearMissing = true)
     {
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index eaecb382fd327..ad311db29095c 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -58,7 +58,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
      * @param string $name    The name of the button
      * @param array  $options The button's options
      *
-     * @throws InvalidArgumentException If the name is empty.
+     * @throws InvalidArgumentException if the name is empty
      */
     public function __construct($name, array $options = array())
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 4a2588ef1d475..676987e641216 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -222,8 +222,8 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
      * @param array      $choices The choices
      * @param array|null $cache   The cache for previously checked entries. Internal
      *
-     * @return bool Returns true if the choices can be cast to strings and
-     *              false otherwise.
+     * @return bool returns true if the choices can be cast to strings and
+     *              false otherwise
      */
     private function castableToString(array $choices, array &$cache = array())
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
index ae7f2375bb896..5ce851096cfc8 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -48,7 +48,7 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface
      *
      * @return string The SHA-256 hash
      *
-     * @internal Should not be used by user-land code.
+     * @internal should not be used by user-land code
      */
     public static function generateHash($value, $namespace = '')
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
index 9e648cc360000..455fa68ac4ba1 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
@@ -36,8 +36,8 @@ class ChoiceGroupView implements \IteratorAggregate
      * Creates a new choice group view.
      *
      * @param string                         $label   The label of the group
-     * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views in the
-     *                                                group.
+     * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the
+     *                                                group
      */
     public function __construct($label, array $choices = array())
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
index cea30dd655559..05c40a48831cd 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
@@ -40,8 +40,8 @@ class ChoiceListView
      * Creates a new choice list view.
      *
      * @param ChoiceGroupView[]|ChoiceView[] $choices          The choice views
-     * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices The preferred
-     *                                                         choice views.
+     * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred
+     *                                                         choice views
      */
     public function __construct(array $choices = array(), array $preferredChoices = array())
     {
diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php
index f1867a9f901f4..bb262e7b8e6b8 100644
--- a/src/Symfony/Component/Form/DataMapperInterface.php
+++ b/src/Symfony/Component/Form/DataMapperInterface.php
@@ -22,7 +22,7 @@ interface DataMapperInterface
      * @param mixed                        $data  Structured data
      * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
      *
-     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.
+     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
     public function mapDataToForms($data, $forms);
 
@@ -32,7 +32,7 @@ public function mapDataToForms($data, $forms);
      * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
      * @param mixed                        $data  Structured data
      *
-     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.
+     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
     public function mapFormsToData($forms, &$data);
 }
diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php
index ee0afda8a91b1..deb073c8128fe 100644
--- a/src/Symfony/Component/Form/DataTransformerInterface.php
+++ b/src/Symfony/Component/Form/DataTransformerInterface.php
@@ -45,7 +45,7 @@ interface DataTransformerInterface
      *
      * @return mixed The value in the transformed representation
      *
-     * @throws TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException when the transformation fails
      */
     public function transform($value);
 
@@ -71,7 +71,7 @@ public function transform($value);
      *
      * @return mixed The value in the original representation
      *
-     * @throws TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException when the transformation fails
      */
     public function reverseTransform($value);
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
index 90e5d774e72e5..6e0cea5539405 100644
--- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
+++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -82,10 +82,10 @@ class ChoiceList implements ChoiceListInterface
      *                                             level of the hierarchy may also be a \Traversable.
      * @param array              $labels           The array of labels. The structure of this array
      *                                             should match the structure of $choices.
-     * @param array              $preferredChoices A flat array of choices that should be
-     *                                             presented to the user with priority.
+     * @param array              $preferredChoices a flat array of choices that should be
+     *                                             presented to the user with priority
      *
-     * @throws UnexpectedTypeException If the choices are not an array or \Traversable.
+     * @throws UnexpectedTypeException if the choices are not an array or \Traversable
      */
     public function __construct($choices, array $labels, array $preferredChoices = array())
     {
@@ -260,16 +260,16 @@ public function getIndicesForValues(array $values)
     /**
      * Recursively adds the given choices to the list.
      *
-     * @param array              $bucketForPreferred The bucket where to store the preferred
-     *                                               view objects.
-     * @param array              $bucketForRemaining The bucket where to store the
-     *                                               non-preferred view objects.
+     * @param array              $bucketForPreferred the bucket where to store the preferred
+     *                                               view objects
+     * @param array              $bucketForRemaining the bucket where to store the
+     *                                               non-preferred view objects
      * @param array|\Traversable $choices            The list of choices
      * @param array              $labels             The labels corresponding to the choices
      * @param array              $preferredChoices   The preferred choices
      *
-     * @throws InvalidArgumentException      If the structures of the choices and labels array do not match.
-     * @throws InvalidConfigurationException If no valid value or index could be created for a choice.
+     * @throws InvalidArgumentException      if the structures of the choices and labels array do not match
+     * @throws InvalidConfigurationException if no valid value or index could be created for a choice
      */
     protected function addChoices(array &$bucketForPreferred, array &$bucketForRemaining, $choices, array $labels, array $preferredChoices)
     {
@@ -307,15 +307,15 @@ protected function addChoices(array &$bucketForPreferred, array &$bucketForRemai
      * Recursively adds a choice group.
      *
      * @param string $group              The name of the group
-     * @param array  $bucketForPreferred The bucket where to store the preferred
-     *                                   view objects.
-     * @param array  $bucketForRemaining The bucket where to store the
-     *                                   non-preferred view objects.
+     * @param array  $bucketForPreferred the bucket where to store the preferred
+     *                                   view objects
+     * @param array  $bucketForRemaining the bucket where to store the
+     *                                   non-preferred view objects
      * @param array  $choices            The list of choices in the group
      * @param array  $labels             The labels corresponding to the choices in the group
      * @param array  $preferredChoices   The preferred choices
      *
-     * @throws InvalidConfigurationException If no valid value or index could be created for a choice.
+     * @throws InvalidConfigurationException if no valid value or index could be created for a choice
      */
     protected function addChoiceGroup($group, array &$bucketForPreferred, array &$bucketForRemaining, array $choices, array $labels, array $preferredChoices)
     {
@@ -344,15 +344,15 @@ protected function addChoiceGroup($group, array &$bucketForPreferred, array &$bu
     /**
      * Adds a new choice.
      *
-     * @param array  $bucketForPreferred The bucket where to store the preferred
-     *                                   view objects.
-     * @param array  $bucketForRemaining The bucket where to store the
-     *                                   non-preferred view objects.
+     * @param array  $bucketForPreferred the bucket where to store the preferred
+     *                                   view objects
+     * @param array  $bucketForRemaining the bucket where to store the
+     *                                   non-preferred view objects
      * @param mixed  $choice             The choice to add
      * @param string $label              The label for the choice
      * @param array  $preferredChoices   The preferred choices
      *
-     * @throws InvalidConfigurationException If no valid value or index could be created.
+     * @throws InvalidConfigurationException if no valid value or index could be created
      */
     protected function addChoice(array &$bucketForPreferred, array &$bucketForRemaining, $choice, $label, array $preferredChoices)
     {
@@ -404,8 +404,8 @@ protected function isPreferred($choice, array $preferredChoices)
      *
      * @param mixed $choice The choice to create an index for
      *
-     * @return int|string A unique index containing only ASCII letters,
-     *                    digits and underscores.
+     * @return int|string a unique index containing only ASCII letters,
+     *                    digits and underscores
      */
     protected function createIndex($choice)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
index 6460ba81efafa..5e2b9a75a2909 100644
--- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
+++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -80,8 +80,8 @@ class ObjectChoiceList extends ChoiceList
      *                                                    by calling the getter on the object. If the
      *                                                    path is NULL, the object's __toString() method
      *                                                    is used instead.
-     * @param array                     $preferredChoices A flat array of choices that should be
-     *                                                    presented to the user with priority.
+     * @param array                     $preferredChoices a flat array of choices that should be
+     *                                                    presented to the user with priority
      * @param string                    $groupPath        A property path pointing to the property used
      *                                                    to group the choices. Only allowed if
      *                                                    the choices are given as flat array.
@@ -109,8 +109,8 @@ public function __construct($choices, $labelPath = null, array $preferredChoices
      * @param array              $labels           Ignored
      * @param array              $preferredChoices The choices to display with priority
      *
-     * @throws InvalidArgumentException When passing a hierarchy of choices and using
-     *                                  the "groupPath" option at the same time.
+     * @throws InvalidArgumentException when passing a hierarchy of choices and using
+     *                                  the "groupPath" option at the same time
      */
     protected function initialize($choices, array $labels, array $preferredChoices)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
index 537e318f80dbf..e5fd865d0dee1 100644
--- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
+++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
@@ -44,8 +44,8 @@ class SimpleChoiceList extends ChoiceList
      *                                as hierarchy of unlimited depth by creating nested
      *                                arrays. The title of the sub-hierarchy is stored
      *                                in the array key pointing to the nested array.
-     * @param array $preferredChoices A flat array of choices that should be
-     *                                presented to the user with priority.
+     * @param array $preferredChoices a flat array of choices that should be
+     *                                presented to the user with priority
      */
     public function __construct(array $choices, array $preferredChoices = array())
     {
@@ -83,10 +83,10 @@ public function getValuesForChoices(array $choices)
      * Takes care of splitting the single $choices array passed in the
      * constructor into choices and labels.
      *
-     * @param array              $bucketForPreferred The bucket where to store the preferred
-     *                                               view objects.
-     * @param array              $bucketForRemaining The bucket where to store the
-     *                                               non-preferred view objects.
+     * @param array              $bucketForPreferred the bucket where to store the preferred
+     *                                               view objects
+     * @param array              $bucketForRemaining the bucket where to store the
+     *                                               non-preferred view objects
      * @param array|\Traversable $choices            The list of choices
      * @param array              $labels             Ignored
      * @param array              $preferredChoices   The preferred choices
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
index 5d3e5eaf051c2..f98b787cacde8 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
@@ -46,7 +46,7 @@ public function __construct($trueValue)
      *
      * @return string String value
      *
-     * @throws TransformationFailedException If the given value is not a Boolean.
+     * @throws TransformationFailedException if the given value is not a Boolean
      */
     public function transform($value)
     {
@@ -68,7 +68,7 @@ public function transform($value)
      *
      * @return bool Boolean value
      *
-     * @throws TransformationFailedException If the given value is not a string.
+     * @throws TransformationFailedException if the given value is not a string
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
index 50ee4b693e485..89f13b6cb26e4 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -49,13 +49,13 @@ public function __construct(ChoiceListInterface $choiceList, $placeholderPresent
      * depending on whether a given option is selected. If this field is rendered
      * as select tag, the value is not modified.
      *
-     * @param mixed $choice An array if "multiple" is set to true, a scalar
-     *                      value otherwise.
+     * @param mixed $choice an array if "multiple" is set to true, a scalar
+     *                      value otherwise
      *
      * @return mixed An array
      *
-     * @throws TransformationFailedException If the given value is not scalar or
-     *                                       if the choices can not be retrieved.
+     * @throws TransformationFailedException if the given value is not scalar or
+     *                                       if the choices can not be retrieved
      */
     public function transform($choice)
     {
@@ -89,10 +89,10 @@ public function transform($choice)
      *
      * @return mixed A scalar value
      *
-     * @throws TransformationFailedException If the given value is not an array,
+     * @throws TransformationFailedException if the given value is not an array,
      *                                       if the recuperation of the choices
      *                                       fails or if some choice can't be
-     *                                       found.
+     *                                       found
      */
     public function reverseTransform($values)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
index 26c6781403227..6cbc5dd464cc0 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
@@ -44,8 +44,8 @@ public function __construct(ChoiceListInterface $choiceList)
      *
      * @return mixed An array
      *
-     * @throws TransformationFailedException If the given value is not an array
-     *                                       or if the choices can not be retrieved.
+     * @throws TransformationFailedException if the given value is not an array
+     *                                       or if the choices can not be retrieved
      */
     public function transform($array)
     {
@@ -83,10 +83,10 @@ public function transform($array)
      *
      * @return mixed An array
      *
-     * @throws TransformationFailedException If the given value is not an array,
+     * @throws TransformationFailedException if the given value is not an array,
      *                                       if the recuperation of the choices
      *                                       fails or if some choice can't be
-     *                                       found.
+     *                                       found
      */
     public function reverseTransform($values)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
index 0a1f2f028863a..65bcf6d4ae3ea 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -37,7 +37,7 @@ public function __construct(ChoiceListInterface $choiceList)
      *
      * @return array
      *
-     * @throws TransformationFailedException If the given value is not an array.
+     * @throws TransformationFailedException if the given value is not an array
      */
     public function transform($array)
     {
@@ -57,9 +57,9 @@ public function transform($array)
      *
      * @return array
      *
-     * @throws TransformationFailedException If the given value is not an array
+     * @throws TransformationFailedException if the given value is not an array
      *                                       or if no matching choice could be
-     *                                       found for some given value.
+     *                                       found for some given value
      */
     public function reverseTransform($array)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index e1db36bda663d..bc8f64dffa6c5 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -74,9 +74,9 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $date
      *
      * @return string|array Localized date string/array
      *
-     * @throws TransformationFailedException If the given value is not an instance
+     * @throws TransformationFailedException if the given value is not an instance
      *                                       of \DateTime or \DateTimeInterface or
-     *                                       if the date could not be transformed.
+     *                                       if the date could not be transformed
      */
     public function transform($dateTime)
     {
@@ -152,11 +152,11 @@ public function reverseTransform($value)
     /**
      * Returns a preconfigured IntlDateFormatter instance.
      *
-     * @param bool $ignoreTimezone Use UTC regardless of the configured timezone.
+     * @param bool $ignoreTimezone use UTC regardless of the configured timezone
      *
      * @return \IntlDateFormatter
      *
-     * @throws TransformationFailedException in case the date formatter can not be constructed.
+     * @throws TransformationFailedException in case the date formatter can not be constructed
      */
     protected function getIntlDateFormatter($ignoreTimezone = false)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
index 6eeee1280bd75..5993c01cb0da9 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -49,8 +49,8 @@ public function __construct($scale = 2, $grouping = true, $roundingMode = self::
      *
      * @return string Localized money string
      *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric or
+     *                                       if the value can not be transformed
      */
     public function transform($value)
     {
@@ -72,8 +72,8 @@ public function transform($value)
      *
      * @return int|float Normalized number
      *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not a string
+     *                                       or if the value can not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index 1e86ffb92e8a9..a719847142366 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -124,8 +124,8 @@ public function __construct($scale = null, $grouping = false, $roundingMode = se
      *
      * @return string Localized value
      *
-     * @throws TransformationFailedException If the given value is not numeric
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric
+     *                                       or if the value can not be transformed
      */
     public function transform($value)
     {
@@ -157,8 +157,8 @@ public function transform($value)
      *
      * @return int|float The numeric value
      *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not a string
+     *                                       or if the value can not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index 7fc191a054ff4..0eb3e2be26dcd 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -70,8 +70,8 @@ public function __construct($scale = null, $type = null)
      *
      * @return string Percentage value
      *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value could not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric or
+     *                                       if the value could not be transformed
      */
     public function transform($value)
     {
@@ -105,8 +105,8 @@ public function transform($value)
      *
      * @return int|float Normalized value
      *
-     * @throws TransformationFailedException If the given value is not a string or
-     *                                       if the value could not be transformed.
+     * @throws TransformationFailedException if the given value is not a string or
+     *                                       if the value could not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
index ffc9915fa409f..2c1d6d0f62b88 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
@@ -51,8 +51,8 @@ public function transform($value)
      *
      * @return mixed The value
      *
-     * @throws TransformationFailedException If the given value is not an array or
-     *                                       if the given array can not be transformed.
+     * @throws TransformationFailedException if the given value is not an array or
+     *                                       if the given array can not be transformed
      */
     public function reverseTransform($array)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index a65116fd5c8ce..6cd5e69d0e48e 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -38,10 +38,10 @@ class MergeCollectionListener implements EventSubscriberInterface
     /**
      * Creates a new listener.
      *
-     * @param bool $allowAdd    Whether values might be added to the
-     *                          collection.
-     * @param bool $allowDelete Whether values might be removed from the
-     *                          collection.
+     * @param bool $allowAdd    whether values might be added to the
+     *                          collection
+     * @param bool $allowDelete whether values might be removed from the
+     *                          collection
      */
     public function __construct($allowAdd = false, $allowDelete = false)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index 880e71d39a24b..b04a9447fc724 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -258,8 +258,8 @@ public function guessPatternForConstraint(Constraint $constraint)
      * @param string   $property     The property for which to find constraints
      * @param \Closure $closure      The closure that returns a guess
      *                               for a given constraint
-     * @param mixed    $defaultValue The default value assumed if no other value
-     *                               can be guessed.
+     * @param mixed    $defaultValue the default value assumed if no other value
+     *                               can be guessed
      *
      * @return Guess|null The guessed value with the highest confidence
      */
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
index bb7c6b7670aef..7f3a4297c3fcb 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
@@ -24,10 +24,10 @@ interface ViolationMapperInterface
      * the given form.
      *
      * @param ConstraintViolation $violation            The violation to map
-     * @param FormInterface       $form                 The root form of the tree
-     *                                                  to map it to.
-     * @param bool                $allowNonSynchronized Whether to allow
-     *                                                  mapping to non-synchronized forms.
+     * @param FormInterface       $form                 the root form of the tree
+     *                                                  to map it to
+     * @param bool                $allowNonSynchronized whether to allow
+     *                                                  mapping to non-synchronized forms
      */
     public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false);
 }
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
index 1e984e2f4da83..fcc2b7c103d85 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -48,8 +48,8 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
     /**
      * Creates a new violation path from a string.
      *
-     * @param string $violationPath The property path of a {@link \Symfony\Component\Validator\ConstraintViolation}
-     *                              object.
+     * @param string $violationPath the property path of a {@link \Symfony\Component\Validator\ConstraintViolation}
+     *                              object
      */
     public function __construct($violationPath)
     {
@@ -210,7 +210,7 @@ public function isIndex($index)
      *
      * @return bool Whether the element maps to a form
      *
-     * @throws OutOfBoundsException If the offset is invalid.
+     * @throws OutOfBoundsException if the offset is invalid
      */
     public function mapsForm($index)
     {
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 87cd15bf47d87..7e662f8f1e5c0 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -996,7 +996,7 @@ public function offsetExists($name)
      *
      * @return FormInterface The child form
      *
-     * @throws \OutOfBoundsException If the named child does not exist.
+     * @throws \OutOfBoundsException if the named child does not exist
      */
     public function offsetGet($name)
     {
@@ -1009,8 +1009,8 @@ public function offsetGet($name)
      * @param string        $name  Ignored. The name of the child is used
      * @param FormInterface $child The child to be added
      *
-     * @throws AlreadySubmittedException If the form has already been submitted.
-     * @throws LogicException            When trying to add a child to a non-compound form.
+     * @throws AlreadySubmittedException if the form has already been submitted
+     * @throws LogicException            when trying to add a child to a non-compound form
      *
      * @see self::add()
      */
@@ -1024,7 +1024,7 @@ public function offsetSet($name, $child)
      *
      * @param string $name The name of the child to remove
      *
-     * @throws AlreadySubmittedException If the form has already been submitted.
+     * @throws AlreadySubmittedException if the form has already been submitted
      */
     public function offsetUnset($name)
     {
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index 61c0da55c0bef..f51881a092c97 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -185,8 +185,8 @@ class FormConfigBuilder implements FormConfigBuilderInterface
      * @param EventDispatcherInterface $dispatcher The event dispatcher
      * @param array                    $options    The form options
      *
-     * @throws InvalidArgumentException If the data class is not a valid class or if
-     *                                  the name contains invalid characters.
+     * @throws InvalidArgumentException if the data class is not a valid class or if
+     *                                  the name contains invalid characters
      */
     public function __construct($name, $dataClass, EventDispatcherInterface $dispatcher, array $options = array())
     {
@@ -882,8 +882,8 @@ public function getFormConfig()
      *
      * @param string|int $name The tested form name
      *
-     * @throws UnexpectedTypeException  If the name is not a string or an integer.
-     * @throws InvalidArgumentException If the name contains invalid characters.
+     * @throws UnexpectedTypeException  if the name is not a string or an integer
+     * @throws InvalidArgumentException if the name contains invalid characters
      */
     public static function validateName($name)
     {
diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index 13ac4682b6bca..3cb4e384824de 100644
--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -152,9 +152,8 @@ public function setRequired($required);
     /**
      * Sets the property path that the form should be mapped to.
      *
-     * @param null|string|PropertyPathInterface $propertyPath
-     *                                                        The property path or null if the path should be set
-     *                                                        automatically based on the form's name.
+     * @param null|string|PropertyPathInterface $propertyPath the property path or null if the path should be set
+     *                                                        automatically based on the form's name
      *
      * @return $this The configuration object
      */
@@ -173,8 +172,8 @@ public function setMapped($mapped);
     /**
      * Sets whether the form's data should be modified by reference.
      *
-     * @param bool $byReference Whether the data should be
-     *                          modified by reference.
+     * @param bool $byReference whether the data should be
+     *                          modified by reference
      *
      * @return $this The configuration object
      */
diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php
index c2f97901d25c3..47a2ac35a89a5 100644
--- a/src/Symfony/Component/Form/FormConfigInterface.php
+++ b/src/Symfony/Component/Form/FormConfigInterface.php
@@ -213,8 +213,8 @@ public function getRequestHandler();
     /**
      * Returns whether the form should be initialized upon creation.
      *
-     * @return bool Returns true if the form should be initialized
-     *              when created, false otherwise.
+     * @return bool returns true if the form should be initialized
+     *              when created, false otherwise
      */
     public function getAutoInitialize();
 
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
index 41a1297d30f57..f3958e77aeccf 100644
--- a/src/Symfony/Component/Form/FormErrorIterator.php
+++ b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -107,8 +107,8 @@ public function getForm()
     /**
      * Returns the current element of the iterator.
      *
-     * @return FormError|FormErrorIterator An error or an iterator containing
-     *                                     nested errors.
+     * @return FormError|FormErrorIterator an error or an iterator containing
+     *                                     nested errors
      */
     public function current()
     {
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index a61f7f99d0d74..780c00f40af48 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -27,9 +27,9 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
      *
      * @return self
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
-     * @throws Exception\LogicException            When trying to set a parent for a form with
-     *                                             an empty name.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
+     * @throws Exception\LogicException            when trying to set a parent for a form with
+     *                                             an empty name
      */
     public function setParent(FormInterface $parent = null);
 
@@ -49,9 +49,9 @@ public function getParent();
      *
      * @return self
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
-     * @throws Exception\LogicException            When trying to add a child to a non-compound form.
-     * @throws Exception\UnexpectedTypeException   If $child or $type has an unexpected type.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
+     * @throws Exception\LogicException            when trying to add a child to a non-compound form
+     * @throws Exception\UnexpectedTypeException   if $child or $type has an unexpected type
      */
     public function add($child, $type = null, array $options = array());
 
@@ -62,7 +62,7 @@ public function add($child, $type = null, array $options = array());
      *
      * @return self
      *
-     * @throws \OutOfBoundsException If the named child does not exist.
+     * @throws \OutOfBoundsException if the named child does not exist
      */
     public function get($name);
 
@@ -82,7 +82,7 @@ public function has($name);
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
      */
     public function remove($name);
 
@@ -112,7 +112,7 @@ public function getErrors($deep = false, $flatten = true);
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
      * @throws Exception\LogicException            If listeners try to call setData in a cycle. Or if
      *                                             the view data does not match the expected type
      *                                             according to {@link FormConfigInterface::getDataClass}.
@@ -129,7 +129,7 @@ public function getData();
     /**
      * Returns the normalized data of the field.
      *
-     * @return mixed When the field is not submitted, the default data is returned
+     * @return mixed When the field is not submitted, the default data is returned.
      *               When the field is submitted, the normalized submitted data is
      *               returned if the field is valid, null otherwise.
      */
@@ -270,13 +270,13 @@ public function handleRequest($request = null);
      * Submits data to the form, transforms and validates it.
      *
      * @param null|string|array $submittedData The submitted data
-     * @param bool              $clearMissing  Whether to set fields to NULL
+     * @param bool              $clearMissing  whether to set fields to NULL
      *                                         when they are missing in the
-     *                                         submitted data.
+     *                                         submitted data
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
      */
     public function submit($submittedData, $clearMissing = true);
 
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index c3667b1dbb5fb..9d116b8608846 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -36,13 +36,13 @@ public function setTheme(FormView $view, $themes);
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view      The view for determining the used themes
+     * @param FormView $view      The view for determining the used themes.
      *                            First the themes attached directly to the
      *                            view with {@link setTheme()} are considered,
      *                            then the ones of its parent etc.
-     * @param string   $blockName The name of the block to render
+     * @param string   $blockName the name of the block to render
      *
-     * @return mixed The renderer resource or false, if none was found
+     * @return mixed the renderer resource or false, if none was found
      */
     public function getResourceForBlockName(FormView $view, $blockName);
 
@@ -70,12 +70,12 @@ public function getResourceForBlockName(FormView $view, $blockName);
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view               The view for determining the used themes
+     * @param FormView $view               The view for determining the used themes.
      *                                     First the themes  attached directly to
      *                                     the view with {@link setTheme()} are
      *                                     considered, then the ones of its parent etc.
-     * @param array    $blockNameHierarchy The block name hierarchy, with the root block
-     *                                     at the beginning.
+     * @param array    $blockNameHierarchy the block name hierarchy, with the root block
+     *                                     at the beginning
      * @param int      $hierarchyLevel     The level in the hierarchy at which to start
      *                                     looking. Level 0 indicates the root block, i.e.
      *                                     the first element of $blockNameHierarchy.
@@ -110,12 +110,12 @@ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNam
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view               The view for determining the used themes
+     * @param FormView $view               The view for determining the used themes.
      *                                     First the themes  attached directly to
      *                                     the view with {@link setTheme()} are
      *                                     considered, then the ones of its parent etc.
-     * @param array    $blockNameHierarchy The block name hierarchy, with the root block
-     *                                     at the beginning.
+     * @param array    $blockNameHierarchy the block name hierarchy, with the root block
+     *                                     at the beginning
      * @param int      $hierarchyLevel     The level in the hierarchy at which to start
      *                                     looking. Level 0 indicates the root block, i.e.
      *                                     the first element of $blockNameHierarchy.
diff --git a/src/Symfony/Component/Form/SubmitButton.php b/src/Symfony/Component/Form/SubmitButton.php
index 4bfc1b6465819..ae69e0426d6b1 100644
--- a/src/Symfony/Component/Form/SubmitButton.php
+++ b/src/Symfony/Component/Form/SubmitButton.php
@@ -39,7 +39,7 @@ public function isClicked()
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the form has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the form has already been submitted
      */
     public function submit($submittedData, $clearMissing = true)
     {
diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
index 534d74ea6f0e4..7305f51640c38 100644
--- a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
+++ b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
@@ -58,10 +58,10 @@ class OrderedHashMapIterator implements \Iterator
     /**
      * Creates a new iterator.
      *
-     * @param array $elements       The elements of the map, indexed by their
-     *                              keys.
-     * @param array $orderedKeys    The keys of the map in the order in which
-     *                              they should be iterated.
+     * @param array $elements       the elements of the map, indexed by their
+     *                              keys
+     * @param array $orderedKeys    the keys of the map in the order in which
+     *                              they should be iterated
      * @param array $managedCursors An array from which to reference the
      *                              iterator's cursor as long as it is alive.
      *                              This array is managed by the corresponding
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index f9512d6706ef9..074c896ff7b3d 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -441,12 +441,12 @@ public function getProtocolVersion()
     /**
      * Sets the response status code.
      *
-     * @param int   $code HTTP status code
-     * @param mixed $text HTTP status text
-     *
      * If the status text is null it will be automatically populated for the known
      * status codes and left empty otherwise.
      *
+     * @param int   $code HTTP status code
+     * @param mixed $text HTTP status text
+     *
      * @return $this
      *
      * @throws \InvalidArgumentException When the HTTP status code is not valid
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
index d3fcd2eec4e73..172c9b457fb15 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
@@ -25,7 +25,7 @@ interface SessionInterface
      *
      * @return bool True if session started
      *
-     * @throws \RuntimeException If session fails to start.
+     * @throws \RuntimeException if session fails to start
      */
     public function start();
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
index 34f6c4633f477..097583d5a51eb 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
@@ -26,7 +26,7 @@ interface SessionStorageInterface
      *
      * @return bool True if started
      *
-     * @throws \RuntimeException If something goes wrong starting the session.
+     * @throws \RuntimeException if something goes wrong starting the session
      */
     public function start();
 
@@ -104,8 +104,8 @@ public function regenerate($destroy = false, $lifetime = null);
      * a real PHP session would interfere with testing, in which case
      * it should actually persist the session data if required.
      *
-     * @throws \RuntimeException If the session is saved without being started, or if the session
-     *                           is already closed.
+     * @throws \RuntimeException if the session is saved without being started, or if the session
+     *                           is already closed
      */
     public function save();
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
index ad6349286dde7..a00ea18304691 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -51,7 +51,7 @@ public function __construct(UriSigner $signer, $fragmentPath = '/_fragment')
      *
      * @param GetResponseEvent $event A GetResponseEvent instance
      *
-     * @throws AccessDeniedHttpException if the request does not come from a trusted IP.
+     * @throws AccessDeniedHttpException if the request does not come from a trusted IP
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
index 9a91888cf57cf..8db6890c7c680 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
@@ -34,7 +34,7 @@ class GenrbCompiler implements BundleCompilerInterface
      * @param string $envVars Optional. Environment variables to be loaded when
      *                        running "genrb".
      *
-     * @throws RuntimeException If the "genrb" cannot be found.
+     * @throws RuntimeException if the "genrb" cannot be found
      */
     public function __construct($genrb = 'genrb', $envVars = '')
     {
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php
index ff04294683e32..1826fcd0fa798 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php
@@ -31,8 +31,8 @@ class BufferedBundleReader implements BundleReaderInterface
      * Buffers a given reader.
      *
      * @param BundleReaderInterface $reader     The reader to buffer
-     * @param int                   $bufferSize The number of entries to store
-     *                                          in the buffer.
+     * @param int                   $bufferSize the number of entries to store
+     *                                          in the buffer
      */
     public function __construct(BundleReaderInterface $reader, $bufferSize)
     {
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php
index e999440190aca..13cf85bb48810 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php
@@ -46,8 +46,8 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
      *                           (i.e. array or \ArrayAccess) or cannot be found
      *                           in the requested locale.
      *
-     * @return mixed Returns an array or {@link \ArrayAccess} instance for
-     *               complex data and a scalar value for simple data.
+     * @return mixed returns an array or {@link \ArrayAccess} instance for
+     *               complex data and a scalar value for simple data
      *
      * @throws MissingResourceException If the indices cannot be accessed
      */
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php
index 8d3da825f77eb..04d5900e34228 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php
@@ -26,8 +26,8 @@ interface BundleReaderInterface
      * @param string $path   The path to the resource bundle
      * @param string $locale The locale to read
      *
-     * @return mixed Returns an array or {@link \ArrayAccess} instance for
-     *               complex data, a scalar value otherwise.
+     * @return mixed returns an array or {@link \ArrayAccess} instance for
+     *               complex data, a scalar value otherwise
      */
     public function read($path, $locale);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
index 3b7d94f10a247..a0fb4334f907d 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
@@ -46,8 +46,8 @@ public function write($path, $locale, $data, $fallback = true)
      * @param resource $file       The file handle to write to
      * @param string   $bundleName The name of the bundle
      * @param mixed    $value      The value of the node
-     * @param bool     $fallback   Whether the resource bundle should be merged
-     *                             with the fallback locale.
+     * @param bool     $fallback   whether the resource bundle should be merged
+     *                             with the fallback locale
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -66,8 +66,8 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)
      * @param resource $file          The file handle to write to
      * @param mixed    $value         The value of the node
      * @param int      $indentation   The number of levels to indent
-     * @param bool     $requireBraces Whether to require braces to be printed
-     *                                around the value.
+     * @param bool     $requireBraces whether to require braces to be printed
+     *                                around the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -153,8 +153,8 @@ private function writeIntVector($file, array $value, $indentation)
      *
      * @param resource $file          The file handle to write to
      * @param string   $value         The value of the node
-     * @param bool     $requireBraces Whether to require braces to be printed
-     *                                around the value.
+     * @param bool     $requireBraces whether to require braces to be printed
+     *                                around the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -199,11 +199,11 @@ private function writeArray($file, array $value, $indentation)
      * @param resource           $file        The file handle to write to
      * @param array|\Traversable $value       The value of the node
      * @param int                $indentation The number of levels to indent
-     * @param bool               $fallback    Whether the table should be merged
-     *                                        with the fallback locale.
+     * @param bool               $fallback    whether the table should be merged
+     *                                        with the fallback locale
      *
-     * @throws UnexpectedTypeException When $value is not an array and not a
-     *                                 \Traversable instance.
+     * @throws UnexpectedTypeException when $value is not an array and not a
+     *                                 \Traversable instance
      */
     private function writeTable($file, $value, $indentation, $fallback = true)
     {
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index 438b4d73e943b..e3279d0b352d5 100644
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -167,8 +167,8 @@ public function __construct($locale, $datetype, $timetype, $timezone = null, $ca
      * @param int    $datetype Type of date formatting, one of the format type constants
      * @param int    $timetype Type of time formatting, one of the format type constants
      * @param string $timezone Timezone identifier
-     * @param int    $calendar Calendar to use for formatting or parsing; default is Gregorian
-     *                         One of the calendar constants.
+     * @param int    $calendar calendar to use for formatting or parsing; default is Gregorian
+     *                         One of the calendar constants
      * @param string $pattern  Optional pattern to use when formatting
      *
      * @return self
@@ -524,7 +524,7 @@ public function setPattern($pattern)
     /**
      * Set the formatter's timezone identifier.
      *
-     * @param string $timeZoneId The time zone ID string of the time zone to use
+     * @param string $timeZoneId The time zone ID string of the time zone to use.
      *                           If NULL or the empty string, the default time zone for the
      *                           runtime is used.
      *
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index ce03e9f5d6642..b5aa050a4ea13 100644
--- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -258,7 +258,7 @@ class NumberFormatter
      * Constructor.
      *
      * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants
+     * @param int    $style   Style of the formatting, one of the format style constants.
      *                        The only supported styles are NumberFormatter::DECIMAL
      *                        and NumberFormatter::CURRENCY.
      * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
@@ -295,7 +295,7 @@ public function __construct($locale = 'en', $style = null, $pattern = null)
      * Static constructor.
      *
      * @param string $locale  The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants
+     * @param int    $style   Style of the formatting, one of the format style constants.
      *                        The only currently supported styles are NumberFormatter::DECIMAL
      *                        and NumberFormatter::CURRENCY.
      * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
@@ -355,8 +355,8 @@ public function formatCurrency($value, $currency)
     /**
      * Format a number.
      *
-     * @param int|float $value The value to format
-     * @param int       $type  Type of the formatting, one of the format type constants
+     * @param int|float $value the value to format
+     * @param int       $type  Type of the formatting, one of the format type constants.
      *                         Only type NumberFormatter::TYPE_DEFAULT is currently supported.
      *
      * @return bool|string The formatted value or false on error
@@ -516,9 +516,9 @@ public function parseCurrency($value, &$currency, &$position = null)
     /**
      * Parse a number.
      *
-     * @param string $value    The value to parse
-     * @param int    $type     Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default
-     * @param int    $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended
+     * @param string $value    the value to parse
+     * @param int    $type     Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default.
+     * @param int    $position offset to begin the parsing on return this value will hold the offset at which the parsing ended
      *
      * @return int|float|false The parsed value of false on error
      *
@@ -566,10 +566,10 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
     /**
      * Set an attribute.
      *
-     * @param int $attr  An attribute specifier, one of the numeric attribute constants
+     * @param int $attr  An attribute specifier, one of the numeric attribute constants.
      *                   The only currently supported attributes are NumberFormatter::FRACTION_DIGITS,
      *                   NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE.
-     * @param int $value The attribute value
+     * @param int $value the attribute value
      *
      * @return bool true on success or false on failure
      *
diff --git a/src/Symfony/Component/Intl/Resources/stubs/functions.php b/src/Symfony/Component/Intl/Resources/stubs/functions.php
index 64e111e8abcb7..c7250d1fd15d5 100644
--- a/src/Symfony/Component/Intl/Resources/stubs/functions.php
+++ b/src/Symfony/Component/Intl/Resources/stubs/functions.php
@@ -35,8 +35,8 @@ function intl_is_failure($errorCode)
      *
      * @author Bernhard Schussek 
      *
-     * @return bool The error code of the last intl function call or
-     *              IntlGlobals::U_ZERO_ERROR if no error occurred.
+     * @return bool the error code of the last intl function call or
+     *              IntlGlobals::U_ZERO_ERROR if no error occurred
      *
      * @see IntlGlobals::getErrorCode()
      */
@@ -51,8 +51,8 @@ function intl_get_error_code()
      *
      * @author Bernhard Schussek 
      *
-     * @return bool The error message of the last intl function call or
-     *              "U_ZERO_ERROR" if no error occurred.
+     * @return bool the error message of the last intl function call or
+     *              "U_ZERO_ERROR" if no error occurred
      *
      * @see IntlGlobals::getErrorMessage()
      */
diff --git a/src/Symfony/Component/Intl/Util/IcuVersion.php b/src/Symfony/Component/Intl/Util/IcuVersion.php
index e7324e7fd381a..1f141224a59e8 100644
--- a/src/Symfony/Component/Intl/Util/IcuVersion.php
+++ b/src/Symfony/Component/Intl/Util/IcuVersion.php
@@ -84,8 +84,8 @@ public static function compare($version1, $version2, $operator, $precision = nul
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
      *
-     * @return string|null The normalized ICU version or NULL if it couldn't be
-     *                     normalized.
+     * @return string|null the normalized ICU version or NULL if it couldn't be
+     *                     normalized
      */
     public static function normalize($version, $precision)
     {
diff --git a/src/Symfony/Component/Intl/Util/SvnCommit.php b/src/Symfony/Component/Intl/Util/SvnCommit.php
index c5ae1f1d79fa7..ef90b6f884e87 100644
--- a/src/Symfony/Component/Intl/Util/SvnCommit.php
+++ b/src/Symfony/Component/Intl/Util/SvnCommit.php
@@ -26,8 +26,8 @@ class SvnCommit
     /**
      * Creates a commit from the given "svn info" data.
      *
-     * @param \SimpleXMLElement $svnInfo The XML result from the "svn info"
-     *                                   command.
+     * @param \SimpleXMLElement $svnInfo the XML result from the "svn info"
+     *                                   command
      */
     public function __construct(\SimpleXMLElement $svnInfo)
     {
diff --git a/src/Symfony/Component/Intl/Util/SvnRepository.php b/src/Symfony/Component/Intl/Util/SvnRepository.php
index 8b5e8f31f859e..3732cbb3920d7 100644
--- a/src/Symfony/Component/Intl/Util/SvnRepository.php
+++ b/src/Symfony/Component/Intl/Util/SvnRepository.php
@@ -44,7 +44,7 @@ class SvnRepository
      *
      * @return static
      *
-     * @throws RuntimeException If an error occurs during the download.
+     * @throws RuntimeException if an error occurs during the download
      */
     public static function download($url, $targetDir)
     {
@@ -119,7 +119,7 @@ public function getLastCommit()
      *
      * @return \SimpleXMLElement The XML result from the "svn info" command
      *
-     * @throws RuntimeException If the "svn info" command failed.
+     * @throws RuntimeException if the "svn info" command failed
      */
     private function getSvnInfo()
     {
diff --git a/src/Symfony/Component/Intl/Util/Version.php b/src/Symfony/Component/Intl/Util/Version.php
index 11e97fe8bdd94..d24c3bae1bf9b 100644
--- a/src/Symfony/Component/Intl/Util/Version.php
+++ b/src/Symfony/Component/Intl/Util/Version.php
@@ -67,8 +67,8 @@ public static function compare($version1, $version2, $operator, $precision = nul
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
      *
-     * @return string|null The normalized version or NULL if it couldn't be
-     *                     normalized.
+     * @return string|null the normalized version or NULL if it couldn't be
+     *                     normalized
      */
     public static function normalize($version, $precision)
     {
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
index f8b6885742d8a..58e499e0ac8f4 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
@@ -40,8 +40,8 @@ interface OptionsResolverInterface
      *
      * The closures should return the lazily created option value.
      *
-     * @param array $defaultValues A list of option names as keys and default
-     *                             values or closures as values.
+     * @param array $defaultValues a list of option names as keys and default
+     *                             values or closures as values
      *
      * @return $this
      */
@@ -55,8 +55,8 @@ public function setDefaults(array $defaultValues);
      * performance if the previous default value is calculated by an expensive
      * closure.
      *
-     * @param array $defaultValues A list of option names as keys and default
-     *                             values or closures as values.
+     * @param array $defaultValues a list of option names as keys and default
+     *                             values or closures as values
      *
      * @return $this
      */
@@ -92,15 +92,15 @@ public function setRequired($optionNames);
     /**
      * Sets allowed values for a list of options.
      *
-     * @param array $allowedValues A list of option names as keys and arrays
+     * @param array $allowedValues a list of option names as keys and arrays
      *                             with values acceptable for that option as
-     *                             values.
+     *                             values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined
+     * @throws InvalidOptionsException if an option has not been defined
      *                                 (see {@link isKnown()}) for which
-     *                                 an allowed value is set.
+     *                                 an allowed value is set
      */
     public function setAllowedValues($allowedValues);
 
@@ -109,28 +109,28 @@ public function setAllowedValues($allowedValues);
      *
      * The values are merged with the allowed values defined previously.
      *
-     * @param array $allowedValues A list of option names as keys and arrays
+     * @param array $allowedValues a list of option names as keys and arrays
      *                             with values acceptable for that option as
-     *                             values.
+     *                             values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined
+     * @throws InvalidOptionsException if an option has not been defined
      *                                 (see {@link isKnown()}) for which
-     *                                 an allowed value is set.
+     *                                 an allowed value is set
      */
     public function addAllowedValues($allowedValues);
 
     /**
      * Sets allowed types for a list of options.
      *
-     * @param array $allowedTypes A list of option names as keys and type
-     *                            names passed as string or array as values.
+     * @param array $allowedTypes a list of option names as keys and type
+     *                            names passed as string or array as values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined for
-     *                                 which an allowed type is set.
+     * @throws InvalidOptionsException if an option has not been defined for
+     *                                 which an allowed type is set
      */
     public function setAllowedTypes($allowedTypes);
 
@@ -139,13 +139,13 @@ public function setAllowedTypes($allowedTypes);
      *
      * The types are merged with the allowed types defined previously.
      *
-     * @param array $allowedTypes A list of option names as keys and type
-     *                            names passed as string or array as values.
+     * @param array $allowedTypes a list of option names as keys and type
+     *                            names passed as string or array as values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined for
-     *                                 which an allowed type is set.
+     * @throws InvalidOptionsException if an option has not been defined for
+     *                                 which an allowed type is set
      */
     public function addAllowedTypes($allowedTypes);
 
@@ -201,12 +201,12 @@ public function isRequired($option);
      *
      * @return array A list of options and their values
      *
-     * @throws InvalidOptionsException   If any of the passed options has not
+     * @throws InvalidOptionsException   if any of the passed options has not
      *                                   been defined or does not contain an
-     *                                   allowed value.
-     * @throws MissingOptionsException   If a required option is missing.
-     * @throws OptionDefinitionException If a cyclic dependency is detected
-     *                                   between two lazy options.
+     *                                   allowed value
+     * @throws MissingOptionsException   if a required option is missing
+     * @throws OptionDefinitionException if a cyclic dependency is detected
+     *                                   between two lazy options
      */
     public function resolve(array $options = array());
 }
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 96a93343f1d5d..b31230d2939e6 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -1487,7 +1487,7 @@ private function doSignal($signal, $throwException)
      *
      * @param string $functionName The function name that was called
      *
-     * @throws LogicException If the process has not run.
+     * @throws LogicException if the process has not run
      */
     private function requireProcessIsStarted($functionName)
     {
@@ -1501,7 +1501,7 @@ private function requireProcessIsStarted($functionName)
      *
      * @param string $functionName The function name that was called
      *
-     * @throws LogicException If the process is not yet terminated.
+     * @throws LogicException if the process is not yet terminated
      */
     private function requireProcessIsTerminated($functionName)
     {
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index a6615f11e7a5e..03dc617782f2d 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -330,7 +330,7 @@ public function isWritable($objectOrArray, $propertyPath)
      *
      * @return array The values read in the path
      *
-     * @throws UnexpectedTypeException If a value within the path is neither object nor array.
+     * @throws UnexpectedTypeException if a value within the path is neither object nor array
      * @throws NoSuchIndexException    If a non-existing index is accessed
      */
     private function readPropertiesUntil($zval, PropertyPathInterface $propertyPath, $lastIndex, $ignoreInvalidIndices = true)
@@ -448,7 +448,7 @@ private function readIndex($zval, $index)
      *
      * @return array The array containing the value of the property
      *
-     * @throws NoSuchPropertyException If the property does not exist or is not public.
+     * @throws NoSuchPropertyException if the property does not exist or is not public
      */
     private function readProperty($zval, $property)
     {
@@ -590,7 +590,7 @@ private function writeIndex($zval, $index, $value)
      * @param string $property The property to write
      * @param mixed  $value    The value to write
      *
-     * @throws NoSuchPropertyException If the property does not exist or is not public.
+     * @throws NoSuchPropertyException if the property does not exist or is not public
      */
     private function writeProperty($zval, $property, $value)
     {
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
index 57751bf13e741..9d1e0870715a5 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -45,10 +45,10 @@ public function __construct($path = null)
      * Appends a (sub-) path to the current path.
      *
      * @param PropertyPathInterface|string $path   The path to append
-     * @param int                          $offset The offset where the appended
-     *                                             piece starts in $path.
-     * @param int                          $length The length of the appended piece
-     *                                             If 0, the full path is appended.
+     * @param int                          $offset the offset where the appended
+     *                                             piece starts in $path
+     * @param int                          $length the length of the appended piece
+     *                                             If 0, the full path is appended
      */
     public function append($path, $offset = 0, $length = 0)
     {
@@ -113,10 +113,10 @@ public function remove($offset, $length = 1)
      * @param int                          $offset     The offset at which to replace
      * @param int                          $length     The length of the piece to replace
      * @param PropertyPathInterface|string $path       The path to insert
-     * @param int                          $pathOffset The offset where the inserted piece
-     *                                                 starts in $path.
-     * @param int                          $pathLength The length of the inserted piece
-     *                                                 If 0, the full path is inserted.
+     * @param int                          $pathOffset the offset where the inserted piece
+     *                                                 starts in $path
+     * @param int                          $pathLength the length of the inserted piece
+     *                                                 If 0, the full path is inserted
      *
      * @throws OutOfBoundsException If the offset is invalid
      */
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
index cdf1973df4158..e8713ccab8b2d 100644
--- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -36,8 +36,8 @@ class XmlFileLoader extends FileLoader
      *
      * @return RouteCollection A RouteCollection instance
      *
-     * @throws \InvalidArgumentException When the file cannot be loaded or when the XML cannot be
-     *                                   parsed because it does not validate against the scheme.
+     * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
+     *                                   parsed because it does not validate against the scheme
      */
     public function load($file, $type = null)
     {
diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php
index ba608e7dd2e70..ecbc96422989a 100644
--- a/src/Symfony/Component/Routing/RouteCompiler.php
+++ b/src/Symfony/Component/Routing/RouteCompiler.php
@@ -40,8 +40,8 @@ class RouteCompiler implements RouteCompilerInterface
      * {@inheritdoc}
      *
      * @throws \LogicException  If a variable is referenced more than once
-     * @throws \DomainException If a variable name starts with a digit or if it is too long to be successfully used as
-     *                          a PCRE subpattern.
+     * @throws \DomainException if a variable name starts with a digit or if it is too long to be successfully used as
+     *                          a PCRE subpattern
      */
     public static function compile(Route $route)
     {
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
index 23c190cb563d0..483ee6e5ac296 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -49,7 +49,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
     /**
      * {@inheritdoc}
      *
-     * @throws AuthenticationCredentialsNotFoundException when the token storage has no authentication token.
+     * @throws AuthenticationCredentialsNotFoundException when the token storage has no authentication token
      */
     final public function isGranted($attributes, $object = null)
     {
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index e09d72e564f12..cde4454e9be3e 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -101,7 +101,7 @@ public function supportsClass($class)
      *
      * @return User
      *
-     * @throws UsernameNotFoundException If user whose given username does not exist.
+     * @throws UsernameNotFoundException if user whose given username does not exist
      */
     private function getUser($username)
     {
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
index 1472a99b244a2..1499d7e5ea33f 100644
--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -90,7 +90,7 @@ public function getLogoutUrl($key = null)
      *
      * @return string The logout URL
      *
-     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or the key could not be found automatically.
+     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or the key could not be found automatically
      */
     private function generateLogoutUrl($key, $referenceType)
     {
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 352ba584a7638..f8f17b4f723e6 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -59,7 +59,7 @@ public function supportsDecoding($format)
      *
      * @return DecoderInterface
      *
-     * @throws RuntimeException If no decoder is found.
+     * @throws RuntimeException if no decoder is found
      */
     private function getDecoder($format)
     {
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
index e19fe5ce58576..48fb8b482ee44 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -27,11 +27,11 @@ interface NormalizableInterface
      * It is important to understand that the normalize() call should normalize
      * recursively all child objects of the implementor.
      *
-     * @param NormalizerInterface $normalizer The normalizer is given so that you
-     *                                        can use it to normalize objects contained within this object.
-     * @param string|null         $format     The format is optionally given to be able to normalize differently
-     *                                        based on different output formats.
-     * @param array               $context    Options for normalizing this object
+     * @param NormalizerInterface $normalizer the normalizer is given so that you
+     *                                        can use it to normalize objects contained within this object
+     * @param string|null         $format     the format is optionally given to be able to normalize differently
+     *                                        based on different output formats
+     * @param array               $context    options for normalizing this object
      *
      * @return array|scalar
      */
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index ed8c9f1dc9023..3a0c80f1c91cf 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -82,7 +82,7 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * @return array
      *
-     * @throws InvalidResourceException If stream content has an invalid format.
+     * @throws InvalidResourceException if stream content has an invalid format
      */
     private function parse($resource)
     {
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index 08041d4c7eed1..fc9d8ae563448 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -209,7 +209,7 @@ public function __set($option, $value)
      *
      * @throws InvalidOptionsException If an invalid option name is given
      *
-     * @internal This method should not be used or overwritten in userland code.
+     * @internal this method should not be used or overwritten in userland code
      */
     public function __get($option)
     {
diff --git a/src/Symfony/Component/Validator/ConstraintViolationInterface.php b/src/Symfony/Component/Validator/ConstraintViolationInterface.php
index 363ef27ef0c51..de8ed69729dac 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationInterface.php
@@ -56,8 +56,8 @@ public function getMessageTemplate();
     /**
      * Returns the parameters to be inserted into the raw violation message.
      *
-     * @return array A possibly empty list of parameters indexed by the names
-     *               that appear in the message template.
+     * @return array a possibly empty list of parameters indexed by the names
+     *               that appear in the message template
      *
      * @see getMessageTemplate()
      * @deprecated since version 2.7, to be replaced by getParameters() in 3.0.
@@ -111,8 +111,8 @@ public function getPropertyPath();
     /**
      * Returns the value that caused the violation.
      *
-     * @return mixed The invalid value that caused the validated constraint to
-     *               fail.
+     * @return mixed the invalid value that caused the validated constraint to
+     *               fail
      */
     public function getInvalidValue();
 
diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
index d96755c9a277e..bc7dc9ee46247 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
@@ -39,7 +39,7 @@ public function addAll(ConstraintViolationListInterface $otherList);
      *
      * @return ConstraintViolationInterface The violation
      *
-     * @throws \OutOfBoundsException If the offset does not exist.
+     * @throws \OutOfBoundsException if the offset does not exist
      */
     public function get($offset);
 
diff --git a/src/Symfony/Component/Validator/DefaultTranslator.php b/src/Symfony/Component/Validator/DefaultTranslator.php
index 85853d8d858ce..15712d0d68e12 100644
--- a/src/Symfony/Component/Validator/DefaultTranslator.php
+++ b/src/Symfony/Component/Validator/DefaultTranslator.php
@@ -129,8 +129,8 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      *
      * @return string The translated string
      *
-     * @throws InvalidArgumentException If the message id does not have the format
-     *                                  "singular|plural".
+     * @throws InvalidArgumentException if the message id does not have the format
+     *                                  "singular|plural"
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php
index 075fecb0c520a..d887124e33c0f 100644
--- a/src/Symfony/Component/Validator/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/ExecutionContextInterface.php
@@ -150,10 +150,10 @@ public function addViolationAt($subPath, $message, array $parameters = array(),
      * @param null|string|string[] $groups   The groups to validate in. If you don't pass any
      *                                       groups here, the current group of the context
      *                                       will be used.
-     * @param bool                 $traverse Whether to traverse the value if it is an array
-     *                                       or an instance of \Traversable.
-     * @param bool                 $deep     Whether to traverse the value recursively if
-     *                                       it is a collection of collections.
+     * @param bool                 $traverse whether to traverse the value if it is an array
+     *                                       or an instance of \Traversable
+     * @param bool                 $deep     whether to traverse the value recursively if
+     *                                       it is a collection of collections
      *
      * @deprecated since version 2.5, to be removed in 3.0.
      *             Use {@link Context\ExecutionContextInterface::getValidator()}
@@ -237,8 +237,8 @@ public function getValue();
      * has been called with a plain value and constraint, this method returns
      * null.
      *
-     * @return MetadataInterface|null The metadata of the currently validated
-     *                                value.
+     * @return MetadataInterface|null the metadata of the currently validated
+     *                                value
      */
     public function getMetadata();
 
diff --git a/src/Symfony/Component/Validator/Validation.php b/src/Symfony/Component/Validator/Validation.php
index 94ed62c52559b..a469b47e25ea2 100644
--- a/src/Symfony/Component/Validator/Validation.php
+++ b/src/Symfony/Component/Validator/Validation.php
@@ -21,7 +21,7 @@ final class Validation
     /**
      * The Validator API provided by Symfony 2.4 and older.
      *
-     * @deprecated use API_VERSION_2_5_BC instead.
+     * @deprecated use API_VERSION_2_5_BC instead
      */
     const API_VERSION_2_4 = 1;
 
diff --git a/src/Symfony/Component/Validator/ValidationVisitorInterface.php b/src/Symfony/Component/Validator/ValidationVisitorInterface.php
index b6c6e9f1cb9d3..28d492132b8a1 100644
--- a/src/Symfony/Component/Validator/ValidationVisitorInterface.php
+++ b/src/Symfony/Component/Validator/ValidationVisitorInterface.php
@@ -62,8 +62,8 @@ interface ValidationVisitorInterface
      * @param bool   $traverse     Whether to traverse the value if it is traversable
      * @param bool   $deep         Whether to traverse nested traversable values recursively
      *
-     * @throws Exception\NoSuchMetadataException If no metadata can be found for
-     *                                           the given value.
+     * @throws Exception\NoSuchMetadataException if no metadata can be found for
+     *                                           the given value
      */
     public function validate($value, $group, $propertyPath, $traverse = false, $deep = false);
 
diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/Validator.php
index feaec0d400382..c69c7a86b7927 100644
--- a/src/Symfony/Component/Validator/Validator.php
+++ b/src/Symfony/Component/Validator/Validator.php
@@ -108,7 +108,7 @@ public function validate($value, $groups = null, $traverse = false, $deep = fals
     /**
      * {@inheritdoc}
      *
-     * @throws ValidatorException If the metadata for the value does not support properties.
+     * @throws ValidatorException if the metadata for the value does not support properties
      */
     public function validateProperty($containingValue, $property, $groups = null)
     {
@@ -139,7 +139,7 @@ public function validateProperty($containingValue, $property, $groups = null)
     /**
      * {@inheritdoc}
      *
-     * @throws ValidatorException If the metadata for the value does not support properties.
+     * @throws ValidatorException if the metadata for the value does not support properties
      */
     public function validatePropertyValue($containingValue, $property, $value, $groups = null)
     {
diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php
index 58b8cd6e4cbb7..fd7785b6ea24d 100644
--- a/src/Symfony/Component/Validator/ValidatorInterface.php
+++ b/src/Symfony/Component/Validator/ValidatorInterface.php
@@ -64,8 +64,8 @@ public function validateProperty($containingValue, $property, $groups = null);
      *
      * @param mixed      $containingValue The value containing the property
      * @param string     $property        The name of the property to validate
-     * @param string     $value           The value to validate against the
-     *                                    constraints of the property.
+     * @param string     $value           the value to validate against the
+     *                                    constraints of the property
      * @param array|null $groups          The validation groups to validate
      *
      * @return ConstraintViolationListInterface A list of constraint violations. If the

From 10204ffe9950e1f809ca49f8e5a5967b07806aee Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 13:58:17 -0700
Subject: [PATCH 0805/1099] [WebProfilerBundle] fixed TemplateManager when
 using Twig 2 without compat interfaces

---
 .../Bundle/WebProfilerBundle/Profiler/TemplateManager.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
index 5b6b9f100461a..91cd1fb837f28 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -126,7 +126,7 @@ protected function templateExists($template)
         }
 
         try {
-            if ($loader instanceof SourceContextLoaderInterface) {
+            if ($loader instanceof SourceContextLoaderInterface || method_exists($loader, 'getSourceContext')) {
                 $loader->getSourceContext($template);
             } else {
                 $loader->getSource($template);

From df07e7336361642c1bba3bee94e69e6b4c45c325 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 14:10:59 -0700
Subject: [PATCH 0806/1099] fixed CS

---
 .../Bundle/FrameworkBundle/Command/AssetsInstallCommand.php     | 2 +-
 src/Symfony/Component/DependencyInjection/Definition.php        | 2 +-
 src/Symfony/Component/Ldap/LdapClientInterface.php              | 2 +-
 src/Symfony/Component/Translation/Loader/FileLoader.php         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
index c068713df6b2a..66f7f9ca8b468 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -222,7 +222,7 @@ private function absoluteSymlinkWithFallback($originDir, $targetDir)
      * @param string $targetDir
      * @param bool   $relative
      *
-     * @throws IOException If link can not be created.
+     * @throws IOException if link can not be created
      */
     private function symlink($originDir, $targetDir, $relative = false)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 05d3c59cff5a5..d2d61d54828ac 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -777,7 +777,7 @@ public function isAbstract()
      *
      * @return $this
      *
-     * @throws InvalidArgumentException When the message template is invalid.
+     * @throws InvalidArgumentException when the message template is invalid
      */
     public function setDeprecated($status = true, $template = null)
     {
diff --git a/src/Symfony/Component/Ldap/LdapClientInterface.php b/src/Symfony/Component/Ldap/LdapClientInterface.php
index dcdc0818da10b..aed445f3484bc 100644
--- a/src/Symfony/Component/Ldap/LdapClientInterface.php
+++ b/src/Symfony/Component/Ldap/LdapClientInterface.php
@@ -29,7 +29,7 @@ interface LdapClientInterface
      * @param string $dn       A LDAP dn
      * @param string $password A password
      *
-     * @throws ConnectionException If dn / password could not be bound.
+     * @throws ConnectionException if dn / password could not be bound
      */
     public function bind($dn = null, $password = null);
 
diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
index 1885963a99550..322679d24cdb8 100644
--- a/src/Symfony/Component/Translation/Loader/FileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -59,7 +59,7 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * @return array
      *
-     * @throws InvalidResourceException If stream content has an invalid format.
+     * @throws InvalidResourceException if stream content has an invalid format
      */
     abstract protected function loadResource($resource);
 }

From ceae3bf16c5243fc5d86d8d8c149d461cca70a0b Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 14:23:01 -0700
Subject: [PATCH 0807/1099] fixed CS

---
 .../Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php   | 1 -
 src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php  | 1 -
 src/Symfony/Component/Cache/Traits/RedisTrait.php           | 2 +-
 src/Symfony/Component/Console/Command/Command.php           | 2 +-
 src/Symfony/Component/Console/Tester/CommandTester.php      | 4 ++--
 .../DependencyInjection/Loader/DirectoryLoader.php          | 2 --
 .../Component/DependencyInjection/Loader/IniFileLoader.php  | 1 -
 .../Component/DependencyInjection/Loader/PhpFileLoader.php  | 2 --
 .../Core/DataTransformer/DateIntervalToArrayTransformer.php | 6 +++---
 .../DataTransformer/DateIntervalToStringTransformer.php     | 6 +++---
 src/Symfony/Component/Form/FormErrorIterator.php            | 2 +-
 src/Symfony/Component/HttpFoundation/JsonResponse.php       | 2 +-
 src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php    | 4 ++--
 src/Symfony/Component/Ldap/LdapInterface.php                | 2 +-
 src/Symfony/Component/Process/Tests/PhpProcessTest.php      | 2 +-
 .../Component/Routing/Matcher/Dumper/PhpMatcherDumper.php   | 2 +-
 .../Routing/Matcher/Dumper/StaticPrefixCollection.php       | 2 +-
 .../Component/Security/Http/Logout/LogoutUrlGenerator.php   | 2 +-
 src/Symfony/Component/Validator/ConstraintViolationList.php | 2 +-
 .../Validator/Context/ExecutionContextInterface.php         | 4 ++--
 src/Symfony/Component/VarDumper/Cloner/Data.php             | 6 +++---
 .../Component/WebLink/Tests/HttpHeaderSerializerTest.php    | 1 -
 22 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
index e134434c9b4e7..60934c1c2df84 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Extension\WorkflowExtension;
 use Symfony\Component\Workflow\Definition;
-use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\SupportStrategy\ClassInstanceSupportStrategy;
 use Symfony\Component\Workflow\Transition;
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
index af31a0fb60026..3af674d652c9a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\SecurityBundle\Security;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
 use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 6202051a8de5d..467e602070c7a 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -67,7 +67,7 @@ public function init($redisClient, $namespace = '', $defaultLifetime = 0)
      * @param string $dsn
      * @param array  $options See self::$defaultConnectionOptions
      *
-     * @throws InvalidArgumentException When the DSN is invalid.
+     * @throws InvalidArgumentException when the DSN is invalid
      *
      * @return \Redis|\Predis\Client According to the "class" option
      */
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 08a74c3b69a9a..915102175ea21 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -475,7 +475,7 @@ public function setHidden($hidden)
     }
 
     /**
-     * @return bool Whether the command should be publicly shown or not.
+     * @return bool whether the command should be publicly shown or not
      */
     public function isHidden()
     {
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
index 0bb1603c33c6f..143c269b17034 100644
--- a/src/Symfony/Component/Console/Tester/CommandTester.php
+++ b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -137,8 +137,8 @@ public function getStatusCode()
     /**
      * Sets the user inputs.
      *
-     * @param array An array of strings representing each input
-     *              passed to the command input stream.
+     * @param array an array of strings representing each input
+     *              passed to the command input stream
      *
      * @return CommandTester
      */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
index 3ab4c5dc82e7e..769f1026e8d98 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\DirectoryResource;
-
 /**
  * DirectoryLoader is a recursive loader to go through directories.
  *
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
index 170e726396a5e..6cc9a1acaf256 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index 36ef0d4752bc9..9d887e4af03f6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
-
 /**
  * PhpFileLoader loads service definitions from a PHP file.
  *
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
index a766760a12213..3e299ba994acf 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -62,7 +62,7 @@ public function __construct(array $fields = null, $pad = false)
      *
      * @return array Interval array
      *
-     * @throws UnexpectedTypeException If the given value is not a \DateInterval instance.
+     * @throws UnexpectedTypeException if the given value is not a \DateInterval instance
      */
     public function transform($dateInterval)
     {
@@ -108,8 +108,8 @@ public function transform($dateInterval)
      *
      * @return \DateInterval Normalized date interval
      *
-     * @throws UnexpectedTypeException       If the given value is not an array.
-     * @throws TransformationFailedException If the value could not be transformed.
+     * @throws UnexpectedTypeException       if the given value is not an array
+     * @throws TransformationFailedException if the value could not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
index 7b9cca0fbd151..dffe146623772 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
@@ -46,7 +46,7 @@ public function __construct($format = 'P%yY%mM%dDT%hH%iM%sS', $parseSigned = fal
      *
      * @return string An ISO 8601 or relative date string like date interval presentation
      *
-     * @throws UnexpectedTypeException If the given value is not a \DateInterval instance.
+     * @throws UnexpectedTypeException if the given value is not a \DateInterval instance
      */
     public function transform($value)
     {
@@ -67,8 +67,8 @@ public function transform($value)
      *
      * @return \DateInterval An instance of \DateInterval
      *
-     * @throws UnexpectedTypeException       If the given value is not a string.
-     * @throws TransformationFailedException If the date interval could not be parsed.
+     * @throws UnexpectedTypeException       if the given value is not a string
+     * @throws TransformationFailedException if the date interval could not be parsed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
index 1aca7fb84a3f0..13dac154fa73a 100644
--- a/src/Symfony/Component/Form/FormErrorIterator.php
+++ b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -271,7 +271,7 @@ public function seek($position)
      *
      * @param string|string[] $codes The codes to find
      *
-     * @return static New instance which contains only specific errors.
+     * @return static new instance which contains only specific errors
      */
     public function findByCodes($codes)
     {
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index 547a8e4876806..137ac33c46ed0 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -150,7 +150,7 @@ public function setData($data = array())
                 try {
                     $data = @json_encode($data, $this->encodingOptions);
                 } finally {
-                     restore_error_handler();
+                    restore_error_handler();
                 }
             } else {
                 try {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index be2bc63dda6de..c9c06597f99d1 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -704,7 +704,7 @@ private function getTraceKey(Request $request)
      *
      * @param Response $entry
      *
-     * @return bool True when the stale response may be served, false otherwise.
+     * @return bool true when the stale response may be served, false otherwise
      */
     private function mayServeStaleWhileRevalidate(Response $entry)
     {
@@ -722,7 +722,7 @@ private function mayServeStaleWhileRevalidate(Response $entry)
      *
      * @param Request $request The request to wait for
      *
-     * @return bool True if the lock was released before the internal timeout was hit; false if the wait timeout was exceeded.
+     * @return bool true if the lock was released before the internal timeout was hit; false if the wait timeout was exceeded
      */
     private function waitForLock(Request $request)
     {
diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
index f71f7e04f81a3..9f24276d61a20 100644
--- a/src/Symfony/Component/Ldap/LdapInterface.php
+++ b/src/Symfony/Component/Ldap/LdapInterface.php
@@ -31,7 +31,7 @@ interface LdapInterface
      * @param string $dn       A LDAP dn
      * @param string $password A password
      *
-     * @throws ConnectionException If dn / password could not be bound.
+     * @throws ConnectionException if dn / password could not be bound
      */
     public function bind($dn = null, $password = null);
 
diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
index 988cd091598ce..f67368c7b358a 100644
--- a/src/Symfony/Component/Process/Tests/PhpProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
@@ -43,6 +43,6 @@ public function testCommandLine()
         $process->wait();
         $this->assertContains($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP after wait');
 
-        $this->assertSame(phpversion().PHP_SAPI, $process->getOutput());
+        $this->assertSame(PHP_VERSION.PHP_SAPI, $process->getOutput());
     }
 }
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index 1397bac448d4d..5e1d30fb571e2 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -182,7 +182,7 @@ private function buildStaticPrefixCollection(DumperCollection $collection)
      *
      * @param StaticPrefixCollection $collection           A StaticPrefixCollection instance
      * @param bool                   $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $ifOrElseIf           Either "if" or "elseif" to influence chaining.
+     * @param string                 $ifOrElseIf           either "if" or "elseif" to influence chaining
      *
      * @return string PHP code
      */
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
index b2bfa343764cc..b4518fdc8f897 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -225,7 +225,7 @@ private function shouldBeInlined()
      *
      * @param string $prefix
      *
-     * @throws \LogicException When a prefix does not belong in a group.
+     * @throws \LogicException when a prefix does not belong in a group
      */
     private function guardAgainstAddingNotAcceptedRoutes($prefix)
     {
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
index 3f2def8d735cc..11f492b59b081 100644
--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -145,7 +145,7 @@ private function generateLogoutUrl($key, $referenceType)
      *
      * @return array The logout listener found
      *
-     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or could not be found automatically.
+     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or could not be found automatically
      */
     private function getListener($key)
     {
diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
index f2da581e4efb0..a80d602b26fd9 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationList.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -164,7 +164,7 @@ public function offsetUnset($offset)
      *
      * @param string|string[] $codes The codes to find
      *
-     * @return static New instance which contains only specific errors.
+     * @return static new instance which contains only specific errors
      */
     public function findByCodes($codes)
     {
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
index 1b1452582dff4..fa0053bb420dd 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -275,8 +275,8 @@ public function getValue();
      * has been called with a plain value and constraint, this method returns
      * null.
      *
-     * @return MetadataInterface|null The metadata of the currently validated
-     *                                value.
+     * @return MetadataInterface|null the metadata of the currently validated
+     *                                value
      */
     public function getMetadata();
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 3de76cdc7da42..a6630558c58cd 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -34,7 +34,7 @@ public function __construct(array $data)
     }
 
     /**
-     * @return string The type of the value.
+     * @return string the type of the value
      */
     public function getType()
     {
@@ -61,9 +61,9 @@ public function getType()
     }
 
     /**
-     * @param bool $recursive Whether values should be resolved recursively or not.
+     * @param bool $recursive whether values should be resolved recursively or not
      *
-     * @return scalar|array|null|Data[] A native representation of the original value.
+     * @return scalar|array|null|Data[] a native representation of the original value
      */
     public function getValue($recursive = false)
     {
diff --git a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
index c5d0716ef96f5..553371fbb414e 100644
--- a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
+++ b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\WebLink\Tests;
 
-use Fig\Link\GenericLinkProvider;
 use Fig\Link\Link;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\WebLink\HttpHeaderSerializer;

From 7ab8efb74ecd422ed627753971637bd7d8dc92ca Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 14:34:45 -0700
Subject: [PATCH 0808/1099] fixed CS

---
 src/Symfony/Component/Debug/Tests/Fixtures/InternalTrait2.php | 2 +-
 src/Symfony/Component/HttpFoundation/Response.php             | 4 ++--
 src/Symfony/Component/Lock/Key.php                            | 2 +-
 src/Symfony/Component/Lock/LockInterface.php                  | 2 +-
 src/Symfony/Component/Lock/Store/SemaphoreStore.php           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/InternalTrait2.php b/src/Symfony/Component/Debug/Tests/Fixtures/InternalTrait2.php
index 73df6d5acf250..05f18e83e4a9e 100644
--- a/src/Symfony/Component/Debug/Tests/Fixtures/InternalTrait2.php
+++ b/src/Symfony/Component/Debug/Tests/Fixtures/InternalTrait2.php
@@ -15,7 +15,7 @@ public function internalMethod()
     }
 
     /**
-     * @internal but should not trigger a deprecation.
+     * @internal but should not trigger a deprecation
      */
     public function usedInInternalClass()
     {
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index 15fa56a6b8f1f..359143f33d77a 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -613,7 +613,7 @@ public function setPublic()
     /**
      * Marks the response as "immutable".
      *
-     * @param bool $immutable Enables or disables the immutable directive.
+     * @param bool $immutable enables or disables the immutable directive
      *
      * @return $this
      */
@@ -631,7 +631,7 @@ public function setImmutable($immutable = true)
     /**
      * Returns true if the response is marked as "immutable".
      *
-     * @return bool Returns true if the response is marked as "immutable"; otherwise false.
+     * @return bool returns true if the response is marked as "immutable"; otherwise false
      */
     public function isImmutable()
     {
diff --git a/src/Symfony/Component/Lock/Key.php b/src/Symfony/Component/Lock/Key.php
index 1f5a7de740ef9..8be4f3a255975 100644
--- a/src/Symfony/Component/Lock/Key.php
+++ b/src/Symfony/Component/Lock/Key.php
@@ -78,7 +78,7 @@ public function resetLifetime()
     }
 
     /**
-     * @param float $ttl The expiration delay of locks in seconds.
+     * @param float $ttl the expiration delay of locks in seconds
      */
     public function reduceLifetime($ttl)
     {
diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php
index ab05d7a8f4ab1..437a4cc2770c8 100644
--- a/src/Symfony/Component/Lock/LockInterface.php
+++ b/src/Symfony/Component/Lock/LockInterface.php
@@ -28,7 +28,7 @@ interface LockInterface
      *
      * @param bool $blocking Whether or not the Lock should wait for the release of someone else
      *
-     * @return bool Whether or not the lock had been acquired.
+     * @return bool whether or not the lock had been acquired
      *
      * @throws LockConflictedException If the lock is acquired by someone else in blocking mode
      * @throws LockAcquiringException  If the lock can not be acquired
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
index 64123e8a51e2b..73a1776827a81 100644
--- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -27,7 +27,7 @@ class SemaphoreStore implements StoreInterface
     /**
      * Returns whether or not the store is supported.
      *
-     * @param bool|null $blocking When not null, checked again the blocking mode.
+     * @param bool|null $blocking when not null, checked again the blocking mode
      *
      * @return bool
      *

From 97ac19c666e0c22bd5bb7a71f23bf3f07b080f07 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 14:45:47 -0700
Subject: [PATCH 0809/1099] fixed CS

---
 .../Component/Console/Helper/SymfonyQuestionHelper.php        | 2 --
 src/Symfony/Component/Form/FormInterface.php                  | 2 +-
 .../Component/VarDumper/Tests/Caster/DateCasterTest.php       | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
index a63225149297d..79016b9f2d90b 100644
--- a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index f4033f60658b4..9897dbe35f998 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -189,7 +189,7 @@ public function addError(FormError $error);
     /**
      * Returns whether the form and all children are valid.
      *
-     * @throws Exception\LogicException If the form is not submitted.
+     * @throws Exception\LogicException if the form is not submitted
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
index 0298c8b3cb5a9..e6a98f993602d 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
@@ -353,8 +353,8 @@ public function providePeriods()
             array('2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) to 2017-01-03 01:00:00.0', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'),
             array('2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'),
 
-            array('2017-01-01', 'P1DT1H', '2017-01-03', 0, "every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
-            array('2017-01-01', 'P1DT1H', 1, 0, "every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
+            array('2017-01-01', 'P1DT1H', '2017-01-03', 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
+            array('2017-01-01', 'P1DT1H', 1, 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
 
             array('2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) to 2017-01-04 00:00:00.0', '1) 2017-01-02%a2) 2017-01-03'),
             array('2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'),

From 4ea681e7d1d1ce7f15fcfdb14a004ad40d271acf Mon Sep 17 00:00:00 2001
From: Dariusz 
Date: Tue, 12 Sep 2017 00:23:36 +0200
Subject: [PATCH 0810/1099] .php_cs.dist - simplify config

---
 .php_cs.dist | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 25f1f4c931bdc..d84a0624bd3c5 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -9,9 +9,6 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
-        'heredoc_to_nowdoc' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(

From 75a26bb80151d22f8922a502cc283473cee01519 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 12 Sep 2017 10:02:51 +0200
Subject: [PATCH 0811/1099] [Debug] fix test assertion

---
 src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
index 71dcfd9b835e3..babf36d2bd053 100644
--- a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+++ b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -204,7 +204,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
 
         $xError = array(
             'type' => E_USER_DEPRECATED,
-            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice',
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
         );
 
         $this->assertSame($xError, $lastError);

From 42183b02133003047724b0a9d93fa2112235272c Mon Sep 17 00:00:00 2001
From: Abdellatif Ait boudad 
Date: Sun, 18 Sep 2016 09:17:44 +0100
Subject: [PATCH 0812/1099] [Translation] Support adding custom message
 formatter

---
 UPGRADE-3.4.md                                | 21 +++++
 UPGRADE-4.0.md                                |  3 +
 .../Extension/TranslationExtensionTest.php    |  9 +-
 .../DependencyInjection/Configuration.php     |  1 +
 .../FrameworkExtension.php                    |  1 +
 .../Resources/config/schema/symfony-1.0.xsd   |  1 +
 .../Resources/config/translation.xml          |  6 +-
 .../DependencyInjection/ConfigurationTest.php |  1 +
 .../Tests/Translation/TranslatorTest.php      | 14 ++--
 .../Translation/Translator.php                | 16 ++--
 .../Component/Translation/CHANGELOG.md        |  1 +
 .../ChoiceMessageFormatterInterface.php       | 30 +++++++
 .../Formatter/MessageFormatter.php            | 48 +++++++++++
 .../Formatter/MessageFormatterInterface.php   | 30 +++++++
 .../Tests/Formatter/MessageFormatterTest.php  | 82 +++++++++++++++++++
 .../Translation/Tests/TranslatorTest.php      | 29 ++++---
 .../Component/Translation/Translator.php      | 38 ++++++---
 17 files changed, 282 insertions(+), 49 deletions(-)
 create mode 100644 src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
 create mode 100644 src/Symfony/Component/Translation/Formatter/MessageFormatter.php
 create mode 100644 src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
 create mode 100644 src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 20114937efc26..9a3a74dd61655 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -234,6 +234,27 @@ Translation
    and will be removed in 4.0, use `Symfony\Component\Translation\Writer\TranslationWriter::write` 
    instead. 
 
+ * Passing a `Symfony\Component\Translation\MessageSelector` to `Translator` has been
+   deprecated. You should pass a message formatter instead
+
+   Before:
+
+   ```php
+   use Symfony\Component\Translation\Translator;
+   use Symfony\Component\Translation\MessageSelector;
+
+   $translator = new Translator('fr_FR', new MessageSelector());
+   ```
+
+   After:
+
+   ```php
+   use Symfony\Component\Translation\Translator;
+   use Symfony\Component\Translation\Formatter\MessageFormatter;
+
+   $translator = new Translator('fr_FR', new MessageFormatter());
+   ```
+
 TwigBridge
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 5d404598f7ec0..9dffe96789b90 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -643,6 +643,9 @@ Translation
  * Removed `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations`, 
    use `Symfony\Component\Translation\Writer\TranslationWriter::write` instead. 
 
+ * Removed support for passing `Symfony\Component\Translation\MessageSelector` as a second argument to the
+   `Translator::__construct()`. You should pass an instance of `Symfony\Component\Translation\Formatter\MessageFormatterInterface` instead.
+
 TwigBundle
 ----------
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
index 36016d7f49bca..b20e0c3905a3a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader as TwigArrayLoader;
@@ -37,7 +36,7 @@ public function testTrans($template, $expected, array $variables = array())
             echo $template."\n";
             $loader = new TwigArrayLoader(array('index' => $template));
             $twig = new Environment($loader, array('debug' => true, 'cache' => false));
-            $twig->addExtension(new TranslationExtension(new Translator('en', new MessageSelector())));
+            $twig->addExtension(new TranslationExtension(new Translator('en')));
 
             echo $twig->compile($twig->parse($twig->tokenize($twig->getLoader()->getSourceContext('index'))))."\n\n";
             $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
@@ -139,7 +138,7 @@ public function testDefaultTranslationDomain()
             ',
         );
 
-        $translator = new Translator('en', new MessageSelector());
+        $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foo (messages)'), 'en');
         $translator->addResource('array', array('foo' => 'foo (custom)'), 'en', 'custom');
@@ -172,7 +171,7 @@ public function testDefaultTranslationDomainWithNamedArguments()
             ',
         );
 
-        $translator = new Translator('en', new MessageSelector());
+        $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foo (messages)'), 'en');
         $translator->addResource('array', array('foo' => 'foo (custom)'), 'en', 'custom');
@@ -187,7 +186,7 @@ public function testDefaultTranslationDomainWithNamedArguments()
     protected function getTemplate($template, $translator = null)
     {
         if (null === $translator) {
-            $translator = new Translator('en', new MessageSelector());
+            $translator = new Translator('en');
         }
 
         if (is_array($template)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index a9c5ec462dcd2..2fce9b2ad4aed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -668,6 +668,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                             ->defaultValue(array('en'))
                         ->end()
                         ->booleanNode('logging')->defaultValue($this->debug)->end()
+                        ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 72d66442c62c9..9b3a071168a51 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1075,6 +1075,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
         // Use the "real" translator instead of the identity default
         $container->setAlias('translator', 'translator.default');
+        $container->setAlias('translator.formatter', new Alias($config['formatter'], false));
         $translator = $container->findDefinition('translator.default');
         $translator->addMethodCall('setFallbackLocales', array($config['fallbacks']));
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index 481c469e36164..f63f93723029d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -184,6 +184,7 @@
         
         
         
+        
     
 
     
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index cfe05f5148fdd..d8c8f1e030111 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -9,7 +9,7 @@
 
         
              
-            
+            
             %kernel.default_locale%
              
             
@@ -28,6 +28,10 @@
             
         
 
+        
+            
+        
+
         
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 1835625da8611..e4e6f0f2a7bea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -255,6 +255,7 @@ protected static function getBundleDefaultConfig()
                 'enabled' => !class_exists(FullStack::class),
                 'fallbacks' => array('en'),
                 'logging' => true,
+                'formatter' => 'translator.formatter.default',
                 'paths' => array(),
             ),
             'validation' => array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
index 6d710a76e8819..d2d0f878f642f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -14,9 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
+use Symfony\Component\Translation\Formatter\MessageFormatter;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Translation\MessageSelector;
 
 class TranslatorTest extends TestCase
 {
@@ -149,7 +149,7 @@ public function testGetDefaultLocaleOmittingLocale()
             ->with('kernel.default_locale')
             ->will($this->returnValue('en'))
         ;
-        $translator = new Translator($container, new MessageSelector());
+        $translator = new Translator($container, new MessageFormatter());
 
         $this->assertSame('en', $translator->getLocale());
     }
@@ -162,7 +162,7 @@ public function testGetDefaultLocaleOmittingLocale()
     public function testGetDefaultLocaleOmittingLocaleWithPsrContainer()
     {
         $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
-        $translator = new Translator($container, new MessageSelector());
+        $translator = new Translator($container, new MessageFormatter());
     }
 
     /**
@@ -277,7 +277,7 @@ public function testLoadResourcesWithoutCaching()
     public function testGetDefaultLocale()
     {
         $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
-        $translator = new Translator($container, new MessageSelector(), 'en');
+        $translator = new Translator($container, new MessageFormatter(), 'en');
 
         $this->assertSame('en', $translator->getLocale());
     }
@@ -290,7 +290,7 @@ public function testInvalidOptions()
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 
-        (new Translator($container, new MessageSelector(), 'en', array(), array('foo' => 'bar')));
+        (new Translator($container, new MessageFormatter(), 'en', array(), array('foo' => 'bar')));
     }
 
     /** @dataProvider getDebugModeAndCacheDirCombinations */
@@ -468,7 +468,7 @@ private function createTranslator($loader, $options, $translatorClass = '\Symfon
         if (null === $defaultLocale) {
             return new $translatorClass(
                 $this->getContainer($loader),
-                new MessageSelector(),
+                new MessageFormatter(),
                 array($loaderFomat => array($loaderFomat)),
                 $options
             );
@@ -476,7 +476,7 @@ private function createTranslator($loader, $options, $translatorClass = '\Symfon
 
         return new $translatorClass(
             $this->getContainer($loader),
-            new MessageSelector(),
+            new MessageFormatter(),
             $defaultLocale,
             array($loaderFomat => array($loaderFomat)),
             $options
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index d18a3b81f04ef..2b41d5af61dbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -15,8 +15,8 @@
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Translation\Translator as BaseTranslator;
-use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
+use Symfony\Component\Translation\Formatter\MessageFormatterInterface;
 
 /**
  * Translator.
@@ -56,15 +56,15 @@ class Translator extends BaseTranslator implements WarmableInterface
      *   * debug:     Whether to enable debugging or not (false by default)
      *   * resource_files: List of translation resources available grouped by locale.
      *
-     * @param ContainerInterface $container     A ContainerInterface instance
-     * @param MessageSelector    $selector      The message selector for pluralization
-     * @param string             $defaultLocale
-     * @param array              $loaderIds     An array of loader Ids
-     * @param array              $options       An array of options
+     * @param ContainerInterface        $container     A ContainerInterface instance
+     * @param MessageFormatterInterface $formatter     The message formatter
+     * @param string                    $defaultLocale
+     * @param array                     $loaderIds     An array of loader Ids
+     * @param array                     $options       An array of options
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(ContainerInterface $container, MessageSelector $selector, $defaultLocale = null, array $loaderIds = array(), array $options = array())
+    public function __construct(ContainerInterface $container, $formatter, $defaultLocale = null, array $loaderIds = array(), array $options = array())
     {
         // BC 3.x, to be removed in 4.0 along with the $defaultLocale default value
         if (is_array($defaultLocale) || 3 > func_num_args()) {
@@ -90,7 +90,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
         $this->resourceLocales = array_keys($this->options['resource_files']);
         $this->addResourceFiles($this->options['resource_files']);
 
-        parent::__construct($defaultLocale, $selector, $this->options['cache_dir'], $this->options['debug']);
+        parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug']);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index cdd11cb91be6c..24753841cadb4 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
  * Improved Xliff 2.0 loader to load `` section.
  * Added `TranslationWriterInterface`
  * Deprecated `TranslationWriter::writeTranslations` in favor of `TranslationWriter::write`
+ * added support for adding custom message formatter and decoupling the default one.
 
 3.2.0
 -----
diff --git a/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php b/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
new file mode 100644
index 0000000000000..92acbcafe2032
--- /dev/null
+++ b/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Formatter;
+
+/**
+ * @author Abdellatif Ait boudad 
+ */
+interface ChoiceMessageFormatterInterface
+{
+    /**
+     * Formats a localized message pattern with given arguments.
+     *
+     * @param string $message    The message (may also be an object that can be cast to string)
+     * @param int    $number     The number to use to find the indice of the message
+     * @param string $locale     The message locale
+     * @param array  $parameters An array of parameters for the message
+     *
+     * @return string
+     */
+    public function choiceFormat($message, $number, $locale, array $parameters = array());
+}
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
new file mode 100644
index 0000000000000..e174be36c3a46
--- /dev/null
+++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
@@ -0,0 +1,48 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Formatter;
+
+use Symfony\Component\Translation\MessageSelector;
+
+/**
+ * @author Abdellatif Ait boudad 
+ */
+class MessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
+{
+    private $selector;
+
+    /**
+     * @param MessageSelector|null $selector The message selector for pluralization
+     */
+    public function __construct(MessageSelector $selector = null)
+    {
+        $this->selector = $selector ?: new MessageSelector();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format($message, $locale, array $parameters = array())
+    {
+        return strtr($message, $parameters);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function choiceFormat($message, $number, $locale, array $parameters = array())
+    {
+        $parameters = array_merge(array('%count%' => $number), $parameters);
+
+        return $this->format($this->selector->choose($message, (int) $number, $locale), $locale, $parameters);
+    }
+}
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php b/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
new file mode 100644
index 0000000000000..86937fb2f0853
--- /dev/null
+++ b/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Formatter;
+
+/**
+ * @author Guilherme Blanco 
+ * @author Abdellatif Ait boudad 
+ */
+interface MessageFormatterInterface
+{
+    /**
+     * Formats a localized message pattern with given arguments.
+     *
+     * @param string $message    The message (may also be an object that can be cast to string)
+     * @param string $locale     The message locale
+     * @param array  $parameters An array of parameters for the message
+     *
+     * @return string
+     */
+    public function format($message, $locale, array $parameters = array());
+}
diff --git a/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php b/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php
new file mode 100644
index 0000000000000..1fa736e7e3df4
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php
@@ -0,0 +1,82 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Tests\Formatter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Formatter\MessageFormatter;
+
+class MessageFormatterTest extends TestCase
+{
+    /**
+     * @dataProvider getTransMessages
+     */
+    public function testFormat($expected, $message, $parameters = array())
+    {
+        $this->assertEquals($expected, $this->getMessageFormatter()->format($message, 'en', $parameters));
+    }
+
+    /**
+     * @dataProvider getTransChoiceMessages
+     */
+    public function testFormatPlural($expected, $message, $number, $parameters)
+    {
+        $this->assertEquals($expected, $this->getMessageFormatter()->choiceFormat($message, $number, 'fr', $parameters));
+    }
+
+    public function getTransMessages()
+    {
+        return array(
+            array(
+                'There is one apple',
+                'There is one apple',
+            ),
+            array(
+                'There are 5 apples',
+                'There are %count% apples',
+                array('%count%' => 5),
+            ),
+            array(
+                'There are 5 apples',
+                'There are {{count}} apples',
+                array('{{count}}' => 5),
+            ),
+        );
+    }
+
+    public function getTransChoiceMessages()
+    {
+        return array(
+            array('Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0)),
+            array('Il y a 1 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 1, array('%count%' => 1)),
+            array('Il y a 10 pommes', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 10, array('%count%' => 10)),
+
+            array('Il y a 0 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 0, array('%count%' => 0)),
+            array('Il y a 1 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 1, array('%count%' => 1)),
+            array('Il y a 10 pommes', 'Il y a %count% pomme|Il y a %count% pommes', 10, array('%count%' => 10)),
+
+            array('Il y a 0 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 0, array('%count%' => 0)),
+            array('Il y a 1 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 1, array('%count%' => 1)),
+            array('Il y a 10 pommes', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 10, array('%count%' => 10)),
+
+            array('Il n\'y a aucune pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 0, array('%count%' => 0)),
+            array('Il y a 1 pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 1, array('%count%' => 1)),
+            array('Il y a 10 pommes', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 10, array('%count%' => 10)),
+
+            array('Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0)),
+        );
+    }
+
+    private function getMessageFormatter()
+    {
+        return new MessageFormatter();
+    }
+}
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 2394fdb4320b1..d2c6fd51f453c 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\MessageCatalogue;
 
@@ -25,7 +24,7 @@ class TranslatorTest extends TestCase
      */
     public function testConstructorInvalidLocale($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        $translator = new Translator($locale);
     }
 
     /**
@@ -33,14 +32,14 @@ public function testConstructorInvalidLocale($locale)
      */
     public function testConstructorValidLocale($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        $translator = new Translator($locale);
 
         $this->assertEquals($locale, $translator->getLocale());
     }
 
     public function testConstructorWithoutLocale()
     {
-        $translator = new Translator(null, new MessageSelector());
+        $translator = new Translator(null);
 
         $this->assertNull($translator->getLocale());
     }
@@ -61,7 +60,7 @@ public function testSetGetLocale()
      */
     public function testSetInvalidLocale($locale)
     {
-        $translator = new Translator('fr', new MessageSelector());
+        $translator = new Translator('fr');
         $translator->setLocale($locale);
     }
 
@@ -70,7 +69,7 @@ public function testSetInvalidLocale($locale)
      */
     public function testSetValidLocale($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        $translator = new Translator($locale);
         $translator->setLocale($locale);
 
         $this->assertEquals($locale, $translator->getLocale());
@@ -144,7 +143,7 @@ public function testSetFallbackLocalesMultiple()
      */
     public function testSetFallbackInvalidLocales($locale)
     {
-        $translator = new Translator('fr', new MessageSelector());
+        $translator = new Translator('fr');
         $translator->setFallbackLocales(array('fr', $locale));
     }
 
@@ -153,7 +152,7 @@ public function testSetFallbackInvalidLocales($locale)
      */
     public function testSetFallbackValidLocales($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        $translator = new Translator($locale);
         $translator->setFallbackLocales(array('fr', $locale));
         // no assertion. this method just asserts that no exception is thrown
         $this->addToAssertionCount(1);
@@ -176,7 +175,7 @@ public function testTransWithFallbackLocale()
      */
     public function testAddResourceInvalidLocales($locale)
     {
-        $translator = new Translator('fr', new MessageSelector());
+        $translator = new Translator('fr');
         $translator->addResource('array', array('foo' => 'foofoo'), $locale);
     }
 
@@ -185,7 +184,7 @@ public function testAddResourceInvalidLocales($locale)
      */
     public function testAddResourceValidLocales($locale)
     {
-        $translator = new Translator('fr', new MessageSelector());
+        $translator = new Translator('fr');
         $translator->addResource('array', array('foo' => 'foofoo'), $locale);
         // no assertion. this method just asserts that no exception is thrown
         $this->addToAssertionCount(1);
@@ -288,7 +287,7 @@ public function testNestedFallbackCatalogueWhenUsingMultipleLocales()
 
     public function testFallbackCatalogueResources()
     {
-        $translator = new Translator('en_GB', new MessageSelector());
+        $translator = new Translator('en_GB');
         $translator->addLoader('yml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
         $translator->addResource('yml', __DIR__.'/fixtures/empty.yml', 'en_GB');
         $translator->addResource('yml', __DIR__.'/fixtures/resources.yml', 'en');
@@ -324,7 +323,7 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
      */
     public function testTransInvalidLocale($locale)
     {
-        $translator = new Translator('en', new MessageSelector());
+        $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foofoo'), 'en');
 
@@ -336,7 +335,7 @@ public function testTransInvalidLocale($locale)
      */
     public function testTransValidLocale($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        $translator = new Translator($locale);
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('test' => 'OK'), $locale);
 
@@ -374,7 +373,7 @@ public function testTransChoice($expected, $id, $translation, $number, $paramete
      */
     public function testTransChoiceInvalidLocale($locale)
     {
-        $translator = new Translator('en', new MessageSelector());
+        $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foofoo'), 'en');
 
@@ -386,7 +385,7 @@ public function testTransChoiceInvalidLocale($locale)
      */
     public function testTransChoiceValidLocale($locale)
     {
-        $translator = new Translator('en', new MessageSelector());
+        $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foofoo'), 'en');
 
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 897aced2717b5..96553ec989986 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -14,10 +14,14 @@
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
+use Symfony\Component\Translation\Exception\LogicException;
 use Symfony\Component\Translation\Exception\RuntimeException;
 use Symfony\Component\Config\ConfigCacheInterface;
 use Symfony\Component\Config\ConfigCacheFactoryInterface;
 use Symfony\Component\Config\ConfigCacheFactory;
+use Symfony\Component\Translation\Formatter\MessageFormatterInterface;
+use Symfony\Component\Translation\Formatter\ChoiceMessageFormatterInterface;
+use Symfony\Component\Translation\Formatter\MessageFormatter;
 
 /**
  * Translator.
@@ -52,9 +56,9 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     private $resources = array();
 
     /**
-     * @var MessageSelector
+     * @var MessageFormatterInterface
      */
-    private $selector;
+    private $formatter;
 
     /**
      * @var string
@@ -74,17 +78,25 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     /**
      * Constructor.
      *
-     * @param string               $locale   The locale
-     * @param MessageSelector|null $selector The message selector for pluralization
-     * @param string|null          $cacheDir The directory to use for the cache
-     * @param bool                 $debug    Use cache in debug mode ?
+     * @param string                         $locale    The locale
+     * @param MessageFormatterInterface|null $formatter The message formatter
+     * @param string|null                    $cacheDir  The directory to use for the cache
+     * @param bool                           $debug     Use cache in debug mode ?
      *
      * @throws InvalidArgumentException If a locale contains invalid characters
      */
-    public function __construct($locale, MessageSelector $selector = null, $cacheDir = null, $debug = false)
+    public function __construct($locale, $formatter = null, $cacheDir = null, $debug = false)
     {
         $this->setLocale($locale);
-        $this->selector = $selector ?: new MessageSelector();
+
+        if ($formatter instanceof MessageSelector) {
+            $formatter = new MessageFormatter($formatter);
+            @trigger_error(sprintf('Passing a "%s" instance into the "%s" as a second argument is deprecated since version 3.4 and will be removed in 4.0. Inject a "%s" implementation instead.', MessageSelector::class, __METHOD__, MessageFormatterInterface::class), E_USER_DEPRECATED);
+        } elseif (null === $formatter) {
+            $formatter = new MessageFormatter();
+        }
+
+        $this->formatter = $formatter;
         $this->cacheDir = $cacheDir;
         $this->debug = $debug;
     }
@@ -192,7 +204,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
             $domain = 'messages';
         }
 
-        return strtr($this->getCatalogue($locale)->get((string) $id, $domain), $parameters);
+        return $this->formatter->format($this->getCatalogue($locale)->get((string) $id, $domain), $locale, $parameters);
     }
 
     /**
@@ -200,9 +212,9 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
-        $parameters = array_merge(array(
-            '%count%' => $number,
-        ), $parameters);
+        if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {
+            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', get_class($this->formatter)));
+        }
 
         if (null === $domain) {
             $domain = 'messages';
@@ -220,7 +232,7 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
             }
         }
 
-        return strtr($this->selector->choose($catalogue->get($id, $domain), (int) $number, $locale), $parameters);
+        return $this->formatter->choiceFormat($catalogue->get($id, $domain), $number, $locale, $parameters);
     }
 
     /**

From 5bc0b0527e961fef3b943a995677a37bde0f9307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= 
Date: Tue, 12 Sep 2017 16:32:04 +0200
Subject: [PATCH 0813/1099] [FrameworkBundle] Enable assets with templates only
 if the Asset component is installed

---
 .../FrameworkBundle/DependencyInjection/Configuration.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index fab5ac344600e..3a95ee5fedb63 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -52,7 +52,7 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->beforeNormalization()
-                ->ifTrue(function ($v) { return !isset($v['assets']) && isset($v['templating']); })
+                ->ifTrue(function ($v) { return !isset($v['assets']) && isset($v['templating']) && class_exists(Package::class); })
                 ->then(function ($v) {
                     $v['assets'] = array();
 

From f1ab3b28ac95f7ea5ce16be4a2c91639d08cfb35 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 12 Sep 2017 18:00:24 +0200
Subject: [PATCH 0814/1099] [Routing] Cleanup apache fixtures

---
 .../Tests/Fixtures/dumper/url_matcher1.apache | 163 ------------------
 .../Tests/Fixtures/dumper/url_matcher2.apache |   7 -
 2 files changed, 170 deletions(-)
 delete mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.apache
 delete mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.apache

diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.apache b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.apache
deleted file mode 100644
index 26a561cc91180..0000000000000
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.apache
+++ /dev/null
@@ -1,163 +0,0 @@
-# skip "real" requests
-RewriteCond %{REQUEST_FILENAME} -f
-RewriteRule .* - [QSA,L]
-
-# foo
-RewriteCond %{REQUEST_URI} ^/foo/(baz|symfony)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:foo,E=_ROUTING_param_bar:%1,E=_ROUTING_default_def:test]
-
-# foobar
-RewriteCond %{REQUEST_URI} ^/foo(?:/([^/]++))?$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:foobar,E=_ROUTING_param_bar:%1,E=_ROUTING_default_bar:toto]
-
-# bar
-RewriteCond %{REQUEST_URI} ^/bar/([^/]++)$
-RewriteCond %{REQUEST_METHOD} !^(GET|HEAD)$ [NC]
-RewriteRule .* - [S=1,E=_ROUTING_allow_GET:1,E=_ROUTING_allow_HEAD:1]
-RewriteCond %{REQUEST_URI} ^/bar/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:bar,E=_ROUTING_param_foo:%1]
-
-# baragain
-RewriteCond %{REQUEST_URI} ^/baragain/([^/]++)$
-RewriteCond %{REQUEST_METHOD} !^(GET|POST|HEAD)$ [NC]
-RewriteRule .* - [S=1,E=_ROUTING_allow_GET:1,E=_ROUTING_allow_POST:1,E=_ROUTING_allow_HEAD:1]
-RewriteCond %{REQUEST_URI} ^/baragain/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baragain,E=_ROUTING_param_foo:%1]
-
-# baz
-RewriteCond %{REQUEST_URI} ^/test/baz$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz]
-
-# baz2
-RewriteCond %{REQUEST_URI} ^/test/baz\.html$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz2]
-
-# baz3
-RewriteCond %{REQUEST_URI} ^/test/baz3$
-RewriteRule .* $0/ [QSA,L,R=301]
-RewriteCond %{REQUEST_URI} ^/test/baz3/$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz3]
-
-# baz4
-RewriteCond %{REQUEST_URI} ^/test/([^/]++)$
-RewriteRule .* $0/ [QSA,L,R=301]
-RewriteCond %{REQUEST_URI} ^/test/([^/]++)/$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz4,E=_ROUTING_param_foo:%1]
-
-# baz5
-RewriteCond %{REQUEST_URI} ^/test/([^/]++)/$
-RewriteCond %{REQUEST_METHOD} !^(GET|HEAD)$ [NC]
-RewriteRule .* - [S=2,E=_ROUTING_allow_GET:1,E=_ROUTING_allow_HEAD:1]
-RewriteCond %{REQUEST_URI} ^/test/([^/]++)$
-RewriteRule .* $0/ [QSA,L,R=301]
-RewriteCond %{REQUEST_URI} ^/test/([^/]++)/$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz5,E=_ROUTING_param_foo:%1]
-
-# baz5unsafe
-RewriteCond %{REQUEST_URI} ^/testunsafe/([^/]++)/$
-RewriteCond %{REQUEST_METHOD} !^(POST)$ [NC]
-RewriteRule .* - [S=1,E=_ROUTING_allow_POST:1]
-RewriteCond %{REQUEST_URI} ^/testunsafe/([^/]++)/$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz5unsafe,E=_ROUTING_param_foo:%1]
-
-# baz6
-RewriteCond %{REQUEST_URI} ^/test/baz$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz6,E=_ROUTING_default_foo:bar\ baz]
-
-# baz7
-RewriteCond %{REQUEST_URI} ^/te\ st/baz$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz7]
-
-# baz8
-RewriteCond %{REQUEST_URI} ^/te\\\ st/baz$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz8]
-
-# baz9
-RewriteCond %{REQUEST_URI} ^/test/(te\\\ st)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:baz9,E=_ROUTING_param_baz:%1]
-
-RewriteCond %{HTTP:Host} ^a\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_1:1]
-
-# route1
-RewriteCond %{ENV:__ROUTING_host_1} =1
-RewriteCond %{REQUEST_URI} ^/route1$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route1]
-
-# route2
-RewriteCond %{ENV:__ROUTING_host_1} =1
-RewriteCond %{REQUEST_URI} ^/c2/route2$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route2]
-
-RewriteCond %{HTTP:Host} ^b\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_2:1]
-
-# route3
-RewriteCond %{ENV:__ROUTING_host_2} =1
-RewriteCond %{REQUEST_URI} ^/c2/route3$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route3]
-
-RewriteCond %{HTTP:Host} ^a\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_3:1]
-
-# route4
-RewriteCond %{ENV:__ROUTING_host_3} =1
-RewriteCond %{REQUEST_URI} ^/route4$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route4]
-
-RewriteCond %{HTTP:Host} ^c\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_4:1]
-
-# route5
-RewriteCond %{ENV:__ROUTING_host_4} =1
-RewriteCond %{REQUEST_URI} ^/route5$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route5]
-
-# route6
-RewriteCond %{REQUEST_URI} ^/route6$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route6]
-
-RewriteCond %{HTTP:Host} ^([^\.]++)\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_5:1,E=__ROUTING_host_5_var1:%1]
-
-# route11
-RewriteCond %{ENV:__ROUTING_host_5} =1
-RewriteCond %{REQUEST_URI} ^/route11$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route11,E=_ROUTING_param_var1:%{ENV:__ROUTING_host_5_var1}]
-
-# route12
-RewriteCond %{ENV:__ROUTING_host_5} =1
-RewriteCond %{REQUEST_URI} ^/route12$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route12,E=_ROUTING_param_var1:%{ENV:__ROUTING_host_5_var1},E=_ROUTING_default_var1:val]
-
-# route13
-RewriteCond %{ENV:__ROUTING_host_5} =1
-RewriteCond %{REQUEST_URI} ^/route13/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route13,E=_ROUTING_param_var1:%{ENV:__ROUTING_host_5_var1},E=_ROUTING_param_name:%1]
-
-# route14
-RewriteCond %{ENV:__ROUTING_host_5} =1
-RewriteCond %{REQUEST_URI} ^/route14/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route14,E=_ROUTING_param_var1:%{ENV:__ROUTING_host_5_var1},E=_ROUTING_param_name:%1,E=_ROUTING_default_var1:val]
-
-RewriteCond %{HTTP:Host} ^c\.example\.com$
-RewriteRule .? - [E=__ROUTING_host_6:1]
-
-# route15
-RewriteCond %{ENV:__ROUTING_host_6} =1
-RewriteCond %{REQUEST_URI} ^/route15/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route15,E=_ROUTING_param_name:%1]
-
-# route16
-RewriteCond %{REQUEST_URI} ^/route16/([^/]++)$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route16,E=_ROUTING_param_name:%1,E=_ROUTING_default_var1:val]
-
-# route17
-RewriteCond %{REQUEST_URI} ^/route17$
-RewriteRule .* app.php [QSA,L,E=_ROUTING_route:route17]
-
-# 405 Method Not Allowed
-RewriteCond %{ENV:_ROUTING__allow_GET} =1 [OR]
-RewriteCond %{ENV:_ROUTING__allow_HEAD} =1 [OR]
-RewriteCond %{ENV:_ROUTING__allow_POST} =1
-RewriteRule .* app.php [QSA,L]
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.apache b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.apache
deleted file mode 100644
index 309f2ff0e5394..0000000000000
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.apache
+++ /dev/null
@@ -1,7 +0,0 @@
-# skip "real" requests
-RewriteCond %{REQUEST_FILENAME} -f
-RewriteRule .* - [QSA,L]
-
-# foo
-RewriteCond %{REQUEST_URI} ^/foo$
-RewriteRule .* ap\ p_d\ ev.php [QSA,L,E=_ROUTING_route:foo]

From 8d5674480f8b7dfbd908fbc5492ac3393074f2ee Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Tue, 12 Sep 2017 14:46:33 -0400
Subject: [PATCH 0815/1099] Add support to environment variables APP_ENV/DEBUG
 in KernelTestCase

---
 .../FrameworkBundle/Test/KernelTestCase.php   | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 4617aea71c4b3..1927146c4cffa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -178,10 +178,27 @@ protected static function createKernel(array $options = array())
             static::$class = static::getKernelClass();
         }
 
-        return new static::$class(
-            isset($options['environment']) ? $options['environment'] : 'test',
-            isset($options['debug']) ? $options['debug'] : true
-        );
+        if (isset($options['environment'])) {
+            $env = $options['environment'];
+        } elseif (isset($_SERVER['APP_ENV'])) {
+            $env = $_SERVER['APP_ENV'];
+        } elseif (isset($_ENV['APP_ENV'])) {
+            $env = $_ENV['APP_ENV'];
+        } else {
+            $env = 'test';
+        }
+
+        if (isset($options['debug'])) {
+            $debug = $options['debug'];
+        } elseif (isset($_SERVER['APP_DEBUG'])) {
+            $debug = $_SERVER['APP_DEBUG'];
+        } elseif (isset($_ENV['APP_DEBUG'])) {
+            $debug = $_ENV['APP_DEBUG'];
+        } else {
+            $debug = true;
+        }
+
+        return new static::$class($env, $debug);
     }
 
     /**

From 2028a83689fe7d413670fc47d5ef5b9c749bfabc Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 12 Sep 2017 18:35:33 +0200
Subject: [PATCH 0816/1099] drop MessageSelector support in the Translator

---
 .../Bundle/FrameworkBundle/Translation/Translator.php      | 2 +-
 src/Symfony/Component/Translation/CHANGELOG.md             | 1 +
 src/Symfony/Component/Translation/Translator.php           | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index 190bd5d0da817..14cb2adecfe55 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -63,7 +63,7 @@ class Translator extends BaseTranslator implements WarmableInterface
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(ContainerInterface $container, $formatter, string $defaultLocale, array $loaderIds = array(), array $options = array())
+    public function __construct(ContainerInterface $container, MessageFormatterInterface $formatter, string $defaultLocale, array $loaderIds = array(), array $options = array())
     {
         $this->container = $container;
         $this->loaderIds = $loaderIds;
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index 289fed1ce4344..ed821fa03d715 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * removed the backup feature of the `FileDumper` class
  * removed `TranslationWriter::writeTranslations()` method
+ * removed support for passing `MessageSelector` instances to the constructor of the `Translator` class
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 5ed01af58b914..f691e65ba6525 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -85,14 +85,11 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
      *
      * @throws InvalidArgumentException If a locale contains invalid characters
      */
-    public function __construct($locale, $formatter = null, $cacheDir = null, $debug = false)
+    public function __construct($locale, MessageFormatterInterface $formatter = null, $cacheDir = null, $debug = false)
     {
         $this->setLocale($locale);
 
-        if ($formatter instanceof MessageSelector) {
-            $formatter = new MessageFormatter($formatter);
-            @trigger_error(sprintf('Passing a "%s" instance into the "%s" as a second argument is deprecated since version 3.4 and will be removed in 4.0. Inject a "%s" implementation instead.', MessageSelector::class, __METHOD__, MessageFormatterInterface::class), E_USER_DEPRECATED);
-        } elseif (null === $formatter) {
+        if (null === $formatter) {
             $formatter = new MessageFormatter();
         }
 

From 1936491f9b12891326aa875aa32050475d2a0404 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 5 Sep 2017 13:45:10 +0200
Subject: [PATCH 0817/1099] Make as many services private as possible

---
 .../AbstractDoctrineExtension.php             |   3 +
 .../DependencyInjection/DebugExtension.php    |   3 +
 .../DebugBundle/Resources/config/services.xml |   4 +-
 src/Symfony/Bundle/DebugBundle/composer.json  |   5 +-
 .../FrameworkExtension.php                    | 161 +++++++++++++-
 .../Resources/config/annotations.xml          |   2 +-
 .../Resources/config/assets.xml               |  10 +-
 .../Resources/config/cache.xml                |  16 +-
 .../Resources/config/collectors.xml           |   4 +-
 .../Resources/config/debug.xml                |   6 +-
 .../Resources/config/debug_prod.xml           |   2 +-
 .../FrameworkBundle/Resources/config/esi.xml  |   4 +-
 .../FrameworkBundle/Resources/config/form.xml |  17 +-
 .../Resources/config/form_csrf.xml            |   6 +-
 .../Resources/config/form_debug.xml           |   6 +-
 .../Resources/config/fragment_listener.xml    |   2 +-
 .../Resources/config/fragment_renderer.xml    |  10 +-
 .../Resources/config/profiling.xml            |   2 +-
 .../Resources/config/property_access.xml      |   2 +-
 .../Resources/config/property_info.xml        |   2 +-
 .../Resources/config/request.xml              |   2 +-
 .../Resources/config/routing.xml              |   2 +-
 .../Resources/config/serializer.xml           |   2 +-
 .../Resources/config/services.xml             |   8 +-
 .../Resources/config/session.xml              |  10 +-
 .../FrameworkBundle/Resources/config/ssi.xml  |   4 +-
 .../Resources/config/templating.xml           |   4 +-
 .../Resources/config/templating_php.xml       |  22 +-
 .../FrameworkBundle/Resources/config/test.xml |   6 +-
 .../Resources/config/translation.xml          |  56 ++---
 .../Resources/config/translation_debug.xml    |   2 +-
 .../Resources/config/validator.xml            |   6 +-
 .../FrameworkBundle/Resources/config/web.xml  |   8 +-
 .../Resources/config/workflow.xml             |   6 +-
 .../Functional/CachePoolClearCommandTest.php  |   4 +-
 .../Tests/Functional/PropertyInfoTest.php     |   2 +-
 .../Functional/app/Serializer/config.yml      |   3 +
 .../DependencyInjection/SecurityExtension.php |  21 +-
 .../SecurityBundle/Resources/config/guard.xml |   1 -
 .../Resources/config/security.xml             |   8 +-
 .../Resources/config/security_acl_dbal.xml    |   6 +-
 .../Resources/config/security_debug.xml       |   2 +-
 .../Resources/config/security_rememberme.xml  |   2 +-
 .../Resources/config/templating_php.xml       |   4 +-
 .../Tests/Functional/SetAclCommandTest.php    |  10 +-
 .../Tests/Functional/app/Acl/config.yml       |   3 +
 .../Bundle/SecurityBundle/composer.json       |   3 +-
 .../Compiler/TwigLoaderPass.php               |   5 +-
 .../DependencyInjection/TwigExtension.php     |   7 +
 .../TwigBundle/Resources/config/form.xml      |   2 +-
 .../TwigBundle/Resources/config/twig.xml      |  10 +-
 .../Compiler/TwigLoaderPassTest.php           |  10 +-
 src/Symfony/Bundle/TwigBundle/composer.json   |   7 +-
 .../WebProfilerExtension.php                  |   1 +
 .../Resources/config/toolbar.xml              |   2 +-
 .../Bundle/WebProfilerBundle/composer.json    |   6 +-
 .../Component/DependencyInjection/Alias.php   |  34 +++
 .../Compiler/CheckDefinitionValidityPass.php  |   2 +-
 .../Compiler/DecoratorServicePass.php         |   4 +-
 .../Compiler/InlineServiceDefinitionsPass.php |   2 +-
 .../Compiler/RemovePrivateAliasesPass.php     |   2 +-
 .../Compiler/RemoveUnusedDefinitionsPass.php  |   5 +-
 .../ReplaceAliasByActualDefinitionPass.php    |   5 +-
 .../Compiler/ResolveChildDefinitionsPass.php  |  23 ++
 .../ResolveReferencesToAliasesPass.php        |   2 +-
 .../DependencyInjection/ContainerBuilder.php  |   4 +-
 .../DependencyInjection/Definition.php        |  30 +++
 .../DependencyInjection/Dumper/PhpDumper.php  |  12 +-
 .../ResolveChildDefinitionsPassTest.php       |  20 ++
 .../Tests/Dumper/PhpDumperTest.php            |  46 ++++
 .../Fixtures/php/services_legacy_privates.php | 200 ++++++++++++++++++
 .../yaml/services_legacy_privates.yml         |  28 +++
 72 files changed, 758 insertions(+), 185 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 3d4fc46e1fff4..229cacf8255a9 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -333,6 +333,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
                 $cacheDef = new Definition($memcacheClass);
                 $memcacheInstance = new Definition($memcacheInstanceClass);
+                $memcacheInstance->setPrivate(true);
                 $memcacheInstance->addMethodCall('connect', array(
                     $memcacheHost, $memcachePort,
                 ));
@@ -346,6 +347,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $memcachedPort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcached_port').'%';
                 $cacheDef = new Definition($memcachedClass);
                 $memcachedInstance = new Definition($memcachedInstanceClass);
+                $memcachedInstance->setPrivate(true);
                 $memcachedInstance->addMethodCall('addServer', array(
                     $memcachedHost, $memcachedPort,
                 ));
@@ -359,6 +361,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $redisPort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.redis_port').'%';
                 $cacheDef = new Definition($redisClass);
                 $redisInstance = new Definition($redisInstanceClass);
+                $redisInstance->setPrivate(true);
                 $redisInstance->addMethodCall('connect', array(
                     $redisHost, $redisPort,
                 ));
diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
index 835d823664021..d7c0ee7287468 100644
--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
+++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
@@ -35,6 +35,9 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
+        $container->getDefinition('debug.dump_listener')->setPrivate(true);
+        $container->getDefinition('var_dumper.cli_dumper')->setPrivate(true);
+
         $container->getDefinition('var_dumper.cloner')
             ->addMethodCall('setMaxItems', array($config['max_items']))
             ->addMethodCall('setMinDepth', array($config['min_depth']))
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
index 79460a160259a..7e276dafab5d2 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -22,14 +22,14 @@
             null
         
 
-        
+        
             
             
             
         
 
         
-        
+        
             null
             %kernel.charset%
             0 
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
index 5ad163e3031a3..7b59b82c765f6 100644
--- a/src/Symfony/Bundle/DebugBundle/composer.json
+++ b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -24,9 +24,12 @@
     },
     "require-dev": {
         "symfony/config": "~3.3|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/web-profiler-bundle": "~2.8|~3.0|~4.0"
     },
+    "conflict": {
+        "symfony/dependency-injection": "<3.4"
+    },
     "suggest": {
         "symfony/config": "For service container configuration",
         "symfony/dependency-injection": "For using as a service from the container"
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 9b3a071168a51..0ead938a1bf10 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -115,6 +115,15 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('web.xml');
         $loader->load('services.xml');
 
+        $container->getDefinition('kernel.class_cache.cache_warmer')->setPrivate(true);
+        $container->getDefinition('uri_signer')->setPrivate(true);
+        $container->getDefinition('config_cache_factory')->setPrivate(true);
+        $container->getDefinition('response_listener')->setPrivate(true);
+        $container->getDefinition('file_locator')->setPrivate(true);
+        $container->getDefinition('streamed_response_listener')->setPrivate(true);
+        $container->getDefinition('locale_listener')->setPrivate(true);
+        $container->getDefinition('validate_request_listener')->setPrivate(true);
+
         // forward compatibility with Symfony 4.0 where the ContainerAwareEventDispatcher class is removed
         if (!class_exists(ContainerAwareEventDispatcher::class)) {
             $definition = $container->getDefinition('event_dispatcher');
@@ -131,6 +140,12 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader->load('fragment_renderer.xml');
 
+        $container->getDefinition('fragment.handler')->setPrivate(true);
+        $container->getDefinition('fragment.renderer.inline')->setPrivate(true);
+        $container->getDefinition('fragment.renderer.hinclude')->setPrivate(true);
+        $container->getDefinition('fragment.renderer.esi')->setPrivate(true);
+        $container->getDefinition('fragment.renderer.ssi')->setPrivate(true);
+
         if (class_exists(Application::class)) {
             $loader->load('console.xml');
 
@@ -145,9 +160,20 @@ public function load(array $configs, ContainerBuilder $container)
         // Property access is used by both the Form and the Validator component
         $loader->load('property_access.xml');
 
+        $container->getDefinition('property_accessor')->setPrivate(true);
+
         // Load Cache configuration first as it is used by other components
         $loader->load('cache.xml');
 
+        $container->getDefinition('cache.adapter.system')->setPrivate(true);
+        $container->getDefinition('cache.adapter.apcu')->setPrivate(true);
+        $container->getDefinition('cache.adapter.doctrine')->setPrivate(true);
+        $container->getDefinition('cache.adapter.filesystem')->setPrivate(true);
+        $container->getDefinition('cache.adapter.psr6')->setPrivate(true);
+        $container->getDefinition('cache.adapter.redis')->setPrivate(true);
+        $container->getDefinition('cache.adapter.memcached')->setPrivate(true);
+        $container->getDefinition('cache.default_clearer')->setPrivate(true);
+
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
@@ -202,6 +228,10 @@ public function load(array $configs, ContainerBuilder $container)
 
         if (!empty($config['test'])) {
             $loader->load('test.xml');
+
+            $container->getDefinition('test.client.history')->setPrivate(true);
+            $container->getDefinition('test.client.cookiejar')->setPrivate(true);
+            $container->getDefinition('test.session.listener')->setPrivate(true);
         }
 
         if ($this->isConfigEnabled($container, $config['session'])) {
@@ -389,6 +419,19 @@ public function getConfiguration(array $config, ContainerBuilder $container)
     private function registerFormConfiguration($config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('form.xml');
+
+        $container->getDefinition('form.resolved_type_factory')->setPrivate(true);
+        $container->getDefinition('form.registry')->setPrivate(true);
+        $container->getDefinition('form.type_guesser.validator')->setPrivate(true);
+        $container->getDefinition('form.type.form')->setPrivate(true);
+        $container->getDefinition('form.type.choice')->setPrivate(true);
+        $container->getDefinition('form.type_extension.form.http_foundation')->setPrivate(true);
+        $container->getDefinition('form.type_extension.form.validator')->setPrivate(true);
+        $container->getDefinition('form.type_extension.repeated.validator')->setPrivate(true);
+        $container->getDefinition('form.type_extension.submit.validator')->setPrivate(true);
+        $container->getDefinition('form.type_extension.upload.validator')->setPrivate(true);
+        $container->getDefinition('deprecated.form.registry')->setPrivate(true);
+
         if (null === $config['form']['csrf_protection']['enabled']) {
             $config['form']['csrf_protection']['enabled'] = $config['csrf_protection']['enabled'];
         }
@@ -396,6 +439,9 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
         if ($this->isConfigEnabled($container, $config['form']['csrf_protection'])) {
             $loader->load('form_csrf.xml');
 
+            $container->getDefinition('form.type_extension.csrf')->setPrivate(true);
+            $container->getDefinition('deprecated.form.registry.csrf')->setPrivate(true);
+
             $container->setParameter('form.type_extension.csrf.enabled', true);
             $container->setParameter('form.type_extension.csrf.field_name', $config['form']['csrf_protection']['field_name']);
         } else {
@@ -419,6 +465,9 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta
         }
 
         $loader->load('esi.xml');
+
+        $container->getDefinition('esi')->setPrivate(true);
+        $container->getDefinition('esi_listener')->setPrivate(true);
     }
 
     /**
@@ -437,6 +486,9 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta
         }
 
         $loader->load('ssi.xml');
+
+        $container->getDefinition('ssi')->setPrivate(true);
+        $container->getDefinition('ssi_listener')->setPrivate(true);
     }
 
     /**
@@ -480,8 +532,16 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         $loader->load('collectors.xml');
         $loader->load('cache_debug.xml');
 
+        $container->getDefinition('data_collector.request')->setPrivate(true);
+        $container->getDefinition('data_collector.router')->setPrivate(true);
+        $container->getDefinition('profiler_listener')->setPrivate(true);
+
         if ($this->formConfigEnabled) {
             $loader->load('form_debug.xml');
+
+            $container->getDefinition('form.resolved_type_factory')->setPrivate(true);
+            $container->getDefinition('data_collector.form.extractor')->setPrivate(true);
+            $container->getDefinition('data_collector.form')->setPrivate(true);
         }
 
         if ($this->validatorConfigEnabled) {
@@ -490,6 +550,9 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
 
         if ($this->translationConfigEnabled) {
             $loader->load('translation_debug.xml');
+
+            $container->getDefinition('data_collector.translation')->setPrivate(true);
+
             $container->getDefinition('translator.data_collector')->setDecoratedService('translator');
         }
 
@@ -506,7 +569,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
 
         if ($this->isConfigEnabled($container, $config['matcher'])) {
             if (isset($config['matcher']['service'])) {
-                $container->setAlias('profiler.request_matcher', $config['matcher']['service']);
+                $container->setAlias('profiler.request_matcher', $config['matcher']['service'])->setPrivate(true);
             } elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) {
                 $definition = $container->register('profiler.request_matcher', 'Symfony\\Component\\HttpFoundation\\RequestMatcher');
                 $definition->setPublic(false);
@@ -553,6 +616,10 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
         $loader->load('workflow.xml');
 
+        $container->getDefinition('workflow.marking_store.multiple_state')->setPrivate(true);
+        $container->getDefinition('workflow.marking_store.single_state')->setPrivate(true);
+        $container->getDefinition('workflow.registry')->setPrivate(true);
+
         $registryDefinition = $container->getDefinition('workflow.registry');
 
         foreach ($config['workflows'] as $name => $workflow) {
@@ -626,6 +693,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             // Enable the AuditTrail
             if ($workflow['audit_trail']['enabled']) {
                 $listener = new Definition(Workflow\EventListener\AuditTrailListener::class);
+                $listener->setPrivate(true);
                 $listener->addTag('monolog.logger', array('channel' => 'workflow'));
                 $listener->addTag('kernel.event_listener', array('event' => sprintf('workflow.%s.leave', $name), 'method' => 'onLeave'));
                 $listener->addTag('kernel.event_listener', array('event' => sprintf('workflow.%s.transition', $name), 'method' => 'onTransition'));
@@ -636,6 +704,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             // Add Guard Listener
             $guard = new Definition(Workflow\EventListener\GuardListener::class);
+            $guard->setPrivate(true);
             $configuration = array();
             foreach ($workflow['transitions'] as $transitionName => $config) {
                 if (!isset($config['guard'])) {
@@ -681,8 +750,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
     {
         $loader->load('debug_prod.xml');
 
+        $container->getDefinition('debug.debug_handlers_listener')->setPrivate(true);
+
         if (class_exists(Stopwatch::class)) {
-            $container->register('debug.stopwatch', Stopwatch::class)->addArgument(true);
+            $container->register('debug.stopwatch', Stopwatch::class)->addArgument(true)->setPrivate(true);
             $container->setAlias(Stopwatch::class, new Alias('debug.stopwatch', false));
         }
 
@@ -694,6 +765,9 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
 
         if ($debug && class_exists(Stopwatch::class)) {
             $loader->load('debug.xml');
+            $container->getDefinition('debug.event_dispatcher')->setPrivate(true);
+            $container->getDefinition('debug.controller_resolver')->setPrivate(true);
+            $container->getDefinition('debug.argument_resolver')->setPrivate(true);
         }
 
         $definition = $container->findDefinition('debug.debug_handlers_listener');
@@ -734,6 +808,8 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
 
         $loader->load('routing.xml');
 
+        $container->getDefinition('router_listener')->setPrivate(true);
+
         $container->setParameter('router.resource', $config['resource']);
         $container->setParameter('router.cache_class_prefix', $container->getParameter('kernel.container_class'));
         $router = $container->findDefinition('router.default');
@@ -792,8 +868,14 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
     {
         $loader->load('session.xml');
 
+        $container->getDefinition('session.storage.native')->setPrivate(true);
+        $container->getDefinition('session.storage.php_bridge')->setPrivate(true);
+        $container->getDefinition('session_listener')->setPrivate(true);
+        $container->getDefinition('session.save_listener')->setPrivate(true);
+        $container->getAlias('session.storage.filesystem')->setPrivate(true);
+
         // session storage
-        $container->setAlias('session.storage', $config['storage_id']);
+        $container->setAlias('session.storage', $config['storage_id'])->setPrivate(true);
         $options = array();
         foreach (array('name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'use_cookies', 'gc_maxlifetime', 'gc_probability', 'gc_divisor', 'use_strict_mode') as $key) {
             if (isset($config[$key])) {
@@ -816,7 +898,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
                 $handlerId = 'session.handler.write_check';
             }
 
-            $container->setAlias('session.handler', $handlerId);
+            $container->setAlias('session.handler', $handlerId)->setPrivate(true);
         }
 
         $container->setParameter('session.save_path', $config['save_path']);
@@ -853,6 +935,9 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c
     {
         if ($config['formats']) {
             $loader->load('request.xml');
+
+            $container->getDefinition('request.add_request_formats_listener')->setPrivate(true);
+
             $container
                 ->getDefinition('request.add_request_formats_listener')
                 ->replaceArgument(0, $config['formats'])
@@ -871,6 +956,9 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
     {
         $loader->load('templating.xml');
 
+        $container->getDefinition('templating.name_parser')->setPrivate(true);
+        $container->getDefinition('templating.filename_parser')->setPrivate(true);
+
         $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
 
         if ($container->getParameter('kernel.debug')) {
@@ -889,10 +977,10 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
 
             // Use a delegation unless only a single loader was registered
             if (1 === count($loaders)) {
-                $container->setAlias('templating.loader', (string) reset($loaders));
+                $container->setAlias('templating.loader', (string) reset($loaders))->setPrivate(true);
             } else {
                 $container->getDefinition('templating.loader.chain')->addArgument($loaders);
-                $container->setAlias('templating.loader', 'templating.loader.chain');
+                $container->setAlias('templating.loader', 'templating.loader.chain')->setPrivate(true);
             }
         }
 
@@ -937,13 +1025,25 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
         if (in_array('php', $config['engines'], true)) {
             $loader->load('templating_php.xml');
 
+            $container->getDefinition('templating.helper.slots')->setPrivate(true);
+            $container->getDefinition('templating.helper.request')->setPrivate(true);
+            $container->getDefinition('templating.helper.session')->setPrivate(true);
+            $container->getDefinition('templating.helper.router')->setPrivate(true);
+            $container->getDefinition('templating.helper.assets')->setPrivate(true);
+            $container->getDefinition('templating.helper.actions')->setPrivate(true);
+            $container->getDefinition('templating.helper.code')->setPrivate(true);
+            $container->getDefinition('templating.helper.translator')->setPrivate(true);
+            $container->getDefinition('templating.helper.form')->setPrivate(true);
+            $container->getDefinition('templating.helper.stopwatch')->setPrivate(true);
+            $container->getDefinition('templating.globals')->setPrivate(true);
+
             $container->setParameter('templating.helper.form.resources', $config['form']['resources']);
 
             if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class)) {
                 $loader->load('templating_debug.xml');
 
                 $container->setDefinition('templating.engine.php', $container->findDefinition('debug.templating.engine.php'));
-                $container->setAlias('debug.templating.engine.php', 'templating.engine.php');
+                $container->setAlias('debug.templating.engine.php', 'templating.engine.php')->setPrivate(true);
             }
 
             if (\PHP_VERSION_ID < 70000) {
@@ -977,6 +1077,12 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
     {
         $loader->load('assets.xml');
 
+        $container->getDefinition('assets.packages')->setPrivate(true);
+        $container->getDefinition('assets.context')->setPrivate(true);
+        $container->getDefinition('assets.path_package')->setPrivate(true);
+        $container->getDefinition('assets.url_package')->setPrivate(true);
+        $container->getDefinition('assets.static_version_strategy')->setPrivate(true);
+
         $defaultVersion = null;
 
         if ($config['version_strategy']) {
@@ -1073,6 +1179,35 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
         $loader->load('translation.xml');
 
+        $container->getDefinition('translator.default')->setPrivate(true);
+        $container->getDefinition('translation.loader.php')->setPrivate(true);
+        $container->getDefinition('translation.loader.yml')->setPrivate(true);
+        $container->getDefinition('translation.loader.xliff')->setPrivate(true);
+        $container->getDefinition('translation.loader.po')->setPrivate(true);
+        $container->getDefinition('translation.loader.mo')->setPrivate(true);
+        $container->getDefinition('translation.loader.qt')->setPrivate(true);
+        $container->getDefinition('translation.loader.csv')->setPrivate(true);
+        $container->getDefinition('translation.loader.res')->setPrivate(true);
+        $container->getDefinition('translation.loader.dat')->setPrivate(true);
+        $container->getDefinition('translation.loader.ini')->setPrivate(true);
+        $container->getDefinition('translation.loader.json')->setPrivate(true);
+        $container->getDefinition('translation.dumper.php')->setPrivate(true);
+        $container->getDefinition('translation.dumper.xliff')->setPrivate(true);
+        $container->getDefinition('translation.dumper.po')->setPrivate(true);
+        $container->getDefinition('translation.dumper.mo')->setPrivate(true);
+        $container->getDefinition('translation.dumper.yml')->setPrivate(true);
+        $container->getDefinition('translation.dumper.qt')->setPrivate(true);
+        $container->getDefinition('translation.dumper.csv')->setPrivate(true);
+        $container->getDefinition('translation.dumper.ini')->setPrivate(true);
+        $container->getDefinition('translation.dumper.json')->setPrivate(true);
+        $container->getDefinition('translation.dumper.res')->setPrivate(true);
+        $container->getDefinition('translation.extractor.php')->setPrivate(true);
+        $container->getDefinition('translator_listener')->setPrivate(true);
+        $container->getDefinition('translation.loader')->setPrivate(true);
+        $container->getDefinition('translation.reader')->setPrivate(true);
+        $container->getDefinition('translation.extractor')->setPrivate(true);
+        $container->getDefinition('translation.writer')->setPrivate(true);
+
         // Use the "real" translator instead of the identity default
         $container->setAlias('translator', 'translator.default');
         $container->setAlias('translator.formatter', new Alias($config['formatter'], false));
@@ -1169,6 +1304,10 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         $loader->load('validator.xml');
 
+        $container->getDefinition('validator.builder')->setPrivate(true);
+        $container->getDefinition('validator.expression')->setPrivate(true);
+        $container->getDefinition('validator.email')->setPrivate(true);
+
         $validatorBuilder = $container->getDefinition('validator.builder');
 
         $container->setParameter('validator.translation_domain', $config['translation_domain']);
@@ -1282,6 +1421,8 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $loader->load('annotations.xml');
 
+        $container->getAlias('annotation_reader')->setPrivate(true);
+
         if ('none' !== $config['cache']) {
             if (!class_exists('Doctrine\Common\Cache\CacheProvider')) {
                 throw new LogicException('Annotations cannot be enabled as the Doctrine Cache library is not installed.');
@@ -1408,6 +1549,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         $loader->load('serializer.xml');
+
+        $container->getDefinition('serializer.mapping.cache.symfony')->setPrivate(true);
+
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
 
         $serializerLoaders = array();
@@ -1498,8 +1642,11 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
     {
         $loader->load('property_info.xml');
 
+        $container->getDefinition('property_info')->setPrivate(true);
+
         if (interface_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {
             $definition = $container->register('property_info.php_doc_extractor', 'Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor');
+            $definition->setPrivate(true);
             $definition->addTag('property_info.description_extractor', array('priority' => -1000));
             $definition->addTag('property_info.type_extractor', array('priority' => -1001));
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 15bf002954199..6b290d7763867 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -49,7 +49,7 @@
             
         
 
-        
+        
         
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
index e714e2834c5fc..9584afdb134ed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
              
              
         
@@ -17,23 +17,23 @@
             
         
 
-        
+        
             
         
 
-        
+        
              
              
             
         
 
-        
+        
              
              
             
         
 
-        
+        
              
              
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index e0d5788bc4879..cbed70e4e11a1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -27,7 +27,7 @@
             
         
 
-        
+        
             
             
             
@@ -38,7 +38,7 @@
             
         
 
-        
+        
             
             
              
@@ -49,7 +49,7 @@
             
         
 
-        
+        
             
             
              
@@ -60,7 +60,7 @@
             
         
 
-        
+        
             
             
              
@@ -71,14 +71,14 @@
             
         
 
-        
+        
             
              
              
             0 
         
 
-        
+        
             
             
              
@@ -89,7 +89,7 @@
             
         
 
-        
+        
             
             
              
@@ -100,7 +100,7 @@
             
         
 
-        
+        
             
         
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 8cd0c3ced0d8b..a1b73097e0bd7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -12,7 +12,7 @@
             
         
 
-        
+        
             
             
         
@@ -47,7 +47,7 @@
             
         
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index aa988dc5b93cf..9aa1367f585e1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -7,20 +7,20 @@
     
         
 
-        
+        
             
             
             
             
         
 
-        
+        
             
             
             
         
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
index fc4efe4e02253..28a8a8a2c04b1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -11,7 +11,7 @@
     
         
 
-        
+        
             
             
             null
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
index 8925acb1ac8f0..cd9fa061dd240 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
@@ -7,9 +7,9 @@
     
         
 
-        
+        
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 642d8d4ee7bfc..211bccb688b49 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -8,11 +8,11 @@
         
 
         
-        
+        
         
 
         
-        
+        
             
                 
-        
+        
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
index a9628ad5609e5..49fbbbaf388cb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
             
             
             %fragment.path%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
index a24d2880ea823..3f518522e153c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
@@ -12,27 +12,27 @@
     
         
 
-        
+        
              
             
             %kernel.debug%
         
 
-        
+        
             
             
             
             %fragment.path%
         
 
-        
+        
              
             
             %fragment.renderer.hinclude.global_template%
             %fragment.path%
         
 
-        
+        
             
             
             
@@ -40,7 +40,7 @@
             %fragment.path%
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index c409e981de7bb..635dc8d2b3ed0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -17,7 +17,7 @@
             %profiler.storage.dsn%
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
index 15e684b62ae2d..91924e5972d8e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
              
              
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
index 8e0498e4f68b3..a893127276564 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
index b9e9e9c7e058b..9cb049c01735f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 22bd38f8b80d6..6856512e20349 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -102,7 +102,7 @@
             
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index d350091a01820..924ebf18d8b0f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -60,7 +60,7 @@
             
         
 
-        
+        
             
             %serializer.mapping.cache.file%
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index cecbdf8d85f2a..9ff2c259ee43b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -27,7 +27,7 @@
             
         
 
-        
+        
             
                 Symfony\Component\HttpFoundation\ParameterBag
                 Symfony\Component\HttpFoundation\HeaderBag
@@ -49,7 +49,7 @@
         
         
 
-        
+        
             
             %kernel.root_dir%/Resources
             
@@ -58,11 +58,11 @@
         
         
 
-        
+        
             %kernel.secret%
         
 
-        
+        
              
         
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 2a930075bbf54..0cb86362a231e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -26,13 +26,13 @@
             %session.metadata.update_threshold%
         
 
-        
+        
             %session.storage.options%
             
             
         
 
-        
+        
             
             
         
@@ -53,7 +53,7 @@
 
         
 
-        
+        
             
             
                 
@@ -65,11 +65,11 @@
             
         
 
-        
+        
             
         
 
         
-        
+        
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
index 4df799fcf5fe3..8a3c0cb593bff 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
@@ -7,9 +7,9 @@
     
         
 
-        
+        
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
index 1de55085c84f5..68b0eeefd7ccf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -12,11 +12,11 @@
              
         
 
-        
+        
             
         
 
-        
+        
 
         
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 5eb7233592f65..5d4aa8625eefd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -20,53 +20,53 @@
             
         
 
-        
+        
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
         
 
-        
+        
             
              
         
 
-        
+        
             
             
         
 
-        
+        
             
             
             %kernel.root_dir%
             %kernel.charset%
         
 
-        
+        
             
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
         
@@ -81,7 +81,7 @@
             
         
 
-        
+        
             
         
     
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
index 2b75d4c5b7016..ff109c4cd2420 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -18,11 +18,11 @@
             
         
 
-        
+        
 
-        
+        
 
-        
+        
             
             
                 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index d8c8f1e030111..b1f478ac90bac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
              
             
             %kernel.default_locale%
@@ -32,67 +32,67 @@
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
@@ -101,38 +101,38 @@
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             
         
 
-        
+        
             The "%service_id%" service is deprecated since Symfony 3.4 and will be removed in 4.0. Use "translation.reader" instead.
         
-        
+        
 
-        
+        
 
-        
+        
 
         
             
@@ -140,7 +140,7 @@
             
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
index ba30db65dcb80..945f8653a524a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
@@ -13,7 +13,7 @@
         
 
         
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
index aa472d380cb33..66e7c7c23517e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
@@ -17,7 +17,7 @@
         
         
 
-        
+        
             
             
                 
@@ -64,11 +64,11 @@
              
         
 
-        
+        
             
         
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index 1eed0e92f6c21..0622c4196c104 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -51,23 +51,23 @@
             
         
 
-        
+        
             
             %kernel.charset%
         
 
-        
+        
             
         
 
-        
+        
             
             
             %kernel.default_locale%
             
         
 
-        
+        
             
         
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
index 0a033d692afdc..d881f699f75ec 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
@@ -20,10 +20,10 @@
              
         
 
-        
-        
+        
+        
 
-        
+        
         
 
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
index a9a5959848e67..9aa0c019d58af 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -58,10 +58,10 @@ public function testClearPoolWithCustomClearer()
     public function testCallClearer()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('pools' => array('cache.default_clearer')), array('decorated' => false));
+        $tester->execute(array('pools' => array('cache.app_clearer')), array('decorated' => false));
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
-        $this->assertContains('Calling cache clearer: cache.default_clearer', $tester->getDisplay());
+        $this->assertContains('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
         $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php
index c02a6b84e519c..f98072ce7b39c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php
@@ -20,7 +20,7 @@ public function testPhpDocPriority()
         static::bootKernel(array('test_case' => 'Serializer'));
         $container = static::$kernel->getContainer();
 
-        $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));
+        $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('test.property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));
     }
 }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
index cac135c315d00..fe3de69299946 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
@@ -1,6 +1,9 @@
 imports:
     - { resource: ../config/default.yml }
 
+services:
+    test.property_info: '@property_info'
+
 framework:
     serializer: { enabled: true }
     property_info: { enabled: true }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 73a1cef128dd8..95e382b7b4226 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -73,8 +73,19 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('collectors.xml');
         $loader->load('guard.xml');
 
+        $container->getDefinition('security.authentication.guard_handler')->setPrivate(true);
+        $container->getDefinition('security.firewall')->setPrivate(true);
+        $container->getDefinition('security.firewall.context')->setPrivate(true);
+        $container->getDefinition('security.validator.user_password')->setPrivate(true);
+        $container->getDefinition('security.rememberme.response_listener')->setPrivate(true);
+        $container->getDefinition('templating.helper.logout_url')->setPrivate(true);
+        $container->getDefinition('templating.helper.security')->setPrivate(true);
+        $container->getAlias('security.encoder_factory')->setPrivate(true);
+
         if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
             $loader->load('security_debug.xml');
+
+            $container->getAlias('security.firewall')->setPrivate(true);
         }
 
         if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
@@ -88,7 +99,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('security.authentication.session_strategy.strategy', $config['session_fixation_strategy']);
 
         if (isset($config['access_decision_manager']['service'])) {
-            $container->setAlias('security.access.decision_manager', $config['access_decision_manager']['service']);
+            $container->setAlias('security.access.decision_manager', $config['access_decision_manager']['service'])->setPrivate(true);
         } else {
             $container
                 ->getDefinition('security.access.decision_manager')
@@ -151,13 +162,13 @@ private function aclLoad($config, ContainerBuilder $container)
         $loader->load('security_acl.xml');
 
         if (isset($config['cache']['id'])) {
-            $container->setAlias('security.acl.cache', $config['cache']['id']);
+            $container->setAlias('security.acl.cache', $config['cache']['id'])->setPrivate(true);
         }
         $container->getDefinition('security.acl.voter.basic_permissions')->addArgument($config['voter']['allow_if_object_identity_unavailable']);
 
         // custom ACL provider
         if (isset($config['provider'])) {
-            $container->setAlias('security.acl.provider', $config['provider']);
+            $container->setAlias('security.acl.provider', $config['provider'])->setPrivate(true);
 
             return;
         }
@@ -169,6 +180,10 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
     {
         $loader->load('security_acl_dbal.xml');
 
+        $container->getDefinition('security.acl.dbal.schema')->setPrivate(true);
+        $container->getAlias('security.acl.dbal.connection')->setPrivate(true);
+        $container->getAlias('security.acl.provider')->setPrivate(true);
+
         if (null !== $config['connection']) {
             $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']));
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
index 77a09f24f8a95..ce6021823ba74 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
@@ -9,7 +9,6 @@
 
         
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 9b31ae84439d7..79a4866d8cbe4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -51,7 +51,7 @@
             
         
 
-        
+        
         
 
         
@@ -105,7 +105,7 @@
 
 
         
-        
+        
             
             
             
@@ -118,7 +118,7 @@
              
         
 
-        
+        
             
             
               
@@ -169,7 +169,7 @@
 
 
         
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
index 1399be3c12bde..c1ed332654fe0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
 
         
             
@@ -22,7 +22,7 @@
             
         
 
-        
+        
             
                 %security.acl.dbal.class_table_name%
                 %security.acl.dbal.entry_table_name%
@@ -36,7 +36,7 @@
             
         
 
-        
+        
         
 
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
index 6087f9ee5b19e..d3b7b936ea69a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
@@ -18,6 +18,6 @@
             
         
 
-        
+        
     
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index 1f0e288687606..c05cdcaa2d290 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -45,7 +45,7 @@
                  public="false"
                  abstract="true" />
 
-        
+        
             
         
     
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
index b0676e2fc15b1..6f2ec1cbf977e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
@@ -7,12 +7,12 @@
     
         
 
-        
+        
             
             
         
 
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
index 5ecbf47078afe..803109ec2097c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
@@ -67,7 +67,7 @@ public function testSetAclUser()
         $permissionMap = new BasicPermissionMap();
 
         /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('security.acl.provider');
+        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
         $acl = $aclProvider->findAcl($objectIdentity, array($securityIdentity1));
 
         $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission1, null), array($securityIdentity1)));
@@ -95,7 +95,7 @@ public function testSetAclRole()
         $role = 'ROLE_ADMIN';
 
         $application = $this->getApplication();
-        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('security.acl.provider')));
+        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('test.security.acl.provider')));
 
         $setAclCommand = $application->find('acl:set');
         $setAclCommandTester = new CommandTester($setAclCommand);
@@ -111,7 +111,7 @@ public function testSetAclRole()
         $permissionMap = new BasicPermissionMap();
 
         /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('security.acl.provider');
+        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
         $acl = $aclProvider->findAcl($objectIdentity, array($roleSecurityIdentity, $userSecurityIdentity));
 
         $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
@@ -137,7 +137,7 @@ public function testSetAclClassScope()
         $role = 'ROLE_USER';
 
         $application = $this->getApplication();
-        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('security.acl.provider')));
+        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('test.security.acl.provider')));
 
         $setAclCommand = $application->find('acl:set');
         $setAclCommandTester = new CommandTester($setAclCommand);
@@ -154,7 +154,7 @@ public function testSetAclClassScope()
         $permissionMap = new BasicPermissionMap();
 
         /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('security.acl.provider');
+        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
 
         $acl1 = $aclProvider->findAcl($objectIdentity1, array($roleSecurityIdentity));
         $this->assertTrue($acl1->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
index 33eadbc7cdf03..49191e01d85c2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
@@ -1,6 +1,9 @@
 imports:
     - { resource: ./../config/framework.yml }
 
+services:
+    test.security.acl.provider: '@security.acl.provider'
+
 doctrine:
     dbal:
         driver:   pdo_sqlite
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 38bf0220536d5..9690cf325aa14 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -31,7 +31,7 @@
         "symfony/dom-crawler": "~2.8|~3.0|~4.0",
         "symfony/event-dispatcher": "^3.3.1|~4.0",
         "symfony/form": "^2.8.18|^3.2.5|~4.0",
-        "symfony/framework-bundle": "^3.2.8|~4.0",
+        "symfony/framework-bundle": "^3.4|~4.0",
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
         "symfony/security-acl": "~2.8|~3.0",
         "symfony/translation": "~2.8|~3.0|~4.0",
@@ -48,6 +48,7 @@
     "conflict": {
         "symfony/var-dumper": "<3.3",
         "symfony/event-dispatcher": "<3.3.1",
+        "symfony/framework-bundle": "<3.4",
         "symfony/console": "<3.4"
     },
     "suggest": {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
index f2c1d32eec974..0f61aecc2c5b7 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -43,7 +44,7 @@ public function process(ContainerBuilder $container)
         }
 
         if (1 === $found) {
-            $container->setAlias('twig.loader', $id);
+            $container->setAlias('twig.loader', $id)->setPrivate(true);
         } else {
             $chainLoader = $container->getDefinition('twig.loader.chain');
             krsort($prioritizedLoaders);
@@ -54,7 +55,7 @@ public function process(ContainerBuilder $container)
                 }
             }
 
-            $container->setAlias('twig.loader', 'twig.loader.chain');
+            $container->setAlias('twig.loader', 'twig.loader.chain')->setPrivate(true);
         }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index ca0c68d49b02a..f3dd1811c7f16 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -43,8 +43,15 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('twig.xml');
 
+        $container->getDefinition('twig.profile')->setPrivate(true);
+        $container->getDefinition('twig.runtime.httpkernel')->setPrivate(true);
+        $container->getDefinition('twig.translation.extractor')->setPrivate(true);
+        $container->getDefinition('workflow.twig_extension')->setPrivate(true);
+        $container->getDefinition('twig.exception_listener')->setPrivate(true);
+
         if (class_exists('Symfony\Component\Form\Form')) {
             $loader->load('form.xml');
+            $container->getDefinition('twig.form.renderer')->setPrivate(true);
         }
 
         if (interface_exists('Symfony\Component\Templating\EngineInterface')) {
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
index b1cee0ae381f7..caa799bc346c0 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
@@ -18,7 +18,7 @@
             
         
 
-        
+        
             
             
             
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index bf53c2b2b28f6..8c6a944603333 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -63,7 +63,7 @@
             
         
 
-        
+        
 
         
             
@@ -100,7 +100,7 @@
 
         
 
-        
+        
             
             
         
@@ -112,16 +112,16 @@
 
         
 
-        
+        
             
             
         
 
-        
+        
             
         
 
-        
+        
             
             
             %twig.exception_listener.controller%
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
index 10bcf3e8f66a8..6575f28c9736d 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\TwigLoaderPass;
 
@@ -55,7 +56,8 @@ public function testMapperPassWithOneTaggedLoaders()
             ->will($this->returnValue($serviceIds));
         $this->builder->expects($this->once())
             ->method('setAlias')
-            ->with('twig.loader', 'test_loader_1');
+            ->with('twig.loader', 'test_loader_1')
+            ->will($this->returnValue(new Alias('test_loader_1')));
 
         $this->pass->process($this->builder);
     }
@@ -85,7 +87,8 @@ public function testMapperPassWithTwoTaggedLoaders()
             ->will($this->returnValue($this->chainLoader));
         $this->builder->expects($this->once())
             ->method('setAlias')
-            ->with('twig.loader', 'twig.loader.chain');
+            ->with('twig.loader', 'twig.loader.chain')
+            ->will($this->returnValue(new Alias('twig.loader.chain')));
 
         $this->pass->process($this->builder);
         $calls = $this->chainLoader->getMethodCalls();
@@ -121,7 +124,8 @@ public function testMapperPassWithTwoTaggedLoadersWithPriority()
             ->will($this->returnValue($this->chainLoader));
         $this->builder->expects($this->once())
             ->method('setAlias')
-            ->with('twig.loader', 'twig.loader.chain');
+            ->with('twig.loader', 'twig.loader.chain')
+            ->will($this->returnValue(new Alias('twig.loader.chain')));
 
         $this->pass->process($this->builder);
         $calls = $this->chainLoader->getMethodCalls();
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 3b8ca5b99469b..3d5fff2779a10 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -26,20 +26,21 @@
     "require-dev": {
         "symfony/asset": "~2.8|~3.0|~4.0",
         "symfony/stopwatch": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/form": "~2.8|~3.0|~4.0",
         "symfony/routing": "~2.8|~3.0|~4.0",
         "symfony/templating": "~2.8|~3.0|~4.0",
         "symfony/yaml": "~2.8|~3.0|~4.0",
-        "symfony/framework-bundle": "^3.2.8|~4.0",
+        "symfony/framework-bundle": "^3.3|~4.0",
         "symfony/web-link": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"
     },
     "conflict": {
-        "symfony/dependency-injection": "<3.3"
+        "symfony/dependency-injection": "<3.4",
+        "symfony/event-dispatcher": "<3.3.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index e507bf2d22b70..b0db2e3bc8f22 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -48,6 +48,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ($config['toolbar'] || $config['intercept_redirects']) {
             $loader->load('toolbar.xml');
+            $container->getDefinition('web_profiler.debug_toolbar')->setPrivate(true);
             $container->getDefinition('web_profiler.debug_toolbar')->replaceArgument(5, $config['excluded_ajax_paths']);
             $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
             $container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
index 25f49fc2cd069..16a7022c6d960 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
@@ -7,7 +7,7 @@
     
         
 
-        
+        
             
             
             %web_profiler.debug_toolbar.intercept_redirects%
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index 40ead3bff2564..dd2a4d728f53c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -27,13 +27,13 @@
     "require-dev": {
         "symfony/config": "~3.4|~4.0",
         "symfony/console": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/stopwatch": "~2.8|~3.0|~4.0"
     },
     "conflict": {
         "symfony/config": "<3.4",
-        "symfony/dependency-injection": "<3.3",
-        "symfony/event-dispatcher": "<3.3",
+        "symfony/dependency-injection": "<3.4",
+        "symfony/event-dispatcher": "<3.3.1",
         "symfony/var-dumper": "<3.3"
     },
     "autoload": {
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
index a113f8f7f2c38..ee43bd399f92b 100644
--- a/src/Symfony/Component/DependencyInjection/Alias.php
+++ b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -15,6 +15,7 @@ class Alias
 {
     private $id;
     private $public;
+    private $private = false;
 
     /**
      * @param string $id     Alias identifier
@@ -40,10 +41,43 @@ public function isPublic()
      * Sets if this Alias is public.
      *
      * @param bool $boolean If this Alias should be public
+     *
+     * @return $this
      */
     public function setPublic($boolean)
     {
         $this->public = (bool) $boolean;
+
+        return $this;
+    }
+
+    /**
+     * Sets if this Alias is private.
+     *
+     * When set, the "private" state has a higher precedence than "public".
+     * In version 3.4, a "private" alias always remains publicly accessible,
+     * but triggers a deprecation notice when accessed from the container,
+     * so that the alias can be made really private in 4.0.
+     *
+     * @param bool $boolean
+     *
+     * @return $this
+     */
+    public function setPrivate($boolean)
+    {
+        $this->private = (bool) $boolean;
+
+        return $this;
+    }
+
+    /**
+     * Whether this alias is private.
+     *
+     * @return bool
+     */
+    public function isPrivate()
+    {
+        return $this->private;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
index a43e0cd78f404..815dbcae4915d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
             // synthetic service is public
-            if ($definition->isSynthetic() && !$definition->isPublic()) {
+            if ($definition->isSynthetic() && (!$definition->isPublic() || $definition->isPrivate())) {
                 throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index d1fe95a0bc7a5..0e9a68e7f0026 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -49,6 +49,7 @@ public function process(ContainerBuilder $container)
             if ($container->hasAlias($inner)) {
                 $alias = $container->getAlias($inner);
                 $public = $alias->isPublic();
+                $private = $alias->isPrivate();
                 $container->setAlias($renamedId, new Alias((string) $alias, false));
             } else {
                 $decoratedDefinition = $container->getDefinition($inner);
@@ -57,6 +58,7 @@ public function process(ContainerBuilder $container)
                     $definition->setAutowiringTypes($types);
                 }
                 $public = $decoratedDefinition->isPublic();
+                $private = $decoratedDefinition->isPrivate();
                 $decoratedDefinition->setPublic(false);
                 $decoratedDefinition->setTags(array());
                 if ($decoratedDefinition->getAutowiringTypes(false)) {
@@ -65,7 +67,7 @@ public function process(ContainerBuilder $container)
                 $container->setDefinition($renamedId, $decoratedDefinition);
             }
 
-            $container->setAlias($inner, new Alias($id, $public));
+            $container->setAlias($inner, $id)->setPublic($public && !$private)->setPrivate($private);
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 240e1ab65527f..73f75b30a982c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -82,7 +82,7 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return true;
         }
 
-        if ($definition->isDeprecated() || $definition->isPublic() || $definition->isLazy()) {
+        if ($definition->isDeprecated() || $definition->isPublic() || $definition->isPrivate() || $definition->isLazy()) {
             return false;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
index 5d6d51d6916f3..529dc9e5b37a3 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
@@ -30,7 +30,7 @@ class RemovePrivateAliasesPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getAliases() as $id => $alias) {
-            if ($alias->isPublic()) {
+            if ($alias->isPublic() || $alias->isPrivate()) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
index a8a01be6d5291..7fcf6cc634283 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -41,7 +41,7 @@ public function process(ContainerBuilder $container)
 
         $hasChanged = false;
         foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isPublic()) {
+            if ($definition->isPublic() || $definition->isPrivate()) {
                 continue;
             }
 
@@ -68,7 +68,8 @@ public function process(ContainerBuilder $container)
 
             if (1 === count($referencingAliases) && false === $isReferenced) {
                 $container->setDefinition((string) reset($referencingAliases), $definition);
-                $definition->setPublic(true);
+                $definition->setPrivate(reset($referencingAliases)->isPrivate());
+                $definition->setPublic(!$definition->isPrivate());
                 $container->removeDefinition($id);
                 $container->log($this, sprintf('Removed service "%s"; reason: replaces alias %s.', $id, reset($referencingAliases)));
             } elseif (0 === count($referencingAliases) && false === $isReferenced) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 30a8f5d048f9a..124bd08b6f92c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -58,11 +58,12 @@ public function process(ContainerBuilder $container)
             } catch (InvalidArgumentException $e) {
                 throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with actual definition "%s".', $definitionId, $targetId), null, $e);
             }
-            if ($definition->isPublic()) {
+            if ($definition->isPublic() || $definition->isPrivate()) {
                 continue;
             }
             // Remove private definition and schedule for replacement
-            $definition->setPublic(true);
+            $definition->setPublic(!$target->isPrivate());
+            $definition->setPrivate($target->isPrivate());
             $container->setDefinition($definitionId, $definition);
             $container->removeDefinition($targetId);
             $replacements[$targetId] = $definitionId;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index 4e09ae630f52c..7625377793769 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -25,6 +26,26 @@
  */
 class ResolveChildDefinitionsPass extends AbstractRecursivePass
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        parent::process($container);
+
+        foreach ($container->getDefinitions() as $definition) {
+            if ($definition->isPrivate()) {
+                $definition->setPublic(false);
+            }
+        }
+
+        foreach ($container->getAliases() as $alias) {
+            if ($alias->isPrivate()) {
+                $alias->setPublic(false);
+            }
+        }
+    }
+
     protected function processValue($value, $isRoot = false)
     {
         if (!$value instanceof Definition) {
@@ -121,6 +142,8 @@ private function doResolveDefinition(ChildDefinition $definition)
         }
         if (isset($changes['public'])) {
             $def->setPublic($definition->isPublic());
+        } else {
+            $def->setPrivate($definition->isPrivate() || $parentDef->isPrivate());
         }
         if (isset($changes['lazy'])) {
             $def->setLazy($definition->isLazy());
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 6e79faba43f04..6946969a2c06f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
             if ($aliasId !== $defId = $this->getDefinitionId($aliasId)) {
-                $container->setAlias($id, new Alias($defId, $alias->isPublic()));
+                $container->setAlias($id, $defId)->setPublic($alias->isPublic() && !$alias->isPrivate())->setPrivate($alias->isPrivate());
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 63a7c2b33176b..f053694e9715d 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -806,6 +806,8 @@ public function setAliases(array $aliases)
      * @param string       $alias The alias to create
      * @param string|Alias $id    The service to alias
      *
+     * @return Alias
+     *
      * @throws InvalidArgumentException if the id is not a string or an Alias
      * @throws InvalidArgumentException if the alias is for itself
      */
@@ -825,7 +827,7 @@ public function setAlias($alias, $id)
 
         unset($this->definitions[$alias]);
 
-        $this->aliasDefinitions[$alias] = $id;
+        return $this->aliasDefinitions[$alias] = $id;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index e3ff8e5411ddc..2cfa3f9f481c6 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -35,6 +35,7 @@ class Definition
     private $configurator;
     private $tags = array();
     private $public = true;
+    private $private = false;
     private $synthetic = false;
     private $abstract = false;
     private $lazy = false;
@@ -616,6 +617,35 @@ public function isPublic()
         return $this->public;
     }
 
+    /**
+     * Sets if this service is private.
+     *
+     * When set, the "private" state has a higher precedence than "public".
+     * In version 3.4, a "private" service always remains publicly accessible,
+     * but triggers a deprecation notice when accessed from the container,
+     * so that the service can be made really private in 4.0.
+     *
+     * @param bool $boolean
+     *
+     * @return $this
+     */
+    public function setPrivate($boolean)
+    {
+        $this->private = (bool) $boolean;
+
+        return $this;
+    }
+
+    /**
+     * Whether this service is private.
+     *
+     * @return bool
+     */
+    public function isPrivate()
+    {
+        return $this->private;
+    }
+
     /**
      * Sets the lazy flag of this service.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 87835ee44008e..f32187b1c1bb4 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1040,11 +1040,17 @@ private function addFileMap()
      */
     private function addPrivateServices()
     {
-        if (!$definitions = $this->container->getDefinitions()) {
-            return '';
+        $code = '';
+
+        $aliases = $this->container->getAliases();
+        ksort($aliases);
+        foreach ($aliases as $id => $alias) {
+            if ($alias->isPrivate()) {
+                $code .= '            '.$this->export($id)." => true,\n";
+            }
         }
 
-        $code = '';
+        $definitions = $this->container->getDefinitions();
         ksort($definitions);
         foreach ($definitions as $id => $definition) {
             if (!$definition->isPublic()) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index 23a1915fd777c..cb9a879a05d48 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -397,6 +397,26 @@ public function testSetAutoconfiguredOnServiceIsParent()
         $this->assertFalse($container->getDefinition('child1')->isAutoconfigured());
     }
 
+    public function testPrivateHasHigherPrecedenceThanPublic()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass')
+            ->setPrivate(true)
+            ->setPublic(true)
+        ;
+
+        $container->setAlias('bar', 'foo')
+            ->setPrivate(false)
+            ->setPublic(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('foo')->isPublic());
+        $this->assertFalse($container->getAlias('bar')->isPublic());
+    }
+
     /**
      * @group legacy
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index ac8aee2fc596c..4ea8290cfc725 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -778,6 +778,52 @@ public function testDumpHandlesLiteralClassWithRootNamespace()
         $this->assertInstanceOf('stdClass', $container->get('foo'));
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Requesting the "private" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "private_alias" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "decorated_private" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "decorated_private_alias" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "private_not_inlined" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "private_not_removed" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "private_child" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Requesting the "private_parent" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     */
+    public function testLegacyPrivateServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_legacy_privates.yml');
+
+        $container->getDefinition('private')->setPrivate(true);
+        $container->getDefinition('private_not_inlined')->setPrivate(true);
+        $container->getDefinition('private_not_removed')->setPrivate(true);
+        $container->getDefinition('decorated_private')->setPrivate(true);
+        $container->getDefinition('private_child')->setPrivate(true);
+        $container->getAlias('decorated_private_alias')->setPrivate(true);
+        $container->getAlias('private_alias')->setPrivate(true);
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_legacy_privates.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Legacy_Privates', 'file' => self::$fixturesPath.'/php/services_legacy_privates.php')));
+
+        require self::$fixturesPath.'/php/services_legacy_privates.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Legacy_Privates();
+
+        $container->get('private');
+        $container->get('private_alias');
+        $container->get('alias_to_private');
+        $container->get('decorated_private');
+        $container->get('decorated_private_alias');
+        $container->get('private_not_inlined');
+        $container->get('private_not_removed');
+        $container->get('private_child');
+        $container->get('private_parent');
+        $container->get('public_child');
+    }
+
     /**
      * This test checks the trigger of a deprecation note and should not be removed in major releases.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
new file mode 100644
index 0000000000000..70e781bdfd9e9
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -0,0 +1,200 @@
+targetDirs[$i] = $dir = dirname($dir);
+        }
+        $this->services = array();
+        $this->methodMap = array(
+            'bar' => 'getBarService',
+            'private' => 'getPrivateService',
+            'private_alias' => 'getPrivateAliasService',
+            'private_alias_decorator' => 'getPrivateAliasDecoratorService',
+            'private_child' => 'getPrivateChildService',
+            'private_decorator' => 'getPrivateDecoratorService',
+            'private_decorator.inner' => 'getPrivateDecorator_InnerService',
+            'private_not_inlined' => 'getPrivateNotInlinedService',
+            'private_not_removed' => 'getPrivateNotRemovedService',
+            'private_parent' => 'getPrivateParentService',
+            'public_child' => 'getPublicChildService',
+        );
+        $this->privates = array(
+            'decorated_private' => true,
+            'decorated_private_alias' => true,
+            'private' => true,
+            'private_alias' => true,
+            'private_child' => true,
+            'private_decorator.inner' => true,
+            'private_not_inlined' => true,
+            'private_not_removed' => true,
+            'private_parent' => true,
+        );
+        $this->aliases = array(
+            'alias_to_private' => 'private',
+            'decorated_private' => 'private_decorator',
+            'decorated_private_alias' => 'private_alias_decorator',
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \stdClass(${($_ = isset($this->services['private_not_inlined']) ? $this->services['private_not_inlined'] : $this->services['private_not_inlined'] = new \stdClass()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'private_alias_decorator' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateAliasDecoratorService()
+    {
+        return $this->services['private_alias_decorator'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'private_decorator' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateDecoratorService()
+    {
+        return $this->services['private_decorator'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'public_child' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPublicChildService()
+    {
+        return $this->services['public_child'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateService()
+    {
+        return $this->services['private'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_alias' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateAliasService()
+    {
+        return $this->services['private_alias'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_child' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateChildService()
+    {
+        return $this->services['private_child'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_decorator.inner' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateDecorator_InnerService()
+    {
+        return $this->services['private_decorator.inner'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_not_inlined' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateNotInlinedService()
+    {
+        return $this->services['private_not_inlined'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_not_removed' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateNotRemovedService()
+    {
+        return $this->services['private_not_removed'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_parent' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateParentService()
+    {
+        return $this->services['private_parent'] = new \stdClass();
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml
new file mode 100644
index 0000000000000..ac54a57dff013
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml
@@ -0,0 +1,28 @@
+services:
+
+    foo: {class: stdClass, public: false}
+
+    bar:
+        class: stdClass
+        arguments: [ '@private_not_inlined' ]
+
+    private: {class: stdClass, public: false}
+    decorated_private: {class: stdClass}
+    decorated_private_alias: '@foo'
+    alias_to_private: '@private'
+    private_alias: {alias: foo, public: false}
+
+    private_decorator:
+        class: stdClass
+        decorates: 'decorated_private'
+
+    private_alias_decorator:
+        class: stdClass
+        decorates: 'decorated_private_alias'
+
+    private_not_inlined: {class: stdClass, public: false}
+    private_not_removed: {class: stdClass, public: false}
+
+    private_child: {parent: foo}
+    private_parent: {parent: private}
+    public_child: {parent: private, public: true}

From 256055218e924e71668f0770008efbf2ceac9e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Mon, 11 Sep 2017 19:24:55 +0200
Subject: [PATCH 0818/1099] [Intl] Fixed support of Locale::getFallback

---
 src/Symfony/Component/Intl/Locale.php         | 43 ++++++++++++----
 .../Component/Intl/Tests/LocaleTest.php       | 49 +++++++++++++++++++
 2 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 src/Symfony/Component/Intl/Tests/LocaleTest.php

diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
index ee09bd263cd42..6dbd71a4ba221 100644
--- a/src/Symfony/Component/Intl/Locale.php
+++ b/src/Symfony/Component/Intl/Locale.php
@@ -67,21 +67,44 @@ public static function getDefaultFallback()
      */
     public static function getFallback($locale)
     {
-        if (false === $pos = strrpos($locale, '_')) {
-            if (self::$defaultFallback === $locale) {
-                return 'root';
-            }
+        if (function_exists('locale_parse')) {
+            $localeSubTags = locale_parse($locale);
+            if (1 === count($localeSubTags)) {
+                if (self::$defaultFallback === $localeSubTags['language']) {
+                    return 'root';
+                }
+
+                // Don't return default fallback for "root", "meta" or others
+                // Normal locales have two or three letters
+                if (strlen($locale) < 4) {
+                    return self::$defaultFallback;
+                }
 
-            // Don't return default fallback for "root", "meta" or others
-            // Normal locales have two or three letters
-            if (strlen($locale) < 4) {
-                return self::$defaultFallback;
+                return null;
             }
 
-            return;
+            array_pop($localeSubTags);
+
+            return locale_compose($localeSubTags);
+        }
+
+        if (false !== $pos = strrpos($locale, '_')) {
+            return substr($locale, 0, $pos);
         }
 
-        return substr($locale, 0, $pos);
+        if (false !== $pos = strrpos($locale, '-')) {
+            return substr($locale, 0, $pos);
+        }
+
+        if (self::$defaultFallback === $locale) {
+            return 'root';
+        }
+
+        // Don't return default fallback for "root", "meta" or others
+        // Normal locales have two or three letters
+        if (strlen($locale) < 4) {
+            return self::$defaultFallback;
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/LocaleTest.php b/src/Symfony/Component/Intl/Tests/LocaleTest.php
new file mode 100644
index 0000000000000..e10df5575ab6c
--- /dev/null
+++ b/src/Symfony/Component/Intl/Tests/LocaleTest.php
@@ -0,0 +1,49 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Intl\Locale;
+
+class LocaleTest extends TestCase
+{
+    public function provideGetFallbackTests()
+    {
+        $tests = array(
+            array('sl_Latn_IT', 'sl_Latn_IT_nedis'),
+            array('sl_Latn', 'sl_Latn_IT'),
+            array('fr', 'fr_FR'),
+            array('fr', 'fr-FR'),
+            array('en', 'fr'),
+            array('root', 'en'),
+            array(null, 'root'),
+        );
+
+        if (function_exists('locale_parse')) {
+            $tests[] = array('sl_Latn_IT', 'sl-Latn-IT-nedis');
+            $tests[] = array('sl_Latn', 'sl-Latn_IT');
+        } else {
+            $tests[] = array('sl-Latn-IT', 'sl-Latn-IT-nedis');
+            $tests[] = array('sl-Latn', 'sl-Latn-IT');
+        }
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider provideGetFallbackTests
+     */
+    public function testGetFallback($expected, $locale)
+    {
+        $this->assertSame($expected, Locale::getFallback($locale));
+    }
+}

From 8729f9fd6a95130948fc33f796a6672a49eaf9b9 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 13 Sep 2017 13:10:11 +0200
Subject: [PATCH 0819/1099] [DI] Resolve nested refs to aliases

---
 .../FrameworkExtension.php                    |  2 +-
 .../Bundle/SecurityBundle/composer.json       |  4 +-
 .../ResolveReferencesToAliasesPass.php        | 75 ++++---------------
 3 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 0ead938a1bf10..ea6dec7fd6bd1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1463,7 +1463,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 ->replaceArgument(2, $config['debug'])
                 ->addTag('annotations.cached_reader', array('provider' => $cacheService))
             ;
-            $container->setAlias('annotation_reader', 'annotations.cached_reader');
+            $container->setAlias('annotation_reader', 'annotations.cached_reader')->setPrivate(true);
             $container->setAlias(Reader::class, new Alias('annotations.cached_reader', false));
         } else {
             $container->removeDefinition('annotations.cached_reader');
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 9690cf325aa14..3e7caac2ec5f9 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -35,8 +35,8 @@
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
         "symfony/security-acl": "~2.8|~3.0",
         "symfony/translation": "~2.8|~3.0|~4.0",
-        "symfony/twig-bundle": "~2.8|~3.0|~4.0",
-        "symfony/twig-bridge": "~2.8|~3.0|~4.0",
+        "symfony/twig-bundle": "~3.4|~4.0",
+        "symfony/twig-bridge": "~3.4|~4.0",
         "symfony/process": "~2.8|~3.0|~4.0",
         "symfony/validator": "^3.2.5|~4.0",
         "symfony/var-dumper": "~3.3|~4.0",
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 6946969a2c06f..6d42f7b4632e1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -22,97 +20,56 @@
  *
  * @author Johannes M. Schmitt 
  */
-class ResolveReferencesToAliasesPass implements CompilerPassInterface
+class ResolveReferencesToAliasesPass extends AbstractRecursivePass
 {
-    private $container;
-
     /**
-     * Processes the ContainerBuilder to replace references to aliases with actual service references.
-     *
-     * @param ContainerBuilder $container
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
-        $this->container = $container;
-
-        foreach ($container->getDefinitions() as $definition) {
-            if ($definition->isSynthetic() || $definition->isAbstract()) {
-                continue;
-            }
-
-            $definition->setArguments($this->processArguments($definition->getArguments()));
-            $definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
-            $definition->setProperties($this->processArguments($definition->getProperties()));
-            if (isset($definition->getChanges()['factory'])) {
-                $definition->setFactory($this->processFactory($definition->getFactory()));
-            }
-        }
+        parent::process($container);
 
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
-            if ($aliasId !== $defId = $this->getDefinitionId($aliasId)) {
+            if ($aliasId !== $defId = $this->getDefinitionId($aliasId, $container)) {
                 $container->setAlias($id, $defId)->setPublic($alias->isPublic() && !$alias->isPrivate())->setPrivate($alias->isPrivate());
             }
         }
     }
 
     /**
-     * Processes the arguments to replace aliases.
-     *
-     * @param array $arguments An array of References
-     *
-     * @return array An array of References
+     * {@inheritdoc}
      */
-    private function processArguments(array $arguments)
+    protected function processValue($value, $isRoot = false)
     {
-        foreach ($arguments as $k => $argument) {
-            if (is_array($argument)) {
-                $arguments[$k] = $this->processArguments($argument);
-            } elseif ($argument instanceof ArgumentInterface) {
-                $argument->setValues($this->processArguments($argument->getValues()));
-            } elseif ($argument instanceof Reference) {
-                $defId = $this->getDefinitionId($id = (string) $argument);
+        if ($value instanceof Reference) {
+            $defId = $this->getDefinitionId($id = (string) $value, $this->container);
 
-                if ($defId !== $id) {
-                    $arguments[$k] = new Reference($defId, $argument->getInvalidBehavior());
-                }
+            if ($defId !== $id) {
+                return new Reference($defId, $value->getInvalidBehavior());
             }
         }
 
-        return $arguments;
-    }
-
-    private function processFactory($factory)
-    {
-        if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
-            return $factory;
-        }
-
-        $defId = $this->getDefinitionId($id = (string) $factory[0]);
-
-        if ($defId !== $id) {
-            $factory[0] = new Reference($defId, $factory[0]->getInvalidBehavior());
-        }
-
-        return $factory;
+        return parent::processValue($value);
     }
 
     /**
      * Resolves an alias into a definition id.
      *
-     * @param string $id The definition or alias id to resolve
+     * @param string           $id        The definition or alias id to resolve
+     * @param ContainerBuilder $container
      *
      * @return string The definition id with aliases resolved
      */
-    private function getDefinitionId($id)
+    private function getDefinitionId($id, $container)
     {
         $seen = array();
-        while ($this->container->hasAlias($id)) {
+        while ($container->hasAlias($id)) {
             if (isset($seen[$id])) {
                 throw new ServiceCircularReferenceException($id, array_keys($seen));
             }
             $seen[$id] = true;
-            $id = (string) $this->container->getAlias($id);
+            $id = (string) $container->getAlias($id);
         }
 
         return $id;

From 30a13baef3d3351b047c3fb37251b87b8190d1d2 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 13 Sep 2017 13:33:28 +0200
Subject: [PATCH 0820/1099] fix oups

---
 .../Compiler/ResolveReferencesToAliasesPass.php                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 6d42f7b4632e1..7ab97044bfe7b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -61,7 +61,7 @@ protected function processValue($value, $isRoot = false)
      *
      * @return string The definition id with aliases resolved
      */
-    private function getDefinitionId($id, $container)
+    private function getDefinitionId($id, ContainerBuilder $container)
     {
         $seen = array();
         while ($container->hasAlias($id)) {

From 86eb10c4131ce06fbfaf1af131315645fd5ec51d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 13 Sep 2017 13:41:56 +0200
Subject: [PATCH 0821/1099] Fix travis php7.0

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d31503dcbd77..e01ab63ab3227 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,11 +120,6 @@ before_install:
 
     - |
       # Install extra PHP extensions
-      if [[ ! $skip && $PHP = 7.0 ]]; then
-          wget https://github.com/symfony/binary-utils/releases/download/v0.1/ldap-php70.tar.bz2
-          tar -xjf ldap-php70.tar.bz2
-          echo extension = $(pwd)/ldap.so >> $INI
-      fi
       if [[ ! $skip && $PHP = 5.* ]]; then
           ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
           tfold ext.memcached pecl install -f memcached-2.1.0 &&

From a1b391fb0025cb8f76a917f690a39035dc446db0 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Fri, 1 Sep 2017 17:54:17 -0400
Subject: [PATCH 0822/1099] Add default templates directory and option to
 configure it

---
 src/Symfony/Bundle/TwigBundle/CHANGELOG.md         |  1 +
 .../DependencyInjection/Configuration.php          |  4 ++++
 .../DependencyInjection/TwigExtension.php          | 14 ++++++++++++--
 .../Resources/config/schema/twig-1.0.xsd           |  1 +
 .../DependencyInjection/Fixtures/php/full.php      |  1 +
 .../templates/bundles/TwigBundle/layout.html.twig  |  1 +
 .../Fixtures/templates/layout.html.twig            |  1 +
 .../DependencyInjection/Fixtures/xml/full.xml      |  2 +-
 .../DependencyInjection/Fixtures/yml/full.yml      |  1 +
 .../DependencyInjection/TwigExtensionTest.php      |  2 ++
 10 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig

diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
index 58a6a7229653d..8ba6647306e04 100644
--- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * deprecated `Symfony\Bundle\TwigBundle\Command\DebugCommand`, use `Symfony\Bridge\Twig\Command\DebugCommand` instead
  * deprecated relying on the `ContainerAwareInterface` implementation for `Symfony\Bundle\TwigBundle\Command\LintCommand`
+ * added option to configure default path templates (via `default_path`)
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index 4880d2534d8f5..f4488c0d5ccd4 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -130,6 +130,10 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                 ->booleanNode('strict_variables')->end()
                 ->scalarNode('auto_reload')->end()
                 ->integerNode('optimizations')->min(-1)->end()
+                ->scalarNode('default_path')
+                    ->info('The default path used to load templates')
+                    ->defaultValue('%kernel.project_dir%/templates')
+                ->end()
                 ->arrayNode('paths')
                     ->normalizeKeys(false)
                     ->useAttributeAsKey('paths')
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index ca0c68d49b02a..718767324a2e0 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -109,7 +109,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $config['paths']);
         $container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
 
-        $bundleHierarchy = $this->getBundleHierarchy($container);
+        $bundleHierarchy = $this->getBundleHierarchy($container, $config);
 
         foreach ($bundleHierarchy as $name => $bundle) {
             $namespace = $this->normalizeBundleName($name);
@@ -130,6 +130,11 @@ public function load(array $configs, ContainerBuilder $container)
         }
         $container->addResource(new FileExistenceResource($dir));
 
+        if (file_exists($dir = $container->getParameterBag()->resolveValue($config['default_path']))) {
+            $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
+        }
+        $container->addResource(new FileExistenceResource($dir));
+
         if (!empty($config['globals'])) {
             $def = $container->getDefinition('twig');
             foreach ($config['globals'] as $key => $global) {
@@ -174,7 +179,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    private function getBundleHierarchy(ContainerBuilder $container)
+    private function getBundleHierarchy(ContainerBuilder $container, array $config)
     {
         $bundleHierarchy = array();
 
@@ -192,6 +197,11 @@ private function getBundleHierarchy(ContainerBuilder $container)
             }
             $container->addResource(new FileExistenceResource($dir));
 
+            if (file_exists($dir = $container->getParameterBag()->resolveValue($config['default_path']).'/bundles/'.$name)) {
+                $bundleHierarchy[$name]['paths'][] = $dir;
+            }
+            $container->addResource(new FileExistenceResource($dir));
+
             if (file_exists($dir = $bundle['path'].'/Resources/views')) {
                 $bundleHierarchy[$name]['paths'][] = $dir;
             }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd b/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd
index 61b57798b27cf..3e491f7029833 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd
@@ -26,6 +26,7 @@
         
         
         
+        
     
 
     
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
index 9385131730d86..839d037fdcd00 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -17,6 +17,7 @@
     'charset' => 'ISO-8859-1',
     'debug' => true,
     'strict_variables' => true,
+    'default_path' => '%kernel.root_dir%/templates',
     'paths' => array(
         'path1',
         'path2',
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
new file mode 100644
index 0000000000000..bb07ecfe55a36
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig
new file mode 100644
index 0000000000000..bb07ecfe55a36
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
index 14c95af97e8f4..702e34617d6b9 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    
+    
         MyBundle::form.html.twig
         
         @@qux
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
index 68ecf463f09f6..07d4abe767a41 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -13,6 +13,7 @@ twig:
     charset:             ISO-8859-1
     debug:               true
     strict_variables:    true
+    default_path: '%kernel.root_dir%/templates'
     paths:
         path1: ''
         path2: ''
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index cdd686029423a..9d47948d67b77 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -196,6 +196,7 @@ public function testTwigLoaderPaths($format)
             array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'Twig'),
             array(__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'Twig'),
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
+            array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
@@ -205,6 +206,7 @@ public function testTwigLoaderPaths($format)
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
             array(__DIR__.'/Fixtures/Resources/views'),
+            array(__DIR__.'/Fixtures/templates'),
         ), $paths);
     }
 

From d1f7024e1488697d8a9e1c49c99a81c07175e6b2 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Wed, 13 Sep 2017 15:44:19 +0200
Subject: [PATCH 0823/1099] Removed unnecessary getDefinition() call.

---
 .../DependencyInjection/RegisterListenersPass.php               | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index 50e466a3983c6..a08f54c3b0098 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -62,8 +62,6 @@ public function process(ContainerBuilder $container)
         $definition = $container->findDefinition($this->dispatcherService);
 
         foreach ($container->findTaggedServiceIds($this->listenerTag, true) as $id => $events) {
-            $def = $container->getDefinition($id);
-
             foreach ($events as $event) {
                 $priority = isset($event['priority']) ? $event['priority'] : 0;
 

From b524c84ce104b285a0c490c712582b3f28fe12eb Mon Sep 17 00:00:00 2001
From: gitlost 
Date: Tue, 11 Jul 2017 04:43:03 +0100
Subject: [PATCH 0824/1099] [Filesystem] mirror - fix copying content with same
 name as source/target.

---
 .../Component/Filesystem/Filesystem.php       |  6 ++-
 .../Filesystem/Tests/FilesystemTest.php       | 47 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index bc2e3dcc2d897..b563dcc3751f2 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -444,6 +444,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
     {
         $targetDir = rtrim($targetDir, '/\\');
         $originDir = rtrim($originDir, '/\\');
+        $originDirLen = strlen($originDir);
 
         // Iterate in destination folder to remove obsolete entries
         if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
@@ -452,8 +453,9 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
                 $flags = \FilesystemIterator::SKIP_DOTS;
                 $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
             }
+            $targetDirLen = strlen($targetDir);
             foreach ($deleteIterator as $file) {
-                $origin = str_replace($targetDir, $originDir, $file->getPathname());
+                $origin = $originDir.substr($file->getPathname(), $targetDirLen);
                 if (!$this->exists($origin)) {
                     $this->remove($file);
                 }
@@ -475,7 +477,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
         }
 
         foreach ($iterator as $file) {
-            $target = str_replace($originDir, $targetDir, $file->getPathname());
+            $target = $targetDir.substr($file->getPathname(), $originDirLen);
 
             if ($copyOnWindows) {
                 if (is_file($file)) {
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index b7bdfac4155e0..a4d111c218c6a 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1009,6 +1009,53 @@ public function testMirrorCopiesRelativeLinkedContents()
         $this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
     }
 
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithoutDeleteOption()
+    {
+        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+        touch($sourcePath.'target');
+
+        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', $targetPath);
+
+        chdir($oldPath);
+
+        $this->assertTrue(is_dir($targetPath));
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileExists($targetPath.'target');
+    }
+
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithDeleteOption()
+    {
+        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+
+        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
+
+        mkdir($targetPath);
+        touch($targetPath.'source');
+        touch($targetPath.'target');
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', 'target', null, array('delete' => true));
+
+        chdir($oldPath);
+
+        $this->assertTrue(is_dir($targetPath));
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileNotExists($targetPath.'target');
+    }
+
     /**
      * @dataProvider providePathsForIsAbsolutePath
      */

From 10ce932504829ec89a2565cc0b0f6e4d17c6f76e Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Wed, 13 Sep 2017 20:51:11 +0200
Subject: [PATCH 0825/1099] [PhpUnitBridge] do not require an error context

The error context argument of an error handler is deprecated as of PHP
7.2. Requiring it in the error handler of the SymfonyTestsListenerTrait
will make error handlers fail that are executed when running PHPUnit
tests and forward the error handling to the previously registered error
handler.
---
 src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 173a0fa82fd93..b561c8f2f53a5 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -303,7 +303,7 @@ public function endTest($test, $time)
         }
     }
 
-    public function handleError($type, $msg, $file, $line, $context)
+    public function handleError($type, $msg, $file, $line, $context = array())
     {
         if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
             $h = $this->previousErrorHandler;

From 8b7c7c179b2fdee778ec0e77a49cdf5f01960e73 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 14 Sep 2017 10:50:29 +0200
Subject: [PATCH 0826/1099] [DI] Fix non-instantiables auto-discovery

---
 src/Symfony/Component/DependencyInjection/Loader/FileLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index 40cf8f9ee4cae..8ad8a1ebd4216 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -133,7 +133,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
                 throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
             }
 
-            if (!$r->isInterface() && !$r->isTrait() && !$r->isAbstract()) {
+            if ($r->isInstantiable()) {
                 $classes[] = $class;
             }
         }

From 7c3bdd913997236f06dae2a351d14c333ce36a14 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Wed, 13 Sep 2017 22:59:37 +0200
Subject: [PATCH 0827/1099] Reset stopwatch.

---
 .../DependencyInjection/FrameworkExtension.php               | 5 ++++-
 src/Symfony/Bundle/FrameworkBundle/composer.json             | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index ea6dec7fd6bd1..cef14f756cc40 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -753,7 +753,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
         $container->getDefinition('debug.debug_handlers_listener')->setPrivate(true);
 
         if (class_exists(Stopwatch::class)) {
-            $container->register('debug.stopwatch', Stopwatch::class)->addArgument(true)->setPrivate(true);
+            $container->register('debug.stopwatch', Stopwatch::class)
+                ->addArgument(true)
+                ->setPrivate(true)
+                ->addTag('kernel.reset', array('method' => 'reset'));
             $container->setAlias(Stopwatch::class, new Alias('debug.stopwatch', false));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 3e0354ec625c1..9b16b9417950c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -46,7 +46,7 @@
         "symfony/security-core": "~3.2|~4.0",
         "symfony/security-csrf": "~2.8|~3.0|~4.0",
         "symfony/serializer": "~3.3|~4.0",
-        "symfony/stopwatch": "~2.8|~3.0|~4.0",
+        "symfony/stopwatch": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
         "symfony/templating": "~2.8|~3.0|~4.0",
         "symfony/validator": "~3.4|~4.0",
@@ -68,6 +68,7 @@
         "symfony/form": "<3.4",
         "symfony/property-info": "<3.3",
         "symfony/serializer": "<3.3",
+        "symfony/stopwatch": "<3.4",
         "symfony/translation": "<3.4",
         "symfony/validator": "<3.4",
         "symfony/workflow": "<3.3"

From d4f6039dcd49c08b1d0f3b2be043074665f11523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= 
Date: Thu, 14 Sep 2017 10:24:46 +0200
Subject: [PATCH 0828/1099] [HttpFoundation] Fix file upload multiple with no
 files

---
 src/Symfony/Component/HttpFoundation/FileBag.php    |  4 ++--
 .../Component/HttpFoundation/Tests/FileBagTest.php  | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
index e17a9057b7157..1f3a502fb75c4 100644
--- a/src/Symfony/Component/HttpFoundation/FileBag.php
+++ b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -69,7 +69,7 @@ public function add(array $files = array())
      *
      * @param array|UploadedFile $file A (multi-dimensional) array of uploaded file information
      *
-     * @return UploadedFile|UploadedFile[] A (multi-dimensional) array of UploadedFile instances
+     * @return UploadedFile[]|UploadedFile|null A (multi-dimensional) array of UploadedFile instances
      */
     protected function convertFileInformation($file)
     {
@@ -89,7 +89,7 @@ protected function convertFileInformation($file)
                     $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
                 }
             } else {
-                $file = array_map(array($this, 'convertFileInformation'), $file);
+                $file = array_filter(array_map(array($this, 'convertFileInformation'), $file));
             }
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
index e7defa677713b..7d2902d325d46 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
@@ -60,6 +60,19 @@ public function testShouldSetEmptyUploadedFilesToNull()
         $this->assertNull($bag->get('file'));
     }
 
+    public function testShouldRemoveEmptyUploadedFilesForMultiUpload()
+    {
+        $bag = new FileBag(array('file' => array(
+            'name' => array(''),
+            'type' => array(''),
+            'tmp_name' => array(''),
+            'error' => array(UPLOAD_ERR_NO_FILE),
+            'size' => array(0),
+        )));
+
+        $this->assertSame(array(), $bag->get('file'));
+    }
+
     public function testShouldConvertUploadedFilesWithPhpBug()
     {
         $tmpFile = $this->createTempFile();

From d9a6b76dbdff123d0c99261b785cdb15c2fbe97e Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Mon, 11 Sep 2017 16:29:04 +0200
Subject: [PATCH 0829/1099] A DI tag for resettable services.

---
 .../FrameworkBundle/FrameworkBundle.php       |  2 +
 .../Resources/config/services.xml             |  6 ++
 .../ResettableServicePass.php                 | 69 +++++++++++++++
 .../EventListener/ServiceResetListener.php    | 50 +++++++++++
 .../ResettableServicePassTest.php             | 85 +++++++++++++++++++
 .../ServiceResetListenerTest.php              | 76 +++++++++++++++++
 .../Tests/Fixtures/ClearableService.php       | 13 +++
 .../Tests/Fixtures/ResettableService.php      | 13 +++
 8 files changed, 314 insertions(+)
 create mode 100644 src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
 create mode 100644 src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Fixtures/ClearableService.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Fixtures/ResettableService.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index ba117ceeb82a2..c6936d35be83d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -33,6 +33,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
+use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
 use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
@@ -117,6 +118,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new CachePoolPrunerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, FormPass::class);
         $container->addCompilerPass(new WorkflowGuardListenerPass());
+        $container->addCompilerPass(new ResettableServicePass());
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 9ff2c259ee43b..0bae93663bf5c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -74,5 +74,11 @@
         
             
         
+
+        
+             
+             
+            
+        
     
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
new file mode 100644
index 0000000000000..56cd059284afe
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
@@ -0,0 +1,69 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\EventListener\ServiceResetListener;
+
+/**
+ * @author Alexander M. Turek 
+ */
+class ResettableServicePass implements CompilerPassInterface
+{
+    private $tagName;
+
+    /**
+     * @param string $tagName
+     */
+    public function __construct($tagName = 'kernel.reset')
+    {
+        $this->tagName = $tagName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->has(ServiceResetListener::class)) {
+            return;
+        }
+
+        $services = $methods = array();
+
+        foreach ($container->findTaggedServiceIds($this->tagName, true) as $id => $tags) {
+            $services[$id] = new Reference($id, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE);
+            $attributes = $tags[0];
+
+            if (!isset($attributes['method'])) {
+                throw new RuntimeException(sprintf('Tag %s requires the "method" attribute to be set.', $this->tagName));
+            }
+
+            $methods[$id] = $attributes['method'];
+        }
+
+        if (empty($services)) {
+            $container->removeDefinition(ServiceResetListener::class);
+
+            return;
+        }
+
+        $container->findDefinition(ServiceResetListener::class)
+            ->replaceArgument(0, new IteratorArgument($services))
+            ->replaceArgument(1, $methods);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php b/src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php
new file mode 100644
index 0000000000000..cf6d15930315f
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php
@@ -0,0 +1,50 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Clean up services between requests.
+ *
+ * @author Alexander M. Turek 
+ */
+class ServiceResetListener implements EventSubscriberInterface
+{
+    private $services;
+    private $resetMethods;
+
+    public function __construct(\Traversable $services, array $resetMethods)
+    {
+        $this->services = $services;
+        $this->resetMethods = $resetMethods;
+    }
+
+    public function onKernelTerminate()
+    {
+        foreach ($this->services as $id => $service) {
+            $method = $this->resetMethods[$id];
+            $service->$method();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::TERMINATE => array('onKernelTerminate', -2048),
+        );
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
new file mode 100644
index 0000000000000..7363586f99588
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -0,0 +1,85 @@
+register('one', ResettableService::class)
+            ->addTag('kernel.reset', array('method' => 'reset'));
+        $container->register('two', ClearableService::class)
+            ->addTag('kernel.reset', array('method' => 'clear'));
+
+        $container->register(ServiceResetListener::class)
+            ->setArguments(array(null, array()));
+        $container->addCompilerPass(new ResettableServicePass('kernel.reset'));
+
+        $container->compile();
+
+        $definition = $container->getDefinition(ServiceResetListener::class);
+
+        $this->assertEquals(
+            array(
+                new IteratorArgument(array(
+                    'one' => new Reference('one', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+                    'two' => new Reference('two', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+                )),
+                array(
+                    'one' => 'reset',
+                    'two' => 'clear',
+                ),
+            ),
+            $definition->getArguments()
+        );
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Tag kernel.reset requires the "method" attribute to be set.
+     */
+    public function testMissingMethod()
+    {
+        $container = new ContainerBuilder();
+        $container->register(ResettableService::class)
+            ->addTag('kernel.reset');
+        $container->register(ServiceResetListener::class)
+            ->setArguments(array(null, array()));
+        $container->addCompilerPass(new ResettableServicePass('kernel.reset'));
+
+        $container->compile();
+    }
+
+    public function testCompilerPassWithoutResetters()
+    {
+        $container = new ContainerBuilder();
+        $container->register(ServiceResetListener::class)
+            ->setArguments(array(null, array()));
+        $container->addCompilerPass(new ResettableServicePass());
+
+        $container->compile();
+
+        $this->assertFalse($container->has(ServiceResetListener::class));
+    }
+
+    public function testCompilerPassWithoutListener()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new ResettableServicePass());
+
+        $container->compile();
+
+        $this->assertFalse($container->has(ServiceResetListener::class));
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
new file mode 100644
index 0000000000000..4675fbe71e5a2
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
@@ -0,0 +1,76 @@
+buildContainer();
+        $container->get('reset_subscriber')->onKernelTerminate();
+
+        $this->assertEquals(0, ResettableService::$counter);
+        $this->assertEquals(0, ClearableService::$counter);
+    }
+
+    public function testResetServicesPartially()
+    {
+        $container = $this->buildContainer();
+        $container->get('one');
+        $container->get('reset_subscriber')->onKernelTerminate();
+
+        $this->assertEquals(1, ResettableService::$counter);
+        $this->assertEquals(0, ClearableService::$counter);
+    }
+
+    public function testResetServicesTwice()
+    {
+        $container = $this->buildContainer();
+        $container->get('one');
+        $container->get('reset_subscriber')->onKernelTerminate();
+        $container->get('two');
+        $container->get('reset_subscriber')->onKernelTerminate();
+
+        $this->assertEquals(2, ResettableService::$counter);
+        $this->assertEquals(1, ClearableService::$counter);
+    }
+
+    /**
+     * @return ContainerBuilder
+     */
+    private function buildContainer()
+    {
+        $container = new ContainerBuilder();
+        $container->register('one', ResettableService::class);
+        $container->register('two', ClearableService::class);
+
+        $container->register('reset_subscriber', ServiceResetListener::class)
+            ->addArgument(new IteratorArgument(array(
+                'one' => new Reference('one', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+                'two' => new Reference('two', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+            )))
+            ->addArgument(array(
+                'one' => 'reset',
+                'two' => 'clear',
+            ));
+
+        $container->compile();
+
+        return $container;
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/ClearableService.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/ClearableService.php
new file mode 100644
index 0000000000000..35acb419ce3e5
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/ClearableService.php
@@ -0,0 +1,13 @@
+
Date: Mon, 11 Sep 2017 11:38:49 -0700
Subject: [PATCH 0830/1099] fixed CS

---
 src/Symfony/Component/HttpKernel/Kernel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index d20258d4ac389..56628544ab15d 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -852,7 +852,7 @@ public static function stripComments($source)
                 do {
                     $token = $tokens[++$i];
                     $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
-                } while ($token[0] !== T_END_HEREDOC);
+                } while (T_END_HEREDOC !== $token[0]);
                 $rawChunk = '';
             } elseif (T_WHITESPACE === $token[0]) {
                 if ($ignoreSpace) {

From 8092dc6838fca79773d9489185f704a15e15a348 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 11:14:25 -0700
Subject: [PATCH 0831/1099] removed the profiler.matcher configuration

---
 .../DependencyInjection/Configuration.php     | 17 ---------------
 .../FrameworkExtension.php                    | 21 -------------------
 .../Resources/config/profiling.xml            |  2 +-
 .../DependencyInjection/ConfigurationTest.php |  4 ----
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 55583eba06c32..e31802ac84c04 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -185,23 +185,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
-                        ->arrayNode('matcher')
-                            ->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
-                            ->canBeEnabled()
-                            ->performNoDeepMerging()
-                            ->fixXmlConfig('ip')
-                            ->children()
-                                ->scalarNode('path')
-                                    ->info('use the urldecoded format')
-                                    ->example('^/path to resource/')
-                                ->end()
-                                ->scalarNode('service')->end()
-                                ->arrayNode('ips')
-                                    ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
-                                    ->prototype('scalar')->end()
-                                ->end()
-                            ->end()
-                        ->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 9593564b6c7c2..5d047cc02ce98 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -445,27 +445,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
 
         $container->setParameter('profiler.storage.dsn', $config['dsn']);
 
-        if ($this->isConfigEnabled($container, $config['matcher'])) {
-            if (isset($config['matcher']['service'])) {
-                $container->setAlias('profiler.request_matcher', $config['matcher']['service'])->setPrivate(true);
-            } elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) {
-                $definition = $container->register('profiler.request_matcher', 'Symfony\\Component\\HttpFoundation\\RequestMatcher');
-                $definition->setPublic(false);
-
-                if (isset($config['matcher']['ip'])) {
-                    $definition->addMethodCall('matchIp', array($config['matcher']['ip']));
-                }
-
-                if (isset($config['matcher']['ips'])) {
-                    $definition->addMethodCall('matchIps', array($config['matcher']['ips']));
-                }
-
-                if (isset($config['matcher']['path'])) {
-                    $definition->addMethodCall('matchPath', array($config['matcher']['path']));
-                }
-            }
-        }
-
         if (!$config['collect']) {
             $container->getDefinition('profiler')->addMethodCall('disable', array());
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index 635dc8d2b3ed0..8816284fa78ed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -21,7 +21,7 @@
             
             
             
-            
+            null
             %profiler_listener.only_exceptions%
             %profiler_listener.only_master_requests%
         
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index c53f6544ed8ab..eb28c69527160 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -148,10 +148,6 @@ protected static function getBundleDefaultConfig()
                 'only_master_requests' => false,
                 'dsn' => 'file:%kernel.cache_dir%/profiler',
                 'collect' => true,
-                'matcher' => array(
-                    'enabled' => false,
-                    'ips' => array(),
-                ),
             ),
             'translator' => array(
                 'enabled' => !class_exists(FullStack::class),

From 5b77d991e98e0d4d8ad3567529ffc68fc2393207 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 14 Sep 2017 20:37:43 -0700
Subject: [PATCH 0832/1099] fixed CS

---
 .../DependencyInjection/FrameworkExtension.php                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 5d047cc02ce98..8120561255cd5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -480,9 +480,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             $transitions = array();
             foreach ($workflow['transitions'] as $transition) {
-                if ($type === 'workflow') {
+                if ('workflow' === $type) {
                     $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $transition['from'], $transition['to']));
-                } elseif ($type === 'state_machine') {
+                } elseif ('state_machine' === $type) {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
                             $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));

From 89893c120425a2c8fa915106f4c539f822957d27 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 10:56:43 -0700
Subject: [PATCH 0833/1099] [HttpKernel] deprecated bundle inheritance

---
 UPGRADE-3.4.md                                |  2 ++
 UPGRADE-4.0.md                                |  2 ++
 .../Controller/ControllerNameParser.php       |  4 +--
 .../HttpKernel/Bundle/BundleInterface.php     |  2 ++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 src/Symfony/Component/HttpKernel/Kernel.php   | 15 ++++++++--
 .../Component/HttpKernel/KernelInterface.php  |  3 ++
 .../Component/HttpKernel/Tests/KernelTest.php | 28 +++++++++++++++++++
 8 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 2c80252b5b8ab..c5def31a9603e 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -173,6 +173,8 @@ FrameworkBundle
 HttpKernel
 ----------
 
+ * Bundle inheritance has been deprecated.
+
  * Relying on convention-based commands discovery has been deprecated and
    won't be supported in 4.0. Use PSR-4 based service discovery instead.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 9f8017c47e8a4..e5a69675a2fa0 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -493,6 +493,8 @@ HttpFoundation
 HttpKernel
 ----------
 
+ * Bundle inheritance has been removed.
+
  * Relying on convention-based commands discovery is not supported anymore.
    Use PSR-4 based service discovery instead.
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index 989dc8cd23d7c..323c5122a531f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -58,7 +58,7 @@ public function parse($controller)
 
         try {
             // this throws an exception if there is no such bundle
-            $allBundles = $this->kernel->getBundle($bundle, false);
+            $allBundles = $this->kernel->getBundle($bundle, false, true);
         } catch (\InvalidArgumentException $e) {
             $message = sprintf(
                 'The "%s" (from the _controller value "%s") does not exist or is not enabled in your kernel!',
@@ -141,7 +141,7 @@ private function findAlternative($nonExistentBundleName)
             }
 
             $lev = levenshtein($nonExistentBundleName, $bundleName);
-            if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
+            if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
                 $alternative = $bundleName;
                 $shortest = $lev;
             }
diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
index 25eea1d76dec3..f4a160c2fd587 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
@@ -56,6 +56,8 @@ public function getContainerExtension();
      * bundle.
      *
      * @return string The Bundle name it overrides or null if no parent
+     *
+     * @deprecated This method is deprecated as of 3.4 and will be removed in 4.0.
      */
     public function getParent();
 
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 4a4c81dac096a..702394ade5bd4 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
  * deprecated commands auto registration
  * added `AddCacheClearerPass`
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 56628544ab15d..4f7ec2c289bac 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -204,8 +204,17 @@ public function getBundles()
     /**
      * {@inheritdoc}
      */
-    public function getBundle($name, $first = true)
+    public function getBundle($name, $first = true/*, $noDeprecation = false */)
     {
+        $noDeprecation = false;
+        if (func_num_args() >= 3) {
+            $noDeprecation = func_get_arg(2);
+        }
+
+        if (!$first && !$noDeprecation) {
+            @trigger_error(sprintf('Passing "false" as the second argument to %s() is deprecated as of 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         if (!isset($this->bundleMap[$name])) {
             throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
         }
@@ -241,7 +250,7 @@ public function locateResource($name, $dir = null, $first = true)
         $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
         $overridePath = substr($path, 9);
         $resourceBundle = null;
-        $bundles = $this->getBundle($bundleName, false);
+        $bundles = $this->getBundle($bundleName, false, true);
         $files = array();
 
         foreach ($bundles as $bundle) {
@@ -468,6 +477,8 @@ protected function initializeBundles()
             $this->bundles[$name] = $bundle;
 
             if ($parentName = $bundle->getParent()) {
+                @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
                 if (isset($directChildren[$parentName])) {
                     throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
                 }
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
index b8609b9ededb9..9fd3777889289 100644
--- a/src/Symfony/Component/HttpKernel/KernelInterface.php
+++ b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -60,6 +60,9 @@ public function getBundles();
     /**
      * Returns a bundle and optionally its descendants by its name.
      *
+     * The second argument is deprecated as of 3.4 and will be removed in 4.0. This method
+     * will always return an instance of BundleInterface in 4.0.
+     *
      * @param string $name  Bundle name
      * @param bool   $first Whether to return the first bundle only or together with its descendants
      *
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 4392e30e652f3..4a093472b9df1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -410,6 +410,9 @@ public function testLocateResourceReturnsTheFirstThatMatches()
         $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt', $kernel->locateResource('@Bundle1Bundle/foo.txt'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLocateResourceReturnsTheFirstThatMatchesWithParent()
     {
         $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
@@ -426,6 +429,9 @@ public function testLocateResourceReturnsTheFirstThatMatchesWithParent()
         $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/bar.txt', $kernel->locateResource('@ParentAABundle/bar.txt'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLocateResourceReturnsAllMatches()
     {
         $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
@@ -444,6 +450,9 @@ public function testLocateResourceReturnsAllMatches()
             $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLocateResourceReturnsAllMatchesBis()
     {
         $kernel = $this->getKernel(array('getBundle'));
@@ -492,6 +501,9 @@ public function testLocateResourceReturnsTheDirOneForResources()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
     {
         $kernel = $this->getKernel(array('getBundle'));
@@ -508,6 +520,9 @@ public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testLocateResourceOverrideBundleAndResourcesFolders()
     {
         $parent = $this->getBundle(__DIR__.'/Fixtures/BaseBundle', null, 'BaseBundle', 'BaseBundle');
@@ -581,6 +596,9 @@ public function testLocateResourceOnDirectories()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testInitializeBundles()
     {
         $parent = $this->getBundle(null, null, 'ParentABundle');
@@ -599,6 +617,9 @@ public function testInitializeBundles()
         $this->assertEquals(array($child, $parent), $map['ParentABundle']);
     }
 
+    /**
+     * @group legacy
+     */
     public function testInitializeBundlesSupportInheritanceCascade()
     {
         $grandparent = $this->getBundle(null, null, 'GrandParentBBundle');
@@ -621,6 +642,7 @@ public function testInitializeBundlesSupportInheritanceCascade()
     }
 
     /**
+     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.
      */
@@ -631,6 +653,9 @@ public function testInitializeBundlesThrowsExceptionWhenAParentDoesNotExists()
         $kernel->boot();
     }
 
+    /**
+     * @group legacy
+     */
     public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
     {
         $grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
@@ -653,6 +678,7 @@ public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
     }
 
     /**
+     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".
      */
@@ -667,6 +693,7 @@ public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtende
     }
 
     /**
+     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Trying to register two bundles with the same name "DuplicateName"
      */
@@ -680,6 +707,7 @@ public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWith
     }
 
     /**
+     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Bundle "CircularRefBundle" can not extend itself.
      */

From 3e90138214c54f8cbf7914706562771b40017cc0 Mon Sep 17 00:00:00 2001
From: SpacePossum 
Date: Thu, 7 Sep 2017 11:04:22 +0200
Subject: [PATCH 0834/1099] [CS][2.7] yoda_style, no_unneeded_curly_braces,
 no_unneeded_final_method, semicolon_after_instruction

---
 .php_cs.dist                                  |  3 ++
 .../AbstractDoctrineExtension.php             |  6 +--
 .../Form/ChoiceList/ORMQueryBuilderLoader.php |  2 +-
 .../MergeDoctrineCollectionListener.php       |  2 +-
 .../Doctrine/Form/Type/DoctrineType.php       |  2 +-
 .../Bridge/Twig/Command/DebugCommand.php      | 20 +++++-----
 .../Twig/Extension/StopwatchExtension.php     |  2 +-
 ...xtensionBootstrap3HorizontalLayoutTest.php |  2 +-
 .../FormExtensionBootstrap3LayoutTest.php     |  2 +-
 .../Extension/FormExtensionDivLayoutTest.php  |  2 +-
 .../FormExtensionTableLayoutTest.php          |  2 +-
 .../Command/TranslationUpdateCommand.php      | 10 ++---
 .../Controller/ControllerNameParser.php       |  2 +-
 .../Controller/RedirectController.php         |  2 +-
 .../Controller/TemplateController.php         |  2 +-
 .../views/FormTable/button_row.html.php       |  2 +-
 .../views/FormTable/form_row.html.php         |  6 +--
 .../FormTable/form_widget_compound.html.php   | 10 ++---
 .../views/FormTable/hidden_row.html.php       |  2 +-
 .../FrameworkBundle/Test/KernelTestCase.php   |  2 +-
 .../Fixtures/StubTemplateNameParser.php       |  4 +-
 .../Resources/Child/form_label.html.php       |  2 +-
 .../Parent/form_widget_simple.html.php        |  4 +-
 .../Templating/TemplateFilenameParserTest.php |  2 +-
 .../SecurityBundle/Command/SetAclCommand.php  |  2 +-
 .../DependencyInjection/MainConfiguration.php |  2 +-
 .../Security/Factory/RememberMeFactory.php    |  2 +-
 .../CompleteConfigurationTest.php             |  2 +-
 src/Symfony/Component/BrowserKit/History.php  |  2 +-
 .../ClassLoader/ClassCollectionLoader.php     |  2 +-
 .../ClassLoader/ClassMapGenerator.php         |  2 +-
 .../Definition/Dumper/YamlReferenceDumper.php |  2 +-
 src/Symfony/Component/Config/FileLocator.php  |  6 +--
 .../Component/Config/Util/XmlUtils.php        |  2 +-
 src/Symfony/Component/Console/Application.php |  8 ++--
 .../Console/Descriptor/XmlDescriptor.php      |  4 +-
 .../Component/Console/Helper/DialogHelper.php |  6 +--
 .../Console/Helper/ProgressHelper.php         |  2 +-
 .../Console/Helper/QuestionHelper.php         |  6 +--
 .../Component/Console/Input/ArgvInput.php     |  2 +-
 .../Console/Logger/ConsoleLogger.php          |  2 +-
 .../Tests/Helper/LegacyDialogHelperTest.php   |  2 +-
 .../Tests/Helper/LegacyProgressHelperTest.php |  2 +-
 .../Tests/Helper/QuestionHelperTest.php       |  2 +-
 .../Parser/Shortcut/EmptyStringParser.php     |  2 +-
 .../DependencyInjection/Container.php         |  2 +-
 .../DependencyInjection/ContainerBuilder.php  |  2 +-
 .../DependencyInjection/Definition.php        |  2 +-
 .../DependencyInjection/Dumper/PhpDumper.php  |  6 +--
 .../DependencyInjection/Dumper/XmlDumper.php  |  4 +-
 .../Extension/Extension.php                   |  2 +-
 .../Loader/XmlFileLoader.php                  |  4 +-
 .../Loader/YamlFileLoader.php                 |  2 +-
 src/Symfony/Component/DomCrawler/Crawler.php  |  2 +-
 .../DomCrawler/Tests/CrawlerTest.php          |  2 +-
 .../ContainerAwareEventDispatcher.php         |  2 +-
 .../Component/ExpressionLanguage/Parser.php   |  6 +--
 .../ExpressionLanguage/TokenStream.php        |  2 +-
 .../Component/Filesystem/Filesystem.php       |  4 +-
 .../Finder/Adapter/GnuFindAdapter.php         |  2 +-
 .../Component/Finder/Expression/Regex.php     |  4 +-
 .../Tests/Iterator/SortableIteratorTest.php   |  6 +--
 .../ChoiceToBooleanArrayTransformer.php       |  2 +-
 .../DateTimeToLocalizedStringTransformer.php  |  4 +-
 .../EventListener/CsrfValidationListener.php  |  2 +-
 .../Component/Form/ResolvedFormType.php       |  8 ++--
 .../Form/Test/FormPerformanceTestCase.php     |  2 +-
 .../Form/Tests/AbstractLayoutTest.php         |  4 +-
 .../ViolationMapper/ViolationMapperTest.php   |  4 +-
 .../Tests/Fixtures/AlternatingRowType.php     |  2 +-
 .../Tests/Fixtures/FixedDataTransformer.php   |  2 +-
 .../HttpFoundation/AcceptHeaderItem.php       |  4 +-
 .../HttpFoundation/BinaryFileResponse.php     |  6 +--
 .../HttpFoundation/File/UploadedFile.php      |  4 +-
 .../Component/HttpFoundation/IpUtils.php      |  2 +-
 .../Component/HttpFoundation/Request.php      | 28 ++++++-------
 .../HttpFoundation/RequestMatcher.php         |  2 +-
 .../Component/HttpFoundation/Response.php     |  4 +-
 .../Component/HttpFoundation/ServerBag.php    |  2 +-
 .../Attribute/NamespacedAttributeBag.php      |  2 +-
 .../Handler/MemcachedSessionHandler.php       |  2 +-
 .../Tests/File/MimeType/MimeTypeTest.php      |  2 +-
 .../HttpFoundation/Tests/RequestTest.php      |  2 +-
 .../Component/HttpKernel/HttpCache/Store.php  |  2 +-
 src/Symfony/Component/HttpKernel/Kernel.php   |  2 +-
 .../Profiler/BaseMemcacheProfilerStorage.php  |  6 +--
 .../Profiler/RedisProfilerStorage.php         |  8 ++--
 .../Data/Bundle/Compiler/GenrbCompiler.php    |  2 +-
 .../DateFormat/TimeZoneTransformer.php        |  4 +-
 ...odArgumentValueNotImplementedException.php |  2 +-
 .../Intl/NumberFormatter/NumberFormatter.php  | 18 ++++-----
 .../AbstractCurrencyDataProviderTest.php      |  4 +-
 .../AbstractNumberFormatterTest.php           |  6 +--
 .../Component/Intl/Util/SvnRepository.php     |  6 +--
 .../Exception/ProcessTimedOutException.php    |  4 +-
 src/Symfony/Component/Process/Process.php     |  8 ++--
 .../Component/Process/Tests/ProcessTest.php   |  6 +--
 .../Exception/UnexpectedTypeException.php     |  2 +-
 .../Matcher/Dumper/PhpMatcherDumper.php       |  6 +--
 .../Tests/Fixtures/dumper/url_matcher1.php    | 36 ++++++++---------
 .../Tests/Fixtures/dumper/url_matcher2.php    | 40 +++++++++----------
 .../Tests/Fixtures/dumper/url_matcher3.php    |  4 +-
 .../Security/Acl/Dbal/MutableAclProvider.php  |  8 ++--
 .../Tests/Dbal/AclProviderBenchmarkTest.php   |  8 ++--
 .../Authorization/AccessDecisionManager.php   |  2 +-
 .../Core/User/InMemoryUserProvider.php        |  2 +-
 .../Authentication/AuthenticationUtils.php    |  2 +-
 .../Component/Security/Http/HttpUtils.php     |  2 +-
 .../RememberMe/AbstractRememberMeServices.php |  2 +-
 ...PersistentTokenBasedRememberMeServices.php |  4 +-
 .../TokenBasedRememberMeServices.php          |  2 +-
 .../Tests/Firewall/ContextListenerTest.php    |  2 +-
 .../Tests/RememberMe/ResponseListenerTest.php |  2 +-
 .../Serializer/Encoder/XmlEncoder.php         |  8 ++--
 .../Normalizer/AbstractNormalizer.php         |  2 +-
 .../Normalizer/GetSetMethodNormalizer.php     |  2 +-
 .../Normalizer/ObjectNormalizer.php           |  6 +--
 .../Normalizer/PropertyNormalizer.php         |  2 +-
 .../Serializer/Tests/Fixtures/ScalarDummy.php |  4 +-
 .../Templating/Loader/FilesystemLoader.php    |  6 +--
 .../Translation/Loader/MoFileLoader.php       |  8 ++--
 .../Translation/Loader/PoFileLoader.php       | 14 +++----
 .../Translation/Loader/QtFileLoader.php       |  2 +-
 .../Translation/PluralizationRules.php        | 28 ++++++-------
 .../Component/Translation/Translator.php      |  2 +-
 .../Component/Validator/Constraint.php        |  2 +-
 .../Validator/Constraints/ChoiceValidator.php |  4 +-
 .../Validator/Constraints/Collection.php      |  2 +-
 .../Validator/Constraints/ImageValidator.php  |  2 +-
 .../Validator/Constraints/TypeValidator.php   |  2 +-
 .../Validator/Constraints/UuidValidator.php   |  2 +-
 .../Mapping/Loader/AbstractLoader.php         |  4 +-
 .../Component/VarDumper/Caster/SplCaster.php  |  2 +-
 .../VarDumper/Tests/VarClonerTest.php         |  2 +-
 src/Symfony/Component/Yaml/Inline.php         |  2 +-
 src/Symfony/Component/Yaml/Parser.php         | 10 ++---
 src/Symfony/Component/Yaml/Yaml.php           |  2 +-
 137 files changed, 313 insertions(+), 310 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index d84a0624bd3c5..624618ab80a43 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -9,11 +9,14 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
+        'no_break_comment' => false,
+        'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__.'/src')
+            ->append(array(__FILE__))
             ->exclude(array(
                 // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
                 'Symfony/Component/DependencyInjection/Tests/Fixtures',
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index b3fecad9df233..c0623572ec606 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -199,13 +199,13 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
             if ($container->hasDefinition($mappingService)) {
                 $mappingDriverDef = $container->getDefinition($mappingService);
                 $args = $mappingDriverDef->getArguments();
-                if ($driverType == 'annotation') {
+                if ('annotation' == $driverType) {
                     $args[1] = array_merge(array_values($driverPaths), $args[1]);
                 } else {
                     $args[0] = array_merge(array_values($driverPaths), $args[0]);
                 }
                 $mappingDriverDef->setArguments($args);
-            } elseif ($driverType == 'annotation') {
+            } elseif ('annotation' == $driverType) {
                 $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
                     new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
                     array_values($driverPaths),
@@ -333,7 +333,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
                 $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
                 $memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%';
-                $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
+                $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && 0 === $cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
                 $cacheDef = new Definition($memcacheClass);
                 $memcacheInstance = new Definition($memcacheInstanceClass);
                 $memcacheInstance->addMethodCall('connect', array(
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
index 297e2ddfe7a43..8d73c32d9e04b 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -111,7 +111,7 @@ public function getEntitiesByIds($identifier, array $values)
 
             // Like above, but we just filter out empty strings.
             $values = array_values(array_filter($values, function ($v) {
-                return (string) $v !== '';
+                return '' !== (string) $v;
             }));
         } else {
             $parameterType = Connection::PARAM_STR_ARRAY;
diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
index 4edf1043c59fc..bb4cfa5087c49 100644
--- a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
+++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -41,7 +41,7 @@ public function onBind(FormEvent $event)
 
         // If all items were removed, call clear which has a higher
         // performance on persistent collections
-        if ($collection instanceof Collection && count($data) === 0) {
+        if ($collection instanceof Collection && 0 === count($data)) {
             $collection->clear();
         }
     }
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 2dd139750c7bd..17036a591322a 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -176,7 +176,7 @@ public function configureOptions(OptionsResolver $resolver)
                     $entityLoader
                 );
 
-                if ($hash !== null) {
+                if (null !== $hash) {
                     $choiceLoaders[$hash] = $doctrineChoiceLoader;
                 }
 
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index d62aef0f2c32a..f86013b0e2476 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $types = array('functions', 'filters', 'tests', 'globals');
 
-        if ($input->getOption('format') === 'json') {
+        if ('json' === $input->getOption('format')) {
             $data = array();
             foreach ($types as $type) {
                 foreach ($twig->{'get'.ucfirst($type)}() as $name => $entity) {
@@ -129,13 +129,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function getMetadata($type, $entity)
     {
-        if ($type === 'globals') {
+        if ('globals' === $type) {
             return $entity;
         }
-        if ($type === 'tests') {
+        if ('tests' === $type) {
             return;
         }
-        if ($type === 'functions' || $type === 'filters') {
+        if ('functions' === $type || 'filters' === $type) {
             $cb = $entity->getCallable();
             if (null === $cb) {
                 return;
@@ -165,7 +165,7 @@ private function getMetadata($type, $entity)
                 array_shift($args);
             }
 
-            if ($type === 'filters') {
+            if ('filters' === $type) {
                 // remove the value the filter is applied on
                 array_shift($args);
             }
@@ -185,20 +185,20 @@ private function getMetadata($type, $entity)
 
     private function getPrettyMetadata($type, $entity)
     {
-        if ($type === 'tests') {
+        if ('tests' === $type) {
             return '';
         }
 
         try {
             $meta = $this->getMetadata($type, $entity);
-            if ($meta === null) {
+            if (null === $meta) {
                 return '(unknown?)';
             }
         } catch (\UnexpectedValueException $e) {
             return ' '.$e->getMessage().'';
         }
 
-        if ($type === 'globals') {
+        if ('globals' === $type) {
             if (is_object($meta)) {
                 return ' = object('.get_class($meta).')';
             }
@@ -206,11 +206,11 @@ private function getPrettyMetadata($type, $entity)
             return ' = '.substr(@json_encode($meta), 0, 50);
         }
 
-        if ($type === 'functions') {
+        if ('functions' === $type) {
             return '('.implode(', ', $meta).')';
         }
 
-        if ($type === 'filters') {
+        if ('filters' === $type) {
             return $meta ? '('.implode(', ', $meta).')' : '';
         }
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
index 635188b7389e4..cb91ff428b0a2 100644
--- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -48,7 +48,7 @@ public function getTokenParsers()
              * Some stuff which will be recorded on the timeline
              * {% endstopwatch %}
              */
-            new StopwatchTokenParser($this->stopwatch !== null && $this->enabled),
+            new StopwatchTokenParser(null !== $this->stopwatch && $this->enabled),
         );
     }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index 9d84946177af2..3fb3a19c277ef 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -75,7 +75,7 @@ protected function renderEnctype(FormView $view)
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index 10161cbd4e1a7..85ef2ceed53af 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -75,7 +75,7 @@ protected function renderEnctype(FormView $view)
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index 2d7339b369d30..e2fbb48ce0339 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -158,7 +158,7 @@ protected function renderEnctype(FormView $view)
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index 1d526d5138fa5..1b5f4022daeb3 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -76,7 +76,7 @@ protected function renderEnctype(FormView $view)
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index f310613d10315..3f1605da582b9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output = new SymfonyStyle($input, $output);
 
         // check presence of force or dump-message
-        if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) {
+        if (true !== $input->getOption('force') && true !== $input->getOption('dump-messages')) {
             $output->error('You must choose one of --force or --dump-messages');
 
             return 1;
@@ -151,7 +151,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // show compiled list of messages
-        if ($input->getOption('dump-messages') === true) {
+        if (true === $input->getOption('dump-messages')) {
             $output->newLine();
             foreach ($operation->getDomains() as $domain) {
                 $output->section(sprintf('Displaying messages for domain %s:', $domain));
@@ -168,17 +168,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ));
             }
 
-            if ($input->getOption('output-format') == 'xlf') {
+            if ('xlf' == $input->getOption('output-format')) {
                 $output->writeln('Xliff output version is 1.2');
             }
         }
 
-        if ($input->getOption('no-backup') === true) {
+        if (true === $input->getOption('no-backup')) {
             $writer->disableBackup();
         }
 
         // save the files
-        if ($input->getOption('force') === true) {
+        if (true === $input->getOption('force')) {
             $output->text('Writing files');
 
             $bundleTransPath = false;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index 989dc8cd23d7c..5cfb30f3713ce 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -141,7 +141,7 @@ private function findAlternative($nonExistentBundleName)
             }
 
             $lev = levenshtein($nonExistentBundleName, $bundleName);
-            if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
+            if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
                 $alternative = $bundleName;
                 $shortest = $lev;
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index b8f4e6415a540..9d060ed43ad3d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -100,7 +100,7 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
 
         $qs = $request->getQueryString();
         if ($qs) {
-            if (strpos($path, '?') === false) {
+            if (false === strpos($path, '?')) {
                 $qs = '?'.$qs;
             } else {
                 $qs = '&'.$qs;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index 16d15f902340c..f75ab2d79514f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -46,7 +46,7 @@ public function templateAction($template, $maxAge = null, $sharedAge = null, $pr
 
         if ($private) {
             $response->setPrivate();
-        } elseif ($private === false || (null === $private && ($maxAge || $sharedAge))) {
+        } elseif (false === $private || (null === $private && ($maxAge || $sharedAge))) {
             $response->setPublic();
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
index ef4d22b975081..67d0137e20b97 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
@@ -1,6 +1,6 @@
 
     
     
-        widget($form) ?>
+        widget($form); ?>
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
index 7e1f2f5d28db8..e2f03ff2b7064 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
@@ -1,9 +1,9 @@
 
     
-        label($form) ?>
+        label($form); ?>
     
     
-        errors($form) ?>
-        widget($form) ?>
+        errors($form); ?>
+        widget($form); ?>
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
index 20b9668aa49c9..adc897338861b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
@@ -1,11 +1,11 @@
-block($form, 'widget_container_attributes') ?>>
+block($form, 'widget_container_attributes'); ?>>
     parent && $errors): ?>
     
-    
-    block($form, 'form_rows') ?>
-    rest($form) ?>
+    
+    block($form, 'form_rows'); ?>
+    rest($form); ?>
 
         
-            errors($form) ?>
+            errors($form); ?>
         
     

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php
index 491ece3602327..116b300bd5619 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php
@@ -1,5 +1,5 @@
 
     
-        widget($form) ?>
+        widget($form); ?>
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 5dadca83f2e1b..6b979c4f36118 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -77,7 +77,7 @@ private static function getPhpUnitCliConfigArgument()
         $dir = null;
         $reversedArgs = array_reverse($_SERVER['argv']);
         foreach ($reversedArgs as $argIndex => $testArg) {
-            if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
+            if (preg_match('/^-[^ \-]*c$/', $testArg) || '--configuration' === $testArg) {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
             } elseif (0 === strpos($testArg, '--configuration=')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
index 3a66454947977..9835bc2a228ea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
@@ -30,9 +30,9 @@ public function parse($name)
     {
         list($bundle, $controller, $template) = explode(':', $name, 3);
 
-        if ($template[0] == '_') {
+        if ('_' == $template[0]) {
             $path = $this->rootTheme.'/Custom/'.$template;
-        } elseif ($bundle === 'TestBundle') {
+        } elseif ('TestBundle' === $bundle) {
             $path = $this->rootTheme.'/'.$controller.'/'.$template;
         } else {
             $path = $this->root.'/'.$controller.'/'.$template;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
index 0c1af407cb9fc..aebb53d3e7221 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
@@ -1 +1 @@
-child
+child
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
index 3c6c158a53d8c..1b53a7213f025 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
@@ -1,2 +1,2 @@
-
-block($form, 'widget_attributes') ?> value="" rel="theme" />
+
+block($form, 'widget_attributes'); ?> value="" rel="theme" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
index 77dd2699ab9ea..8cdc26ecfe292 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
@@ -36,7 +36,7 @@ public function testParseFromFilename($file, $ref)
     {
         $template = $this->parser->parse($file);
 
-        if ($ref === false) {
+        if (false === $ref) {
             $this->assertFalse($template);
         } else {
             $this->assertEquals($template->getLogicalName(), $ref->getLogicalName());
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
index ba34782346275..7d0f3a261b123 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
@@ -120,7 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             foreach ($userOption as $user) {
                 $data = explode(':', $user, 2);
 
-                if (count($data) === 1) {
+                if (1 === count($data)) {
                     throw new \InvalidArgumentException('The user must follow the format "Acme/MyUser:username".');
                 }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index df6380224cd20..382c4ade6af8b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -394,7 +394,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
                 ->thenInvalid('You cannot set multiple provider types for the same provider')
             ->end()
             ->validate()
-                ->ifTrue(function ($v) { return count($v) === 0; })
+                ->ifTrue(function ($v) { return 0 === count($v); })
                 ->thenInvalid('You must set a provider definition for the provider.')
             ->end()
         ;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index c6688affb40ae..a77d872e26c40 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -93,7 +93,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
                 $userProviders[] = new Reference('security.user.provider.concrete.'.$providerName);
             }
         }
-        if (count($userProviders) === 0) {
+        if (0 === count($userProviders)) {
             throw new \RuntimeException('You must configure at least one remember-me aware listener (such as form-login) for each firewall that has remember-me enabled.');
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index d273fb05942b3..6da50316a4721 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -133,7 +133,7 @@ public function testAccess()
 
         $rules = array();
         foreach ($container->getDefinition('security.access_map')->getMethodCalls() as $call) {
-            if ($call[0] == 'add') {
+            if ('add' == $call[0]) {
                 $rules[] = array((string) $call[1][0], $call[1][1], $call[1][2]);
             }
         }
diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
index 8e38fe5ca8711..13af2b4f37927 100644
--- a/src/Symfony/Component/BrowserKit/History.php
+++ b/src/Symfony/Component/BrowserKit/History.php
@@ -49,7 +49,7 @@ public function add(Request $request)
      */
     public function isEmpty()
     {
-        return count($this->stack) == 0;
+        return 0 == count($this->stack);
     }
 
     /**
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
index cd3c433ed200a..3f2a8ab1c99fc 100644
--- a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
+++ b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -215,7 +215,7 @@ public static function fixNamespaceDeclarations($source)
                 do {
                     $token = $tokens[++$i];
                     $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
-                } while ($token[0] !== T_END_HEREDOC);
+                } while (T_END_HEREDOC !== $token[0]);
                 $output .= "\n";
                 $rawChunk = '';
             } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
index a35c90ca10d8b..ab9762cd04e5d 100644
--- a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
+++ b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -66,7 +66,7 @@ public static function createMap($dir)
 
             $path = $file->getRealPath() ?: $file->getPathname();
 
-            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
+            if ('php' !== pathinfo($path, PATHINFO_EXTENSION)) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 12ababe39435b..2b103d9533b09 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -117,7 +117,7 @@ private function writeNode(NodeInterface $node, $depth = 0)
             $comments[] = 'Example: '.$example;
         }
 
-        $default = (string) $default != '' ? ' '.$default : '';
+        $default = '' != (string) $default ? ' '.$default : '';
         $comments = count($comments) ? '# '.implode(', ', $comments) : '';
 
         $text = rtrim(sprintf('%-21s%s %s', $node->getName().':', $default, $comments), ' ');
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index 4816724c8190e..94e7e23b43729 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -81,10 +81,10 @@ public function locate($name, $currentPath = null, $first = true)
      */
     private function isAbsolutePath($file)
     {
-        if ($file[0] === '/' || $file[0] === '\\'
+        if ('/' === $file[0] || '\\' === $file[0]
             || (strlen($file) > 3 && ctype_alpha($file[0])
-                && $file[1] === ':'
-                && ($file[2] === '\\' || $file[2] === '/')
+                && ':' === $file[1]
+                && ('\\' === $file[2] || '/' === $file[2])
             )
             || null !== parse_url($file, PHP_URL_SCHEME)
         ) {
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index 0f16fc080bf05..9c7ac126ef1ca 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -68,7 +68,7 @@ public static function loadFile($file, $schemaOrCallable = null)
         libxml_disable_entity_loader($disableEntities);
 
         foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+            if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new \InvalidArgumentException('Document types are not allowed.');
             }
         }
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 873b09e808729..21b2e8ea5c40a 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -709,8 +709,8 @@ public function renderException($e, $output)
                 $trace = $e->getTrace();
                 array_unshift($trace, array(
                     'function' => '',
-                    'file' => $e->getFile() !== null ? $e->getFile() : 'n/a',
-                    'line' => $e->getLine() !== null ? $e->getLine() : 'n/a',
+                    'file' => null !== $e->getFile() ? $e->getFile() : 'n/a',
+                    'line' => null !== $e->getLine() ? $e->getLine() : 'n/a',
                     'args' => array(),
                 ));
 
@@ -838,9 +838,9 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $input->setInteractive(false);
         } else {
-            if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || $input->getParameterOption('--verbose') === 3) {
+            if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || 3 === $input->getParameterOption('--verbose')) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
-            } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || $input->getParameterOption('--verbose') === 2) {
+            } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || 2 === $input->getParameterOption('--verbose')) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
             } elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') || $input->hasParameterOption('--verbose') || $input->getParameterOption('--verbose')) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index b5676beb3766f..0f1fb472c25c8 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -94,9 +94,9 @@ public function getApplicationDocument(Application $application, $namespace = nu
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($rootXml = $dom->createElement('symfony'));
 
-        if ($application->getName() !== 'UNKNOWN') {
+        if ('UNKNOWN' !== $application->getName()) {
             $rootXml->setAttribute('name', $application->getName());
-            if ($application->getVersion() !== 'UNKNOWN') {
+            if ('UNKNOWN' !== $application->getVersion()) {
                 $rootXml->setAttribute('version', $application->getVersion());
             }
         }
diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
index 7f5a5df2cea81..342fe02638604 100644
--- a/src/Symfony/Component/Console/Helper/DialogHelper.php
+++ b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -159,7 +159,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
                         $output->write("\033[1D");
                     }
 
-                    if ($i === 0) {
+                    if (0 === $i) {
                         $ofs = -1;
                         $matches = $autocomplete;
                         $numMatches = count($matches);
@@ -324,7 +324,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
 
         if (false !== $shell = $this->getShell()) {
             $output->write($question);
-            $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword';
+            $readCmd = 'csh' === $shell ? 'set mypassword = $<' : 'read -r mypassword';
             $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
             $value = rtrim(shell_exec($command));
             $output->writeln('');
@@ -462,7 +462,7 @@ private function hasSttyAvailable()
 
         exec('stty 2>&1', $output, $exitcode);
 
-        return self::$stty = $exitcode === 0;
+        return self::$stty = 0 === $exitcode;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php
index 625fb8120824a..b95befe00f870 100644
--- a/src/Symfony/Component/Console/Helper/ProgressHelper.php
+++ b/src/Symfony/Component/Console/Helper/ProgressHelper.php
@@ -423,7 +423,7 @@ private function humaneTime($secs)
         $text = '';
         foreach ($this->timeFormats as $format) {
             if ($secs < $format[0]) {
-                if (count($format) == 2) {
+                if (2 == count($format)) {
                     $text = $format[1];
                     break;
                 } else {
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 676c3c045114f..4cdecfd41a49a 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -235,7 +235,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
                     $output->write("\033[1D");
                 }
 
-                if ($i === 0) {
+                if (0 === $i) {
                     $ofs = -1;
                     $matches = $autocomplete;
                     $numMatches = count($matches);
@@ -365,7 +365,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)
         }
 
         if (false !== $shell = $this->getShell()) {
-            $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword';
+            $readCmd = 'csh' === $shell ? 'set mypassword = $<' : 'read -r mypassword';
             $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
             $value = rtrim(shell_exec($command));
             $output->writeln('');
@@ -447,6 +447,6 @@ private function hasSttyAvailable()
 
         exec('stty 2>&1', $output, $exitcode);
 
-        return self::$stty = $exitcode === 0;
+        return self::$stty = 0 === $exitcode;
     }
 }
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index 119be49170853..55df649ed7efb 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -328,7 +328,7 @@ public function __toString()
                 return $match[1].$self->escapeToken($match[2]);
             }
 
-            if ($token && $token[0] !== '-') {
+            if ($token && '-' !== $token[0]) {
                 return $self->escapeToken($token);
             }
 
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index 987e96a6587e5..4b237c17c6904 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -82,7 +82,7 @@ public function log($level, $message, array $context = array())
         }
 
         // Write to the error output if necessary and available
-        if ($this->formatLevelMap[$level] === self::ERROR && $this->output instanceof ConsoleOutputInterface) {
+        if (self::ERROR === $this->formatLevelMap[$level] && $this->output instanceof ConsoleOutputInterface) {
             $output = $this->output->getErrorOutput();
         } else {
             $output = $this->output;
diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
index d50366d1bf063..b7d1b5cf19e66 100644
--- a/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
@@ -253,6 +253,6 @@ private function hasSttyAvailable()
     {
         exec('stty 2>&1', $output, $exitcode);
 
-        return $exitcode === 0;
+        return 0 === $exitcode;
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
index 2e473c2eef170..76d003e78d18a 100644
--- a/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
@@ -217,7 +217,7 @@ protected function generateOutput($expected)
     {
         $expectedout = $expected;
 
-        if ($this->lastMessagesLength !== null) {
+        if (null !== $this->lastMessagesLength) {
             $expectedout = str_pad($expected, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT);
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 7d450252301be..4fb462cc1048d 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -502,6 +502,6 @@ private function hasSttyAvailable()
     {
         exec('stty 2>&1', $output, $exitcode);
 
-        return $exitcode === 0;
+        return 0 === $exitcode;
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
index 98a08fde069ea..a35450dcd0338 100644
--- a/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
@@ -35,7 +35,7 @@ class EmptyStringParser implements ParserInterface
     public function parse($source)
     {
         // Matches an empty string
-        if ($source == '') {
+        if ('' == $source) {
             return array(new SelectorNode(new ElementNode(null, '*')));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 4019504a5a199..0ba5d646c89cf 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -477,7 +477,7 @@ public function addScope(ScopeInterface $scope)
         $this->scopeChildren[$name] = array();
 
         // normalize the child relations
-        while ($parentScope !== self::SCOPE_CONTAINER) {
+        while (self::SCOPE_CONTAINER !== $parentScope) {
             $this->scopeChildren[$parentScope][] = $name;
             $parentScope = $this->scopes[$parentScope];
         }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index c1a2ee85c42c5..f9658fcf68e04 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1038,7 +1038,7 @@ public static function getServiceConditionals($value)
             foreach ($value as $v) {
                 $services = array_unique(array_merge($services, self::getServiceConditionals($v)));
             }
-        } elseif ($value instanceof Reference && $value->getInvalidBehavior() === ContainerInterface::IGNORE_ON_INVALID_REFERENCE) {
+        } elseif ($value instanceof Reference && ContainerInterface::IGNORE_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
             $services[] = (string) $value;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 780ad187cdba5..97b491328677f 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -60,7 +60,7 @@ public function __construct($class = null, array $arguments = array())
      */
     public function setFactory($factory)
     {
-        if (is_string($factory) && strpos($factory, '::') !== false) {
+        if (is_string($factory) && false !== strpos($factory, '::')) {
             $factory = explode('::', $factory, 2);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 4d576df1bd6c8..e67c0869f4071 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -533,7 +533,7 @@ private function addServiceConfigurator(Definition $definition, $variableName =
 
             $class = $this->dumpValue($callable[0]);
             // If the class is a string we can optimize call_user_func away
-            if (strpos($class, "'") === 0) {
+            if (0 === strpos($class, "'")) {
                 return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
             }
 
@@ -753,7 +753,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
 
                 $class = $this->dumpValue($callable[0]);
                 // If the class is a string we can optimize call_user_func away
-                if (strpos($class, "'") === 0) {
+                if (0 === strpos($class, "'")) {
                     return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
@@ -766,7 +766,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
                 $class = $this->dumpValue($definition->getFactoryClass(false));
 
                 // If the class is a string we can optimize call_user_func away
-                if (strpos($class, "'") === 0) {
+                if (0 === strpos($class, "'")) {
                     return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $definition->getFactoryMethod(false), $arguments ? implode(', ', $arguments) : '');
                 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index c793e9aed0f3d..4a4ac00d08310 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -282,9 +282,9 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
                 $element->setAttribute('type', 'service');
                 $element->setAttribute('id', (string) $value);
                 $behaviour = $value->getInvalidBehavior();
-                if ($behaviour == ContainerInterface::NULL_ON_INVALID_REFERENCE) {
+                if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behaviour) {
                     $element->setAttribute('on-invalid', 'null');
-                } elseif ($behaviour == ContainerInterface::IGNORE_ON_INVALID_REFERENCE) {
+                } elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behaviour) {
                     $element->setAttribute('on-invalid', 'ignore');
                 }
                 if (!$value->isStrict()) {
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
index ced39f7281b6c..5a6573b70e0da 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -65,7 +65,7 @@ public function getNamespace()
     public function getAlias()
     {
         $className = get_class($this);
-        if (substr($className, -9) != 'Extension') {
+        if ('Extension' != substr($className, -9)) {
             throw new BadMethodCallException('This extension does not follow the naming convention; you must overwrite the getAlias() method.');
         }
         $classBaseName = substr(strrchr($className, '\\'), 1, -9);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index b3e4ef4d3e7c1..bc57828f35187 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -414,7 +414,7 @@ private function getChildren(\DOMNode $node, $name)
     {
         $children = array();
         foreach ($node->childNodes as $child) {
-            if ($child instanceof \DOMElement && $child->localName === $name && $child->namespaceURI === self::NS) {
+            if ($child instanceof \DOMElement && $child->localName === $name && self::NS === $child->namespaceURI) {
                 $children[] = $child;
             }
         }
@@ -533,7 +533,7 @@ private function validateExtensions(\DOMDocument $dom, $file)
     private function loadFromExtensions(\DOMDocument $xml)
     {
         foreach ($xml->documentElement->childNodes as $node) {
-            if (!$node instanceof \DOMElement || $node->namespaceURI === self::NS) {
+            if (!$node instanceof \DOMElement || self::NS === $node->namespaceURI) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index d93891e9c8c52..ba12fdc821bc2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -192,7 +192,7 @@ private function parseDefinition($id, $service, $file)
 
         if (isset($service['factory'])) {
             if (is_string($service['factory'])) {
-                if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
+                if (false !== strpos($service['factory'], ':') && false === strpos($service['factory'], '::')) {
                     $parts = explode(':', $service['factory']);
                     $definition->setFactory(array($this->resolveServices('@'.$parts[0]), $parts[1]));
                 } else {
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index f711c02bfff83..e54dd9b9f1f91 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -969,7 +969,7 @@ protected function sibling($node, $siblingDir = 'nextSibling')
         $nodes = array();
 
         do {
-            if ($node !== $this->getNode(0) && $node->nodeType === 1) {
+            if ($node !== $this->getNode(0) && 1 === $node->nodeType) {
                 $nodes[] = $node;
             }
         } while ($node = $node->$siblingDir);
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
index 495a4a9d14a34..335406ab2460d 100644
--- a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -295,7 +295,7 @@ public function testReduce()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');
         $nodes = $crawler->reduce(function ($node, $i) {
-            return $i !== 1;
+            return 1 !== $i;
         });
         $this->assertNotSame($nodes, $crawler, '->reduce() returns a new instance of a crawler');
         $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Crawler', $nodes, '->reduce() returns a new instance of a crawler');
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index dc2816f16906b..1c5e5b1d554a7 100644
--- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -175,7 +175,7 @@ protected function lazyLoad($eventName)
                 $key = $serviceId.'.'.$method;
                 if (!isset($this->listeners[$eventName][$key])) {
                     $this->addListener($eventName, array($listener, $method), $priority);
-                } elseif ($listener !== $this->listeners[$eventName][$key]) {
+                } elseif ($this->listeners[$eventName][$key] !== $listener) {
                     parent::removeListener($eventName, array($this->listeners[$eventName][$key], $method));
                     $this->addListener($eventName, array($listener, $method), $priority);
                 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index d847dfa4b03bc..68d48a9af8f84 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -305,14 +305,14 @@ public function parseHashExpression()
     public function parsePostfixExpression($node)
     {
         $token = $this->stream->current;
-        while ($token->type == Token::PUNCTUATION_TYPE) {
+        while (Token::PUNCTUATION_TYPE == $token->type) {
             if ('.' === $token->value) {
                 $this->stream->next();
                 $token = $this->stream->current;
                 $this->stream->next();
 
                 if (
-                    $token->type !== Token::NAME_TYPE
+                    Token::NAME_TYPE !== $token->type
                     &&
                     // Operators like "not" and "matches" are valid method or property names,
                     //
@@ -325,7 +325,7 @@ public function parsePostfixExpression($node)
                     // Other types, such as STRING_TYPE and NUMBER_TYPE, can't be parsed as property nor method names.
                     //
                     // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown.
-                    ($token->type !== Token::OPERATOR_TYPE || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
+                    (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
                 ) {
                     throw new SyntaxError('Expected name', $token->cursor, $this->stream->getExpression());
                 }
diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
index 3c22fc1d46ed3..471d67a83a372 100644
--- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
@@ -84,7 +84,7 @@ public function expect($type, $value = null, $message = null)
      */
     public function isEOF()
     {
-        return $this->current->type === Token::EOF_TYPE;
+        return Token::EOF_TYPE === $this->current->type;
     }
 
     /**
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index b4f238f02bda1..02a90c996901a 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -404,7 +404,7 @@ public function makePathRelative($endPath, $startPath)
         }
 
         // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        if (count($startPathArr) === 1 && $startPathArr[0] === '') {
+        if (1 === count($startPathArr) && '' === $startPathArr[0]) {
             $depth = 0;
         } else {
             $depth = count($startPathArr) - $index;
@@ -512,7 +512,7 @@ public function isAbsolutePath($file)
     {
         return strspn($file, '/\\', 0, 1)
             || (strlen($file) > 3 && ctype_alpha($file[0])
-                && substr($file, 1, 1) === ':'
+                && ':' === substr($file, 1, 1)
                 && strspn($file, '/\\', 2, 1)
             )
             || null !== parse_url($file, PHP_URL_SCHEME)
diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
index 0fbf48ffa40f4..9f03953e5ee05 100644
--- a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
+++ b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -72,7 +72,7 @@ protected function buildFormatSorting(Command $command, $sort)
      */
     protected function canBeUsed()
     {
-        return $this->shell->getType() === Shell::TYPE_UNIX && parent::canBeUsed();
+        return Shell::TYPE_UNIX === $this->shell->getType() && parent::canBeUsed();
     }
 
     /**
diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php
index e3c404b6d73f5..531a3e2e785db 100644
--- a/src/Symfony/Component/Finder/Expression/Regex.php
+++ b/src/Symfony/Component/Finder/Expression/Regex.php
@@ -67,8 +67,8 @@ public static function create($expr)
 
             if (
                 ($start === $end && !preg_match('/[*?[:alnum:] \\\\]/', $start))
-                || ($start === '{' && $end === '}')
-                || ($start === '(' && $end === ')')
+                || ('{' === $start && '}' === $end)
+                || ('(' === $start && ')' === $end)
             ) {
                 return new self(substr($m[1], 1, -1), $m[2], $end);
             }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
index 4750f250d736c..444654a28fb61 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
@@ -58,9 +58,9 @@ public function testAccept($mode, $expected)
 
         $iterator = new SortableIterator($inner, $mode);
 
-        if ($mode === SortableIterator::SORT_BY_ACCESSED_TIME
-            || $mode === SortableIterator::SORT_BY_CHANGED_TIME
-            || $mode === SortableIterator::SORT_BY_MODIFIED_TIME
+        if (SortableIterator::SORT_BY_ACCESSED_TIME === $mode
+            || SortableIterator::SORT_BY_CHANGED_TIME === $mode
+            || SortableIterator::SORT_BY_MODIFIED_TIME === $mode
         ) {
             if ('\\' === DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
                 $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
index 89f13b6cb26e4..640af6e1ff25e 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -109,7 +109,7 @@ public function reverseTransform($values)
         foreach ($values as $i => $selected) {
             if ($selected) {
                 if (isset($choices[$i])) {
-                    return $choices[$i] === '' ? null : $choices[$i];
+                    return '' === $choices[$i] ? null : $choices[$i];
                 } elseif ($this->placeholderPresent && 'placeholder' === $i) {
                     return;
                 } else {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index bc8f64dffa6c5..ff2fa7594991e 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -90,7 +90,7 @@ public function transform($dateTime)
 
         $value = $this->getIntlDateFormatter()->format($dateTime->getTimestamp());
 
-        if (intl_get_error_code() != 0) {
+        if (0 != intl_get_error_code()) {
             throw new TransformationFailedException(intl_get_error_message());
         }
 
@@ -123,7 +123,7 @@ public function reverseTransform($value)
 
         $timestamp = $this->getIntlDateFormatter($dateOnly)->parse($value);
 
-        if (intl_get_error_code() != 0) {
+        if (0 != intl_get_error_code()) {
             throw new TransformationFailedException(intl_get_error_message());
         }
 
diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
index 034f30612df83..b232e4f3b7de8 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -101,7 +101,7 @@ public function __construct($fieldName, $tokenManager, $tokenId, $errorMessage,
     public function preSubmit(FormEvent $event)
     {
         $form = $event->getForm();
-        $postRequestSizeExceeded = $form->getConfig()->getMethod() === 'POST' && $this->serverParams->hasPostMaxSizeBeenExceeded();
+        $postRequestSizeExceeded = 'POST' === $form->getConfig()->getMethod() && $this->serverParams->hasPostMaxSizeBeenExceeded();
 
         if ($form->isRoot() && $form->getConfig()->getOption('compound') && !$postRequestSizeExceeded) {
             $data = $event->getData();
diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
index 54c96959c4881..09d578ea35d2d 100644
--- a/src/Symfony/Component/Form/ResolvedFormType.php
+++ b/src/Symfony/Component/Form/ResolvedFormType.php
@@ -202,10 +202,10 @@ public function getOptionsResolver()
 
             if (method_exists($this->innerType, 'configureOptions')) {
                 $reflector = new \ReflectionMethod($this->innerType, 'setDefaultOptions');
-                $isOldOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+                $isOldOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
                 $reflector = new \ReflectionMethod($this->innerType, 'configureOptions');
-                $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+                $isNewOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
                 if ($isOldOverwritten && !$isNewOverwritten) {
                     @trigger_error(get_class($this->innerType).': The FormTypeInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
@@ -219,10 +219,10 @@ public function getOptionsResolver()
 
                 if (method_exists($extension, 'configureOptions')) {
                     $reflector = new \ReflectionMethod($extension, 'setDefaultOptions');
-                    $isOldOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractTypeExtension';
+                    $isOldOverwritten = 'Symfony\Component\Form\AbstractTypeExtension' !== $reflector->getDeclaringClass()->getName();
 
                     $reflector = new \ReflectionMethod($extension, 'configureOptions');
-                    $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractTypeExtension';
+                    $isNewOverwritten = 'Symfony\Component\Form\AbstractTypeExtension' !== $reflector->getDeclaringClass()->getName();
 
                     if ($isOldOverwritten && !$isNewOverwritten) {
                         @trigger_error(get_class($extension).': The FormTypeExtensionInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeExtensionInterface with Symfony 3.0.', E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
index 75ddba621278f..dfb4ffaa0115b 100644
--- a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
+++ b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
@@ -35,7 +35,7 @@ protected function runTest()
         parent::runTest();
         $time = microtime(true) - $s;
 
-        if ($this->maxRunningTime != 0 && $time > $this->maxRunningTime) {
+        if (0 != $this->maxRunningTime && $time > $this->maxRunningTime) {
             $this->fail(
                 sprintf(
                     'expected running time: <= %s but was: %s',
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 411a8196cc73d..52aaacd15ac12 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -78,8 +78,8 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
             $this->fail(sprintf(
                 "Failed asserting that \n\n%s\n\nmatches exactly %s. Matches %s in \n\n%s",
                 $expression,
-                $count == 1 ? 'once' : $count.' times',
-                $nodeList->length == 1 ? 'once' : $nodeList->length.' times',
+                1 == $count ? 'once' : $count.' times',
+                1 == $nodeList->length ? 'once' : $nodeList->length.' times',
                 // strip away  and 
                 substr($dom->saveHTML(), 6, -8)
             ));
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
index dd70b23bda0da..f874e5a4390ef 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -1260,7 +1260,7 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
         // Only add it if we expect the error to come up on a different
         // level than LEVEL_0, because in this case the error would
         // (correctly) be mapped to the distraction field
-        if ($target !== self::LEVEL_0) {
+        if (self::LEVEL_0 !== $target) {
             $mapFromPath = new PropertyPath($mapFrom);
             $mapFromPrefix = $mapFromPath->isIndex(0)
                 ? '['.$mapFromPath->getElement(0).']'
@@ -1274,7 +1274,7 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
 
         $this->mapper->mapViolation($violation, $parent);
 
-        if ($target !== self::LEVEL_0) {
+        if (self::LEVEL_0 !== $target) {
             $this->assertCount(0, $distraction->getErrors(), 'distraction should not have an error, but has one');
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
index ee7d135339dcf..738d51dc48d3f 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
@@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($formFactory) {
             $form = $event->getForm();
-            $type = $form->getName() % 2 === 0 ? 'text' : 'textarea';
+            $type = 0 === $form->getName() % 2 ? 'text' : 'textarea';
             $form->add('title', $type);
         });
     }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FixedDataTransformer.php b/src/Symfony/Component/Form/Tests/Fixtures/FixedDataTransformer.php
index f7fba56c4211f..e768b1d7cfac9 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/FixedDataTransformer.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FixedDataTransformer.php
@@ -36,7 +36,7 @@ public function reverseTransform($value)
     {
         $result = array_search($value, $this->mapping, true);
 
-        if ($result === false) {
+        if (false === $result) {
             throw new TransformationFailedException(sprintf('No reverse mapping for value "%s"', $value));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
index fb54b4935a9f3..06582b677ea28 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
@@ -67,7 +67,7 @@ public static function fromString($itemValue)
 
         $lastNullAttribute = null;
         foreach ($bits as $bit) {
-            if (($start = substr($bit, 0, 1)) === ($end = substr($bit, -1)) && ($start === '"' || $start === '\'')) {
+            if (($start = substr($bit, 0, 1)) === ($end = substr($bit, -1)) && ('"' === $start || '\'' === $start)) {
                 $attributes[$lastNullAttribute] = substr($bit, 1, -1);
             } elseif ('=' === $end) {
                 $lastNullAttribute = $bit = substr($bit, 0, -1);
@@ -78,7 +78,7 @@ public static function fromString($itemValue)
             }
         }
 
-        return new self(($start = substr($value, 0, 1)) === ($end = substr($value, -1)) && ($start === '"' || $start === '\'') ? substr($value, 1, -1) : $value, $attributes);
+        return new self(($start = substr($value, 0, 1)) === ($end = substr($value, -1)) && ('"' === $start || '\'' === $start) ? substr($value, 1, -1) : $value, $attributes);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index 177b708e8f054..0cac313ddc924 100644
--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -157,7 +157,7 @@ public function setAutoEtag()
      */
     public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
     {
-        if ($filename === '') {
+        if ('' === $filename) {
             $filename = $this->file->getFilename();
         }
 
@@ -214,7 +214,7 @@ public function prepare(Request $request)
             if (false === $path) {
                 $path = $this->file->getPathname();
             }
-            if (strtolower($type) === 'x-accel-redirect') {
+            if ('x-accel-redirect' === strtolower($type)) {
                 // Do X-Accel-Mapping substitutions.
                 // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
                 foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
@@ -254,7 +254,7 @@ public function prepare(Request $request)
                     if ($start < 0 || $end > $fileSize - 1) {
                         $this->setStatusCode(416);
                         $this->headers->set('Content-Range', sprintf('bytes */%s', $fileSize));
-                    } elseif ($start !== 0 || $end !== $fileSize - 1) {
+                    } elseif (0 !== $start || $end !== $fileSize - 1) {
                         $this->maxlen = $end < $fileSize ? $end - $start + 1 : -1;
                         $this->offset = $start;
 
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
index 10837726cde5c..d32ec176cc116 100644
--- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -198,7 +198,7 @@ public function getError()
      */
     public function isValid()
     {
-        $isOk = $this->error === UPLOAD_ERR_OK;
+        $isOk = UPLOAD_ERR_OK === $this->error;
 
         return $this->test ? $isOk : $isOk && is_uploaded_file($this->getPathname());
     }
@@ -285,7 +285,7 @@ public function getErrorMessage()
         );
 
         $errorCode = $this->error;
-        $maxFilesize = $errorCode === UPLOAD_ERR_INI_SIZE ? self::getMaxFilesize() / 1024 : 0;
+        $maxFilesize = UPLOAD_ERR_INI_SIZE === $errorCode ? self::getMaxFilesize() / 1024 : 0;
         $message = isset($errors[$errorCode]) ? $errors[$errorCode] : 'The file "%s" was not uploaded due to an unknown error.';
 
         return sprintf($message, $this->getClientOriginalName(), $maxFilesize);
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
index eba603b15df01..dc6d3ec818a32 100644
--- a/src/Symfony/Component/HttpFoundation/IpUtils.php
+++ b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -75,7 +75,7 @@ public static function checkIp4($requestIp, $ip)
         if (false !== strpos($ip, '/')) {
             list($address, $netmask) = explode('/', $ip, 2);
 
-            if ($netmask === '0') {
+            if ('0' === $netmask) {
                 return self::$checkedIps[$cacheKey] = filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
             }
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 0c11adab6a92e..f1aff0f87edf7 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -427,22 +427,22 @@ public static function setFactory($callable)
     public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
     {
         $dup = clone $this;
-        if ($query !== null) {
+        if (null !== $query) {
             $dup->query = new ParameterBag($query);
         }
-        if ($request !== null) {
+        if (null !== $request) {
             $dup->request = new ParameterBag($request);
         }
-        if ($attributes !== null) {
+        if (null !== $attributes) {
             $dup->attributes = new ParameterBag($attributes);
         }
-        if ($cookies !== null) {
+        if (null !== $cookies) {
             $dup->cookies = new ParameterBag($cookies);
         }
-        if ($files !== null) {
+        if (null !== $files) {
             $dup->files = new FileBag($files);
         }
-        if ($server !== null) {
+        if (null !== $server) {
             $dup->server = new ServerBag($server);
             $dup->headers = new HeaderBag($dup->server->getHeaders());
         }
@@ -971,7 +971,7 @@ public function getPort()
         }
 
         if ($host = $this->headers->get('HOST')) {
-            if ($host[0] === '[') {
+            if ('[' === $host[0]) {
                 $pos = strpos($host, ':', strrpos($host, ']'));
             } else {
                 $pos = strrpos($host, ':');
@@ -1036,7 +1036,7 @@ public function getHttpHost()
         $scheme = $this->getScheme();
         $port = $this->getPort();
 
-        if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
+        if (('http' == $scheme && 80 == $port) || ('https' == $scheme && 443 == $port)) {
             return $this->getHost();
         }
 
@@ -1618,7 +1618,7 @@ public function getLanguages()
                     }
                 } else {
                     for ($i = 0, $max = count($codes); $i < $max; ++$i) {
-                        if ($i === 0) {
+                        if (0 === $i) {
                             $lang = strtolower($codes[0]);
                         } else {
                             $lang .= '_'.strtoupper($codes[$i]);
@@ -1713,7 +1713,7 @@ protected function prepareRequestUri()
             // IIS with ISAPI_Rewrite
             $requestUri = $this->headers->get('X_REWRITE_URL');
             $this->headers->remove('X_REWRITE_URL');
-        } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
+        } elseif ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
             // IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
             $requestUri = $this->server->get('UNENCODED_URL');
             $this->server->remove('UNENCODED_URL');
@@ -1722,7 +1722,7 @@ protected function prepareRequestUri()
             $requestUri = $this->server->get('REQUEST_URI');
             // HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path, only use URL path
             $schemeAndHttpHost = $this->getSchemeAndHttpHost();
-            if (strpos($requestUri, $schemeAndHttpHost) === 0) {
+            if (0 === strpos($requestUri, $schemeAndHttpHost)) {
                 $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
             }
         } elseif ($this->server->has('ORIG_PATH_INFO')) {
@@ -1774,7 +1774,7 @@ protected function prepareBaseUrl()
 
         // Does the baseUrl have anything in common with the request_uri?
         $requestUri = $this->getRequestUri();
-        if ($requestUri !== '' && $requestUri[0] !== '/') {
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
             $requestUri = '/'.$requestUri;
         }
 
@@ -1802,7 +1802,7 @@ protected function prepareBaseUrl()
         // If using mod_rewrite or ISAPI_Rewrite strip the script filename
         // out of baseUrl. $pos !== 0 makes sure it is not matching a value
         // from PATH_INFO or QUERY_STRING
-        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && $pos !== 0) {
+        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
             $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
         }
 
@@ -1852,7 +1852,7 @@ protected function preparePathInfo()
         if (false !== $pos = strpos($requestUri, '?')) {
             $requestUri = substr($requestUri, 0, $pos);
         }
-        if ($requestUri !== '' && $requestUri[0] !== '/') {
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
             $requestUri = '/'.$requestUri;
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index aa4f67b58bb43..076d077c7d072 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -173,6 +173,6 @@ public function matches(Request $request)
 
         // Note to future implementors: add additional checks above the
         // foreach above or else your check might not be run!
-        return count($this->ips) === 0;
+        return 0 === count($this->ips);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index 074c896ff7b3d..860906c3d88c3 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -1151,7 +1151,7 @@ public static function closeOutputBuffers($targetLevel, $flush)
         $level = count($status);
         $flags = defined('PHP_OUTPUT_HANDLER_REMOVABLE') ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
 
-        while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
+        while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || ($s['flags'] & $flags) === $flags : $s['del'])) {
             if ($flush) {
                 ob_end_flush();
             } else {
@@ -1167,7 +1167,7 @@ public static function closeOutputBuffers($targetLevel, $flush)
      */
     protected function ensureIEOverSSLCompatibility(Request $request)
     {
-        if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) == 1 && true === $request->isSecure()) {
+        if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) && true === $request->isSecure()) {
             if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {
                 $this->headers->remove('Cache-Control');
             }
diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php
index 0d38c08ac0544..19d2022ef7ddb 100644
--- a/src/Symfony/Component/HttpFoundation/ServerBag.php
+++ b/src/Symfony/Component/HttpFoundation/ServerBag.php
@@ -68,7 +68,7 @@ public function getHeaders()
                 if (0 === stripos($authorizationHeader, 'basic ')) {
                     // Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW when authorization header is basic
                     $exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2);
-                    if (count($exploded) == 2) {
+                    if (2 == count($exploded)) {
                         list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
                     }
                 } elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader, 'digest '))) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
index d797a6f23886e..7301f9528a876 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
@@ -109,7 +109,7 @@ public function remove($name)
     protected function &resolveAttributePath($name, $writeContext = false)
     {
         $array = &$this->attributes;
-        $name = (strpos($name, $this->namespaceCharacter) === 0) ? substr($name, 1) : $name;
+        $name = (0 === strpos($name, $this->namespaceCharacter)) ? substr($name, 1) : $name;
 
         // Check if there is anything to do, else return
         if (!$name) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 67a49ad6f5e2a..dfe2fee0d44be 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -103,7 +103,7 @@ public function destroy($sessionId)
     {
         $result = $this->memcached->delete($this->prefix.$sessionId);
 
-        return $result || $this->memcached->getResultCode() == \Memcached::RES_NOTFOUND;
+        return $result || \Memcached::RES_NOTFOUND == $this->memcached->getResultCode();
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
index 5a2b7a21c325e..b3f1f026a558f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
@@ -71,7 +71,7 @@ public function testGuessWithNonReadablePath()
         touch($path);
         @chmod($path, 0333);
 
-        if (substr(sprintf('%o', fileperms($path)), -4) == '0333') {
+        if ('0333' == substr(sprintf('%o', fileperms($path)), -4)) {
             $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
             MimeTypeGuesser::getInstance()->guess($path);
         } else {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index bb7a3f4800cd6..ed4224c4fd38f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1008,7 +1008,7 @@ public function testGetContentReturnsResourceWhenContentSetInConstructor()
         $req = new Request(array(), array(), array(), array(), array(), array(), 'MyContent');
         $resource = $req->getContent(true);
 
-        $this->assertTrue(is_resource($resource));
+        $this->assertInternalType('resource', $resource);
         $this->assertEquals('MyContent', stream_get_contents($resource));
     }
 
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index c4d961e68f043..bea7e1d84463e 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -210,7 +210,7 @@ public function write(Request $request, Response $response)
                 $entry[1]['vary'] = array('');
             }
 
-            if ($vary != $entry[1]['vary'][0] || !$this->requestsMatch($vary, $entry[0], $storedEnv)) {
+            if ($entry[1]['vary'][0] != $vary || !$this->requestsMatch($vary, $entry[0], $storedEnv)) {
                 $entries[] = $entry;
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 0fcbbe47fddea..4636e29908e51 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -728,7 +728,7 @@ public static function stripComments($source)
                 do {
                     $token = $tokens[++$i];
                     $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
-                } while ($token[0] !== T_END_HEREDOC);
+                } while (T_END_HEREDOC !== $token[0]);
                 $rawChunk = '';
             } elseif (T_WHITESPACE === $token[0]) {
                 if ($ignoreSpace) {
diff --git a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
index c6395bd67a2d0..dc48009ce3ba5 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
@@ -53,11 +53,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
         $result = array();
 
         foreach ($profileList as $item) {
-            if ($limit === 0) {
+            if (0 === $limit) {
                 break;
             }
 
-            if ($item == '') {
+            if ('' == $item) {
                 continue;
             }
 
@@ -119,7 +119,7 @@ public function purge()
         $profileList = explode("\n", $indexContent);
 
         foreach ($profileList as $item) {
-            if ($item == '') {
+            if ('' == $item) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
index b0e14ea456291..257ca4c68466e 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
@@ -63,11 +63,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
         $result = array();
 
         foreach ($profileList as $item) {
-            if ($limit === 0) {
+            if (0 === $limit) {
                 break;
             }
 
-            if ($item == '') {
+            if ('' == $item) {
                 continue;
             }
 
@@ -123,7 +123,7 @@ public function purge()
         $result = array();
 
         foreach ($profileList as $item) {
-            if ($item == '') {
+            if ('' == $item) {
                 continue;
             }
 
@@ -209,7 +209,7 @@ protected function getRedis()
         if (null === $this->redis) {
             $data = parse_url($this->dsn);
 
-            if (false === $data || !isset($data['scheme']) || $data['scheme'] !== 'redis' || !isset($data['host']) || !isset($data['port'])) {
+            if (false === $data || !isset($data['scheme']) || 'redis' !== $data['scheme'] || !isset($data['host']) || !isset($data['port'])) {
                 throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Redis with an invalid dsn "%s". The minimal expected format is "redis://[host]:port".', $this->dsn));
             }
 
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
index 8db6890c7c680..b3df7387c23ad 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
@@ -61,7 +61,7 @@ public function compile($sourcePath, $targetDir)
 
         exec($this->genrb.' --quiet -e UTF-8 -d '.$targetDir.' '.$sourcePath, $output, $status);
 
-        if ($status !== 0) {
+        if (0 !== $status) {
             throw new RuntimeException(sprintf(
                 'genrb failed with status %d while compiling %s to %s.',
                 $status,
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php
index 5170bb788eb88..79b4b3ad7c40d 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php
@@ -101,7 +101,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)
         if (preg_match('/GMT(?P[+-])(?P\d{2}):?(?P\d{2})/', $formattedTimeZone, $matches)) {
             $hours = (int) $matches['hours'];
             $minutes = (int) $matches['minutes'];
-            $signal = $matches['signal'] == '-' ? '+' : '-';
+            $signal = '-' == $matches['signal'] ? '+' : '-';
 
             if (0 < $minutes) {
                 throw new NotImplementedException(sprintf(
@@ -110,7 +110,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)
                 ));
             }
 
-            return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');
+            return 'Etc/GMT'.(0 !== $hours ? $signal.$hours : '');
         }
 
         throw new \InvalidArgumentException(sprintf('The GMT time zone "%s" does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.', $formattedTimeZone));
diff --git a/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
index 3193483dfe88a..59b068f0f9e61 100644
--- a/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
+++ b/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
@@ -31,7 +31,7 @@ public function __construct($methodName, $argName, $argValue, $additionalMessage
             $methodName,
             $argName,
             var_export($argValue, true),
-            $additionalMessage !== '' ? ' '.$additionalMessage.'. ' : ''
+            '' !== $additionalMessage ? ' '.$additionalMessage.'. ' : ''
         );
 
         parent::__construct($message);
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index b5aa050a4ea13..42298e48c3a49 100644
--- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -330,7 +330,7 @@ public static function create($locale = 'en', $style = null, $pattern = null)
      */
     public function formatCurrency($value, $currency)
     {
-        if ($this->style == self::DECIMAL) {
+        if (self::DECIMAL == $this->style) {
             return $this->format($value);
         }
 
@@ -369,13 +369,13 @@ public function formatCurrency($value, $currency)
     public function format($value, $type = self::TYPE_DEFAULT)
     {
         // The original NumberFormatter does not support this format type
-        if ($type == self::TYPE_CURRENCY) {
+        if (self::TYPE_CURRENCY == $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
         }
 
-        if ($this->style == self::CURRENCY) {
+        if (self::CURRENCY == $this->style) {
             throw new NotImplementedException(sprintf(
                 '%s() method does not support the formatting of currencies (instance with CURRENCY style). %s',
                 __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE
@@ -383,7 +383,7 @@ public function format($value, $type = self::TYPE_DEFAULT)
         }
 
         // Only the default type is supported.
-        if ($type != self::TYPE_DEFAULT) {
+        if (self::TYPE_DEFAULT != $type) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'type', $type, 'Only TYPE_DEFAULT is supported');
         }
 
@@ -526,7 +526,7 @@ public function parseCurrency($value, &$currency, &$position = null)
      */
     public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
     {
-        if ($type == self::TYPE_DEFAULT || $type == self::TYPE_CURRENCY) {
+        if (self::TYPE_DEFAULT == $type || self::TYPE_CURRENCY == $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -773,7 +773,7 @@ private function formatNumber($value, $precision)
      */
     private function getUninitializedPrecision($value, $precision)
     {
-        if ($this->style == self::CURRENCY) {
+        if (self::CURRENCY == $this->style) {
             return $precision;
         }
 
@@ -809,11 +809,11 @@ private function isInitializedAttribute($attr)
      */
     private function convertValueDataType($value, $type)
     {
-        if ($type == self::TYPE_DOUBLE) {
+        if (self::TYPE_DOUBLE == $type) {
             $value = (float) $value;
-        } elseif ($type == self::TYPE_INT32) {
+        } elseif (self::TYPE_INT32 == $type) {
             $value = $this->getInt32Value($value);
-        } elseif ($type == self::TYPE_INT64) {
+        } elseif (self::TYPE_INT64 == $type) {
             $value = $this->getInt64Value($value);
         }
 
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
index 3e71ed78a4234..7387e0e47d737 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
@@ -676,7 +676,7 @@ function ($currency) { return array($currency); },
      */
     public function testGetFractionDigits($currency)
     {
-        $this->assertTrue(is_numeric($this->dataProvider->getFractionDigits($currency)));
+        $this->assertInternalType('numeric', $this->dataProvider->getFractionDigits($currency));
     }
 
     /**
@@ -684,7 +684,7 @@ public function testGetFractionDigits($currency)
      */
     public function testGetRoundingIncrement($currency)
     {
-        $this->assertTrue(is_numeric($this->dataProvider->getRoundingIncrement($currency)));
+        $this->assertInternalType('numeric', $this->dataProvider->getRoundingIncrement($currency));
     }
 
     public function provideCurrenciesWithNumericEquivalent()
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
index a3f86e2b5144a..0822fb1275fcd 100644
--- a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -621,7 +621,7 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
         $this->assertSame($expected, $parsedValue, $message);
         $this->assertSame($expectedPosition, $position, $message);
 
-        if ($expected === false) {
+        if (false === $expected) {
             $errorCode = IntlGlobals::U_PARSE_ERROR;
             $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
         } else {
@@ -631,10 +631,10 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
 
         $this->assertSame($errorMessage, $this->getIntlErrorMessage());
         $this->assertSame($errorCode, $this->getIntlErrorCode());
-        $this->assertSame($errorCode !== 0, $this->isIntlFailure($this->getIntlErrorCode()));
+        $this->assertSame(0 !== $errorCode, $this->isIntlFailure($this->getIntlErrorCode()));
         $this->assertSame($errorMessage, $formatter->getErrorMessage());
         $this->assertSame($errorCode, $formatter->getErrorCode());
-        $this->assertSame($errorCode !== 0, $this->isIntlFailure($formatter->getErrorCode()));
+        $this->assertSame(0 !== $errorCode, $this->isIntlFailure($formatter->getErrorCode()));
     }
 
     public function parseProvider()
diff --git a/src/Symfony/Component/Intl/Util/SvnRepository.php b/src/Symfony/Component/Intl/Util/SvnRepository.php
index 3732cbb3920d7..9716a5425ead7 100644
--- a/src/Symfony/Component/Intl/Util/SvnRepository.php
+++ b/src/Symfony/Component/Intl/Util/SvnRepository.php
@@ -50,7 +50,7 @@ public static function download($url, $targetDir)
     {
         exec('which svn', $output, $result);
 
-        if ($result !== 0) {
+        if (0 !== $result) {
             throw new RuntimeException('The command "svn" is not installed.');
         }
 
@@ -62,7 +62,7 @@ public static function download($url, $targetDir)
 
             exec('svn checkout '.$url.' '.$targetDir, $output, $result);
 
-            if ($result !== 0) {
+            if (0 !== $result) {
                 throw new RuntimeException('The SVN checkout of '.$url.'failed.');
             }
         }
@@ -128,7 +128,7 @@ private function getSvnInfo()
 
             $svnInfo = simplexml_load_string(implode("\n", $output));
 
-            if ($result !== 0) {
+            if (0 !== $result) {
                 throw new RuntimeException('svn info failed');
             }
 
diff --git a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
index d45114696f640..fef4a8ae867b8 100644
--- a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+++ b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
@@ -45,12 +45,12 @@ public function getProcess()
 
     public function isGeneralTimeout()
     {
-        return $this->timeoutType === self::TYPE_GENERAL;
+        return self::TYPE_GENERAL === $this->timeoutType;
     }
 
     public function isIdleTimeout()
     {
-        return $this->timeoutType === self::TYPE_IDLE;
+        return self::TYPE_IDLE === $this->timeoutType;
     }
 
     public function getExceededTimeout()
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index b31230d2939e6..c3447c4eb237f 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -713,7 +713,7 @@ public function isRunning()
      */
     public function isStarted()
     {
-        return $this->status != self::STATUS_READY;
+        return self::STATUS_READY != $this->status;
     }
 
     /**
@@ -725,7 +725,7 @@ public function isTerminated()
     {
         $this->updateStatus(false);
 
-        return $this->status == self::STATUS_TERMINATED;
+        return self::STATUS_TERMINATED == $this->status;
     }
 
     /**
@@ -1187,7 +1187,7 @@ public function setEnhanceSigchildCompatibility($enhance)
      */
     public function checkTimeout()
     {
-        if ($this->status !== self::STATUS_STARTED) {
+        if (self::STATUS_STARTED !== $this->status) {
             return;
         }
 
@@ -1368,7 +1368,7 @@ private function readPipes($blocking, $close)
         $callback = $this->callback;
         foreach ($result as $type => $data) {
             if (3 !== $type) {
-                $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
+                $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data);
             } elseif (!isset($this->fallbackStatus['signaled'])) {
                 $this->fallbackStatus['exitcode'] = (int) $data;
             }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 90689c88cb8e6..3240aa7954d30 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -336,7 +336,7 @@ public function testCallbackIsExecutedForOutput()
 
         $called = false;
         $p->run(function ($type, $buffer) use (&$called) {
-            $called = $buffer === 'foo';
+            $called = 'foo' === $buffer;
         });
 
         $this->assertTrue($called, 'The callback should be executed with the output');
@@ -731,8 +731,8 @@ public function testRestart()
         // Ensure that both processed finished and the output is numeric
         $this->assertFalse($process1->isRunning());
         $this->assertFalse($process2->isRunning());
-        $this->assertTrue(is_numeric($process1->getOutput()));
-        $this->assertTrue(is_numeric($process2->getOutput()));
+        $this->assertInternalType('numeric', $process1->getOutput());
+        $this->assertInternalType('numeric', $process2->getOutput());
 
         // Ensure that restart returned a new process by check that the output is different
         $this->assertNotEquals($process1->getOutput(), $process2->getOutput());
diff --git a/src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php b/src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php
index 3bf8fa4b5e97c..20e5962d5b556 100644
--- a/src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php
+++ b/src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php
@@ -27,7 +27,7 @@ class UnexpectedTypeException extends RuntimeException
      */
     public function __construct($value, $path, $pathIndex = null)
     {
-        if (func_num_args() === 3 && $path instanceof PropertyPathInterface) {
+        if (3 === func_num_args() && $path instanceof PropertyPathInterface) {
             $message = sprintf(
                 'PropertyAccessor requires a graph of objects or arrays to operate on, '.
                 'but it found type "%s" while trying to traverse path "%s" at property "%s".',
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index aa7df8a78b5ba..881dcd0331bf9 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -225,11 +225,11 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
         $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('HEAD', $methods));
 
         if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P.*?)\$\1#', $compiledRoute->getRegex(), $m)) {
-            if ($supportsTrailingSlash && substr($m['url'], -1) === '/') {
-                $conditions[] = sprintf("rtrim(\$pathinfo, '/') === %s", var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
+            if ($supportsTrailingSlash && '/' === substr($m['url'], -1)) {
+                $conditions[] = sprintf("%s === rtrim(\$pathinfo, '/')", var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
                 $hasTrailingSlash = true;
             } else {
-                $conditions[] = sprintf('$pathinfo === %s', var_export(str_replace('\\', '', $m['url']), true));
+                $conditions[] = sprintf('%s === $pathinfo', var_export(str_replace('\\', '', $m['url']), true));
             }
         } else {
             if ($compiledRoute->getStaticPrefix() && $compiledRoute->getStaticPrefix() !== $parentPrefix) {
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
index 4ea0b8a1a3e7c..be36a1b3933ee 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -60,17 +60,17 @@ public function match($pathinfo)
         if (0 === strpos($pathinfo, '/test')) {
             if (0 === strpos($pathinfo, '/test/baz')) {
                 // baz
-                if ($pathinfo === '/test/baz') {
+                if ('/test/baz' === $pathinfo) {
                     return array('_route' => 'baz');
                 }
 
                 // baz2
-                if ($pathinfo === '/test/baz.html') {
+                if ('/test/baz.html' === $pathinfo) {
                     return array('_route' => 'baz2');
                 }
 
                 // baz3
-                if ($pathinfo === '/test/baz3/') {
+                if ('/test/baz3/' === $pathinfo) {
                     return array('_route' => 'baz3');
                 }
 
@@ -106,7 +106,7 @@ public function match($pathinfo)
         }
 
         // foofoo
-        if ($pathinfo === '/foofoo') {
+        if ('/foofoo' === $pathinfo) {
             return array (  'def' => 'test',  '_route' => 'foofoo',);
         }
 
@@ -116,7 +116,7 @@ public function match($pathinfo)
         }
 
         // space
-        if ($pathinfo === '/spa ce') {
+        if ('/spa ce' === $pathinfo) {
             return array('_route' => 'space');
         }
 
@@ -161,12 +161,12 @@ public function match($pathinfo)
             }
 
             // overridden2
-            if ($pathinfo === '/multi/new') {
+            if ('/multi/new' === $pathinfo) {
                 return array('_route' => 'overridden2');
             }
 
             // hey
-            if ($pathinfo === '/multi/hey/') {
+            if ('/multi/hey/' === $pathinfo) {
                 return array('_route' => 'hey');
             }
 
@@ -184,7 +184,7 @@ public function match($pathinfo)
 
         if (0 === strpos($pathinfo, '/aba')) {
             // ababa
-            if ($pathinfo === '/ababa') {
+            if ('/ababa' === $pathinfo) {
                 return array('_route' => 'ababa');
             }
 
@@ -199,12 +199,12 @@ public function match($pathinfo)
 
         if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route1
-            if ($pathinfo === '/route1') {
+            if ('/route1' === $pathinfo) {
                 return array('_route' => 'route1');
             }
 
             // route2
-            if ($pathinfo === '/c2/route2') {
+            if ('/c2/route2' === $pathinfo) {
                 return array('_route' => 'route2');
             }
 
@@ -212,7 +212,7 @@ public function match($pathinfo)
 
         if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
             // route3
-            if ($pathinfo === '/c2/route3') {
+            if ('/c2/route3' === $pathinfo) {
                 return array('_route' => 'route3');
             }
 
@@ -220,7 +220,7 @@ public function match($pathinfo)
 
         if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route4
-            if ($pathinfo === '/route4') {
+            if ('/route4' === $pathinfo) {
                 return array('_route' => 'route4');
             }
 
@@ -228,26 +228,26 @@ public function match($pathinfo)
 
         if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route5
-            if ($pathinfo === '/route5') {
+            if ('/route5' === $pathinfo) {
                 return array('_route' => 'route5');
             }
 
         }
 
         // route6
-        if ($pathinfo === '/route6') {
+        if ('/route6' === $pathinfo) {
             return array('_route' => 'route6');
         }
 
         if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
             if (0 === strpos($pathinfo, '/route1')) {
                 // route11
-                if ($pathinfo === '/route11') {
+                if ('/route11' === $pathinfo) {
                     return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route11')), array ());
                 }
 
                 // route12
-                if ($pathinfo === '/route12') {
+                if ('/route12' === $pathinfo) {
                     return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route12')), array (  'var1' => 'val',));
                 }
 
@@ -280,7 +280,7 @@ public function match($pathinfo)
             }
 
             // route17
-            if ($pathinfo === '/route17') {
+            if ('/route17' === $pathinfo) {
                 return array('_route' => 'route17');
             }
 
@@ -288,7 +288,7 @@ public function match($pathinfo)
 
         if (0 === strpos($pathinfo, '/a')) {
             // a
-            if ($pathinfo === '/a/a...') {
+            if ('/a/a...' === $pathinfo) {
                 return array('_route' => 'a');
             }
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
index f9d3fa2d8257b..afdba317b3def 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -60,17 +60,17 @@ public function match($pathinfo)
         if (0 === strpos($pathinfo, '/test')) {
             if (0 === strpos($pathinfo, '/test/baz')) {
                 // baz
-                if ($pathinfo === '/test/baz') {
+                if ('/test/baz' === $pathinfo) {
                     return array('_route' => 'baz');
                 }
 
                 // baz2
-                if ($pathinfo === '/test/baz.html') {
+                if ('/test/baz.html' === $pathinfo) {
                     return array('_route' => 'baz2');
                 }
 
                 // baz3
-                if (rtrim($pathinfo, '/') === '/test/baz3') {
+                if ('/test/baz3' === rtrim($pathinfo, '/')) {
                     if (substr($pathinfo, -1) !== '/') {
                         return $this->redirect($pathinfo.'/', 'baz3');
                     }
@@ -114,7 +114,7 @@ public function match($pathinfo)
         }
 
         // foofoo
-        if ($pathinfo === '/foofoo') {
+        if ('/foofoo' === $pathinfo) {
             return array (  'def' => 'test',  '_route' => 'foofoo',);
         }
 
@@ -124,7 +124,7 @@ public function match($pathinfo)
         }
 
         // space
-        if ($pathinfo === '/spa ce') {
+        if ('/spa ce' === $pathinfo) {
             return array('_route' => 'space');
         }
 
@@ -169,12 +169,12 @@ public function match($pathinfo)
             }
 
             // overridden2
-            if ($pathinfo === '/multi/new') {
+            if ('/multi/new' === $pathinfo) {
                 return array('_route' => 'overridden2');
             }
 
             // hey
-            if (rtrim($pathinfo, '/') === '/multi/hey') {
+            if ('/multi/hey' === rtrim($pathinfo, '/')) {
                 if (substr($pathinfo, -1) !== '/') {
                     return $this->redirect($pathinfo.'/', 'hey');
                 }
@@ -196,7 +196,7 @@ public function match($pathinfo)
 
         if (0 === strpos($pathinfo, '/aba')) {
             // ababa
-            if ($pathinfo === '/ababa') {
+            if ('/ababa' === $pathinfo) {
                 return array('_route' => 'ababa');
             }
 
@@ -211,12 +211,12 @@ public function match($pathinfo)
 
         if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route1
-            if ($pathinfo === '/route1') {
+            if ('/route1' === $pathinfo) {
                 return array('_route' => 'route1');
             }
 
             // route2
-            if ($pathinfo === '/c2/route2') {
+            if ('/c2/route2' === $pathinfo) {
                 return array('_route' => 'route2');
             }
 
@@ -224,7 +224,7 @@ public function match($pathinfo)
 
         if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
             // route3
-            if ($pathinfo === '/c2/route3') {
+            if ('/c2/route3' === $pathinfo) {
                 return array('_route' => 'route3');
             }
 
@@ -232,7 +232,7 @@ public function match($pathinfo)
 
         if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route4
-            if ($pathinfo === '/route4') {
+            if ('/route4' === $pathinfo) {
                 return array('_route' => 'route4');
             }
 
@@ -240,26 +240,26 @@ public function match($pathinfo)
 
         if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route5
-            if ($pathinfo === '/route5') {
+            if ('/route5' === $pathinfo) {
                 return array('_route' => 'route5');
             }
 
         }
 
         // route6
-        if ($pathinfo === '/route6') {
+        if ('/route6' === $pathinfo) {
             return array('_route' => 'route6');
         }
 
         if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
             if (0 === strpos($pathinfo, '/route1')) {
                 // route11
-                if ($pathinfo === '/route11') {
+                if ('/route11' === $pathinfo) {
                     return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route11')), array ());
                 }
 
                 // route12
-                if ($pathinfo === '/route12') {
+                if ('/route12' === $pathinfo) {
                     return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route12')), array (  'var1' => 'val',));
                 }
 
@@ -292,7 +292,7 @@ public function match($pathinfo)
             }
 
             // route17
-            if ($pathinfo === '/route17') {
+            if ('/route17' === $pathinfo) {
                 return array('_route' => 'route17');
             }
 
@@ -300,7 +300,7 @@ public function match($pathinfo)
 
         if (0 === strpos($pathinfo, '/a')) {
             // a
-            if ($pathinfo === '/a/a...') {
+            if ('/a/a...' === $pathinfo) {
                 return array('_route' => 'a');
             }
 
@@ -320,7 +320,7 @@ public function match($pathinfo)
         }
 
         // secure
-        if ($pathinfo === '/secure') {
+        if ('/secure' === $pathinfo) {
             $requiredSchemes = array (  'https' => 0,);
             if (!isset($requiredSchemes[$this->context->getScheme()])) {
                 return $this->redirect($pathinfo, 'secure', key($requiredSchemes));
@@ -330,7 +330,7 @@ public function match($pathinfo)
         }
 
         // nonsecure
-        if ($pathinfo === '/nonsecure') {
+        if ('/nonsecure' === $pathinfo) {
             $requiredSchemes = array (  'http' => 0,);
             if (!isset($requiredSchemes[$this->context->getScheme()])) {
                 return $this->redirect($pathinfo, 'nonsecure', key($requiredSchemes));
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
index d9da7b02d4b43..bc8bf513c4884 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
@@ -29,7 +29,7 @@ public function match($pathinfo)
 
         if (0 === strpos($pathinfo, '/rootprefix')) {
             // static
-            if ($pathinfo === '/rootprefix/test') {
+            if ('/rootprefix/test' === $pathinfo) {
                 return array('_route' => 'static');
             }
 
@@ -41,7 +41,7 @@ public function match($pathinfo)
         }
 
         // with-condition
-        if ($pathinfo === '/with-condition' && ($context->getMethod() == "GET")) {
+        if ('/with-condition' === $pathinfo && ($context->getMethod() == "GET")) {
             return array('_route' => 'with-condition');
         }
 
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
index ba50d48fa275e..2555c15044474 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -315,7 +315,7 @@ public function updateAcl(MutableAclInterface $acl)
 
                 foreach ($this->loadedAcls[$acl->getObjectIdentity()->getType()] as $sameTypeAcl) {
                     if (isset($sharedPropertyChanges['classAces'])) {
-                        if ($acl !== $sameTypeAcl && $classAcesProperty->getValue($sameTypeAcl) !== $sharedPropertyChanges['classAces'][0]) {
+                        if ($acl !== $sameTypeAcl && $sharedPropertyChanges['classAces'][0] !== $classAcesProperty->getValue($sameTypeAcl)) {
                             throw new ConcurrentModificationException('The "classAces" property has been modified concurrently.');
                         }
 
@@ -323,7 +323,7 @@ public function updateAcl(MutableAclInterface $acl)
                     }
 
                     if (isset($sharedPropertyChanges['classFieldAces'])) {
-                        if ($acl !== $sameTypeAcl && $classFieldAcesProperty->getValue($sameTypeAcl) !== $sharedPropertyChanges['classFieldAces'][0]) {
+                        if ($acl !== $sameTypeAcl && $sharedPropertyChanges['classFieldAces'][0] !== $classFieldAcesProperty->getValue($sameTypeAcl)) {
                             throw new ConcurrentModificationException('The "classFieldAces" property has been modified concurrently.');
                         }
 
@@ -870,7 +870,7 @@ private function updateNewFieldAceProperty($name, array $changes)
                         $classId = $this->createOrRetrieveClassId($oid->getType());
                     }
 
-                    $objectIdentityId = $name === 'classFieldAces' ? null : $ace->getAcl()->getId();
+                    $objectIdentityId = 'classFieldAces' === $name ? null : $ace->getAcl()->getId();
 
                     $this->connection->executeQuery($this->getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $i, $sid, $ace->getStrategy(), $ace->getMask(), $ace->isGranting(), $ace->isAuditSuccess(), $ace->isAuditFailure()));
                     $aceId = $this->connection->executeQuery($this->getSelectAccessControlEntryIdSql($classId, $objectIdentityId, $field, $i))->fetchColumn();
@@ -944,7 +944,7 @@ private function updateNewAceProperty($name, array $changes)
                     $classId = $this->createOrRetrieveClassId($oid->getType());
                 }
 
-                $objectIdentityId = $name === 'classAces' ? null : $ace->getAcl()->getId();
+                $objectIdentityId = 'classAces' === $name ? null : $ace->getAcl()->getId();
 
                 $this->connection->executeQuery($this->getInsertAccessControlEntrySql($classId, $objectIdentityId, null, $i, $sid, $ace->getStrategy(), $ace->getMask(), $ace->isGranting(), $ace->isAuditSuccess(), $ace->isAuditFailure()));
                 $aceId = $this->connection->executeQuery($this->getSelectAccessControlEntryIdSql($classId, $objectIdentityId, null, $i))->fetchColumn();
diff --git a/src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderBenchmarkTest.php b/src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderBenchmarkTest.php
index b5b4dab95f544..6341401c24c2a 100644
--- a/src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderBenchmarkTest.php
+++ b/src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderBenchmarkTest.php
@@ -121,7 +121,7 @@ protected function chooseClassId()
     {
         static $id = 1000;
 
-        if ($id === 1000 || ($id < 1500 && rand(0, 1))) {
+        if (1000 === $id || ($id < 1500 && rand(0, 1))) {
             $this->insertClassStmt->execute(array($id, $this->getRandomString(rand(20, 100), 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\_')));
             ++$id;
 
@@ -158,7 +158,7 @@ protected function chooseSid()
     {
         static $id = 1000;
 
-        if ($id === 1000 || ($id < 11000 && rand(0, 1))) {
+        if (1000 === $id || ($id < 11000 && rand(0, 1))) {
             $this->insertSidStmt->execute(array(
                 $id,
                 $this->getRandomString(rand(5, 30)),
@@ -193,9 +193,9 @@ protected function generateAces($classId, $objectId)
             $sids[$sid][] = $fieldName;
 
             $strategy = rand(0, 2);
-            if ($strategy === 0) {
+            if (0 === $strategy) {
                 $strategy = PermissionGrantingStrategy::ALL;
-            } elseif ($strategy === 1) {
+            } elseif (1 === $strategy) {
                 $strategy = PermissionGrantingStrategy::ANY;
             } else {
                 $strategy = PermissionGrantingStrategy::EQUAL;
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
index c18c2cbf09f0f..55c65dd7a53a7 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -172,7 +172,7 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje
             return false;
         }
 
-        if ($grant == $deny && $grant != 0) {
+        if ($grant == $deny && 0 != $grant) {
             return $this->allowIfEqualGrantedDeniedDecisions;
         }
 
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index cde4454e9be3e..6fde611aefd0e 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -91,7 +91,7 @@ public function refreshUser(UserInterface $user)
      */
     public function supportsClass($class)
     {
-        return $class === 'Symfony\Component\Security\Core\User\User';
+        return 'Symfony\Component\Security\Core\User\User' === $class;
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php
index c6397e8ca1e3b..0012d36a1fa00 100644
--- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php
+++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php
@@ -49,7 +49,7 @@ public function getLastAuthenticationError($clearSession = true)
 
         if ($request->attributes->has(Security::AUTHENTICATION_ERROR)) {
             $authenticationException = $request->attributes->get(Security::AUTHENTICATION_ERROR);
-        } elseif ($session !== null && $session->has(Security::AUTHENTICATION_ERROR)) {
+        } elseif (null !== $session && $session->has(Security::AUTHENTICATION_ERROR)) {
             $authenticationException = $session->get(Security::AUTHENTICATION_ERROR);
 
             if ($clearSession) {
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
index 56add79926d3e..1a8b4f3ced155 100644
--- a/src/Symfony/Component/Security/Http/HttpUtils.php
+++ b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -41,7 +41,7 @@ class HttpUtils
     public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null)
     {
         $this->urlGenerator = $urlGenerator;
-        if ($urlMatcher !== null && !$urlMatcher instanceof UrlMatcherInterface && !$urlMatcher instanceof RequestMatcherInterface) {
+        if (null !== $urlMatcher && !$urlMatcher instanceof UrlMatcherInterface && !$urlMatcher instanceof RequestMatcherInterface) {
             throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
         }
         $this->urlMatcher = $urlMatcher;
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index 4ab3465c66263..675afe7eed799 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -318,6 +318,6 @@ protected function isRememberMeRequested(Request $request)
             $this->logger->debug('Did not send remember-me cookie.', array('parameter' => $this->options['remember_me_parameter']));
         }
 
-        return $parameter === 'true' || $parameter === 'on' || $parameter === '1' || $parameter === 'yes' || $parameter === true;
+        return 'true' === $parameter || 'on' === $parameter || '1' === $parameter || 'yes' === $parameter || true === $parameter;
     }
 }
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index cbbbb235192d9..c294067377c27 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -72,7 +72,7 @@ protected function cancelCookie(Request $request)
 
         // Delete cookie from the tokenProvider
         if (null !== ($cookie = $request->cookies->get($this->options['name']))
-            && count($parts = $this->decodeCookie($cookie)) === 2
+            && 2 === count($parts = $this->decodeCookie($cookie))
         ) {
             list($series) = $parts;
             $this->tokenProvider->deleteTokenBySeries($series);
@@ -84,7 +84,7 @@ protected function cancelCookie(Request $request)
      */
     protected function processAutoLoginCookie(array $cookieParts, Request $request)
     {
-        if (count($cookieParts) !== 2) {
+        if (2 !== count($cookieParts)) {
             throw new AuthenticationException('The cookie is invalid.');
         }
 
diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
index d68ada5211a92..25d2bd5a4b9a8 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -32,7 +32,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
      */
     protected function processAutoLoginCookie(array $cookieParts, Request $request)
     {
-        if (count($cookieParts) !== 4) {
+        if (4 !== count($cookieParts)) {
             throw new AuthenticationException('The cookie is invalid.');
         }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index ba8edc3b17401..e3bb11caa9c87 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -283,7 +283,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
     {
         $session = new Session(new MockArraySessionStorage());
 
-        if ($original !== null) {
+        if (null !== $original) {
             $session->set('_security_session', $original);
         }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
index 42649ef5f6577..bc10698f0fb4f 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
@@ -96,7 +96,7 @@ private function getEvent($request, $response, $type = HttpKernelInterface::MAST
             ->getMock();
 
         $event->expects($this->any())->method('getRequest')->will($this->returnValue($request));
-        $event->expects($this->any())->method('isMasterRequest')->will($this->returnValue($type === HttpKernelInterface::MASTER_REQUEST));
+        $event->expects($this->any())->method('isMasterRequest')->will($this->returnValue(HttpKernelInterface::MASTER_REQUEST === $type));
         $event->expects($this->any())->method('getResponse')->will($this->returnValue($response));
 
         return $event;
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index e8a24a39d69d0..b363401f235df 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -94,10 +94,10 @@ public function decode($data, $format, array $context = array())
 
         $rootNode = null;
         foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+            if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new UnexpectedValueException('Document types are not allowed.');
             }
-            if (!$rootNode && $child->nodeType !== XML_PI_NODE) {
+            if (!$rootNode && XML_PI_NODE !== $child->nodeType) {
                 $rootNode = $child;
             }
         }
@@ -339,7 +339,7 @@ private function parseXmlValue(\DOMNode $node)
         $value = array();
 
         foreach ($node->childNodes as $subnode) {
-            if ($subnode->nodeType === XML_PI_NODE) {
+            if (XML_PI_NODE === $subnode->nodeType) {
                 continue;
             }
 
@@ -388,7 +388,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
                         $data = $this->serializer->normalize($data, $this->format, $this->context);
                     }
                     $parentNode->setAttribute($attributeName, $data);
-                } elseif ($key === '#') {
+                } elseif ('#' === $key) {
                     $append = $this->selectNodeType($parentNode, $data);
                 } elseif (is_array($data) && false === is_numeric($key)) {
                     // Is this array fully numeric keys?
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 5149d0dbc7d97..85b9c83d5247c 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -325,7 +325,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                 $paramName = $constructorParameter->name;
                 $key = $this->nameConverter ? $this->nameConverter->normalize($paramName) : $paramName;
 
-                $allowed = $allowedAttributes === false || in_array($paramName, $allowedAttributes);
+                $allowed = false === $allowedAttributes || in_array($paramName, $allowedAttributes);
                 $ignored = in_array($paramName, $this->ignoredAttributes);
                 if (method_exists($constructorParameter, 'isVariadic') && $constructorParameter->isVariadic()) {
                     if ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index a5e5dbf8484c9..2b054dfc9d9cb 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -108,7 +108,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $attribute = $this->nameConverter->denormalize($attribute);
             }
 
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
+            $allowed = false === $allowedAttributes || in_array($attribute, $allowedAttributes);
             $ignored = in_array($attribute, $this->ignoredAttributes);
 
             if ($allowed && !$ignored) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index fe1676fbf36fb..fbd771dbd76ab 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -75,10 +75,10 @@ public function normalize($object, $format = null, array $context = array())
                 ) {
                     $name = $reflMethod->getName();
 
-                    if (strpos($name, 'get') === 0 || strpos($name, 'has') === 0) {
+                    if (0 === strpos($name, 'get') || 0 === strpos($name, 'has')) {
                         // getters and hassers
                         $attributes[lcfirst(substr($name, 3))] = true;
-                    } elseif (strpos($name, 'is') === 0) {
+                    } elseif (0 === strpos($name, 'is')) {
                         // issers
                         $attributes[lcfirst(substr($name, 2))] = true;
                     }
@@ -148,7 +148,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $attribute = $this->nameConverter->denormalize($attribute);
             }
 
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
+            $allowed = false === $allowedAttributes || in_array($attribute, $allowedAttributes);
             $ignored = in_array($attribute, $this->ignoredAttributes);
 
             if ($allowed && !$ignored) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index abbc74f27c5bc..a5764244fe4cc 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -105,7 +105,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $propertyName = $this->nameConverter->denormalize($propertyName);
             }
 
-            $allowed = $allowedAttributes === false || in_array($propertyName, $allowedAttributes);
+            $allowed = false === $allowedAttributes || in_array($propertyName, $allowedAttributes);
             $ignored = in_array($propertyName, $this->ignoredAttributes);
             if ($allowed && !$ignored && $reflectionClass->hasProperty($propertyName)) {
                 $property = $reflectionClass->getProperty($propertyName);
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
index e9db23882b58f..598e76fda8bf7 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
@@ -23,12 +23,12 @@ class ScalarDummy implements NormalizableInterface, DenormalizableInterface
 
     public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array())
     {
-        return $format === 'xml' ? $this->xmlFoo : $this->foo;
+        return 'xml' === $format ? $this->xmlFoo : $this->foo;
     }
 
     public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
     {
-        if ($format === 'xml') {
+        if ('xml' === $format) {
             $this->xmlFoo = $data;
         } else {
             $this->foo = $data;
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
index 0d102a6326e6c..a190f887aa053 100644
--- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -111,10 +111,10 @@ public function isFresh(TemplateReferenceInterface $template, $time)
      */
     protected static function isAbsolutePath($file)
     {
-        if ($file[0] == '/' || $file[0] == '\\'
+        if ('/' == $file[0] || '\\' == $file[0]
             || (strlen($file) > 3 && ctype_alpha($file[0])
-                && $file[1] == ':'
-                && ($file[2] == '\\' || $file[2] == '/')
+                && ':' == $file[1]
+                && ('\\' == $file[2] || '/' == $file[2])
             )
             || null !== parse_url($file, PHP_URL_SCHEME)
         ) {
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index 3a0c80f1c91cf..50811d01aaf9f 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -96,9 +96,9 @@ private function parse($resource)
         $magic = unpack('V1', fread($stream, 4));
         $magic = hexdec(substr(dechex(current($magic)), -8));
 
-        if ($magic == self::MO_LITTLE_ENDIAN_MAGIC) {
+        if (self::MO_LITTLE_ENDIAN_MAGIC == $magic) {
             $isBigEndian = false;
-        } elseif ($magic == self::MO_BIG_ENDIAN_MAGIC) {
+        } elseif (self::MO_BIG_ENDIAN_MAGIC == $magic) {
             $isBigEndian = true;
         } else {
             throw new InvalidResourceException('MO stream content has an invalid format.');
@@ -132,7 +132,7 @@ private function parse($resource)
             fseek($stream, $offset);
             $singularId = fread($stream, $length);
 
-            if (strpos($singularId, "\000") !== false) {
+            if (false !== strpos($singularId, "\000")) {
                 list($singularId, $pluralId) = explode("\000", $singularId);
             }
 
@@ -147,7 +147,7 @@ private function parse($resource)
             fseek($stream, $offset);
             $translated = fread($stream, $length);
 
-            if (strpos($translated, "\000") !== false) {
+            if (false !== strpos($translated, "\000")) {
                 $translated = explode("\000", $translated);
             }
 
diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
index 29e898cc47ceb..c2d0ce2b99a34 100644
--- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -113,24 +113,24 @@ private function parse($resource)
         while ($line = fgets($stream)) {
             $line = trim($line);
 
-            if ($line === '') {
+            if ('' === $line) {
                 // Whitespace indicated current item is done
                 if (!in_array('fuzzy', $flags)) {
                     $this->addMessage($messages, $item);
                 }
                 $item = $defaults;
                 $flags = array();
-            } elseif (substr($line, 0, 2) === '#,') {
+            } elseif ('#,' === substr($line, 0, 2)) {
                 $flags = array_map('trim', explode(',', substr($line, 2)));
-            } elseif (substr($line, 0, 7) === 'msgid "') {
+            } elseif ('msgid "' === substr($line, 0, 7)) {
                 // We start a new msg so save previous
                 // TODO: this fails when comments or contexts are added
                 $this->addMessage($messages, $item);
                 $item = $defaults;
                 $item['ids']['singular'] = substr($line, 7, -1);
-            } elseif (substr($line, 0, 8) === 'msgstr "') {
+            } elseif ('msgstr "' === substr($line, 0, 8)) {
                 $item['translated'] = substr($line, 8, -1);
-            } elseif ($line[0] === '"') {
+            } elseif ('"' === $line[0]) {
                 $continues = isset($item['translated']) ? 'translated' : 'ids';
 
                 if (is_array($item[$continues])) {
@@ -139,9 +139,9 @@ private function parse($resource)
                 } else {
                     $item[$continues] .= substr($line, 1, -1);
                 }
-            } elseif (substr($line, 0, 14) === 'msgid_plural "') {
+            } elseif ('msgid_plural "' === substr($line, 0, 14)) {
                 $item['ids']['plural'] = substr($line, 14, -1);
-            } elseif (substr($line, 0, 7) === 'msgstr[') {
+            } elseif ('msgstr[' === substr($line, 0, 7)) {
                 $size = strpos($line, ']');
                 $item['translated'][(int) substr($line, 7, 1)] = substr($line, $size + 3, -1);
             }
diff --git a/src/Symfony/Component/Translation/Loader/QtFileLoader.php b/src/Symfony/Component/Translation/Loader/QtFileLoader.php
index 657bd6eb53ce5..22536aa866c62 100644
--- a/src/Symfony/Component/Translation/Loader/QtFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/QtFileLoader.php
@@ -50,7 +50,7 @@ public function load($resource, $locale, $domain = 'messages')
         $nodes = $xpath->evaluate('//TS/context/name[text()="'.$domain.'"]');
 
         $catalogue = new MessageCatalogue($locale);
-        if ($nodes->length == 1) {
+        if (1 == $nodes->length) {
             $translations = $nodes->item(0)->nextSibling->parentNode->parentNode->getElementsByTagName('message');
             foreach ($translations as $translation) {
                 $translationValue = (string) $translation->getElementsByTagName('translation')->item(0)->nodeValue;
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
index 09748211b13b3..847ffe3c44f76 100644
--- a/src/Symfony/Component/Translation/PluralizationRules.php
+++ b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -123,7 +123,7 @@ public static function get($number, $locale)
             case 'tk':
             case 'ur':
             case 'zu':
-                return ($number == 1) ? 0 : 1;
+                return (1 == $number) ? 0 : 1;
 
             case 'am':
             case 'bh':
@@ -138,7 +138,7 @@ public static function get($number, $locale)
             case 'xbr':
             case 'ti':
             case 'wa':
-                return (($number == 0) || ($number == 1)) ? 0 : 1;
+                return ((0 == $number) || (1 == $number)) ? 0 : 1;
 
             case 'be':
             case 'bs':
@@ -146,41 +146,41 @@ public static function get($number, $locale)
             case 'ru':
             case 'sr':
             case 'uk':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+                return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
 
             case 'cs':
             case 'sk':
-                return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
+                return (1 == $number) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
 
             case 'ga':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
+                return (1 == $number) ? 0 : ((2 == $number) ? 1 : 2);
 
             case 'lt':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+                return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
 
             case 'sl':
-                return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
+                return (1 == $number % 100) ? 0 : ((2 == $number % 100) ? 1 : (((3 == $number % 100) || (4 == $number % 100)) ? 2 : 3));
 
             case 'mk':
-                return ($number % 10 == 1) ? 0 : 1;
+                return (1 == $number % 10) ? 0 : 1;
 
             case 'mt':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
+                return (1 == $number) ? 0 : (((0 == $number) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
 
             case 'lv':
-                return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
+                return (0 == $number) ? 0 : (((1 == $number % 10) && (11 != $number % 100)) ? 1 : 2);
 
             case 'pl':
-                return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
+                return (1 == $number) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
 
             case 'cy':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
+                return (1 == $number) ? 0 : ((2 == $number) ? 1 : (((8 == $number) || (11 == $number)) ? 2 : 3));
 
             case 'ro':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
+                return (1 == $number) ? 0 : (((0 == $number) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
 
             case 'ar':
-                return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
+                return (0 == $number) ? 0 : ((1 == $number) ? 1 : ((2 == $number) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
 
             default:
                 return 0;
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 816cfd28f9f2a..a8371f01026a4 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -443,7 +443,7 @@ protected function computeFallbackLocales($locale)
             $locales[] = $fallback;
         }
 
-        if (strrchr($locale, '_') !== false) {
+        if (false !== strrchr($locale, '_')) {
             array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));
         }
 
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index fc9d8ae563448..bac99dcfcf11f 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -141,7 +141,7 @@ public function __construct($options = null)
                     $invalidOptions[] = $option;
                 }
             }
-        } elseif (null !== $options && !(is_array($options) && count($options) === 0)) {
+        } elseif (null !== $options && !(is_array($options) && 0 === count($options))) {
             $option = $this->getDefaultOption();
 
             if (null === $option) {
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
index 83cfc6e77887a..c1b11599d024d 100644
--- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -81,7 +81,7 @@ public function validate($value, Constraint $constraint)
 
             $count = count($value);
 
-            if ($constraint->min !== null && $count < $constraint->min) {
+            if (null !== $constraint->min && $count < $constraint->min) {
                 if ($this->context instanceof ExecutionContextInterface) {
                     $this->context->buildViolation($constraint->minMessage)
                         ->setParameter('{{ limit }}', $constraint->min)
@@ -99,7 +99,7 @@ public function validate($value, Constraint $constraint)
                 return;
             }
 
-            if ($constraint->max !== null && $count > $constraint->max) {
+            if (null !== $constraint->max && $count > $constraint->max) {
                 if ($this->context instanceof ExecutionContextInterface) {
                     $this->context->buildViolation($constraint->maxMessage)
                         ->setParameter('{{ limit }}', $constraint->max)
diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
index ae55366cc9f23..afb0f03e35703 100644
--- a/src/Symfony/Component/Validator/Constraints/Collection.php
+++ b/src/Symfony/Component/Validator/Constraints/Collection.php
@@ -63,7 +63,7 @@ protected function initializeNestedConstraints()
         foreach ($this->fields as $fieldName => $field) {
             // the XmlFileLoader and YamlFileLoader pass the field Optional
             // and Required constraint as an array with exactly one element
-            if (is_array($field) && count($field) == 1) {
+            if (is_array($field) && 1 == count($field)) {
                 $this->fields[$fieldName] = $field = $field[0];
             }
 
diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
index a5165e25532cd..4ff9e00c2f9be 100644
--- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
@@ -53,7 +53,7 @@ public function validate($value, Constraint $constraint)
 
         $size = @getimagesize($value);
 
-        if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
+        if (empty($size) || (0 === $size[0]) || (0 === $size[1])) {
             if ($this->context instanceof ExecutionContextInterface) {
                 $this->context->buildViolation($constraint->sizeNotDetectedMessage)
                     ->setCode(Image::SIZE_NOT_DETECTED_ERROR)
diff --git a/src/Symfony/Component/Validator/Constraints/TypeValidator.php b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
index 592f122502773..e5ae85e542d56 100644
--- a/src/Symfony/Component/Validator/Constraints/TypeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
@@ -35,7 +35,7 @@ public function validate($value, Constraint $constraint)
         }
 
         $type = strtolower($constraint->type);
-        $type = $type == 'boolean' ? 'bool' : $constraint->type;
+        $type = 'boolean' == $type ? 'bool' : $constraint->type;
         $isFunction = 'is_'.$type;
         $ctypeFunction = 'ctype_'.$type;
 
diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
index d025a560d28aa..6dcda078a418e 100644
--- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -327,7 +327,7 @@ private function validateStrict($value, Uuid $constraint)
         //   0b10xx
         // & 0b1100 (12)
         // = 0b1000 (8)
-        if ((hexdec($value[self::STRICT_VARIANT_POSITION]) & 12) !== 8) {
+        if (8 !== (hexdec($value[self::STRICT_VARIANT_POSITION]) & 12)) {
             if ($this->context instanceof ExecutionContextInterface) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
index 2ae89886c8d09..0d61e9aa4394a 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
@@ -72,9 +72,9 @@ protected function addNamespaceAlias($alias, $namespace)
      */
     protected function newConstraint($name, $options = null)
     {
-        if (strpos($name, '\\') !== false && class_exists($name)) {
+        if (false !== strpos($name, '\\') && class_exists($name)) {
             $className = (string) $name;
-        } elseif (strpos($name, ':') !== false) {
+        } elseif (false !== strpos($name, ':')) {
             list($prefix, $className) = explode(':', $name, 2);
 
             if (!isset($this->namespaces[$prefix])) {
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index d50419f624394..835837266128e 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -33,7 +33,7 @@ public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $i
             $prefix.'storage' => $c->getArrayCopy(),
         );
 
-        if ($class === 'ArrayObject') {
+        if ('ArrayObject' === $class) {
             $a = $b;
         } else {
             if (!($flags & \ArrayObject::STD_PROP_LIST)) {
diff --git a/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
index 6e98d6ecbcd78..a1c69224b9bf5 100644
--- a/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
@@ -138,7 +138,7 @@ public function testClone()
 
     public function testJsonCast()
     {
-        if (ini_get('xdebug.overload_var_dump') == 2) {
+        if (2 == ini_get('xdebug.overload_var_dump')) {
             $this->markTestSkipped('xdebug is active');
         }
 
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 06268a2bc6979..6d5ac1cd807f2 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -481,7 +481,7 @@ private static function evaluateScalar($scalar, $references = array())
             case 'false' === $scalarLower:
                 return false;
             // Optimise for returning strings.
-            case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]):
+            case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || '!' === $scalar[0] || is_numeric($scalar[0]):
                 switch (true) {
                     case 0 === strpos($scalar, '!str'):
                         return (string) substr($scalar, 5);
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 90a2f34e02123..fb3e205d29a52 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -200,7 +200,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
 
                         $data += $refValue; // array union
                     } else {
-                        if (isset($values['value']) && $values['value'] !== '') {
+                        if (isset($values['value']) && '' !== $values['value']) {
                             $value = $values['value'];
                         } else {
                             $value = $this->getNextEmbedBlock();
@@ -406,7 +406,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
             $indent = $this->getCurrentLineIndentation();
 
             // terminate all block scalars that are more indented than the current line
-            if (!empty($blockScalarIndentations) && $indent < $previousLineIndentation && trim($this->currentLine) !== '') {
+            if (!empty($blockScalarIndentations) && $indent < $previousLineIndentation && '' !== trim($this->currentLine)) {
                 foreach ($blockScalarIndentations as $key => $blockScalarIndentation) {
                     if ($blockScalarIndentation >= $this->getCurrentLineIndentation()) {
                         unset($blockScalarIndentations[$key]);
@@ -699,7 +699,7 @@ private function isCurrentLineComment()
         //checking explicitly the first char of the trim is faster than loops or strpos
         $ltrimmedLine = ltrim($this->currentLine, ' ');
 
-        return '' !== $ltrimmedLine && $ltrimmedLine[0] === '#';
+        return '' !== $ltrimmedLine && '#' === $ltrimmedLine[0];
     }
 
     private function isCurrentLineLastLineInDocument()
@@ -725,7 +725,7 @@ private function cleanup($value)
 
         // remove leading comments
         $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-        if ($count == 1) {
+        if (1 == $count) {
             // items have been removed, update the offset
             $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
             $value = $trimmedValue;
@@ -733,7 +733,7 @@ private function cleanup($value)
 
         // remove start of the document marker (---)
         $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-        if ($count == 1) {
+        if (1 == $count) {
             // items have been removed, update the offset
             $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
             $value = $trimmedValue;
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
index 6fc4e9273d50b..62901ec075d32 100644
--- a/src/Symfony/Component/Yaml/Yaml.php
+++ b/src/Symfony/Component/Yaml/Yaml.php
@@ -48,7 +48,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
     {
         // if input is a file, process it
         $file = '';
-        if (strpos($input, "\n") === false && is_file($input)) {
+        if (false === strpos($input, "\n") && is_file($input)) {
             @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
 
             if (false === is_readable($input)) {

From 4e9d1600eec7ee368df9b61cab69b672b1d27751 Mon Sep 17 00:00:00 2001
From: Dariusz 
Date: Fri, 15 Sep 2017 12:36:22 +0200
Subject: [PATCH 0835/1099] CS: recover no_break_comment

---
 .php_cs.dist                                                   | 1 -
 src/Symfony/Component/Form/Util/ServerParams.php               | 3 +++
 src/Symfony/Component/HttpFoundation/File/UploadedFile.php     | 3 +++
 .../Component/HttpKernel/DataCollector/MemoryDataCollector.php | 3 +++
 src/Symfony/Component/VarDumper/Cloner/Data.php                | 2 +-
 src/Symfony/Component/VarDumper/Dumper/CliDumper.php           | 3 ++-
 src/Symfony/Component/Yaml/Inline.php                          | 1 +
 7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 624618ab80a43..f1a3691142b6d 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -9,7 +9,6 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'no_break_comment' => false,
         'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)
diff --git a/src/Symfony/Component/Form/Util/ServerParams.php b/src/Symfony/Component/Form/Util/ServerParams.php
index b9f5aaff557d6..fc5e9dd27ad34 100644
--- a/src/Symfony/Component/Form/Util/ServerParams.php
+++ b/src/Symfony/Component/Form/Util/ServerParams.php
@@ -62,8 +62,11 @@ public function getPostMaxSize()
 
         switch (substr($iniMax, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
index d32ec176cc116..9a2d28491a1fd 100644
--- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -259,8 +259,11 @@ public static function getMaxFilesize()
 
         switch (substr($iniMax, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index 93850108444a0..b7f61f46fd19b 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -99,8 +99,11 @@ private function convertToBytes($memoryLimit)
 
         switch (substr($memoryLimit, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index cf21f0e4bcc43..9244a567e3178 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -179,7 +179,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item)
                     $item = clone $item;
                     $item->type = $item->class;
                     $item->class = $item->value;
-                    // No break;
+                    // no break
                 case Stub::TYPE_OBJECT:
                 case Stub::TYPE_RESOURCE:
                     $withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index 822736abd5561..107a2a438d35e 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -317,6 +317,7 @@ protected function dumpKey(Cursor $cursor)
                 default:
                 case Cursor::HASH_INDEXED:
                     $style = 'index';
+                    // no break
                 case Cursor::HASH_ASSOC:
                     if (is_int($key)) {
                         $this->line .= $this->style($style, $key).' => ';
@@ -327,7 +328,7 @@ protected function dumpKey(Cursor $cursor)
 
                 case Cursor::HASH_RESOURCE:
                     $key = "\0~\0".$key;
-                    // No break;
+                    // no break
                 case Cursor::HASH_OBJECT:
                     if (!isset($key[0]) || "\0" !== $key[0]) {
                         $this->line .= '+'.$bin.$this->style('public', $key).': ';
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 6d5ac1cd807f2..1dd9761e970e6 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -537,6 +537,7 @@ private static function evaluateScalar($scalar, $references = array())
 
                         return $time;
                 }
+                // no break
             default:
                 return (string) $scalar;
         }

From cdb53266b3b6349c807146c2dcd00cb57cb1588c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 15 Sep 2017 12:58:39 +0200
Subject: [PATCH 0836/1099] fix merge

---
 .../Component/Debug/Tests/Exception/FlattenExceptionTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
index fadefd49d565e..e7762bdec8edd 100644
--- a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -256,7 +256,7 @@ function () {},
 
         // assertEquals() does not like NAN values.
         $this->assertEquals($array[$i][0], 'float');
-        $this->assertNan($array[$i++][1]);
+        $this->assertTrue(is_nan($array[$i++][1]));
     }
 
     public function testRecursionInArguments()

From 4dd2e3e83762c5a4f055251f36069070924e4d6c Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Thu, 14 Sep 2017 14:40:52 +0200
Subject: [PATCH 0837/1099] Preserve URI fragment in HttpUtils::generateUri()

---
 src/Symfony/Component/Security/Http/HttpUtils.php        | 7 ++++++-
 .../Component/Security/Http/Tests/HttpUtilsTest.php      | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
index 56add79926d3e..01f56b356adaf 100644
--- a/src/Symfony/Component/Security/Http/HttpUtils.php
+++ b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -41,7 +41,7 @@ class HttpUtils
     public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null)
     {
         $this->urlGenerator = $urlGenerator;
-        if ($urlMatcher !== null && !$urlMatcher instanceof UrlMatcherInterface && !$urlMatcher instanceof RequestMatcherInterface) {
+        if (null !== $urlMatcher && !$urlMatcher instanceof UrlMatcherInterface && !$urlMatcher instanceof RequestMatcherInterface) {
             throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
         }
         $this->urlMatcher = $urlMatcher;
@@ -150,7 +150,12 @@ public function generateUri($request, $path)
         // fortunately, they all are, so we have to remove entire query string
         $position = strpos($url, '?');
         if (false !== $position) {
+            $fragment = parse_url($url, PHP_URL_FRAGMENT);
             $url = substr($url, 0, $position);
+            // fragment must be preserved
+            if ($fragment) {
+                $url .= "#$fragment";
+            }
         }
 
         return $url;
diff --git a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
index b508012665e87..457588c180529 100644
--- a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
@@ -252,6 +252,15 @@ public function testGenerateUriRemovesQueryString()
         $this->assertEquals('/foo/bar', $utils->generateUri(new Request(), 'route_name'));
     }
 
+    public function testGenerateUriPreservesFragment()
+    {
+        $utils = new HttpUtils($this->getUrlGenerator('/foo/bar?param=value#fragment'));
+        $this->assertEquals('/foo/bar#fragment', $utils->generateUri(new Request(), 'route_name'));
+
+        $utils = new HttpUtils($this->getUrlGenerator('/foo/bar#fragment'));
+        $this->assertEquals('/foo/bar#fragment', $utils->generateUri(new Request(), 'route_name'));
+    }
+
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessage You must provide a UrlGeneratorInterface instance to be able to use routes.

From 6185cb19913984c336f7aee389842bed958af73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Parmentier?=
 
Date: Tue, 1 Aug 2017 17:22:43 +0200
Subject: [PATCH 0838/1099] [Serializer][FrameworkBundle] Add a DateInterval
 normalizer

---
 .../FrameworkExtension.php                    |   8 +
 .../FrameworkExtensionTest.php                |  16 ++
 src/Symfony/Component/Serializer/CHANGELOG.md |   1 +
 .../Normalizer/DateIntervalNormalizer.php     | 106 ++++++++++++++
 .../Normalizer/DateIntervalNormalizerTest.php | 137 ++++++++++++++++++
 5 files changed, 268 insertions(+)
 create mode 100644 src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index ea6dec7fd6bd1..937fdc5dcb43c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -67,6 +67,7 @@
 use Symfony\Component\Serializer\Encoder\YamlEncoder;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
+use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
@@ -1522,6 +1523,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $definition->addTag('serializer.normalizer', array('priority' => -920));
         }
 
+        if (class_exists(DateIntervalNormalizer::class)) {
+            // Run before serializer.normalizer.object
+            $definition = $container->register('serializer.normalizer.dateinterval', DateIntervalNormalizer::class);
+            $definition->setPublic(false);
+            $definition->addTag('serializer.normalizer', array('priority' => -915));
+        }
+
         if (class_exists('Symfony\Component\Serializer\Normalizer\DateTimeNormalizer')) {
             // Run before serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.datetime', DateTimeNormalizer::class);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 991eda1ea6ac6..67be87baa8a3b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -34,6 +34,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
@@ -776,6 +777,21 @@ public function testDataUriNormalizerRegistered()
         $this->assertEquals(-920, $tag[0]['priority']);
     }
 
+    public function testDateIntervalNormalizerRegistered()
+    {
+        if (!class_exists(DateIntervalNormalizer::class)) {
+            $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');
+        }
+
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.dateinterval');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals(DateIntervalNormalizer::class, $definition->getClass());
+        $this->assertEquals(-915, $tag[0]['priority']);
+    }
+
     public function testDateTimeNormalizerRegistered()
     {
         if (!class_exists('Symfony\Component\Serializer\Normalizer\DateTimeNormalizer')) {
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 2e10bd469bab4..ef59f22499264 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * added `AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT` context option
    to disable throwing an `UnexpectedValueException` on a type mismatch
+ * added support for serializing `DateInterval` objects
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
new file mode 100644
index 0000000000000..3628cd670b499
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -0,0 +1,106 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * Normalizes an instance of {@see \DateInterval} to an interval string.
+ * Denormalizes an interval string to an instance of {@see \DateInterval}.
+ *
+ * @author Jérôme Parmentier 
+ */
+class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    const FORMAT_KEY = 'dateinterval_format';
+
+    /**
+     * @var string
+     */
+    private $format;
+
+    /**
+     * @param string $format
+     */
+    public function __construct($format = 'P%yY%mM%dDT%hH%iM%sS')
+    {
+        $this->format = $format;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @throws InvalidArgumentException
+     */
+    public function normalize($object, $format = null, array $context = array())
+    {
+        if (!$object instanceof \DateInterval) {
+            throw new InvalidArgumentException('The object must be an instance of "\DateInterval".');
+        }
+
+        $dateIntervalFormat = isset($context[self::FORMAT_KEY]) ? $context[self::FORMAT_KEY] : $this->format;
+
+        return $object->format($dateIntervalFormat);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsNormalization($data, $format = null)
+    {
+        return $data instanceof \DateInterval;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @throws InvalidArgumentException
+     * @throws UnexpectedValueException
+     */
+    public function denormalize($data, $class, $format = null, array $context = array())
+    {
+        if (!is_string($data)) {
+            throw new InvalidArgumentException(sprintf('Data expected to be a string, %s given.', gettype($data)));
+        }
+
+        if (!$this->isISO8601($data)) {
+            throw new UnexpectedValueException('Expected a valid ISO 8601 interval string.');
+        }
+
+        $dateIntervalFormat = isset($context[self::FORMAT_KEY]) ? $context[self::FORMAT_KEY] : $this->format;
+
+        $valuePattern = '/^'.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $dateIntervalFormat).'$/';
+        if (!preg_match($valuePattern, $data)) {
+            throw new UnexpectedValueException(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat));
+        }
+
+        try {
+            return new \DateInterval($data);
+        } catch (\Exception $e) {
+            throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsDenormalization($data, $type, $format = null)
+    {
+        return \DateInterval::class === $type;
+    }
+
+    private function isISO8601($string)
+    {
+        return preg_match('/^P(?=\w*(?:\d|%\w))(?:\d+Y|%[yY]Y)?(?:\d+M|%[mM]M)?(?:(?:\d+D|%[dD]D)|(?:\d+W|%[wW]W))?(?:T(?:\d+H|[hH]H)?(?:\d+M|[iI]M)?(?:\d+S|[sS]S)?)?$/', $string);
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
new file mode 100644
index 0000000000000..f6dc6c2475e53
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -0,0 +1,137 @@
+
+ */
+class DateIntervalNormalizerTest extends TestCase
+{
+    /**
+     * @var DateIntervalNormalizer
+     */
+    private $normalizer;
+
+    protected function setUp()
+    {
+        $this->normalizer = new DateIntervalNormalizer();
+    }
+
+    public function dataProviderISO()
+    {
+        $data = array(
+            array('P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'),
+            array('P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'),
+            array('P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'),
+            array('P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'),
+            array('P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'),
+            array('P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'),
+        );
+
+        return $data;
+    }
+
+    public function testSupportsNormalization()
+    {
+        $this->assertTrue($this->normalizer->supportsNormalization(new \DateInterval('P00Y00M00DT00H00M00S')));
+        $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
+    }
+
+    public function testNormalize()
+    {
+        $this->assertEquals('P0Y0M0DT0H0M0S', $this->normalizer->normalize(new \DateInterval('PT0S')));
+    }
+
+    /**
+     * @dataProvider dataProviderISO
+     */
+    public function testNormalizeUsingFormatPassedInContext($format, $output, $input)
+    {
+        $this->assertEquals($output, $this->normalizer->normalize(new \DateInterval($input), null, array(DateIntervalNormalizer::FORMAT_KEY => $format)));
+    }
+
+    /**
+     * @dataProvider dataProviderISO
+     */
+    public function testNormalizeUsingFormatPassedInConstructor($format, $output, $input)
+    {
+        $this->assertEquals($output, (new DateIntervalNormalizer($format))->normalize(new \DateInterval($input)));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The object must be an instance of "\DateInterval".
+     */
+    public function testNormalizeInvalidObjectThrowsException()
+    {
+        $this->normalizer->normalize(new \stdClass());
+    }
+
+    public function testSupportsDenormalization()
+    {
+        $this->assertTrue($this->normalizer->supportsDenormalization('P00Y00M00DT00H00M00S', \DateInterval::class));
+        $this->assertFalse($this->normalizer->supportsDenormalization('foo', 'Bar'));
+    }
+
+    public function testDenormalize()
+    {
+        $this->assertDateIntervalEquals(new \DateInterval('P00Y00M00DT00H00M00S'), $this->normalizer->denormalize('P00Y00M00DT00H00M00S', \DateInterval::class));
+    }
+
+    /**
+     * @dataProvider dataProviderISO
+     */
+    public function testDenormalizeUsingFormatPassedInContext($format, $input, $output)
+    {
+        $this->assertDateIntervalEquals(new \DateInterval($output), $this->normalizer->denormalize($input, \DateInterval::class, null, array(DateIntervalNormalizer::FORMAT_KEY => $format)));
+    }
+
+    /**
+     * @dataProvider dataProviderISO
+     */
+    public function testDenormalizeUsingFormatPassedInConstructor($format, $input, $output)
+    {
+        $this->assertDateIntervalEquals(new \DateInterval($output), (new DateIntervalNormalizer($format))->denormalize($input, \DateInterval::class));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+     */
+    public function testDenormalizeExpectsString()
+    {
+        $this->normalizer->denormalize(1234, \DateInterval::class);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+     * @expectedExceptionMessage Expected a valid ISO 8601 interval string.
+     */
+    public function testDenormalizeNonISO8601IntervalStringThrowsException()
+    {
+        $this->normalizer->denormalize('10 years 2 months 3 days', \DateInterval::class, null);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+     */
+    public function testDenormalizeInvalidDataThrowsException()
+    {
+        $this->normalizer->denormalize('invalid interval', \DateInterval::class);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+     */
+    public function testDenormalizeFormatMismatchThrowsException()
+    {
+        $this->normalizer->denormalize('P00Y00M00DT00H00M00S', \DateInterval::class, null, array(DateIntervalNormalizer::FORMAT_KEY => 'P%yY%mM%dD'));
+    }
+
+    private function assertDateIntervalEquals(\DateInterval $expected, \DateInterval $actual)
+    {
+        $this->assertEquals($expected->format('%RP%yY%mM%dDT%hH%iM%sS'), $actual->format('%RP%yY%mM%dDT%hH%iM%sS'));
+    }
+}

From 12d1a7f81064c3669368e3b2453be28769c2085f Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Wed, 13 Sep 2017 08:23:26 -0400
Subject: [PATCH 0839/1099] Display form defaults on debug:form

---
 .../Resources/config/console.xml              |  3 ++
 src/Symfony/Component/Form/CHANGELOG.md       |  5 +++
 .../Component/Form/Command/DebugCommand.php   | 40 ++++++++++++-----
 .../Form/Console/Descriptor/Descriptor.php    | 29 ++++++++++--
 .../Console/Descriptor/JsonDescriptor.php     | 10 +++++
 .../Console/Descriptor/TextDescriptor.php     | 20 +++++++++
 .../Form/DependencyInjection/FormPass.php     | 17 +++++++
 .../Form/Tests/Command/DebugCommandTest.php   |  9 ++++
 .../Descriptor/AbstractDescriptorTest.php     | 22 +++++++++
 .../Tests/Fixtures/Descriptor/defaults_1.json | 45 +++++++++++++++++++
 .../Tests/Fixtures/Descriptor/defaults_1.txt  | 27 +++++++++++
 11 files changed, 213 insertions(+), 14 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
index 80bc32d3ff221..7dc4ea6d2fbae 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -100,6 +100,9 @@
         
             
              
+             
+             
+             
             
         
     
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 1c8936995c226..8af1a324dca95 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * added `DebugCommand`
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index d646ffa154305..d9b3eee838244 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Command;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -31,13 +32,19 @@ class DebugCommand extends Command
 
     private $formRegistry;
     private $namespaces;
+    private $types;
+    private $extensions;
+    private $guessers;
 
-    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array('Symfony\Component\Form\Extension\Core\Type'))
+    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array('Symfony\Component\Form\Extension\Core\Type'), array $types = array(), array $extensions = array(), array $guessers = array())
     {
         parent::__construct();
 
         $this->formRegistry = $formRegistry;
         $this->namespaces = $namespaces;
+        $this->types = $types;
+        $this->extensions = $extensions;
+        $this->guessers = $guessers;
     }
 
     /**
@@ -47,18 +54,25 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('class', InputArgument::REQUIRED, 'The form type class'),
+                new InputArgument('class', InputArgument::OPTIONAL, 'The form type class'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt or json)', 'txt'),
             ))
             ->setDescription('Displays form type information')
             ->setHelp(<<<'EOF'
-The %command.name% command displays information about a form type.
+The %command.name% command displays information about form types.
 
-Either the fully-qualified class name or the short class name can be used:
+  php %command.full_name%
+
+The command lists all built-in types, services types, type extensions and guessers currently available.
 
   php %command.full_name% Symfony\Component\Form\Extension\Core\Type\ChoiceType
   php %command.full_name% ChoiceType
 
+The command lists all defined options that contains the given form type, as well as their parents and type extensions.
+
+  php %command.full_name% --format=json
+
+The command lists everything in a machine readable json format.
 EOF
             )
         ;
@@ -71,12 +85,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $io = new SymfonyStyle($input, $output);
 
-        if (!class_exists($class = $input->getArgument('class'))) {
-            $class = $this->getFqcnTypeClass($input, $io, $class);
+        if (null === $class = $input->getArgument('class')) {
+            $object = null;
+            $options['types'] = $this->types;
+            $options['extensions'] = $this->extensions;
+            $options['guessers'] = $this->guessers;
+        } else {
+            if (!class_exists($class)) {
+                $class = $this->getFqcnTypeClass($input, $io, $class);
+            }
+            $object = $this->formRegistry->getType($class);
         }
 
-        $object = $this->formRegistry->getType($class);
-
         $helper = new DescriptorHelper();
         $options['format'] = $input->getOption('format');
         $helper->describe($io, $object, $options);
@@ -92,13 +112,13 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shor
         }
 
         if (0 === $count = count($classes)) {
-            throw new \InvalidArgumentException(sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces)));
+            throw new InvalidArgumentException(sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces)));
         }
         if (1 === $count) {
             return $classes[0];
         }
         if (!$input->isInteractive()) {
-            throw new \InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
+            throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
         }
 
         return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\n Select one of the following form types to display its information:", $shortClassName), $classes, $classes[0]);
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index af77f19931244..c72a19d7993f1 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -12,8 +12,12 @@
 namespace Symfony\Component\Form\Console\Descriptor;
 
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\StyleInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Form\Extension\Core\CoreExtension;
+use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
 use Symfony\Component\Form\Util\OptionsResolverWrapper;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -25,9 +29,7 @@
  */
 abstract class Descriptor implements DescriptorInterface
 {
-    /**
-     * @var SymfonyStyle
-     */
+    /** @var StyleInterface */
     protected $output;
     protected $type;
     protected $ownOptions = array();
@@ -43,9 +45,12 @@ abstract class Descriptor implements DescriptorInterface
      */
     public function describe(OutputInterface $output, $object, array $options = array())
     {
-        $this->output = $output;
+        $this->output = $output instanceof StyleInterface ? $output : new SymfonyStyle(new ArrayInput(array()), $output);
 
         switch (true) {
+            case null === $object:
+                $this->describeDefaults($options);
+                break;
             case $object instanceof ResolvedFormTypeInterface:
                 $this->describeResolvedFormType($object, $options);
                 break;
@@ -54,8 +59,24 @@ public function describe(OutputInterface $output, $object, array $options = arra
         }
     }
 
+    abstract protected function describeDefaults(array $options = array());
+
     abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = array());
 
+    protected function getCoreTypes()
+    {
+        $coreExtension = new CoreExtension();
+        $coreExtensionRefObject = new \ReflectionObject($coreExtension);
+        $loadTypesRefMethod = $coreExtensionRefObject->getMethod('loadTypes');
+        $loadTypesRefMethod->setAccessible(true);
+        $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
+
+        $coreTypes = array_map(function (FormTypeInterface $type) { return get_class($type); }, $coreTypes);
+        sort($coreTypes);
+
+        return $coreTypes;
+    }
+
     protected function collectOptions(ResolvedFormTypeInterface $type)
     {
         $this->parents = array();
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index 638ea7a5ff71e..7616d616f1441 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -20,6 +20,16 @@
  */
 class JsonDescriptor extends Descriptor
 {
+    protected function describeDefaults(array $options = array())
+    {
+        $data['builtin_form_types'] = $this->getCoreTypes();
+        $data['service_form_types'] = array_values(array_diff($options['types'], $data['builtin_form_types']));
+        $data['type_extensions'] = $options['extensions'];
+        $data['type_guessers'] = $options['guessers'];
+
+        $this->writeData($data, $options);
+    }
+
     protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = array())
     {
         $this->collectOptions($resolvedFormType);
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index b12a22bb9e26a..d5072f1e9a632 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -21,6 +21,26 @@
  */
 class TextDescriptor extends Descriptor
 {
+    protected function describeDefaults(array $options = array())
+    {
+        $coreTypes = $this->getCoreTypes();
+
+        $this->output->section('Built-in form types (Symfony\Component\Form\Extension\Core\Type)');
+        $shortClassNames = array_map(function ($fqcn) { return array_slice(explode('\\', $fqcn), -1)[0]; }, $coreTypes);
+        for ($i = 0; $i * 5 < count($shortClassNames); ++$i) {
+            $this->output->writeln(' '.implode(', ', array_slice($shortClassNames, $i * 5, 5)));
+        }
+
+        $this->output->section('Service form types');
+        $this->output->listing(array_diff($options['types'], $coreTypes));
+
+        $this->output->section('Type extensions');
+        $this->output->listing($options['extensions']);
+
+        $this->output->section('Type guessers');
+        $this->output->listing($options['guessers']);
+    }
+
     protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = array())
     {
         $this->collectOptions($resolvedFormType);
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
index ff1ac8af60658..bed74532d1571 100644
--- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -77,6 +77,7 @@ private function processFormTypes(ContainerBuilder $container)
         if ($container->hasDefinition($this->formDebugCommandService)) {
             $commandDefinition = $container->getDefinition($this->formDebugCommandService);
             $commandDefinition->setArgument(1, array_keys($namespaces));
+            $commandDefinition->setArgument(2, array_keys($servicesMap));
         }
 
         return ServiceLocatorTagPass::register($container, $servicesMap);
@@ -85,6 +86,7 @@ private function processFormTypes(ContainerBuilder $container)
     private function processFormTypeExtensions(ContainerBuilder $container)
     {
         $typeExtensions = array();
+        $typeExtensionsClasses = array();
         foreach ($this->findAndSortTaggedServices($this->formTypeExtensionTag, $container) as $reference) {
             $serviceId = (string) $reference;
             $serviceDefinition = $container->getDefinition($serviceId);
@@ -97,20 +99,35 @@ private function processFormTypeExtensions(ContainerBuilder $container)
             }
 
             $typeExtensions[$extendedType][] = new Reference($serviceId);
+            $typeExtensionsClasses[] = $serviceDefinition->getClass();
         }
 
         foreach ($typeExtensions as $extendedType => $extensions) {
             $typeExtensions[$extendedType] = new IteratorArgument($extensions);
         }
 
+        if ($container->hasDefinition($this->formDebugCommandService)) {
+            $commandDefinition = $container->getDefinition($this->formDebugCommandService);
+            $commandDefinition->setArgument(3, $typeExtensionsClasses);
+        }
+
         return $typeExtensions;
     }
 
     private function processFormTypeGuessers(ContainerBuilder $container)
     {
         $guessers = array();
+        $guessersClasses = array();
         foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag, true) as $serviceId => $tags) {
             $guessers[] = new Reference($serviceId);
+
+            $serviceDefinition = $container->getDefinition($serviceId);
+            $guessersClasses[] = $serviceDefinition->getClass();
+        }
+
+        if ($container->hasDefinition($this->formDebugCommandService)) {
+            $commandDefinition = $container->getDefinition($this->formDebugCommandService);
+            $commandDefinition->setArgument(4, $guessersClasses);
         }
 
         return new IteratorArgument($guessers);
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index c2083ea12ce4d..610f6197d62cb 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -21,6 +21,15 @@
 
 class DebugCommandTest extends TestCase
 {
+    public function testDebugDefaults()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(array(), array('decorated' => false));
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertContains('Built-in form types', $tester->getDisplay());
+    }
+
     public function testDebugSingleFormType()
     {
         $tester = $this->createCommandTester();
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
index c760e5ecf972c..3a5efcefeb684 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -24,6 +24,19 @@
 
 abstract class AbstractDescriptorTest extends TestCase
 {
+    /** @dataProvider getDescribeDefaultsTestData */
+    public function testDescribeDefaults($object, array $options, $fixtureName)
+    {
+        $expectedDescription = $this->getExpectedDescription($fixtureName);
+        $describedObject = $this->getObjectDescription($object, $options);
+
+        if ('json' === $this->getFormat()) {
+            $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($describedObject), JSON_PRETTY_PRINT));
+        } else {
+            $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $describedObject)));
+        }
+    }
+
     /** @dataProvider getDescribeResolvedFormTypeTestData */
     public function testDescribeResolvedFormType(ResolvedFormTypeInterface $type, array $options, $fixtureName)
     {
@@ -37,6 +50,15 @@ public function testDescribeResolvedFormType(ResolvedFormTypeInterface $type, ar
         }
     }
 
+    public function getDescribeDefaultsTestData()
+    {
+        $options['types'] = array('Symfony\Bridge\Doctrine\Form\Type\EntityType');
+        $options['extensions'] = array('Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension');
+        $options['guessers'] = array('Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser');
+
+        yield array(null, $options, 'defaults_1');
+    }
+
     public function getDescribeResolvedFormTypeTestData()
     {
         $typeExtensions = array(
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
new file mode 100644
index 0000000000000..565c17601ed1e
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
@@ -0,0 +1,45 @@
+{
+    "builtin_form_types": [
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\BirthdayType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CheckboxType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ChoiceType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CollectionType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CountryType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CurrencyType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateIntervalType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateTimeType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\EmailType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\FileType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\HiddenType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\IntegerType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\LanguageType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\LocaleType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\MoneyType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\NumberType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\PasswordType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\PercentType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RadioType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RangeType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RepeatedType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\SearchType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextareaType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimeType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimezoneType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\UrlType"
+    ],
+    "service_form_types": [
+        "Symfony\\Bridge\\Doctrine\\Form\\Type\\EntityType"
+    ],
+    "type_extensions": [
+        "Symfony\\Component\\Form\\Extension\\Csrf\\Type\\FormTypeCsrfExtension"
+    ],
+    "type_guessers": [
+        "Symfony\\Component\\Form\\Extension\\Validator\\ValidatorTypeGuesser"
+    ]
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
new file mode 100644
index 0000000000000..dd08d5f7a64c3
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
@@ -0,0 +1,27 @@
+
+[33mBuilt-in form types (Symfony\Component\Form\Extension\Core\Type)[39m
+[33m----------------------------------------------------------------[39m
+
+ BirthdayType, ButtonType, CheckboxType, ChoiceType, CollectionType
+ CountryType, CurrencyType, DateIntervalType, DateTimeType, DateType
+ EmailType, FileType, FormType, HiddenType, IntegerType
+ LanguageType, LocaleType, MoneyType, NumberType, PasswordType
+ PercentType, RadioType, RangeType, RepeatedType, ResetType
+ SearchType, SubmitType, TextType, TextareaType, TimeType
+ TimezoneType, UrlType
+
+[33mService form types[39m
+[33m------------------[39m
+
+ * Symfony\Bridge\Doctrine\Form\Type\EntityType
+
+[33mType extensions[39m
+[33m---------------[39m
+
+ * Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension
+
+[33mType guessers[39m
+[33m-------------[39m
+
+ * Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser
+

From 15fd8631128e9d5dfb61c2cbc59e066bb1a98242 Mon Sep 17 00:00:00 2001
From: GDIBass 
Date: Fri, 15 Sep 2017 09:32:24 -0700
Subject: [PATCH 0840/1099] Updated Test name and exception name to be more
 accurate

---
 .../Component/Workflow/EventListener/GuardListener.php        | 2 +-
 .../Workflow/Tests/EventListener/GuardListenerTest.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
index 8726e4bddca47..4d1065299de05 100644
--- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -57,7 +57,7 @@ private function getVariables(GuardEvent $event)
         $token = $this->tokenStorage->getToken();
 
         if (null === $token) {
-            throw new InvalidTokenConfigurationException(sprintf('There are no token available for workflow %s', $event->getWorkflowName()));
+            throw new InvalidTokenConfigurationException(sprintf('There are no tokens available for workflow %s.', $event->getWorkflowName()));
         }
 
         if (null !== $this->roleHierarchy) {
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
index 0e2dbc13bc53d..741dcf0930579 100644
--- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
+++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -71,9 +71,9 @@ public function testWithSupportedEventAndAccept()
 
     /**
      * @expectedException \Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException
-     * @expectedExceptionMessage There are no token available for workflow unnamed
+     * @expectedExceptionMessage There are no tokens available for workflow unnamed.
      */
-    public function testWithNoTokenStorage()
+    public function testWithNoTokensInTokenStorage()
     {
         $event = $this->createEvent();
         $this->tokenStorage->setToken(null);

From 183307b741d0015abab34323c7feb0c835c07eec Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Mon, 24 Jul 2017 17:43:04 +0200
Subject: [PATCH 0841/1099] [Form] Add input  + regions options to TimezoneType

---
 UPGRADE-3.4.md                                | 32 ++++++++
 UPGRADE-4.0.md                                | 29 +++++++
 src/Symfony/Component/Form/CHANGELOG.md       |  2 +
 .../DateTimeZoneToStringTransformer.php       | 82 +++++++++++++++++++
 .../Form/Extension/Core/Type/TimezoneType.php | 49 +++++++++--
 .../DateTimeZoneToStringTransformerTest.php   | 56 +++++++++++++
 .../Extension/Core/Type/TimezoneTypeTest.php  | 27 ++++++
 7 files changed, 272 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
 create mode 100644 src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index c5def31a9603e..33147c4cc9ad1 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -74,6 +74,38 @@ Finder
    deprecated and will be removed in 4.0 as it used to fix a bug which existed
    before version 5.5.23/5.6.7.
 
+Form
+----
+
+ * Deprecated `ChoiceLoaderInterface` implementation in `TimezoneType`. Use the "choice_loader" option instead.
+
+   Before:
+   ```php
+   class MyTimezoneType extends TimezoneType
+   {
+       public function loadChoices()
+       {
+           // override the method
+       }
+   }
+   ```
+
+   After:
+   ```php
+   class MyTimezoneType extends AbstractType
+   {
+       public function. getParent()
+       {
+           return TimezoneType::class;
+       }
+
+       public function configureOptions(OptionsResolver $resolver)
+       {
+           $resolver->setDefault('choice_loader', ...); // override the option instead
+       }
+   }
+   ```
+
 FrameworkBundle
 ---------------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index e5a69675a2fa0..6c32bad70c90b 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -282,6 +282,35 @@ Form
    ));
    ```
 
+ * Removed `ChoiceLoaderInterface` implementation in `TimezoneType`. Use the "choice_loader" option instead.
+
+   Before:
+   ```php
+   class MyTimezoneType extends TimezoneType
+   {
+       public function loadChoices()
+       {
+           // override the method
+       }
+   }
+   ```
+
+   After:
+   ```php
+   class MyTimezoneType extends AbstractType
+   {
+       public function. getParent()
+       {
+           return TimezoneType::class;
+       }
+
+       public function configureOptions(OptionsResolver $resolver)
+       {
+           $resolver->setDefault('choice_loader', ...); // override the option instead
+       }
+   }
+   ```
+
 FrameworkBundle
 ---------------
 
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 8af1a324dca95..62c52a897d3f2 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,6 +5,8 @@ CHANGELOG
 -----
 
  * added `DebugCommand`
+ * deprecated `ChoiceLoaderInterface` implementation in `TimezoneType`
+ * added options "input" and "regions" to `TimezoneType`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
new file mode 100644
index 0000000000000..7e133c2e9b3b9
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
@@ -0,0 +1,82 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * Transforms between a timezone identifier string and a DateTimeZone object.
+ *
+ * @author Roland Franssen 
+ */
+class DateTimeZoneToStringTransformer implements DataTransformerInterface
+{
+    private $multiple;
+
+    public function __construct($multiple = false)
+    {
+        $this->multiple = $multiple;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function transform($dateTimeZone)
+    {
+        if (null === $dateTimeZone) {
+            return;
+        }
+
+        if ($this->multiple) {
+            if (!is_array($dateTimeZone)) {
+                throw new TransformationFailedException('Expected an array.');
+            }
+
+            return array_map(array(new self(), 'transform'), $dateTimeZone);
+        }
+
+        if (!$dateTimeZone instanceof \DateTimeZone) {
+            throw new TransformationFailedException('Expected a \DateTimeZone.');
+        }
+
+        return $dateTimeZone->getName();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reverseTransform($value)
+    {
+        if (null === $value) {
+            return;
+        }
+
+        if ($this->multiple) {
+            if (!is_array($value)) {
+                throw new TransformationFailedException('Expected an array.');
+            }
+
+            return array_map(array(new self(), 'reverseTransform'), $value);
+        }
+
+        if (!is_string($value)) {
+            throw new TransformationFailedException('Expected a string.');
+        }
+
+        try {
+            return new \DateTimeZone($value);
+        } catch (\Exception $e) {
+            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index 196c7400bbb65..0a0ea56ef9ea6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -13,7 +13,10 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -25,9 +28,21 @@ class TimezoneType extends AbstractType implements ChoiceLoaderInterface
      * The choices are generated from the ICU function \DateTimeZone::listIdentifiers().
      *
      * @var ArrayChoiceList
+     *
+     * @deprecated since version 3.4, to be removed in 4.0
      */
     private $choiceList;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        if ('datetimezone' === $options['input']) {
+            $builder->addModelTransformer(new DateTimeZoneToStringTransformer($options['multiple']));
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -41,10 +56,20 @@ public function configureOptions(OptionsResolver $resolver)
                     return null;
                 }
 
-                return $this;
+                $regions = $options['regions'];
+
+                return new CallbackChoiceLoader(function () use ($regions) {
+                    return self::getTimezones($regions);
+                });
             },
             'choice_translation_domain' => false,
+            'input' => 'string',
+            'regions' => \DateTimeZone::ALL,
         ));
+
+        $resolver->setAllowedValues('input', array('string', 'datetimezone'));
+
+        $resolver->setAllowedTypes('regions', 'int');
     }
 
     /**
@@ -65,21 +90,29 @@ public function getBlockPrefix()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since version 3.4, to be removed in 4.0
      */
     public function loadChoiceList($value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
         if (null !== $this->choiceList) {
             return $this->choiceList;
         }
 
-        return $this->choiceList = new ArrayChoiceList(self::getTimezones(), $value);
+        return $this->choiceList = new ArrayChoiceList(self::getTimezones(\DateTimeZone::ALL), $value);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since version 3.4, to be removed in 4.0
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
@@ -96,9 +129,13 @@ public function loadChoicesForValues(array $values, $value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since version 3.4, to be removed in 4.0
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {
@@ -116,13 +153,15 @@ public function loadValuesForChoices(array $choices, $value = null)
     /**
      * Returns a normalized array of timezone choices.
      *
+     * @param int $regions
+     *
      * @return array The timezone choices
      */
-    private static function getTimezones()
+    private static function getTimezones($regions)
     {
         $timezones = array();
 
-        foreach (\DateTimeZone::listIdentifiers() as $timezone) {
+        foreach (\DateTimeZone::listIdentifiers($regions) as $timezone) {
             $parts = explode('/', $timezone);
 
             if (count($parts) > 2) {
@@ -139,6 +178,6 @@ private static function getTimezones()
             $timezones[$region][str_replace('_', ' ', $name)] = $timezone;
         }
 
-        return $timezones;
+        return 1 === count($timezones) ? reset($timezones) : $timezones;
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
new file mode 100644
index 0000000000000..51442ecbf9053
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
@@ -0,0 +1,56 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer;
+use PHPUnit\Framework\TestCase;
+
+class DateTimeZoneToStringTransformerTest extends TestCase
+{
+    public function testSingle()
+    {
+        $transformer = new DateTimeZoneToStringTransformer();
+
+        $this->assertNull($transformer->transform(null));
+        $this->assertNull($transformer->reverseTransform(null));
+
+        $this->assertSame('Europe/Amsterdam', $transformer->transform(new \DateTimeZone('Europe/Amsterdam')));
+        $this->assertEquals(new \DateTimeZone('Europe/Amsterdam'), $transformer->reverseTransform('Europe/Amsterdam'));
+    }
+
+    public function testMultiple()
+    {
+        $transformer = new DateTimeZoneToStringTransformer(true);
+
+        $this->assertNull($transformer->transform(null));
+        $this->assertNull($transformer->reverseTransform(null));
+
+        $this->assertSame(array('Europe/Amsterdam'), $transformer->transform(array(new \DateTimeZone('Europe/Amsterdam'))));
+        $this->assertEquals(array(new \DateTimeZone('Europe/Amsterdam')), $transformer->reverseTransform(array('Europe/Amsterdam')));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testInvalidTimezone()
+    {
+        (new DateTimeZoneToStringTransformer())->transform(1);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testUnknownTimezone()
+    {
+        (new DateTimeZoneToStringTransformer(true))->reverseTransform(array('Foo/Bar'));
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
index 8682efed69356..51578bd6ad298 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -33,4 +33,31 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
         parent::testSubmitNull($expected, $norm, '');
     }
+
+    public function testDateTimeZoneInput()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, new \DateTimeZone('America/New_York'), array('input' => 'datetimezone'));
+
+        $this->assertSame('America/New_York', $form->createView()->vars['value']);
+
+        $form->submit('Europe/Amsterdam');
+
+        $this->assertEquals(new \DateTimeZone('Europe/Amsterdam'), $form->getData());
+
+        $form = $this->factory->create(static::TESTED_TYPE, array(new \DateTimeZone('America/New_York')), array('input' => 'datetimezone', 'multiple' => true));
+
+        $this->assertSame(array('America/New_York'), $form->createView()->vars['value']);
+
+        $form->submit(array('Europe/Amsterdam', 'Europe/Paris'));
+
+        $this->assertEquals(array(new \DateTimeZone('Europe/Amsterdam'), new \DateTimeZone('Europe/Paris')), $form->getData());
+    }
+
+    public function testFilterByRegions()
+    {
+        $choices = $this->factory->create(static::TESTED_TYPE, null, array('regions' => \DateTimeZone::EUROPE))
+            ->createView()->vars['choices'];
+
+        $this->assertContains(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'Amsterdam'), $choices, '', false, false);
+    }
 }

From b0c5cf0d9d98d893e89029ca8aafe43083831d0f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 15 Sep 2017 23:40:40 +0200
Subject: [PATCH 0842/1099] [Serializer] Add local cache to normalizers

---
 .../Normalizer/AbstractObjectNormalizer.php   |  5 +--
 .../Normalizer/ArrayDenormalizer.php          |  2 +-
 .../Normalizer/CustomNormalizer.php           | 10 ++++--
 .../Normalizer/DataUriNormalizer.php          | 14 ++++----
 .../Normalizer/DateTimeNormalizer.php         | 14 ++++----
 .../Normalizer/GetSetMethodNormalizer.php     |  5 +--
 .../Normalizer/PropertyNormalizer.php         |  6 ++--
 .../Component/Serializer/Serializer.php       | 36 +++++--------------
 8 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 5a49cfec91b41..93e85c6fe67de 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -36,6 +36,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
 
     private $propertyTypeExtractor;
     private $attributesCache = array();
+    private $cache = array();
 
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null)
     {
@@ -49,7 +50,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
      */
     public function supportsNormalization($data, $format = null)
     {
-        return is_object($data) && !$data instanceof \Traversable;
+        return \is_object($data) && !$data instanceof \Traversable;
     }
 
     /**
@@ -163,7 +164,7 @@ abstract protected function getAttributeValue($object, $attribute, $format = nul
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        return class_exists($type);
+        return isset($this->cache[$type]) ? $this->cache[$type] : $this->cache[$type] = class_exists($type);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index 7a94d59aad467..14b23d01a073f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -66,7 +66,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null/*, array $context = array()*/)
     {
-        $context = func_num_args() > 3 ? func_get_arg(3) : array();
+        $context = \func_num_args() > 3 ? func_get_arg(3) : array();
 
         return '[]' === substr($type, -2)
             && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index 688590ef02a10..fd8bbca274211 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -19,6 +19,8 @@
  */
 class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
+    private $cache = array();
+
     use SerializerAwareTrait;
 
     /**
@@ -64,10 +66,14 @@ public function supportsNormalization($data, $format = null)
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
+        if (isset($this->cache[$type])) {
+            return $this->cache[$type];
+        }
+
         if (!class_exists($type)) {
-            return false;
+            return $this->cache[$type] = false;
         }
 
-        return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
+        return $this->cache[$type] = is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index 9e5af130d03b7..66a9ed6bd8d55 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -25,6 +25,12 @@
  */
 class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
 {
+    private static $supportedTypes = array(
+        \SplFileInfo::class => true,
+        \SplFileObject::class => true,
+        File::class => true,
+    );
+
     /**
      * @var MimeTypeGuesserInterface
      */
@@ -107,13 +113,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        $supportedTypes = array(
-            \SplFileInfo::class => true,
-            \SplFileObject::class => true,
-            'Symfony\Component\HttpFoundation\File\File' => true,
-        );
-
-        return isset($supportedTypes[$type]);
+        return isset(self::$supportedTypes[$type]);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 35b0b5f0e5cd6..26fd9c6201afd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -31,6 +31,12 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
     private $format;
     private $timezone;
 
+    private static $supportedTypes = array(
+        \DateTimeInterface::class => true,
+        \DateTimeImmutable::class => true,
+        \DateTime::class => true,
+    );
+
     /**
      * @param string             $format
      * @param \DateTimeZone|null $timezone
@@ -115,13 +121,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        $supportedTypes = array(
-            \DateTimeInterface::class => true,
-            \DateTimeImmutable::class => true,
-            \DateTime::class => true,
-        );
-
-        return isset($supportedTypes[$type]);
+        return isset(self::$supportedTypes[$type]);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 3d2c0665be60f..426ae562fb730 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -35,13 +35,14 @@
 class GetSetMethodNormalizer extends AbstractObjectNormalizer
 {
     private static $setterAccessibleCache = array();
+    private $cache = array();
 
     /**
      * {@inheritdoc}
      */
     public function supportsNormalization($data, $format = null)
     {
-        return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));
+        return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**
@@ -49,7 +50,7 @@ public function supportsNormalization($data, $format = null)
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
+        return parent::supportsDenormalization($data, $type, $format) && (isset($this->cache[$type]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 9795ec4bc85e9..2d96608ff2400 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -30,12 +30,14 @@
  */
 class PropertyNormalizer extends AbstractObjectNormalizer
 {
+    private $cache = array();
+
     /**
      * {@inheritdoc}
      */
     public function supportsNormalization($data, $format = null)
     {
-        return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));
+        return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**
@@ -43,7 +45,7 @@ public function supportsNormalization($data, $format = null)
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
+        return parent::supportsDenormalization($data, $type, $format) && (isset($this->cache[$type]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index 36752465ac149..4c5cec1653ced 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -171,7 +171,15 @@ public function normalize($data, $format = null, array $context = array())
      */
     public function denormalize($data, $type, $format = null, array $context = array())
     {
-        return $this->denormalizeObject($data, $type, $format, $context);
+        if (!$this->normalizers) {
+            throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
+        }
+
+        if ($normalizer = $this->getDenormalizer($data, $type, $format, $context)) {
+            return $normalizer->denormalize($data, $type, $format, $context);
+        }
+
+        throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $type));
     }
 
     /**
@@ -269,32 +277,6 @@ final public function decode($data, $format, array $context = array())
         return $this->decoder->decode($data, $format, $context);
     }
 
-    /**
-     * Denormalizes data back into an object of the given class.
-     *
-     * @param mixed  $data    data to restore
-     * @param string $class   the expected class to instantiate
-     * @param string $format  format name, present to give the option to normalizers to act differently based on formats
-     * @param array  $context The context data for this particular denormalization
-     *
-     * @return object
-     *
-     * @throws LogicException
-     * @throws UnexpectedValueException
-     */
-    private function denormalizeObject($data, $class, $format, array $context = array())
-    {
-        if (!$this->normalizers) {
-            throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
-        }
-
-        if ($normalizer = $this->getDenormalizer($data, $class, $format, $context)) {
-            return $normalizer->denormalize($data, $class, $format, $context);
-        }
-
-        throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $class));
-    }
-
     /**
      * {@inheritdoc}
      */

From d761a7614a0226c4109525ed2d1d1754a45ec6ae Mon Sep 17 00:00:00 2001
From: Pascal Luna 
Date: Sat, 16 Sep 2017 14:21:39 +0100
Subject: [PATCH 0843/1099] Require v3.4+ of the var-dumper component

---
 src/Symfony/Bundle/DebugBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
index 7b59b82c765f6..c5224da2e45b8 100644
--- a/src/Symfony/Bundle/DebugBundle/composer.json
+++ b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/http-kernel": "~2.8|~3.0|~4.0",
         "symfony/twig-bridge": "~2.8|~3.0|~4.0",
-        "symfony/var-dumper": "~2.8|~3.0|~4.0"
+        "symfony/var-dumper": "~3.4|~4.0"
     },
     "require-dev": {
         "symfony/config": "~3.3|~4.0",

From dce1eb95ff57d306ba49d1974e78f3a5c35bb09a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sat, 16 Sep 2017 18:00:00 +0200
Subject: [PATCH 0844/1099] [Bridge\Doctrine] Add "DoctrineType::reset()"
 method

---
 src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 17010990497cb..25b0aefecfe8c 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -280,4 +280,9 @@ public function getParent()
     {
         return 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
     }
+
+    public function reset()
+    {
+        $this->choiceLoaders = array();
+    }
 }

From 2a30908bcd3dd6e25ee49c7db3e45bc73a6a8c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= 
Date: Sat, 16 Sep 2017 20:19:07 +0200
Subject: [PATCH 0845/1099] [DI] Fix decorated service merge in
 ResolveInstanceofConditionalsPass

---
 .../ResolveInstanceofConditionalsPass.php     |  1 +
 .../ResolveInstanceofConditionalsPassTest.php | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 32d7ad2911408..35ab241ef4fab 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -119,6 +119,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
             $abstract
                 ->setArguments(array())
                 ->setMethodCalls(array())
+                ->setDecoratedService(null)
                 ->setTags(array())
                 ->setAbstract(true);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index 164ab25941d64..e68e83ad9e3dc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -224,4 +224,30 @@ public function testProcessThrowsExceptionForArguments()
 
         (new ResolveInstanceofConditionalsPass())->process($container);
     }
+
+    public function testMergeReset()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('bar', self::class)
+            ->addArgument('a')
+            ->addMethodCall('setB')
+            ->setDecoratedService('foo')
+            ->addTag('t')
+            ->setInstanceofConditionals(array(
+                parent::class => (new ChildDefinition(''))->addTag('bar'),
+            ))
+        ;
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $abstract = $container->getDefinition('abstract.instanceof.bar');
+
+        $this->assertEmpty($abstract->getArguments());
+        $this->assertEmpty($abstract->getMethodCalls());
+        $this->assertNull($abstract->getDecoratedService());
+        $this->assertEmpty($abstract->getTags());
+        $this->assertTrue($abstract->isAbstract());
+    }
 }

From c388b25cbbb15297ef663bac8cd6236cce42f237 Mon Sep 17 00:00:00 2001
From: Vladimir Tsykun 
Date: Sun, 17 Sep 2017 09:12:04 +0300
Subject: [PATCH 0846/1099] [WebProfilerBundle] Added missing link to profile
 token

---
 .../Resources/views/Collector/request.html.twig                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
index 5fe45a0f4ed39..8f94f6f5f0bd3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -274,7 +274,7 @@
                         
                             {{ helper.set_handler(child.getcollector('request').controller) }}
                         
-                        (token = {{ child.token }})
+                        (token = {{ child.token }})
                     
 
                     {{ include('@WebProfiler/Profiler/bag.html.twig', { bag: child.getcollector('request').requestattributes }, with_context = false) }}

From d94b9ac3086d7776c8a7ba6f1b99e4d48f8dd09d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 17 Sep 2017 12:10:12 +0200
Subject: [PATCH 0847/1099] CS fixes

---
 .../Tests/DependencyInjection/FrameworkExtensionTest.php        | 1 +
 src/Symfony/Component/VarDumper/Cloner/Data.php                 | 1 +
 src/Symfony/Component/Yaml/Inline.php                           | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index eee6169ae15da..11795e54cb6bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1052,6 +1052,7 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
                 if (ChainAdapter::class === $parentDefinition->getClass()) {
                     break;
                 }
+                // no break
             case 'cache.adapter.filesystem':
                 $this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
                 break;
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 3adaa6e55b091..73d9b38319b8e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -247,6 +247,7 @@ public function seek($key)
                 $keys[] = Caster::PREFIX_PROTECTED.$key;
                 $keys[] = Caster::PREFIX_VIRTUAL.$key;
                 $keys[] = "\0$item->class\0$key";
+                // no break
             case Stub::TYPE_ARRAY:
             case Stub::TYPE_RESOURCE:
                 break;
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index ecf2033adfa0e..c5e7f97a588aa 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -656,11 +656,13 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                 }
 
             // Optimize for returning strings.
+            // no break
             case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || is_numeric($scalar[0]):
                 switch (true) {
                     case Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar):
                         $scalar = str_replace('_', '', (string) $scalar);
                         // omitting the break / return as integers are handled in the next case
+                        // no break
                     case ctype_digit($scalar):
                         $raw = $scalar;
                         $cast = (int) $scalar;

From 2bc11505f4c2a932101748bfbc582993c91274fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Auswo=CC=88ger?= 
Date: Thu, 6 Apr 2017 20:04:32 +0200
Subject: [PATCH 0848/1099] [Filesystem] Fixed makePathRelative

---
 .../Component/Filesystem/Filesystem.php       | 42 +++++++++----------
 .../Filesystem/Tests/FilesystemTest.php       | 12 ++++++
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index edfc1b9d46a23..ac2a1c7857030 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -358,25 +358,28 @@ public function makePathRelative($endPath, $startPath)
             $startPath = str_replace('\\', '/', $startPath);
         }
 
+        $stripDriveLetter = function ($path) {
+            if (strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {
+                return substr($path, 2);
+            }
+
+            return $path;
+        };
+
+        $endPath = $stripDriveLetter($endPath);
+        $startPath = $stripDriveLetter($startPath);
+
         // Split the paths into arrays
         $startPathArr = explode('/', trim($startPath, '/'));
         $endPathArr = explode('/', trim($endPath, '/'));
 
-        if ('/' !== $startPath[0]) {
-            array_shift($startPathArr);
-        }
-
-        if ('/' !== $endPath[0]) {
-            array_shift($endPathArr);
-        }
-
-        $normalizePathArray = function ($pathSegments) {
+        $normalizePathArray = function ($pathSegments, $absolute) {
             $result = array();
 
             foreach ($pathSegments as $segment) {
-                if ('..' === $segment) {
+                if ('..' === $segment && ($absolute || count($result))) {
                     array_pop($result);
-                } else {
+                } elseif ('.' !== $segment) {
                     $result[] = $segment;
                 }
             }
@@ -384,8 +387,8 @@ public function makePathRelative($endPath, $startPath)
             return $result;
         };
 
-        $startPathArr = $normalizePathArray($startPathArr);
-        $endPathArr = $normalizePathArray($endPathArr);
+        $startPathArr = $normalizePathArray($startPathArr, static::isAbsolutePath($startPath));
+        $endPathArr = $normalizePathArray($endPathArr, static::isAbsolutePath($endPath));
 
         // Find for which directory the common path stops
         $index = 0;
@@ -394,19 +397,14 @@ public function makePathRelative($endPath, $startPath)
         }
 
         // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        if (count($startPathArr) === 1 && $startPathArr[0] === '') {
+        if (1 === count($startPathArr) && '' === $startPathArr[0]) {
             $depth = 0;
         } else {
             $depth = count($startPathArr) - $index;
         }
 
-        // When we need to traverse from the start, and we are starting from a root path, don't add '../'
-        if ('/' === $startPath[0] && 0 === $index && 0 === $depth) {
-            $traverser = '';
-        } else {
-            // Repeated "../" for each level need to reach the common path
-            $traverser = str_repeat('../', $depth);
-        }
+        // Repeated "../" for each level need to reach the common path
+        $traverser = str_repeat('../', $depth);
 
         $endPathRemainder = implode('/', array_slice($endPathArr, $index));
 
@@ -500,7 +498,7 @@ public function isAbsolutePath($file)
     {
         return strspn($file, '/\\', 0, 1)
             || (strlen($file) > 3 && ctype_alpha($file[0])
-                && substr($file, 1, 1) === ':'
+                && ':' === substr($file, 1, 1)
                 && strspn($file, '/\\', 2, 1)
             )
             || null !== parse_url($file, PHP_URL_SCHEME)
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index ab2395cd001c0..d2058d0a01cf3 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -847,6 +847,7 @@ public function providePathsForMakePathRelative()
             array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
             array('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../'),
             array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
+            array('usr/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
             array('/aa/bb', '/aa/bb', './'),
             array('/aa/bb', '/aa/bb/', './'),
@@ -878,6 +879,17 @@ public function providePathsForMakePathRelative()
             array('C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'),
             array('C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'),
             array('C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'),
+            array('aa/bb', 'aa/cc', '../bb/'),
+            array('aa/cc', 'bb/cc', '../../aa/cc/'),
+            array('aa/bb', 'aa/./cc', '../bb/'),
+            array('aa/./bb', 'aa/cc', '../bb/'),
+            array('aa/./bb', 'aa/./cc', '../bb/'),
+            array('../../', '../../', './'),
+            array('../aa/bb/', 'aa/bb/', '../../../aa/bb/'),
+            array('../../../', '../../', '../'),
+            array('', '', './'),
+            array('', 'aa/', '../'),
+            array('aa/', '', 'aa/'),
         );
 
         if ('\\' === DIRECTORY_SEPARATOR) {

From 081c1e4f812342902b1e3bfa228b83a593074bdc Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sun, 17 Sep 2017 18:42:13 +0200
Subject: [PATCH 0849/1099] [WebProfiler] Fix z-index for pinned AJAX block

---
 .../Resources/views/Profiler/toolbar.css.twig                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index ac2e38eea1842..670dd47e1c728 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -310,6 +310,9 @@
     position: relative;
     z-index: 10002;
 }
+.sf-toolbar-block-ajax.hover .sf-toolbar-info {
+    z-index: 10001;
+}
 .sf-toolbar-block:hover .sf-toolbar-info,
 .sf-toolbar-block.hover .sf-toolbar-info {
     display: block;

From 47993a8abd833a79afbda9b9ab2aafd5e65b3242 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Sun, 17 Sep 2017 20:01:07 +0200
Subject: [PATCH 0850/1099] [Form] Remove deprecated ChoiceLoaderInterface
 implementation in TimezoneType

---
 src/Symfony/Component/Form/CHANGELOG.md       |  1 +
 .../Form/Extension/Core/Type/TimezoneType.php | 77 +------------------
 2 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index b28d44740d770..f6912fa3b80bd 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -18,6 +18,7 @@ CHANGELOG
  * removed passing a `ValueExporter` instance to the `FormDataExtractor::__construct()` method
  * removed passing guesser services ids as the fourth argument of `DependencyInjectionExtension::__construct()`
  * removed the ability to validate an unsubmitted form.
+ * removed `ChoiceLoaderInterface` implementation in `TimezoneType`
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index 1ba5a13604c65..3f1a223d371ab 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -12,27 +12,14 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class TimezoneType extends AbstractType implements ChoiceLoaderInterface
+class TimezoneType extends AbstractType
 {
-    /**
-     * Timezone loaded choice list.
-     *
-     * The choices are generated from the ICU function \DateTimeZone::listIdentifiers().
-     *
-     * @var ArrayChoiceList
-     *
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    private $choiceList;
-
     /**
      * {@inheritdoc}
      */
@@ -82,68 +69,6 @@ public function getBlockPrefix()
         return 'timezone';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    public function loadChoiceList($value = null)
-    {
-        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        if (null !== $this->choiceList) {
-            return $this->choiceList;
-        }
-
-        return $this->choiceList = new ArrayChoiceList(self::getTimezones(\DateTimeZone::ALL), $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    public function loadChoicesForValues(array $values, $value = null)
-    {
-        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        // Optimize
-        $values = array_filter($values);
-        if (empty($values)) {
-            return array();
-        }
-
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
-        return $this->loadChoiceList($value)->getChoicesForValues($values);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    public function loadValuesForChoices(array $choices, $value = null)
-    {
-        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        // Optimize
-        $choices = array_filter($choices);
-        if (empty($choices)) {
-            return array();
-        }
-
-        // If no callable is set, choices are the same as values
-        if (null === $value) {
-            return $choices;
-        }
-
-        return $this->loadChoiceList($value)->getValuesForChoices($choices);
-    }
-
     /**
      * Returns a normalized array of timezone choices.
      *

From 893df5804e82150dc6b3a3b32f53a7e93642e58e Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Thu, 14 Sep 2017 14:29:42 +0200
Subject: [PATCH 0851/1099] deprecate relative paths in makePathRelative()

---
 UPGRADE-3.4.md                                         |  1 +
 UPGRADE-4.0.md                                         |  1 +
 src/Symfony/Component/Filesystem/CHANGELOG.md          |  1 +
 src/Symfony/Component/Filesystem/Filesystem.php        |  6 +++++-
 .../Component/Filesystem/Tests/FilesystemTest.php      | 10 +++++++++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 33147c4cc9ad1..7c575cfc2d436 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -66,6 +66,7 @@ Filesystem
  * The `Symfony\Component\Filesystem\LockHandler` class has been deprecated,
    use the `Symfony\Component\Lock\Store\FlockStore` class
    or the `Symfony\Component\Lock\Store\FlockStore\SemaphoreStore` class directly instead.
+ * Support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0.
 
 Finder
 ------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 6c32bad70c90b..983c7f72fbe93 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -200,6 +200,7 @@ Filesystem
  * The `Symfony\Component\Filesystem\LockHandler` has been removed,
    use the `Symfony\Component\Lock\Store\FlockStore` class
    or  the `Symfony\Component\Lock\Store\FlockStore\SemaphoreStore` class directly instead.
+ * Support for passing relative paths to `Filesystem::makePathRelative()` has been removed.
 
 Finder
 ------
diff --git a/src/Symfony/Component/Filesystem/CHANGELOG.md b/src/Symfony/Component/Filesystem/CHANGELOG.md
index 4a275e86f0cad..ba3eff0f0d1e4 100644
--- a/src/Symfony/Component/Filesystem/CHANGELOG.md
+++ b/src/Symfony/Component/Filesystem/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `appendToFile()` to append contents to existing files
+ * support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0
 
 3.2.0
 -----
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 2e742d532a641..2548c196463c5 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -446,6 +446,10 @@ public function readlink($path, $canonicalize = false)
      */
     public function makePathRelative($endPath, $startPath)
     {
+        if (!$this->isAbsolutePath($endPath) || !$this->isAbsolutePath($startPath)) {
+            @trigger_error(sprintf('Support for passing relative paths to %s() is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         // Normalize separators on Windows
         if ('\\' === DIRECTORY_SEPARATOR) {
             $endPath = str_replace('\\', '/', $endPath);
@@ -596,7 +600,7 @@ public function isAbsolutePath($file)
     {
         return strspn($file, '/\\', 0, 1)
             || (strlen($file) > 3 && ctype_alpha($file[0])
-                && ':' === substr($file, 1, 1)
+                && ':' === $file[1]
                 && strspn($file, '/\\', 2, 1)
             )
             || null !== parse_url($file, PHP_URL_SCHEME)
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 4420e8fb855c3..9b6da0d66d53d 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1103,7 +1103,6 @@ public function providePathsForMakePathRelative()
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'),
             array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
             array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
-            array('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../'),
             array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
             array('/aa/bb', '/aa/bb', './'),
@@ -1145,6 +1144,15 @@ public function providePathsForMakePathRelative()
         return $paths;
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Support for passing relative paths to Symfony\Component\Filesystem\Filesystem::makePathRelative() is deprecated since version 3.4 and will be removed in 4.0.
+     */
+    public function testMakePathRelativeWithRelativePaths()
+    {
+        $this->assertSame('../../../', $this->filesystem->makePathRelative('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component'));
+    }
+
     public function testMirrorCopiesFilesAndDirectoriesRecursively()
     {
         $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;

From cde5a47e8fb587f447403546e554f913427086ec Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sun, 17 Sep 2017 11:49:29 +0200
Subject: [PATCH 0852/1099] [Validator] Clarify UUID validator behavior

---
 .../Component/Validator/Constraints/UuidValidator.php     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
index 6dcda078a418e..6bbef2d05fbe7 100644
--- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -18,13 +18,19 @@
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
- * Validates whether the value is a valid UUID per RFC 4122.
+ * Validates whether the value is a valid UUID (also known as GUID).
+ *
+ * Strict validation will allow a UUID as specified per RFC 4122.
+ * Loose validation will allow any type of UUID.
+ *
+ * For better compatibility, both loose and strict, you should consider using a specialized UUID library like "ramsey/uuid" instead.
  *
  * @author Colin O'Dell 
  * @author Bernhard Schussek 
  *
  * @see http://tools.ietf.org/html/rfc4122
  * @see https://en.wikipedia.org/wiki/Universally_unique_identifier
+ * @see https://github.com/ramsey/uuid
  */
 class UuidValidator extends ConstraintValidator
 {

From e39e7a4fa9ba81c4a364b10f66c2cbf73067f54e Mon Sep 17 00:00:00 2001
From: HeahDude 
Date: Sun, 30 Jul 2017 18:55:50 +0200
Subject: [PATCH 0853/1099] [Form] Fixed GroupSequence with "constraints"
 option

---
 .../Validator/Constraints/FormValidator.php   | 40 ++++++++++++++-----
 .../Constraints/FormValidatorTest.php         |  5 ++-
 .../Type/FormTypeValidatorExtensionTest.php   | 31 +++++++++++++-
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index b5a06156c0db4..3bf57df048c60 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -65,18 +65,38 @@ public function validate($form, Constraint $constraint)
             // Validate the data against the constraints defined
             // in the form
             $constraints = $config->getOption('constraints', array());
-            foreach ($constraints as $constraint) {
-                foreach ($groups as $group) {
-                    if (in_array($group, $constraint->groups)) {
-                        if ($validator) {
-                            $validator->atPath('data')->validate($form->getData(), $constraint, $group);
-                        } else {
-                            // 2.4 API
-                            $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+
+            if ($groups instanceof GroupSequence) {
+                if ($validator) {
+                    $validator->atPath('data')->validate($form->getData(), $constraints, $groups);
+                } else {
+                    // 2.4 API
+                    foreach ($groups as $group) {
+                        foreach ($constraints as $constraint) {
+                            if (in_array($group, $constraint->groups)) {
+                                $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+                            }
                         }
 
-                        // Prevent duplicate validation
-                        continue 2;
+                        if (count($this->context->getViolations()) > 0) {
+                            break;
+                        }
+                    }
+                }
+            } else {
+                foreach ($constraints as $constraint) {
+                    foreach ($groups as $group) {
+                        if (in_array($group, $constraint->groups)) {
+                            if ($validator) {
+                                $validator->atPath('data')->validate($form->getData(), $constraint, $group);
+                            } else {
+                                // 2.4 API
+                                $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+                            }
+
+                            // Prevent duplicate validation
+                            continue 2;
+                        }
                     }
                 }
             }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index 8cd2dabc023e9..78015b504940b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -342,7 +342,7 @@ function () { throw new TransformationFailedException(); }
         $this->assertNoViolation();
     }
 
-    public function testHandleCallbackValidationGroups()
+    public function testHandleGroupSequenceValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
         $options = array('validation_groups' => new GroupSequence(array('group1', 'group2')));
@@ -351,13 +351,14 @@ public function testHandleCallbackValidationGroups()
             ->getForm();
 
         $this->expectValidateAt(0, 'data', $object, new GroupSequence(array('group1', 'group2')));
+        $this->expectValidateAt(1, 'data', $object, new GroupSequence(array('group1', 'group2')));
 
         $this->validator->validate($form, new Form());
 
         $this->assertNoViolation();
     }
 
-    public function testHandleGroupSequenceValidationGroups()
+    public function testHandleCallbackValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
         $options = array('validation_groups' => array($this, 'getValidationGroups'));
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
index 79e4dc78f7ac6..e0de1c1ff82db 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -12,14 +12,22 @@
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
 use Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension;
+use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+use Symfony\Component\Form\Forms;
+use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
+use Symfony\Component\Form\Tests\Extension\Core\Type\TextTypeTest;
+use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\Constraints\GroupSequence;
+use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Validation;
 
 class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
     public function testSubmitValidatesData()
     {
         $builder = $this->factory->createBuilder(
-            'form',
+            FormTypeTest::TESTED_TYPE,
             null,
             array(
                 'validation_groups' => 'group',
@@ -63,8 +71,27 @@ public function testInvalidValidatorInterface()
         new FormTypeValidatorExtension(null);
     }
 
+    public function testGroupSequenceWithConstraintsOption()
+    {
+        $form = Forms::createFormFactoryBuilder()
+            ->addExtension(new ValidatorExtension(Validation::createValidator()))
+            ->getFormFactory()
+            ->create(FormTypeTest::TESTED_TYPE, null, (array('validation_groups' => new GroupSequence(array('First', 'Second')))))
+            ->add('field', TextTypeTest::TESTED_TYPE, array(
+                'constraints' => array(
+                    new Length(array('min' => 10, 'groups' => array('First'))),
+                    new Email(array('groups' => array('Second'))),
+                ),
+            ))
+        ;
+
+        $form->submit(array('field' => 'wrong'));
+
+        $this->assertCount(1, $form->getErrors(true));
+    }
+
     protected function createForm(array $options = array())
     {
-        return $this->factory->create('form', null, $options);
+        return $this->factory->create(FormTypeTest::TESTED_TYPE, null, $options);
     }
 }

From 3da645efed0d564bdeb5d4c519eee2d848445c39 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 18 Sep 2017 17:50:14 +0200
Subject: [PATCH 0854/1099] [DI] remove confusing code

---
 .../Compiler/ResolveParameterPlaceHoldersPass.php               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
index a35f84cbe4a80..905549897f8ba 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -64,7 +64,7 @@ public function process(ContainerBuilder $container)
 
         $aliases = array();
         foreach ($container->getAliases() as $name => $target) {
-            $aliases[$parameterBag->resolveValue($name)] = $parameterBag->resolveValue($target);
+            $aliases[$parameterBag->resolveValue($name)] = $target;
         }
         $container->setAliases($aliases);
 

From 9948b09c6d356f363def065a300eafb4ca56f5a3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 17 Sep 2017 11:49:41 +0200
Subject: [PATCH 0855/1099] [DI] Turn services and aliases private by default,
 with BC layer

---
 UPGRADE-3.4.md                                | 11 +--
 UPGRADE-4.0.md                                | 15 +++--
 .../Tests/LazyProxy/Dumper/PhpDumperTest.php  |  2 +-
 .../FrameworkExtension.php                    |  6 +-
 .../Kernel/MicroKernelTrait.php               |  1 +
 .../Functional/app/AutowiringTypes/config.yml |  1 +
 .../Functional/app/ContainerDebug/config.yml  |  1 +
 .../Functional/app/Serializer/config.yml      |  1 +
 .../Tests/Kernel/ConcreteMicroKernel.php      |  2 +-
 .../DependencyInjection/SecurityExtension.php |  2 +-
 .../Tests/Functional/app/Acl/config.yml       |  1 +
 .../Functional/app/AutowiringTypes/config.yml |  1 +
 .../AddConsoleCommandPass.php                 |  5 +-
 src/Symfony/Component/Console/composer.json   |  4 +-
 .../Component/DependencyInjection/Alias.php   |  4 +-
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/AutoAliasServicePass.php         |  2 +-
 .../Compiler/CheckDefinitionValidityPass.php  |  2 +-
 .../Compiler/DecoratorServicePass.php         |  2 +-
 .../Compiler/RegisterEnvVarProcessorsPass.php |  1 +
 .../ReplaceAliasByActualDefinitionPass.php    |  2 +-
 .../Compiler/ResolveChildDefinitionsPass.php  |  2 +
 .../ResolveReferencesToAliasesPass.php        |  2 +-
 .../DependencyInjection/Definition.php        |  3 +-
 .../DependencyInjection/Dumper/XmlDumper.php  |  8 +--
 .../DependencyInjection/Dumper/YamlDumper.php |  8 +--
 .../Loader/XmlFileLoader.php                  |  7 +-
 .../Loader/YamlFileLoader.php                 | 14 ++--
 .../ResolveChildDefinitionsPassTest.php       |  4 +-
 .../Tests/Dumper/PhpDumperTest.php            | 67 ++++++++++++-------
 .../Tests/Dumper/XmlDumperTest.php            | 10 +--
 .../Tests/Dumper/YamlDumperTest.php           |  3 +-
 .../Tests/Fixtures/containers/container10.php |  1 +
 .../Tests/Fixtures/containers/container11.php |  1 +
 .../Tests/Fixtures/containers/container12.php |  1 +
 .../Tests/Fixtures/containers/container13.php |  2 +
 .../Tests/Fixtures/containers/container15.php |  1 +
 .../Tests/Fixtures/containers/container16.php |  1 +
 .../Tests/Fixtures/containers/container17.php |  1 +
 .../Tests/Fixtures/containers/container19.php |  2 +
 .../Tests/Fixtures/containers/container21.php |  1 +
 .../Tests/Fixtures/containers/container24.php |  1 +
 .../Tests/Fixtures/containers/container33.php |  4 +-
 .../Tests/Fixtures/containers/container9.php  | 24 ++++++-
 .../containers/container_abstract.php         |  1 +
 .../container_uninitialized_ref.php           |  3 +
 .../Tests/Fixtures/php/services1-1.php        |  3 +
 .../Tests/Fixtures/php/services1.php          |  3 +
 .../Tests/Fixtures/php/services10.php         |  3 +
 .../Tests/Fixtures/php/services12.php         |  3 +
 .../Tests/Fixtures/php/services13.php         |  3 +
 .../Tests/Fixtures/php/services19.php         |  3 +
 .../Tests/Fixtures/php/services24.php         |  3 +
 .../Tests/Fixtures/php/services26.php         |  3 +
 .../Tests/Fixtures/php/services33.php         |  3 +
 .../Tests/Fixtures/php/services8.php          |  3 +
 .../Tests/Fixtures/php/services9_as_files.txt |  1 +
 .../Tests/Fixtures/php/services9_compiled.php |  1 +
 .../Fixtures/php/services_array_params.php    |  3 +
 .../Fixtures/php/services_base64_env.php      |  3 +
 .../Fixtures/php/services_legacy_privates.php | 13 +---
 .../Tests/Fixtures/php/services_locator.php   |  1 +
 .../Fixtures/php/services_private_frozen.php  |  1 +
 .../php/services_private_in_expression.php    |  1 +
 .../Tests/Fixtures/php/services_rot13_env.php |  3 +
 .../Fixtures/php/services_subscriber.php      |  1 +
 .../php/services_uninitialized_ref.php        |  1 +
 .../Tests/Fixtures/xml/services21.xml         |  2 +-
 .../Tests/Fixtures/xml/services24.xml         |  2 +-
 .../Tests/Fixtures/xml/services9.xml          | 44 ++++++------
 .../Tests/Fixtures/xml/services_abstract.xml  |  2 +-
 .../Fixtures/xml/services_without_id.xml      |  1 +
 .../Tests/Fixtures/yaml/services24.yml        |  1 +
 .../Tests/Fixtures/yaml/services26.yml        |  1 +
 .../Tests/Fixtures/yaml/services9.yml         | 28 +++++++-
 .../Tests/Fixtures/yaml/services_inline.yml   |  1 +
 .../yaml/services_legacy_privates.yml         |  3 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |  2 +-
 78 files changed, 264 insertions(+), 121 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 33147c4cc9ad1..cdc062008bf4b 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -4,6 +4,9 @@ UPGRADE FROM 3.3 to 3.4
 DependencyInjection
 -------------------
 
+ * Definitions and aliases will be made private by default in 4.0. You should either use service injection
+   or explicitly define your services as public if you really need to inject the container.
+
  * Relying on service auto-registration while autowiring is deprecated and won't be supported
    in Symfony 4.0. Explicitly inject your dependencies or create services
    whose ids are their fully-qualified class name.
@@ -154,7 +157,7 @@ FrameworkBundle
  * The `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`
    class has been deprecated and will be removed in 4.0. Use the
    `Symfony\Component\Translation\Reader\TranslationReader` class instead.
-   
+
  * The `translation.loader` service has been deprecated and will be removed in 4.0.
    Use the `translation.reader` service instead..
 
@@ -269,9 +272,9 @@ SecurityBundle
 Translation
 -----------
 
- * `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations` has been deprecated 
-   and will be removed in 4.0, use `Symfony\Component\Translation\Writer\TranslationWriter::write` 
-   instead. 
+ * `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations` has been deprecated
+   and will be removed in 4.0, use `Symfony\Component\Translation\Writer\TranslationWriter::write`
+   instead.
 
  * Passing a `Symfony\Component\Translation\MessageSelector` to `Translator` has been
    deprecated. You should pass a message formatter instead
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 6c32bad70c90b..fba86ef01c971 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -77,6 +77,9 @@ Debug
 DependencyInjection
 -------------------
 
+ * Definitions and aliases are now private by default in 4.0. You should either use service injection
+   or explicitly define your services as public if you really need to inject the container.
+
  * Relying on service auto-registration while autowiring is not supported anymore.
    Explicitly inject your dependencies or create services whose ids are
    their fully-qualified class name.
@@ -449,14 +452,14 @@ FrameworkBundle
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslatorPass`
    class has been removed. Use the
    `Symfony\Component\Translation\DependencyInjection\TranslatorPass` class instead.
- 
+
  * The `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`
    class has been deprecated and will be removed in 4.0. Use the
    `Symfony\Component\Translation\Reader\TranslationReader` class instead.
 
  * The `translation.loader` service has been removed.
    Use the `translation.reader` service instead.
- 
+
  * `AssetsInstallCommand::__construct()` now requires an instance of
    `Symfony\Component\Filesystem\Filesystem` as first argument.
 
@@ -673,11 +676,11 @@ Translation
 -----------
 
  * Removed the backup feature from the file dumper classes.
- 
+
  * The default value of the `$readerServiceId` argument of `TranslatorPass::__construct()` has been changed to `"translation.reader"`.
- 
- * Removed `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations`, 
-   use `Symfony\Component\Translation\Writer\TranslationWriter::write` instead. 
+
+ * Removed `Symfony\Component\Translation\Writer\TranslationWriter::writeTranslations`,
+   use `Symfony\Component\Translation\Writer\TranslationWriter::write` instead.
 
  * Removed support for passing `Symfony\Component\Translation\MessageSelector` as a second argument to the
    `Translator::__construct()`. You should pass an instance of `Symfony\Component\Translation\Formatter\MessageFormatterInterface` instead.
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
index 62cc3cd38d38f..7c7464133315a 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
@@ -61,7 +61,7 @@ private function dumpLazyServiceProjectServiceContainer()
     {
         $container = new ContainerBuilder();
 
-        $container->register('foo', 'stdClass');
+        $container->register('foo', 'stdClass')->setPublic(true);
         $container->getDefinition('foo')->setLazy(true);
         $container->compile();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index f687b71870338..e0d7258902f4d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1012,12 +1012,12 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
 
         // Use a delegation unless only a single engine was registered
         if (1 === count($engines)) {
-            $container->setAlias('templating', (string) reset($engines));
+            $container->setAlias('templating', (string) reset($engines))->setPublic(true);
         } else {
             foreach ($engines as $engine) {
                 $container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));
             }
-            $container->setAlias('templating', 'templating.engine.delegating');
+            $container->setAlias('templating', 'templating.engine.delegating')->setPublic(true);
         }
 
         $container->getDefinition('fragment.renderer.hinclude')
@@ -1213,7 +1213,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $container->getDefinition('translation.writer')->setPrivate(true);
 
         // Use the "real" translator instead of the identity default
-        $container->setAlias('translator', 'translator.default');
+        $container->setAlias('translator', 'translator.default')->setPublic(true);
         $container->setAlias('translator.formatter', new Alias($config['formatter'], false));
         $translator = $container->findDefinition('translator.default');
         $translator->addMethodCall('setFallbackLocales', array($config['fallbacks']));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index ef632ca04cc61..a596beafdc4c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -72,6 +72,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             if ($this instanceof EventSubscriberInterface) {
                 $container->register('kernel', static::class)
                     ->setSynthetic(true)
+                    ->setPublic(true)
                     ->addTag('kernel.event_subscriber')
                 ;
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml
index a44078cc499b3..1b47c1100a159 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ../config/default.yml }
 
 services:
+    _defaults: { public: true }
     test.autowiring_types.autowired_services:
         class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes\AutowiredServices
         autowire: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
index f4a5425808440..d00d6f235ec67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ../config/default.yml }
 
 services:
+    _defaults: { public: true }
     public:
         class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass
     private_alias:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
index fe3de69299946..e4090041bb196 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ../config/default.yml }
 
 services:
+    _defaults: { public: true }
     test.property_info: '@property_info'
 
 framework:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
index 5337050d0e37c..f476945f3da0c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
@@ -82,7 +82,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
         ));
 
         $c->setParameter('halloween', 'Have a great day!');
-        $c->register('halloween', 'stdClass');
+        $c->register('halloween', 'stdClass')->setPublic(true);
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 95e382b7b4226..21fc056e382f2 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -185,7 +185,7 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
         $container->getAlias('security.acl.provider')->setPrivate(true);
 
         if (null !== $config['connection']) {
-            $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']));
+            $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']))->setPrivate(true);
         }
 
         $container
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
index 49191e01d85c2..45f8e24d4f81e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ./../config/framework.yml }
 
 services:
+    _defaults: { public: true }
     test.security.acl.provider: '@security.acl.provider'
 
 doctrine:
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/config.yml
index bb3ef5a2dc70f..2045118e1b9f1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ../config/framework.yml }
 
 services:
+    _defaults: { public: true }
     test.autowiring_types.autowired_services:
         class: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AutowiringBundle\AutowiredServices
         autowire: true
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
index dcc023cb222da..39d53ef8e37d3 100644
--- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -65,8 +65,8 @@ public function process(ContainerBuilder $container)
                 if (isset($serviceIds[$commandId]) || $container->hasAlias($commandId)) {
                     $commandId = $commandId.'_'.$id;
                 }
-                if (!$definition->isPublic()) {
-                    $container->setAlias($commandId, $id);
+                if (!$definition->isPublic() || $definition->isPrivate()) {
+                    $container->setAlias($commandId, $id)->setPublic(true);
                     $id = $commandId;
                 }
                 $serviceIds[$commandId] = $id;
@@ -97,6 +97,7 @@ public function process(ContainerBuilder $container)
 
         $container
             ->register($this->commandLoaderServiceId, ContainerCommandLoader::class)
+            ->setPublic(true)
             ->setArguments(array(ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap));
 
         $container->setParameter('console.command.ids', $serviceIds);
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index 95164005e7ba5..e9d10e0c7f887 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "symfony/config": "~3.3|~4.0",
         "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/lock": "~3.4|~4.0",
         "symfony/process": "~3.3|~4.0",
         "psr/log": "~1.0"
@@ -35,7 +35,7 @@
         "psr/log": "For using the console logger"
     },
     "conflict": {
-        "symfony/dependency-injection": "<3.3",
+        "symfony/dependency-injection": "<3.4",
         "symfony/process": "<3.3"
     },
     "autoload": {
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
index ee43bd399f92b..8773b8389110f 100644
--- a/src/Symfony/Component/DependencyInjection/Alias.php
+++ b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -15,7 +15,7 @@ class Alias
 {
     private $id;
     private $public;
-    private $private = false;
+    private $private;
 
     /**
      * @param string $id     Alias identifier
@@ -25,6 +25,7 @@ public function __construct($id, $public = true)
     {
         $this->id = (string) $id;
         $this->public = $public;
+        $this->private = 2 > func_num_args();
     }
 
     /**
@@ -47,6 +48,7 @@ public function isPublic()
     public function setPublic($boolean)
     {
         $this->public = (bool) $boolean;
+        $this->private = false;
 
         return $this;
     }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index e0cd5dbf6053b..bc8fd3051870c 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * deprecated "public-by-default" definitions and aliases, the new default will be "private" in 4.0
  * added `EnvVarProcessorInterface` and corresponding "container.env_var_processor" tag for processing env vars
  * added support for ignore-on-uninitialized references
  * deprecated service auto-registration while autowiring
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
index c1f05e03ec02c..03420683a205a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
 
                 $aliasId = $container->getParameterBag()->resolveValue($tag['format']);
                 if ($container->hasDefinition($aliasId) || $container->hasAlias($aliasId)) {
-                    $container->setAlias($serviceId, new Alias($aliasId));
+                    $container->setAlias($serviceId, new Alias($aliasId, true));
                 }
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
index 815dbcae4915d..9a7ee4d3520bb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
             // synthetic service is public
-            if ($definition->isSynthetic() && (!$definition->isPublic() || $definition->isPrivate())) {
+            if ($definition->isSynthetic() && !($definition->isPublic() || $definition->isPrivate())) {
                 throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index 0e9a68e7f0026..99234812d65ca 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)
                 $container->setDefinition($renamedId, $decoratedDefinition);
             }
 
-            $container->setAlias($inner, $id)->setPublic($public && !$private)->setPrivate($private);
+            $container->setAlias($inner, $id)->setPublic($public)->setPrivate($private);
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
index 247f5b69ad40f..68f2f9a41c134 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -52,6 +52,7 @@ public function process(ContainerBuilder $container)
                 $bag->setProvidedTypes($types);
             }
             $container->register('container.env_var_processors_locator', ServiceLocator::class)
+                ->setPublic(true)
                 ->setArguments(array($processors))
             ;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 124bd08b6f92c..bc575e1fc536b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)
             }
             // Check if target needs to be replaces
             if (isset($replacements[$targetId])) {
-                $container->setAlias($definitionId, $replacements[$targetId]);
+                $container->setAlias($definitionId, $replacements[$targetId])->setPublic($target->isPublic())->setPrivate($target->isPrivate());
             }
             // No need to process the same target twice
             if (isset($seenAliasTargets[$targetId])) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index 7625377793769..460fb55e472be 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -36,12 +36,14 @@ public function process(ContainerBuilder $container)
         foreach ($container->getDefinitions() as $definition) {
             if ($definition->isPrivate()) {
                 $definition->setPublic(false);
+                $definition->setPrivate(true);
             }
         }
 
         foreach ($container->getAliases() as $alias) {
             if ($alias->isPrivate()) {
                 $alias->setPublic(false);
+                $alias->setPrivate(true);
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 7ab97044bfe7b..a46c74fbb65f1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
             if ($aliasId !== $defId = $this->getDefinitionId($aliasId, $container)) {
-                $container->setAlias($id, $defId)->setPublic($alias->isPublic() && !$alias->isPrivate())->setPrivate($alias->isPrivate());
+                $container->setAlias($id, $defId)->setPublic($alias->isPublic())->setPrivate($alias->isPrivate());
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 7a660eef1d6e0..34d6f46cacca4 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -35,7 +35,7 @@ class Definition
     private $configurator;
     private $tags = array();
     private $public = true;
-    private $private = false;
+    private $private = true;
     private $synthetic = false;
     private $abstract = false;
     private $lazy = false;
@@ -603,6 +603,7 @@ public function setPublic($boolean)
         $this->changes['public'] = true;
 
         $this->public = (bool) $boolean;
+        $this->private = false;
 
         return $this;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 0631ddaf3ef9f..fb307a76e8ca7 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -122,8 +122,8 @@ private function addService($definition, $id, \DOMElement $parent)
         if (!$definition->isShared()) {
             $service->setAttribute('shared', 'false');
         }
-        if (!$definition->isPublic()) {
-            $service->setAttribute('public', 'false');
+        if (!$definition->isPrivate()) {
+            $service->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
         }
         if ($definition->isSynthetic()) {
             $service->setAttribute('synthetic', 'true');
@@ -242,8 +242,8 @@ private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
         $service = $this->document->createElement('service');
         $service->setAttribute('id', $alias);
         $service->setAttribute('alias', $id);
-        if (!$id->isPublic()) {
-            $service->setAttribute('public', 'false');
+        if (!$id->isPrivate()) {
+            $service->setAttribute('public', $id->isPublic() ? 'true' : 'false');
         }
         $parent->appendChild($service);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index d8f07edc08e5c..916a2317b3893 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -74,8 +74,8 @@ private function addService($id, $definition)
             $code .= sprintf("        class: %s\n", $this->dumper->dump($class));
         }
 
-        if (!$definition->isPublic()) {
-            $code .= "        public: false\n";
+        if (!$definition->isPrivate()) {
+            $code .= sprintf("        public: %s\n", $definition->isPublic() ? 'true' : 'false');
         }
 
         $tagsCode = '';
@@ -178,11 +178,11 @@ private function addService($id, $definition)
      */
     private function addServiceAlias($alias, $id)
     {
-        if ($id->isPublic()) {
+        if ($id->isPrivate()) {
             return sprintf("    %s: '@%s'\n", $alias, $id);
         }
 
-        return sprintf("    %s:\n        alias: %s\n        public: false\n", $alias, $id);
+        return sprintf("    %s:\n        alias: %s\n        public: %s\n", $alias, $id, $id->isPublic() ? 'true' : 'false');
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 4a16d75e36c5c..6bebf2133c57b 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -203,13 +203,12 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
         if ($alias = $service->getAttribute('alias')) {
             $this->validateAlias($service, $file);
 
-            $public = true;
+            $this->container->setAlias((string) $service->getAttribute('id'), $alias = new Alias($alias));
             if ($publicAttr = $service->getAttribute('public')) {
-                $public = XmlUtils::phpize($publicAttr);
+                $alias->setPublic(XmlUtils::phpize($publicAttr));
             } elseif (isset($defaults['public'])) {
-                $public = $defaults['public'];
+                $alias->setPublic($defaults['public']);
             }
-            $this->container->setAlias((string) $service->getAttribute('id'), new Alias($alias, $public));
 
             return;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index b57ead2c89015..be0c75b2cac73 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -336,8 +336,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
             @trigger_error(sprintf('Service names that start with an underscore are deprecated since Symfony 3.3 and will be reserved in 4.0. Rename the "%s" service or define it in XML instead.', $id), E_USER_DEPRECATED);
         }
         if (is_string($service) && 0 === strpos($service, '@')) {
-            $public = isset($defaults['public']) ? $defaults['public'] : true;
-            $this->container->setAlias($id, new Alias(substr($service, 1), $public));
+            $this->container->setAlias($id, $alias = new Alias(substr($service, 1)));
+            if (isset($defaults['public'])) {
+                $alias->setPublic($defaults['public']);
+            }
 
             return;
         }
@@ -357,8 +359,12 @@ private function parseDefinition($id, $service, $file, array $defaults)
         $this->checkDefinition($id, $service, $file);
 
         if (isset($service['alias'])) {
-            $public = array_key_exists('public', $service) ? (bool) $service['public'] : (isset($defaults['public']) ? $defaults['public'] : true);
-            $this->container->setAlias($id, new Alias($service['alias'], $public));
+            $this->container->setAlias($id, $alias = new Alias($service['alias']));
+            if (array_key_exists('public', $service)) {
+                $alias->setPublic($service['public']);
+            } elseif (isset($defaults['public'])) {
+                $alias->setPublic($defaults['public']);
+            }
 
             foreach ($service as $key => $value) {
                 if (!in_array($key, array('alias', 'public'))) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index cb9a879a05d48..c8135b965e80d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -402,13 +402,13 @@ public function testPrivateHasHigherPrecedenceThanPublic()
         $container = new ContainerBuilder();
 
         $container->register('foo', 'stdClass')
-            ->setPrivate(true)
             ->setPublic(true)
+            ->setPrivate(true)
         ;
 
         $container->setAlias('bar', 'foo')
-            ->setPrivate(false)
             ->setPublic(false)
+            ->setPrivate(false)
         ;
 
         $this->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 4ea8290cfc725..f4c25cd9d2bb1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -71,6 +72,7 @@ public function testDumpOptimizationString()
             'optimize concatenation from the start' => '%empty_value%start',
             'optimize concatenation at the end' => 'end%empty_value%',
         ));
+        $definition->setPublic(true);
 
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
@@ -89,6 +91,7 @@ public function testDumpRelativeDir()
         $definition->setClass('stdClass');
         $definition->addArgument('%foo%');
         $definition->addArgument(array('%foo%' => '%buz%/'));
+        $definition->setPublic(true);
 
         $container = new ContainerBuilder();
         $container->setDefinition('test', $definition);
@@ -151,7 +154,7 @@ public function testAddService()
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
 
         $container = new ContainerBuilder();
-        $container->register('foo', 'FooClass')->addArgument(new \stdClass());
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
         try {
@@ -188,8 +191,8 @@ public function testAddServiceIdWithUnsupportedCharacters()
     {
         $class = 'Symfony_DI_PhpDumper_Test_Unsupported_Characters';
         $container = new ContainerBuilder();
-        $container->register('bar$', 'FooClass');
-        $container->register('bar$!', 'FooClass');
+        $container->register('bar$', 'FooClass')->setPublic(true);
+        $container->register('bar$!', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
         eval('?>'.$dumper->dump(array('class' => $class)));
@@ -202,8 +205,8 @@ public function testConflictingServiceIds()
     {
         $class = 'Symfony_DI_PhpDumper_Test_Conflicting_Service_Ids';
         $container = new ContainerBuilder();
-        $container->register('foo_bar', 'FooClass');
-        $container->register('foobar', 'FooClass');
+        $container->register('foo_bar', 'FooClass')->setPublic(true);
+        $container->register('foobar', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
         eval('?>'.$dumper->dump(array('class' => $class)));
@@ -216,8 +219,8 @@ public function testConflictingMethodsWithParent()
     {
         $class = 'Symfony_DI_PhpDumper_Test_Conflicting_Method_With_Parent';
         $container = new ContainerBuilder();
-        $container->register('bar', 'FooClass');
-        $container->register('foo_bar', 'FooClass');
+        $container->register('bar', 'FooClass')->setPublic(true);
+        $container->register('foo_bar', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
         eval('?>'.$dumper->dump(array(
@@ -238,6 +241,7 @@ public function testInvalidFactories($factory)
     {
         $container = new ContainerBuilder();
         $def = new Definition('stdClass');
+        $def->setPublic(true);
         $def->setFactory($factory);
         $container->setDefinition('bar', $def);
         $container->compile();
@@ -319,9 +323,9 @@ public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFrom
     public function testCircularReference()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'));
+        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'))->setPublic(true);
         $container->register('bar', 'stdClass')->setPublic(false)->addMethodCall('setA', array(new Reference('baz')));
-        $container->register('baz', 'stdClass')->addMethodCall('setA', array(new Reference('foo')));
+        $container->register('baz', 'stdClass')->addMethodCall('setA', array(new Reference('foo')))->setPublic(true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -394,7 +398,7 @@ public function testCustomEnvParameters()
         $container = new ContainerBuilder();
         $container->setParameter('env(foo)', str_rot13('world'));
         $container->setParameter('hello', '%env(rot13:foo)%');
-        $container->register(Rot13EnvVarProcessor::class)->addTag('container.env_var_processor');
+        $container->register(Rot13EnvVarProcessor::class)->addTag('container.env_var_processor')->setPublic(true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -459,7 +463,7 @@ public function testInlinedDefinitionReferencingServiceContainer()
     {
         $container = new ContainerBuilder();
         $container->register('foo', 'stdClass')->addMethodCall('add', array(new Reference('service_container')))->setPublic(false);
-        $container->register('bar', 'stdClass')->addArgument(new Reference('foo'));
+        $container->register('bar', 'stdClass')->addArgument(new Reference('foo'))->setPublic(true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -471,8 +475,9 @@ public function testInitializePropertiesBeforeMethodCalls()
         require_once self::$fixturesPath.'/includes/classes.php';
 
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass');
+        $container->register('foo', 'stdClass')->setPublic(true);
         $container->register('bar', 'MethodCallClass')
+            ->setPublic(true)
             ->setProperty('simple', 'bar')
             ->setProperty('complex', new Reference('foo'))
             ->addMethodCall('callMe');
@@ -488,8 +493,8 @@ public function testInitializePropertiesBeforeMethodCalls()
     public function testCircularReferenceAllowanceForLazyServices()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'));
-        $container->register('bar', 'stdClass')->setLazy(true)->addArgument(new Reference('foo'));
+        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'))->setPublic(true);
+        $container->register('bar', 'stdClass')->setLazy(true)->addArgument(new Reference('foo'))->setPublic(true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -514,14 +519,16 @@ public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServic
 
         $eventManagerDefinition = new Definition('stdClass');
 
-        $connectionDefinition = $container->register('connection', 'stdClass');
+        $connectionDefinition = $container->register('connection', 'stdClass')->setPublic(true);
         $connectionDefinition->addArgument($eventManagerDefinition);
 
         $container->register('entity_manager', 'stdClass')
+            ->setPublic(true)
             ->setLazy(true)
             ->addArgument(new Reference('connection'));
 
         $lazyServiceDefinition = $container->register('lazy_service', 'stdClass');
+        $lazyServiceDefinition->setPublic(true);
         $lazyServiceDefinition->setLazy(true);
         $lazyServiceDefinition->addArgument(new Reference('entity_manager'));
 
@@ -542,9 +549,10 @@ public function testLazyArgumentProvideGenerator()
         require_once self::$fixturesPath.'/includes/classes.php';
 
         $container = new ContainerBuilder();
-        $container->register('lazy_referenced', 'stdClass');
+        $container->register('lazy_referenced', 'stdClass')->setPublic(true);
         $container
             ->register('lazy_context', 'LazyContext')
+            ->setPublic(true)
             ->setArguments(array(
                 new IteratorArgument(array('k1' => new Reference('lazy_referenced'), 'k2' => new Reference('service_container'))),
                 new IteratorArgument(array()),
@@ -592,8 +600,8 @@ public function testNormalizedId()
     public function testDumpContainerBuilderWithFrozenConstructorIncludingPrivateServices()
     {
         $container = new ContainerBuilder();
-        $container->register('foo_service', 'stdClass')->setArguments(array(new Reference('baz_service')));
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')));
+        $container->register('foo_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
+        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -606,6 +614,7 @@ public function testServiceLocator()
     {
         $container = new ContainerBuilder();
         $container->register('foo_service', ServiceLocator::class)
+            ->setPublic(true)
             ->addArgument(array(
                 'bar' => new ServiceClosureArgument(new Reference('bar_service')),
                 'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
@@ -614,40 +623,43 @@ public function testServiceLocator()
         ;
 
         // no method calls
-        $container->register('translator.loader_1', 'stdClass');
+        $container->register('translator.loader_1', 'stdClass')->setPublic(true);
         $container->register('translator.loader_1_locator', ServiceLocator::class)
             ->setPublic(false)
             ->addArgument(array(
                 'translator.loader_1' => new ServiceClosureArgument(new Reference('translator.loader_1')),
             ));
         $container->register('translator_1', StubbedTranslator::class)
+            ->setPublic(true)
             ->addArgument(new Reference('translator.loader_1_locator'));
 
         // one method calls
-        $container->register('translator.loader_2', 'stdClass');
+        $container->register('translator.loader_2', 'stdClass')->setPublic(true);
         $container->register('translator.loader_2_locator', ServiceLocator::class)
             ->setPublic(false)
             ->addArgument(array(
                 'translator.loader_2' => new ServiceClosureArgument(new Reference('translator.loader_2')),
             ));
         $container->register('translator_2', StubbedTranslator::class)
+            ->setPublic(true)
             ->addArgument(new Reference('translator.loader_2_locator'))
             ->addMethodCall('addResource', array('db', new Reference('translator.loader_2'), 'nl'));
 
         // two method calls
-        $container->register('translator.loader_3', 'stdClass');
+        $container->register('translator.loader_3', 'stdClass')->setPublic(true);
         $container->register('translator.loader_3_locator', ServiceLocator::class)
             ->setPublic(false)
             ->addArgument(array(
                 'translator.loader_3' => new ServiceClosureArgument(new Reference('translator.loader_3')),
             ));
         $container->register('translator_3', StubbedTranslator::class)
+            ->setPublic(true)
             ->addArgument(new Reference('translator.loader_3_locator'))
             ->addMethodCall('addResource', array('db', new Reference('translator.loader_3'), 'nl'))
             ->addMethodCall('addResource', array('db', new Reference('translator.loader_3'), 'en'));
 
         $nil->setValues(array(null));
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')));
+        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -660,6 +672,7 @@ public function testServiceSubscriber()
     {
         $container = new ContainerBuilder();
         $container->register('foo_service', TestServiceSubscriber::class)
+            ->setPublic(true)
             ->setAutowired(true)
             ->addArgument(new Reference(ContainerInterface::class))
             ->addTag('container.service_subscriber', array(
@@ -667,7 +680,7 @@ public function testServiceSubscriber()
                 'id' => TestServiceSubscriber::class,
             ))
         ;
-        $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class);
+        $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class)->setPublic(true);
 
         $container->register(CustomDefinition::class, CustomDefinition::class)
             ->setPublic(false);
@@ -686,6 +699,7 @@ public function testPrivateWithIgnoreOnInvalidReference()
         $container->register('not_invalid', 'BazClass')
             ->setPublic(false);
         $container->register('bar', 'BarClass')
+            ->setPublic(true)
             ->addMethodCall('setBaz', array(new Reference('not_invalid', SymfonyContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
         $container->compile();
 
@@ -702,6 +716,7 @@ public function testArrayParameters()
         $container->setParameter('array_1', array(123));
         $container->setParameter('array_2', array(__DIR__));
         $container->register('bar', 'BarClass')
+            ->setPublic(true)
             ->addMethodCall('setBaz', array('%array_1%', '%array_2%', '%%array_1%%', array(123)));
         $container->compile();
 
@@ -718,6 +733,7 @@ public function testExpressionReferencingPrivateService()
         $container->register('private_foo', 'stdClass')
             ->setPublic(false);
         $container->register('public_foo', 'stdClass')
+            ->setPublic(true)
             ->addArgument(new Expression('service("private_foo")'));
 
         $container->compile();
@@ -767,7 +783,7 @@ public function testUninitializedReference()
     public function testDumpHandlesLiteralClassWithRootNamespace()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', '\\stdClass');
+        $container->register('foo', '\\stdClass')->setPublic(true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -795,6 +811,9 @@ public function testLegacyPrivateServices()
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services_legacy_privates.yml');
 
+        $container->setDefinition('private_child', new ChildDefinition('foo'));
+        $container->setDefinition('private_parent', new ChildDefinition('private'));
+
         $container->getDefinition('private')->setPrivate(true);
         $container->getDefinition('private_not_inlined')->setPrivate(true);
         $container->getDefinition('private_not_removed')->setPrivate(true);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 8a34a2b19a297..7904ed0c9e6db 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -57,7 +57,7 @@ public function testAddService()
         $this->assertEquals(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/services9.xml')), $dumper->dump(), '->dump() dumps services');
 
         $dumper = new XmlDumper($container = new ContainerBuilder());
-        $container->register('foo', 'FooClass')->addArgument(new \stdClass());
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
         try {
             $dumper->dump();
             $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
@@ -75,7 +75,7 @@ public function testDumpAnonymousServices()
 
   
     
-    
+    
       
         
           
@@ -99,7 +99,7 @@ public function testDumpEntities()
 
   
     
-    
+    
       
       foo<>&bar
     
@@ -128,7 +128,7 @@ public function provideDecoratedServicesData()
 
   
     
-    
+    
     
     
   
@@ -138,7 +138,7 @@ public function provideDecoratedServicesData()
 
   
     
-    
+    
     
     
   
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
index 85ce181461419..2a34692c5862d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -52,7 +52,7 @@ public function testAddService()
         $this->assertEqualYamlStructure(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
 
         $dumper = new YamlDumper($container = new ContainerBuilder());
-        $container->register('foo', 'FooClass')->addArgument(new \stdClass());
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
         try {
             $dumper->dump();
             $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
@@ -85,6 +85,7 @@ public function testInlineServices()
     {
         $container = new ContainerBuilder();
         $container->register('foo', 'Class1')
+            ->setPublic(true)
             ->addArgument((new Definition('Class2'))
                 ->addArgument(new Definition('Class2'))
             )
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container10.php
index a16ca9fff87d8..4f5492ad5a843 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container10.php
@@ -9,6 +9,7 @@
 $container->
     register('foo', 'FooClass')->
     addArgument(new Reference('bar'))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
index 3e6cafca24f90..150cd7921ee1b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
@@ -7,6 +7,7 @@
 $container->
     register('foo', 'FooClass')->
     addArgument(new Definition('BarClass', array(new Definition('BazClass'))))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
index 73c5b4ef176e2..bc527eb79e78d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
@@ -7,6 +7,7 @@
     register('foo', 'FooClass\\Foo')->
     addArgument('foo<>&bar')->
     addTag('foo"bar\\bar', array('foo' => 'foo"barřž€'))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container13.php
index cc716c78f04f5..df598d4ea5fae 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container13.php
@@ -7,9 +7,11 @@
 $container->
     register('foo', 'FooClass')->
     addArgument(new Reference('bar'))
+    ->setPublic(true)
 ;
 $container->
     register('bar', 'BarClass')
+    ->setPublic(true)
 ;
 $container->compile();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container15.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container15.php
index bb41ea3c4f175..7949247558f34 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container15.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container15.php
@@ -6,6 +6,7 @@
 $container
     ->register('foo', 'FooClass\\Foo')
     ->setDecoratedService('bar', 'bar.woozy')
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container16.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container16.php
index 67b4d353db4d2..88619ec50e267 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container16.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container16.php
@@ -6,6 +6,7 @@
 $container
     ->register('foo', 'FooClass\\Foo')
     ->setDecoratedService('bar')
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container17.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container17.php
index d902ec2a39306..7f1db6762981e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container17.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container17.php
@@ -5,6 +5,7 @@
 $container = new ContainerBuilder();
 $container
     ->register('foo', '%foo.class%')
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
index 64b8f066dca10..823a77f534f52 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
@@ -10,6 +10,7 @@
 $container
     ->register('service_from_anonymous_factory', 'Bar\FooClass')
     ->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'))
+    ->setPublic(true)
 ;
 
 $anonymousServiceWithFactory = new Definition('Bar\FooClass');
@@ -17,6 +18,7 @@
 $container
     ->register('service_with_method_call_and_factory', 'Bar\FooClass')
     ->addMethodCall('setBar', array($anonymousServiceWithFactory))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
index d0467386140a9..298c9266a9e2b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
@@ -15,6 +15,7 @@
     ->register('foo', 'Foo')
     ->setFactory(array($fooFactory, 'createFoo'))
     ->setConfigurator(array($bar, 'configureFoo'))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container24.php
index cba10b526b2a8..b9d0b91f10eb8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container24.php
@@ -7,6 +7,7 @@
 $container
     ->register('foo', 'Foo')
     ->setAutowired(true)
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container33.php
index ec68f929d449e..673abe204cd9e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container33.php
@@ -6,7 +6,7 @@
 
 $container = new ContainerBuilder();
 
-$container->register(\Foo\Foo::class);
-$container->register(\Bar\Foo::class);
+$container->register(\Foo\Foo::class)->setPublic(true);
+$container->register(\Bar\Foo::class)->setPublic(true);
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 2906004828a59..91a9af43d9a1f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -21,21 +21,25 @@
     ->addMethodCall('setBar', array(new Reference('bar')))
     ->addMethodCall('initialize')
     ->setConfigurator('sc_configure')
+    ->setPublic(true)
 ;
 $container
     ->register('foo.baz', '%baz_class%')
     ->setFactory(array('%baz_class%', 'getInstance'))
     ->setConfigurator(array('%baz_class%', 'configureStatic1'))
+    ->setPublic(true)
 ;
 $container
     ->register('bar', 'Bar\FooClass')
     ->setArguments(array('foo', new Reference('foo.baz'), new Parameter('foo_bar')))
     ->setConfigurator(array(new Reference('foo.baz'), 'configure'))
+    ->setPublic(true)
 ;
 $container
     ->register('foo_bar', '%foo_class%')
     ->addArgument(new Reference('deprecated_service'))
     ->setShared(false)
+    ->setPublic(true)
 ;
 $container->getParameterBag()->clear();
 $container->getParameterBag()->add(array(
@@ -43,8 +47,8 @@
     'foo_class' => 'Bar\FooClass',
     'foo' => 'bar',
 ));
-$container->setAlias('alias_for_foo', 'foo');
-$container->setAlias('alias_for_alias', 'alias_for_foo');
+$container->setAlias('alias_for_foo', 'foo')->setPublic(true);
+$container->setAlias('alias_for_alias', 'alias_for_foo')->setPublic(true);
 $container
     ->register('method_call1', 'Bar\FooClass')
     ->setFile(realpath(__DIR__.'/../includes/foo.php'))
@@ -53,10 +57,12 @@
     ->addMethodCall('setBar', array(new Reference('foo3', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
     ->addMethodCall('setBar', array(new Reference('foobaz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
     ->addMethodCall('setBar', array(new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')))
+    ->setPublic(true)
 ;
 $container
     ->register('foo_with_inline', 'Foo')
     ->addMethodCall('setBar', array(new Reference('inlined')))
+    ->setPublic(true)
 ;
 $container
     ->register('inlined', 'Bar')
@@ -67,10 +73,12 @@
 $container
     ->register('baz', 'Baz')
     ->addMethodCall('setFoo', array(new Reference('foo_with_inline')))
+    ->setPublic(true)
 ;
 $container
     ->register('request', 'Request')
     ->setSynthetic(true)
+    ->setPublic(true)
 ;
 $container
     ->register('configurator_service', 'ConfClass')
@@ -80,6 +88,7 @@
 $container
     ->register('configured_service', 'stdClass')
     ->setConfigurator(array(new Reference('configurator_service'), 'configureStdClass'))
+    ->setPublic(true)
 ;
 $container
     ->register('configurator_service_simple', 'ConfClass')
@@ -89,21 +98,26 @@
 $container
     ->register('configured_service_simple', 'stdClass')
     ->setConfigurator(array(new Reference('configurator_service_simple'), 'configureStdClass'))
+    ->setPublic(true)
 ;
 $container
     ->register('decorated', 'stdClass')
+    ->setPublic(true)
 ;
 $container
     ->register('decorator_service', 'stdClass')
     ->setDecoratedService('decorated')
+    ->setPublic(true)
 ;
 $container
     ->register('decorator_service_with_name', 'stdClass')
     ->setDecoratedService('decorated', 'decorated.pif-pouf')
+    ->setPublic(true)
 ;
 $container
     ->register('deprecated_service', 'stdClass')
     ->setDeprecated(true)
+    ->setPublic(true)
 ;
 $container
     ->register('new_factory', 'FactoryClass')
@@ -113,15 +127,18 @@
 $container
     ->register('factory_service', 'Bar')
     ->setFactory(array(new Reference('foo.baz'), 'getInstance'))
+    ->setPublic(true)
 ;
 $container
     ->register('new_factory_service', 'FooBarBaz')
     ->setProperty('foo', 'bar')
     ->setFactory(array(new Reference('new_factory'), 'getInstance'))
+    ->setPublic(true)
 ;
 $container
     ->register('service_from_static_method', 'Bar\FooClass')
     ->setFactory(array('Bar\FooClass', 'getInstance'))
+    ->setPublic(true)
 ;
 $container
     ->register('factory_simple', 'SimpleFactoryClass')
@@ -132,14 +149,17 @@
 $container
     ->register('factory_service_simple', 'Bar')
     ->setFactory(array(new Reference('factory_simple'), 'getInstance'))
+    ->setPublic(true)
 ;
 $container
     ->register('lazy_context', 'LazyContext')
     ->setArguments(array(new IteratorArgument(array('k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container'))), new IteratorArgument(array())))
+    ->setPublic(true)
 ;
 $container
     ->register('lazy_context_ignore_invalid_ref', 'LazyContext')
     ->setArguments(array(new IteratorArgument(array(new Reference('foo.baz'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE))), new IteratorArgument(array())))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php
index 9622a273d3806..308e22524132f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php
@@ -7,6 +7,7 @@
 $container
     ->register('foo', 'Foo')
     ->setAbstract(true)
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
index 9ecf7c909f04a..7aeefb4d5227f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
@@ -9,6 +9,7 @@
 
 $container
     ->register('foo1', 'stdClass')
+    ->setPublic(true)
 ;
 
 $container
@@ -24,6 +25,7 @@
 $container
     ->register('baz', 'stdClass')
     ->setProperty('foo3', new Reference('foo3'))
+    ->setPublic(true)
 ;
 
 $container
@@ -41,6 +43,7 @@
         'foo2' => new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
         'foo3' => new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
     )))
+    ->setPublic(true)
 ;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index 44631328ce606..d87e61e14aa19 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -29,6 +29,9 @@ class Container extends AbstractContainer
     public function __construct()
     {
         $this->services = array();
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 9ad021ece802b..69fc82e056966 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -27,6 +27,9 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index d8478d677f4ff..26c73706168d3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -32,6 +32,9 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 976c720768752..65891c77b994d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -36,6 +36,9 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index 42b9e78963662..1525115f5b74a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -30,6 +30,9 @@ public function __construct()
         $this->methodMap = array(
             'bar' => 'getBarService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index 3af42c502c0b4..44822ac27d8b0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -31,6 +31,9 @@ public function __construct()
             'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
             'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 116972d25b8fc..8fbfc408caa4c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -30,6 +30,9 @@ public function __construct()
         $this->methodMap = array(
             'foo' => 'getFooService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index 3a38cff1a1539..d3349f02b3007 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -36,6 +36,9 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index 20eda55d99e0f..327d9e1c4136c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -35,6 +35,9 @@ public function __construct()
             'Bar\\Foo' => 'getFooService',
             'Foo\\Foo' => 'getFoo2Service',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index 1689a9658668a..f46835ef9dfc1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -29,6 +29,9 @@ public function __construct()
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 059f0912815ca..0af1392afd0f6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -295,6 +295,7 @@ class Container%s extends Container
         );
         $this->privates = array(
             'factory_simple' => true,
+            'service_container' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 103bb0de34d88..3478d54ec52be 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -52,6 +52,7 @@ public function __construct()
         );
         $this->privates = array(
             'factory_simple' => true,
+            'service_container' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index d848941013388..872b5179532b6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -36,6 +36,9 @@ public function __construct()
         $this->methodMap = array(
             'bar' => 'getBarService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 4f4c7e79df38b..8ebd8f0580c58 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -29,6 +29,9 @@ public function __construct()
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
index 70e781bdfd9e9..aa154e2c435aa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -38,7 +38,6 @@ public function __construct()
             'private_alias_decorator' => 'getPrivateAliasDecoratorService',
             'private_child' => 'getPrivateChildService',
             'private_decorator' => 'getPrivateDecoratorService',
-            'private_decorator.inner' => 'getPrivateDecorator_InnerService',
             'private_not_inlined' => 'getPrivateNotInlinedService',
             'private_not_removed' => 'getPrivateNotRemovedService',
             'private_parent' => 'getPrivateParentService',
@@ -50,10 +49,10 @@ public function __construct()
             'private' => true,
             'private_alias' => true,
             'private_child' => true,
-            'private_decorator.inner' => true,
             'private_not_inlined' => true,
             'private_not_removed' => true,
             'private_parent' => true,
+            'service_container' => true,
         );
         $this->aliases = array(
             'alias_to_private' => 'private',
@@ -158,16 +157,6 @@ protected function getPrivateChildService()
         return $this->services['private_child'] = new \stdClass();
     }
 
-    /**
-     * Gets the private 'private_decorator.inner' shared service.
-     *
-     * @return \stdClass
-     */
-    protected function getPrivateDecorator_InnerService()
-    {
-        return $this->services['private_decorator.inner'] = new \stdClass();
-    }
-
     /**
      * Gets the private 'private_not_inlined' shared service.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index 751ad8e4fa454..fb2bbbcde8a5a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -40,6 +40,7 @@ public function __construct()
         );
         $this->privates = array(
             'baz_service' => true,
+            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index a6717fd6abf8f..6c24edc01801c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -34,6 +34,7 @@ public function __construct()
         );
         $this->privates = array(
             'baz_service' => true,
+            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index e5129d4f36566..121951a26f998 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -33,6 +33,7 @@ public function __construct()
         );
         $this->privates = array(
             'private_foo' => true,
+            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 2e08cdcb42f92..22496e69a4dce 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -36,6 +36,9 @@ public function __construct()
             'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor' => 'getRot13EnvVarProcessorService',
             'container.env_var_processors_locator' => 'getContainer_EnvVarProcessorsLocatorService',
         );
+        $this->privates = array(
+            'service_container' => true,
+        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 3d7cc80336831..21fcf03c1efe3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -38,6 +38,7 @@ public function __construct()
         );
         $this->privates = array(
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
+            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 4c26d58d70c28..5a2990e303840 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -35,6 +35,7 @@ public function __construct()
         );
         $this->privates = array(
             'foo3' => true,
+            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
index 2ed88fee5a0d4..34fd11ef097c2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
@@ -2,7 +2,7 @@
 
   
     
-    
+    
       
         
           
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
index c4e32cb634e0c..7183435842f13 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
@@ -2,7 +2,7 @@
 
   
     
-    
+    
     
     
   
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index c7884fb11d6ab..59fa6b102ab42 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -7,7 +7,7 @@
   
   
     
-    
+    
       
       
       foo
@@ -31,20 +31,20 @@
       
       
     
-    
+    
       
       
     
-    
+    
       foo
       
       %foo_bar%
       
     
-    
+    
       
     
-    
+    
       %path%foo.php
       
         
@@ -62,7 +62,7 @@
         service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")
       
     
-    
+    
       
         
       
@@ -73,60 +73,60 @@
         
       
     
-    
+    
       
         
       
     
-    
+    
     
       
         
       
     
-    
+    
       
     
     
       bar
     
-    
+    
       
     
-    
-    
-    
-    
+    
+    
+    
+    
       The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
     
     
       bar
     
-    
+    
       
     
-    
+    
       bar
       
     
-    
+    
       
     
     
       foo
       The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
     
-    
+    
       
     
-    
+    
       
         
         
       
       
     
-    
+    
       
         
         
@@ -135,7 +135,7 @@
     
     
     
-    
-    
+    
+    
   
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
index 334e8b045f237..bf9e07e5b083c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
@@ -2,7 +2,7 @@
 
   
     
-    
+    
     
     
   
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml
index afabf3d891d39..bc0f719bd5330 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml
@@ -1,6 +1,7 @@
 
 
   
+    
     
     
       
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
index afed157017f4d..5faf830410afc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
@@ -5,6 +5,7 @@ services:
         synthetic: true
     foo:
         class: Foo
+        public: true
         autowire: true
     Psr\Container\ContainerInterface:
         alias: service_container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
index d573e810dbe23..aa44b4d77a941 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services26.yml
@@ -9,6 +9,7 @@ parameters:
 
 services:
     test:
+        public: true
         class: '%env(FOO)%'
         arguments:
             - '%env(Bar)%'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index 01b67d78ac553..1744611a1a7e0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -20,18 +20,22 @@ services:
 
         factory: [Bar\FooClass, getInstance]
         configurator: sc_configure
+        public: true
     foo.baz:
         class: '%baz_class%'
         factory: ['%baz_class%', getInstance]
         configurator: ['%baz_class%', configureStatic1]
+        public: true
     bar:
         class: Bar\FooClass
         arguments: [foo, '@foo.baz', '%foo_bar%']
         configurator: ['@foo.baz', configure]
+        public: true
     foo_bar:
         class: '%foo_class%'
         shared: false
         arguments: ['@deprecated_service']
+        public: true
     method_call1:
         class: Bar\FooClass
         file: '%path%foo.php'
@@ -41,11 +45,13 @@ services:
             - [setBar, ['@?foo3']]
             - [setBar, ['@?foobaz']]
             - [setBar, ['@=service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")']]
+        public: true
 
     foo_with_inline:
         class: Foo
         calls:
             - [setBar, ['@inlined']]
+        public: true
 
     inlined:
         class: Bar
@@ -58,10 +64,12 @@ services:
         class: Baz
         calls:
             - [setFoo, ['@foo_with_inline']]
+        public: true
 
     request:
         class: Request
         synthetic: true
+        public: true
     configurator_service:
         class: ConfClass
         public: false
@@ -71,6 +79,7 @@ services:
     configured_service:
         class: stdClass
         configurator: ['@configurator_service', configureStdClass]
+        public: true
     configurator_service_simple:
         class: ConfClass
         public: false
@@ -78,18 +87,23 @@ services:
     configured_service_simple:
         class: stdClass
         configurator: ['@configurator_service_simple', configureStdClass]
+        public: true
     decorated:
         class: stdClass
+        public: true
     decorator_service:
         class: stdClass
         decorates: decorated
+        public: true
     decorator_service_with_name:
         class: stdClass
         decorates: decorated
         decoration_inner_name: decorated.pif-pouf
+        public: true
     deprecated_service:
         class: stdClass
         deprecated: The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
+        public: true
     new_factory:
         class: FactoryClass
         public: false
@@ -97,13 +111,16 @@ services:
     factory_service:
         class: Bar
         factory: ['@foo.baz', getInstance]
+        public: true
     new_factory_service:
         class: FooBarBaz
         properties: { foo: bar }
         factory: ['@new_factory', getInstance]
+        public: true
     service_from_static_method:
         class: Bar\FooClass
         factory: [Bar\FooClass, getInstance]
+        public: true
     factory_simple:
         class: SimpleFactoryClass
         deprecated: The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
@@ -112,14 +129,21 @@ services:
     factory_service_simple:
         class: Bar
         factory: ['@factory_simple', getInstance]
+        public: true
     lazy_context:
         class: LazyContext
         arguments: [!iterator {'k1': '@foo.baz', 'k2': '@service_container'}, !iterator []]
+        public: true
     lazy_context_ignore_invalid_ref:
         class: LazyContext
         arguments: [!iterator ['@foo.baz', '@?invalid'], !iterator []]
-    alias_for_foo: '@foo'
-    alias_for_alias: '@foo'
+        public: true
+    alias_for_foo:
+        alias: 'foo'
+        public: true
+    alias_for_alias:
+        alias: 'foo'
+        public: true
     Psr\Container\ContainerInterface:
         alias: service_container
         public: false
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
index 14adedf32dde0..15d78b50a7725 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
@@ -5,6 +5,7 @@ services:
         synthetic: true
     foo:
         class: Class1
+        public: true
         arguments: [!service { class: Class2, arguments: [!service { class: Class2 }] }]
     Psr\Container\ContainerInterface:
         alias: service_container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml
index ac54a57dff013..0fd20446e7964 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_legacy_privates.yml
@@ -1,4 +1,5 @@
 services:
+    _defaults: {public: true}
 
     foo: {class: stdClass, public: false}
 
@@ -23,6 +24,4 @@ services:
     private_not_inlined: {class: stdClass, public: false}
     private_not_removed: {class: stdClass, public: false}
 
-    private_child: {parent: foo}
-    private_parent: {parent: private}
     public_child: {parent: private, public: true}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 8f6467c05eb76..a30567a2546e6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -234,7 +234,7 @@ public function testLoadAnonymousServices()
 
     /**
      * @group legacy
-     * @expectedDeprecation Top-level anonymous services are deprecated since Symfony 3.4, the "id" attribute will be required in version 4.0 in %sservices_without_id.xml at line 4.
+     * @expectedDeprecation Top-level anonymous services are deprecated since Symfony 3.4, the "id" attribute will be required in version 4.0 in %sservices_without_id.xml at line 5.
      */
     public function testLoadAnonymousServicesWithoutId()
     {

From 1db99f316d67db6a344777b125cc88bbcaf1829e Mon Sep 17 00:00:00 2001
From: Kevin Verschaeve 
Date: Tue, 19 Sep 2017 12:46:10 +0200
Subject: [PATCH 0856/1099] [TwigBundle] Break long lines in exceptions

---
 .../Bundle/TwigBundle/Resources/views/Exception/trace.html.twig | 2 +-
 .../Bundle/TwigBundle/Resources/views/exception.css.twig        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
index 1d8125a38f84b..4e6c85a420bff 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
@@ -1,4 +1,4 @@
-
+
     {% if trace.file|default(false) %}
         {{ include('@Twig/images/icon-minus-square.svg') }}
         {{ include('@Twig/images/icon-plus-square.svg') }}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
index 9f12edece1e71..87a60d4197072 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
@@ -105,7 +105,7 @@ header .container { display: flex; justify-content: space-between; }
 .trace-line a { color: #222; }
 .trace-line .icon { opacity: .4; position: absolute; left: 10px; top: 11px; }
 .trace-line .icon svg { height: 16px; width: 16px; }
-.trace-line-header { padding-left: 36px; }
+.trace-line-header { padding-left: 36px; padding-right: 10px; }
 
 .trace-file-path, .trace-file-path a { color: #222; font-size: 13px; }
 .trace-class { color: #B0413E; }

From f13081d12c7fe27da12db5d079cf42826af39403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= 
Date: Tue, 19 Sep 2017 13:52:15 +0200
Subject: [PATCH 0857/1099] [Form] Fix phpdoc

---
 src/Symfony/Component/Form/FormConfigInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php
index 47a2ac35a89a5..e66570cf5f1e6 100644
--- a/src/Symfony/Component/Form/FormConfigInterface.php
+++ b/src/Symfony/Component/Form/FormConfigInterface.php
@@ -167,7 +167,7 @@ public function getData();
     /**
      * Returns the class of the form data or null if the data is scalar or an array.
      *
-     * @return string The data class or null
+     * @return null|string The data class or null
      */
     public function getDataClass();
 

From e2d4904a843652b4d43e570fcde9d8cfbb8d7658 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Fri, 15 Sep 2017 10:30:52 -0400
Subject: [PATCH 0858/1099] Render all line breaks according to the exception
 message

---
 src/Symfony/Component/Console/Application.php    |  7 +++----
 .../Component/Console/Tests/ApplicationTest.php  | 16 ++++++++++++++++
 .../application_renderexception_linebreaks.txt   | 11 +++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 21b2e8ea5c40a..37f3dc4885118 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -681,7 +681,7 @@ public function renderException($e, $output)
                 $width = 1 << 31;
             }
             $lines = array();
-            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
+            foreach (preg_split('/\r?\n/', trim($e->getMessage())) as $line) {
                 foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                     // pre-format lines to get the right string length
                     $lineLength = Helper::strlen($line) + 4;
@@ -1133,9 +1133,8 @@ private function splitStringByWidth($string, $width)
             $lines[] = str_pad($line, $width);
             $line = $char;
         }
-        if ('' !== $line) {
-            $lines[] = count($lines) ? str_pad($line, $width) : $line;
-        }
+
+        $lines[] = count($lines) ? str_pad($line, $width) : $line;
 
         mb_convert_variables($encoding, 'utf8', $lines);
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index af92f6c4ba579..8ffc5d695174b 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -608,6 +608,22 @@ public function testRenderExceptionEscapesLines()
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_escapeslines.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting');
     }
 
+    public function testRenderExceptionLineBreaks()
+    {
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('getTerminalWidth'))->getMock();
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
+        $application->register('foo')->setCode(function () {
+            throw new \InvalidArgumentException("\n\nline 1 with extra spaces        \nline 2\n\nline 4\n");
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
+    }
+
     public function testRun()
     {
         $application = new Application();
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
new file mode 100644
index 0000000000000..e9a9518b4aead
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
@@ -0,0 +1,11 @@
+
+                                    
+  [InvalidArgumentException]        
+  line 1 with extra spaces          
+  line 2                            
+                                    
+  line 4                            
+                                    
+
+foo
+

From ff2ab5831a9fcaf2847e3dc48afd97c52a026165 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 19 Sep 2017 22:53:21 +0200
Subject: [PATCH 0859/1099] [DI] Fix private-by-default BC layer

---
 .../Tests/LazyProxy/ContainerBuilderTest.php  |  2 +-
 .../FrameworkExtensionTest.php                |  1 +
 .../WebProfilerExtensionTest.php              | 14 +++++---
 .../DependencyInjection/ChildDefinition.php   |  1 +
 .../Compiler/RemoveUnusedDefinitionsPass.php  |  2 +-
 .../DependencyInjection/ContainerBuilder.php  | 30 ++++++++++++----
 .../Loader/XmlFileLoader.php                  |  6 +---
 .../Tests/ContainerBuilderTest.php            | 34 ++++++++++++-------
 .../Tests/Dumper/XmlDumperTest.php            |  8 ++---
 .../Tests/Fixtures/php/services1-1.php        |  3 --
 .../Tests/Fixtures/php/services1.php          |  3 --
 .../Tests/Fixtures/php/services10.php         |  3 --
 .../Tests/Fixtures/php/services12.php         |  3 --
 .../Tests/Fixtures/php/services13.php         |  3 --
 .../Tests/Fixtures/php/services19.php         |  3 --
 .../Tests/Fixtures/php/services24.php         |  3 --
 .../Tests/Fixtures/php/services26.php         |  3 --
 .../Tests/Fixtures/php/services33.php         |  3 --
 .../Tests/Fixtures/php/services8.php          |  3 --
 .../Tests/Fixtures/php/services9_as_files.txt |  1 -
 .../Tests/Fixtures/php/services9_compiled.php |  1 -
 .../Fixtures/php/services_array_params.php    |  3 --
 .../Fixtures/php/services_base64_env.php      |  3 --
 .../Fixtures/php/services_legacy_privates.php |  1 -
 .../Tests/Fixtures/php/services_locator.php   |  1 -
 .../Fixtures/php/services_private_frozen.php  |  1 -
 .../php/services_private_in_expression.php    |  1 -
 .../Tests/Fixtures/php/services_rot13_env.php |  3 --
 .../Fixtures/php/services_subscriber.php      |  1 -
 .../php/services_uninitialized_ref.php        |  1 -
 .../Tests/Fixtures/xml/services1.xml          |  2 +-
 .../Tests/Fixtures/xml/services21.xml         |  2 +-
 .../Tests/Fixtures/xml/services24.xml         |  2 +-
 .../Tests/Fixtures/xml/services8.xml          |  2 +-
 .../Tests/Fixtures/xml/services9.xml          |  2 +-
 .../Tests/Fixtures/xml/services_abstract.xml  |  2 +-
 .../Tests/Fixtures/xml/services_dump_load.xml |  2 +-
 .../Tests/Fixtures/yaml/services1.yml         |  1 +
 .../Tests/Fixtures/yaml/services24.yml        |  1 +
 .../Tests/Fixtures/yaml/services8.yml         |  1 +
 .../Tests/Fixtures/yaml/services9.yml         |  1 +
 .../Tests/Fixtures/yaml/services_inline.yml   |  1 +
 .../DependencyInjection/FormPassTest.php      | 15 ++++----
 .../ResettableServicePassTest.php             |  3 ++
 .../ServiceResetListenerTest.php              |  5 +--
 .../Component/HttpKernel/Tests/KernelTest.php |  2 +-
 46 files changed, 91 insertions(+), 98 deletions(-)

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
index 858e9d76b64c9..fc5af78fac182 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
@@ -31,7 +31,7 @@ public function testCreateProxyServiceWithRuntimeInstantiator()
 
         $builder->setProxyInstantiator(new RuntimeInstantiator());
 
-        $builder->register('foo1', 'ProxyManagerBridgeFooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
+        $builder->register('foo1', 'ProxyManagerBridgeFooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php')->setPublic(true);
         $builder->getDefinition('foo1')->setLazy(true);
 
         $builder->compile();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index e32db4097da64..89f8f48182157 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -953,6 +953,7 @@ public function testEventDispatcherService()
         $this->loadFromFile($container, 'default_config');
         $container
             ->register('foo', \stdClass::class)
+            ->setPublic(true)
             ->setProperty('dispatcher', new Reference('event_dispatcher'));
         $container->compile();
         $this->assertInstanceOf(EventDispatcherInterface::class, $container->get('foo')->dispatcher);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index 25e352e7124ce..fbb3ca072046e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -52,11 +52,11 @@ protected function setUp()
         $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
-        $this->container->register('event_dispatcher', EventDispatcher::class);
-        $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'));
-        $this->container->register('twig', 'Twig\Environment');
-        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array());
-        $this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'));
+        $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
+        $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
+        $this->container->register('twig', 'Twig\Environment')->setPublic(true);
+        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array())->setPublic(true);
+        $this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'))->setPublic(true);
         $this->container->setParameter('kernel.bundles', array());
         $this->container->setParameter('kernel.cache_dir', __DIR__);
         $this->container->setParameter('kernel.debug', false);
@@ -65,6 +65,7 @@ protected function setUp()
         $this->container->setParameter('debug.file_link_format', null);
         $this->container->setParameter('profiler.class', array('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'));
         $this->container->register('profiler', $this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'))
+            ->setPublic(true)
             ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
         $this->container->setParameter('data_collector.templates', array());
         $this->container->set('kernel', $this->kernel);
@@ -123,6 +124,9 @@ public function getDebugModes()
 
     private function getCompiledContainer()
     {
+        if ($this->container->has('web_profiler.debug_toolbar')) {
+            $this->container->getDefinition('web_profiler.debug_toolbar')->setPublic(true);
+        }
         $this->container->compile();
         $this->container->set('kernel', $this->kernel);
 
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
index d72c762c5c6dd..f363a64829c24 100644
--- a/src/Symfony/Component/DependencyInjection/ChildDefinition.php
+++ b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -30,6 +30,7 @@ class ChildDefinition extends Definition
     public function __construct($parent)
     {
         $this->parent = $parent;
+        $this->setPrivate(false);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
index 7fcf6cc634283..9a200499fa69a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -68,8 +68,8 @@ public function process(ContainerBuilder $container)
 
             if (1 === count($referencingAliases) && false === $isReferenced) {
                 $container->setDefinition((string) reset($referencingAliases), $definition);
-                $definition->setPrivate(reset($referencingAliases)->isPrivate());
                 $definition->setPublic(!$definition->isPrivate());
+                $definition->setPrivate(reset($referencingAliases)->isPrivate());
                 $container->removeDefinition($id);
                 $container->log($this, sprintf('Removed service "%s"; reason: replaces alias %s.', $id, reset($referencingAliases)));
             } elseif (0 === count($referencingAliases) && false === $isReferenced) {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 4881f828f1c6f..d46da389f05b4 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -126,7 +126,7 @@ public function __construct(ParameterBagInterface $parameterBag = null)
         parent::__construct($parameterBag);
 
         $this->trackResources = interface_exists('Symfony\Component\Config\Resource\ResourceInterface');
-        $this->setDefinition('service_container', (new Definition(ContainerInterface::class))->setSynthetic(true));
+        $this->setDefinition('service_container', (new Definition(ContainerInterface::class))->setSynthetic(true)->setPublic(true));
         $this->setAlias(PsrContainerInterface::class, new Alias('service_container', false));
         $this->setAlias(ContainerInterface::class, new Alias('service_container', false));
     }
@@ -562,6 +562,22 @@ public function has($id)
      * @see Reference
      */
     public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
+    {
+        if ($this->isCompiled()) {
+            $id = $this->normalizeId($id);
+
+            if (isset($this->definitions[$id]) && $this->definitions[$id]->isPrivate()) {
+                @trigger_error(sprintf('Fetching the "%s" private service is deprecated and will fail in Symfony 4.0. Make the service public instead.', $id), E_USER_DEPRECATED);
+            }
+            if (isset($this->aliasDefinitions[$id]) && $this->aliasDefinitions[$id]->isPrivate()) {
+                @trigger_error(sprintf('Fetching the "%s" private alias is deprecated and will fail in Symfony 4.0. Make the alias public instead.', $id), E_USER_DEPRECATED);
+            }
+        }
+
+        return $this->doGet($id, $invalidBehavior);
+    }
+
+    private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
         $id = $this->normalizeId($id);
 
@@ -573,7 +589,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
         }
 
         if (!isset($this->definitions[$id]) && isset($this->aliasDefinitions[$id])) {
-            return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);
+            return $this->doGet((string) $this->aliasDefinitions[$id], $invalidBehavior);
         }
 
         try {
@@ -1122,7 +1138,7 @@ private function createService(Definition $definition, $id, $tryProxy = true)
                 $callable[0] = $parameterBag->resolveValue($callable[0]);
 
                 if ($callable[0] instanceof Reference) {
-                    $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
+                    $callable[0] = $this->doGet((string) $callable[0], $callable[0]->getInvalidBehavior());
                 } elseif ($callable[0] instanceof Definition) {
                     $callable[0] = $this->createService($callable[0], null);
                 }
@@ -1166,7 +1182,7 @@ public function resolveServices($value)
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->get($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                             continue 2;
                         }
                     }
@@ -1182,7 +1198,7 @@ public function resolveServices($value)
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->get($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                             continue 2;
                         }
                     }
@@ -1193,7 +1209,7 @@ public function resolveServices($value)
                 return $count;
             });
         } elseif ($value instanceof Reference) {
-            $value = $this->get((string) $value, $value->getInvalidBehavior());
+            $value = $this->doGet((string) $value, $value->getInvalidBehavior());
         } elseif ($value instanceof Definition) {
             $value = $this->createService($value, null);
         } elseif ($value instanceof Expression) {
@@ -1518,7 +1534,7 @@ private function callMethod($service, $call)
             }
         }
         foreach (self::getInitializedConditionals($call[1]) as $s) {
-            if (!$this->get($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+            if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                 return;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 6bebf2133c57b..f152d462676e2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -255,11 +255,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
             $definition->setChanges(array());
         }
 
-        if ($publicAttr = $service->getAttribute('public')) {
-            $definition->setPublic(XmlUtils::phpize($publicAttr));
-        }
-
-        foreach (array('class', 'shared', 'synthetic', 'lazy', 'abstract') as $key) {
+        foreach (array('class', 'public', 'shared', 'synthetic', 'lazy', 'abstract') as $key) {
             if ($value = $service->getAttribute($key)) {
                 $method = 'set'.$key;
                 $definition->$method(XmlUtils::phpize($value));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index d074189cbeab7..80c9eb4559809 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -630,6 +630,7 @@ public function testCompileWithResolveEnv()
         $container->setParameter('env(HTTP_DUMMY_VAR)', '123');
         $container->register('teatime', 'stdClass')
             ->setProperty('foo', '%env(DUMMY_ENV_VAR)%')
+            ->setPublic(true)
         ;
         $container->compile(true);
 
@@ -687,9 +688,11 @@ public function testCastEnv()
         $container = new ContainerBuilder();
         $container->setParameter('env(FAKE)', '123');
 
-        $container->register('foo', 'stdClass')->setProperties(array(
-            'fake' => '%env(int:FAKE)%',
-        ));
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setProperties(array(
+                'fake' => '%env(int:FAKE)%',
+            ));
 
         $container->compile(true);
 
@@ -701,7 +704,9 @@ public function testEnvAreNullable()
         $container = new ContainerBuilder();
         $container->setParameter('env(FAKE)', null);
 
-        $container->register('foo', 'stdClass')->setProperties(array(
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setProperties(array(
             'fake' => '%env(int:FAKE)%',
         ));
 
@@ -860,7 +865,7 @@ public function testCompilesClassDefinitionsOfLazyServices()
 
         $this->assertEmpty($container->getResources(), 'No resources get registered without resource tracking');
 
-        $container->register('foo', 'BarClass');
+        $container->register('foo', 'BarClass')->setPublic(true);
         $container->getDefinition('foo')->setLazy(true);
 
         $container->compile();
@@ -959,7 +964,7 @@ public function testPrivateServiceUser()
 
         $container->addDefinitions(array(
             'bar' => $fooDefinition,
-            'bar_user' => $fooUserDefinition,
+            'bar_user' => $fooUserDefinition->setPublic(true),
         ));
 
         $container->compile();
@@ -973,7 +978,7 @@ public function testThrowsExceptionWhenSetServiceOnACompiledContainer()
     {
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
-        $container->setDefinition('a', new Definition('stdClass'));
+        $container->register('a', 'stdClass')->setPublic(true);
         $container->compile();
         $container->set('a', new \stdClass());
     }
@@ -990,7 +995,7 @@ public function testNoExceptionWhenSetSyntheticServiceOnACompiledContainer()
     {
         $container = new ContainerBuilder();
         $def = new Definition('stdClass');
-        $def->setSynthetic(true);
+        $def->setSynthetic(true)->setPublic(true);
         $container->setDefinition('a', $def);
         $container->compile();
         $container->set('a', $a = new \stdClass());
@@ -1031,10 +1036,10 @@ public function testAbstractAlias()
         $container = new ContainerBuilder();
 
         $abstract = new Definition('AbstractClass');
-        $abstract->setAbstract(true);
+        $abstract->setAbstract(true)->setPublic(true);
 
         $container->setDefinition('abstract_service', $abstract);
-        $container->setAlias('abstract_alias', 'abstract_service');
+        $container->setAlias('abstract_alias', 'abstract_service')->setPublic(true);
 
         $container->compile();
 
@@ -1048,6 +1053,7 @@ public function testLazyLoadedService()
             $container->set('a', new \BazClass());
             $definition = new Definition('BazClass');
             $definition->setLazy(true);
+            $definition->setPublic(true);
             $container->setDefinition('a', $definition);
         });
 
@@ -1075,6 +1081,7 @@ public function testInitializePropertiesBeforeMethodCalls()
         $container = new ContainerBuilder();
         $container->register('foo', 'stdClass');
         $container->register('bar', 'MethodCallClass')
+            ->setPublic(true)
             ->setProperty('simple', 'bar')
             ->setProperty('complex', new Reference('foo'))
             ->addMethodCall('callMe');
@@ -1088,9 +1095,10 @@ public function testAutowiring()
     {
         $container = new ContainerBuilder();
 
-        $container->register(A::class);
+        $container->register(A::class)->setPublic(true);
         $bDefinition = $container->register('b', __NAMESPACE__.'\B');
         $bDefinition->setAutowired(true);
+        $bDefinition->setPublic(true);
 
         $container->compile();
 
@@ -1149,12 +1157,13 @@ public function testServiceLocator()
     {
         $container = new ContainerBuilder();
         $container->register('foo_service', ServiceLocator::class)
+            ->setPublic(true)
             ->addArgument(array(
                 'bar' => new ServiceClosureArgument(new Reference('bar_service')),
                 'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
             ))
         ;
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')));
+        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -1234,6 +1243,7 @@ public function testParameterWithMixedCase()
     {
         $container = new ContainerBuilder(new ParameterBag(array('foo' => 'bar')));
         $container->register('foo', 'stdClass')
+            ->setPublic(true)
             ->setProperty('foo', '%FOO%');
 
         $container->compile();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 7904ed0c9e6db..2e4ccf1fdbe4c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -74,7 +74,7 @@ public function testDumpAnonymousServices()
         $this->assertEquals('
 
   
-    
+    
     
       
         
@@ -98,7 +98,7 @@ public function testDumpEntities()
         $this->assertEquals("
 
   
-    
+    
     
       
       foo<>&bar
@@ -127,7 +127,7 @@ public function provideDecoratedServicesData()
             array("
 
   
-    
+    
     
     
     
@@ -137,7 +137,7 @@ public function provideDecoratedServicesData()
             array("
 
   
-    
+    
     
     
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index d87e61e14aa19..44631328ce606 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -29,9 +29,6 @@ class Container extends AbstractContainer
     public function __construct()
     {
         $this->services = array();
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 69fc82e056966..9ad021ece802b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -27,9 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index 26c73706168d3..d8478d677f4ff 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -32,9 +32,6 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 65891c77b994d..976c720768752 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -36,9 +36,6 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index 1525115f5b74a..42b9e78963662 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -30,9 +30,6 @@ public function __construct()
         $this->methodMap = array(
             'bar' => 'getBarService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index 44822ac27d8b0..3af42c502c0b4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -31,9 +31,6 @@ public function __construct()
             'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
             'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 8fbfc408caa4c..116972d25b8fc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -30,9 +30,6 @@ public function __construct()
         $this->methodMap = array(
             'foo' => 'getFooService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index d3349f02b3007..3a38cff1a1539 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -36,9 +36,6 @@ public function __construct()
         $this->methodMap = array(
             'test' => 'getTestService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index 327d9e1c4136c..20eda55d99e0f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -35,9 +35,6 @@ public function __construct()
             'Bar\\Foo' => 'getFooService',
             'Foo\\Foo' => 'getFoo2Service',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index f46835ef9dfc1..1689a9658668a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -29,9 +29,6 @@ public function __construct()
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 0af1392afd0f6..059f0912815ca 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -295,7 +295,6 @@ class Container%s extends Container
         );
         $this->privates = array(
             'factory_simple' => true,
-            'service_container' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 3478d54ec52be..103bb0de34d88 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -52,7 +52,6 @@ public function __construct()
         );
         $this->privates = array(
             'factory_simple' => true,
-            'service_container' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 872b5179532b6..d848941013388 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -36,9 +36,6 @@ public function __construct()
         $this->methodMap = array(
             'bar' => 'getBarService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 8ebd8f0580c58..4f4c7e79df38b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -29,9 +29,6 @@ public function __construct()
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
index aa154e2c435aa..611b0cf4acadd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -52,7 +52,6 @@ public function __construct()
             'private_not_inlined' => true,
             'private_not_removed' => true,
             'private_parent' => true,
-            'service_container' => true,
         );
         $this->aliases = array(
             'alias_to_private' => 'private',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index fb2bbbcde8a5a..751ad8e4fa454 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -40,7 +40,6 @@ public function __construct()
         );
         $this->privates = array(
             'baz_service' => true,
-            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index 6c24edc01801c..a6717fd6abf8f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -34,7 +34,6 @@ public function __construct()
         );
         $this->privates = array(
             'baz_service' => true,
-            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index 121951a26f998..e5129d4f36566 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -33,7 +33,6 @@ public function __construct()
         );
         $this->privates = array(
             'private_foo' => true,
-            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 22496e69a4dce..2e08cdcb42f92 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -36,9 +36,6 @@ public function __construct()
             'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor' => 'getRot13EnvVarProcessorService',
             'container.env_var_processors_locator' => 'getContainer_EnvVarProcessorsLocatorService',
         );
-        $this->privates = array(
-            'service_container' => true,
-        );
 
         $this->aliases = array();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 21fcf03c1efe3..3d7cc80336831 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -38,7 +38,6 @@ public function __construct()
         );
         $this->privates = array(
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
-            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 5a2990e303840..4c26d58d70c28 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -35,7 +35,6 @@ public function __construct()
         );
         $this->privates = array(
             'foo3' => true,
-            'service_container' => true,
         );
 
         $this->aliases = array();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services1.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services1.xml
index fd7bb3cf9b080..6dc3ea6618c6d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services1.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services1.xml
@@ -1,7 +1,7 @@
 
 
     
-        
+        
         
         
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
index 34fd11ef097c2..36fc8cfd81c68 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services21.xml
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
       
         
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
index 7183435842f13..abf389bc8d632 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services24.xml
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
     
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
index 533d2a38d765e..bc1186bd93ccf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
@@ -20,7 +20,7 @@
     
   
   
-    
+    
     
     
   
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index 59fa6b102ab42..06f314f5eff73 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -6,7 +6,7 @@
     bar
   
   
-    
+    
     
       
       
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
index bf9e07e5b083c..22abf54681f6a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
     
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_dump_load.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_dump_load.xml
index e763aa870a028..e70be185c0ee1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_dump_load.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_dump_load.xml
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
       
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml
index 7b0d3dc697852..071742f2e0519 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml
@@ -1,6 +1,7 @@
 services:
     service_container:
         class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
         synthetic: true
     Psr\Container\ContainerInterface:
         alias: service_container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
index 5faf830410afc..f59354e3e2509 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services24.yml
@@ -2,6 +2,7 @@
 services:
     service_container:
         class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
         synthetic: true
     foo:
         class: Foo
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
index 9efdf3e0d4d0a..4e37bc9315c9b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
@@ -8,6 +8,7 @@ parameters:
 services:
     service_container:
         class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
         synthetic: true
     Psr\Container\ContainerInterface:
         alias: service_container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index 1744611a1a7e0..b6b76da513106 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -6,6 +6,7 @@ parameters:
 services:
     service_container:
         class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
         synthetic: true
     foo:
         class: Bar\FooClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
index 15d78b50a7725..b985cabd9649e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_inline.yml
@@ -2,6 +2,7 @@
 services:
     service_container:
         class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
         synthetic: true
     foo:
         class: Class1
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
index 4e9971ea8ccf3..f045e3f9f5d50 100644
--- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
+++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -51,8 +51,8 @@ public function testAddTaggedTypes()
         $container = $this->createContainerBuilder();
 
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
-        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type');
-        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type');
+        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
+        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
 
         $container->compile();
 
@@ -73,8 +73,8 @@ public function testAddTaggedTypesToDebugCommand()
 
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
         $container->setDefinition(DebugCommand::class, $this->createDebugCommandDefinition());
-        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type');
-        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type');
+        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
+        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
 
         $container->compile();
 
@@ -163,6 +163,7 @@ public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
 
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
         $container->register('my.type_extension', 'stdClass')
+            ->setPublic(true)
             ->addTag('form.type_extension');
 
         $container->compile();
@@ -178,8 +179,8 @@ public function testAddTaggedGuessers()
         $definition2->addTag('form.type_guesser');
 
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
-        $container->setDefinition('my.guesser1', $definition1);
-        $container->setDefinition('my.guesser2', $definition2);
+        $container->setDefinition('my.guesser1', $definition1)->setPublic(true);
+        $container->setDefinition('my.guesser2', $definition2)->setPublic(true);
 
         $container->compile();
 
@@ -249,6 +250,7 @@ function (ContainerBuilder $container) {
     private function createExtensionDefinition()
     {
         $definition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $definition->setPublic(true);
         $definition->setArguments(array(
             array(),
             array(),
@@ -261,6 +263,7 @@ private function createExtensionDefinition()
     private function createDebugCommandDefinition()
     {
         $definition = new Definition('Symfony\Component\Form\Command\DebugCommand');
+        $definition->setPublic(true);
         $definition->setArguments(array(
             $formRegistry = $this->getMockBuilder(FormRegistryInterface::class)->getMock(),
             array(),
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
index 7363586f99588..c998ef2eaf086 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -18,11 +18,14 @@ public function testCompilerPass()
     {
         $container = new ContainerBuilder();
         $container->register('one', ResettableService::class)
+            ->setPublic(true)
             ->addTag('kernel.reset', array('method' => 'reset'));
         $container->register('two', ClearableService::class)
+            ->setPublic(true)
             ->addTag('kernel.reset', array('method' => 'clear'));
 
         $container->register(ServiceResetListener::class)
+            ->setPublic(true)
             ->setArguments(array(null, array()));
         $container->addCompilerPass(new ResettableServicePass('kernel.reset'));
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
index 4675fbe71e5a2..603d11b2bf412 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
@@ -56,10 +56,11 @@ public function testResetServicesTwice()
     private function buildContainer()
     {
         $container = new ContainerBuilder();
-        $container->register('one', ResettableService::class);
-        $container->register('two', ClearableService::class);
+        $container->register('one', ResettableService::class)->setPublic(true);
+        $container->register('two', ClearableService::class)->setPublic(true);
 
         $container->register('reset_subscriber', ServiceResetListener::class)
+            ->setPublic(true)
             ->addArgument(new IteratorArgument(array(
                 'one' => new Reference('one', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
                 'two' => new Reference('two', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 4a093472b9df1..a408f87f87a32 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -824,7 +824,7 @@ public function testKernelReset()
         $this->assertFileExists($containerFile);
         unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
 
-        $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass'); });
+        $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
         $kernel->boot();
 
         $this->assertTrue(get_class($kernel->getContainer()) !== $containerClass);

From 0e73d7126ee4c387a657b36ada1d1456e9cb3b39 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 19 Sep 2017 23:53:27 +0200
Subject: [PATCH 0860/1099] fixes

---
 .../AddExpressionLanguageProvidersPassTest.php   | 16 ++++++++--------
 .../Compiler/FormPassTest.php                    |  8 ++++++--
 .../Functional/app/CachePoolClear/config.yml     |  1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
index 0934fe31c0c40..d2fa0f4bdfb69 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -26,9 +26,9 @@ public function testProcessForRouter()
 
         $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
         $definition->addTag('routing.expression_language_provider');
-        $container->setDefinition('some_routing_provider', $definition);
+        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
-        $container->register('router', '\stdClass');
+        $container->register('router', '\stdClass')->setPublic(true);
         $container->compile();
 
         $router = $container->getDefinition('router');
@@ -45,9 +45,9 @@ public function testProcessForRouterAlias()
 
         $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
         $definition->addTag('routing.expression_language_provider');
-        $container->setDefinition('some_routing_provider', $definition);
+        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
-        $container->register('my_router', '\stdClass');
+        $container->register('my_router', '\stdClass')->setPublic(true);
         $container->setAlias('router', 'my_router');
         $container->compile();
 
@@ -65,9 +65,9 @@ public function testProcessForSecurity()
 
         $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
         $definition->addTag('security.expression_language_provider');
-        $container->setDefinition('some_security_provider', $definition);
+        $container->setDefinition('some_security_provider', $definition->setPublic(true));
 
-        $container->register('security.access.expression_voter', '\stdClass');
+        $container->register('security.access.expression_voter', '\stdClass')->setPublic(true);
         $container->compile();
 
         $router = $container->getDefinition('security.access.expression_voter');
@@ -84,9 +84,9 @@ public function testProcessForSecurityAlias()
 
         $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
         $definition->addTag('security.expression_language_provider');
-        $container->setDefinition('some_security_provider', $definition);
+        $container->setDefinition('some_security_provider', $definition->setPublic(true));
 
-        $container->register('my_security.access.expression_voter', '\stdClass');
+        $container->register('my_security.access.expression_voter', '\stdClass')->setPublic(true);
         $container->setAlias('security.access.expression_voter', 'my_security.access.expression_voter');
         $container->compile();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
index 9adbaf8da9062..58dbd2efd9c02 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
@@ -41,6 +41,7 @@ public function testAddTaggedTypes()
         $container->addCompilerPass(new FormPass());
 
         $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $extDefinition->setPublic(true);
         $extDefinition->setArguments(array(
             new Reference('service_container'),
             array(),
@@ -49,8 +50,8 @@ public function testAddTaggedTypes()
         ));
 
         $container->setDefinition('form.extension', $extDefinition);
-        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type');
-        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type');
+        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
+        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
 
         $container->compile();
 
@@ -76,6 +77,7 @@ public function testAddTaggedTypeExtensions(array $extensions, array $expectedRe
             array(),
             array(),
         ));
+        $extDefinition->setPublic(true);
 
         $container->setDefinition('form.extension', $extDefinition);
 
@@ -138,6 +140,7 @@ public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
             array(),
             array(),
         ));
+        $extDefinition->setPublic(true);
 
         $container->setDefinition('form.extension', $extDefinition);
         $container->register('my.type_extension', 'stdClass')
@@ -152,6 +155,7 @@ public function testAddTaggedGuessers()
         $container->addCompilerPass(new FormPass());
 
         $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $extDefinition->setPublic(true);
         $extDefinition->setArguments(array(
             new Reference('service_container'),
             array(),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/config.yml
index 75107485ee65f..b991dd593148d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/config.yml
@@ -5,6 +5,7 @@ services:
     dummy:
         class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass
         arguments: ['@cache.private_pool']
+        public: true
     custom_clearer:
         parent: cache.default_clearer
         tags:

From cc2abd9d1c3e977b9d29e8b3c10fd259af0b1edb Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 20 Sep 2017 06:13:06 +0200
Subject: [PATCH 0861/1099] fix merge

---
 .../Compiler/ResolveChildDefinitionsPass.php                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index c9b2d2f7c05cb..84447b853c78c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -142,7 +142,7 @@ private function doResolveDefinition(ChildDefinition $definition)
         if (isset($changes['public'])) {
             $def->setPublic($definition->isPublic());
         } else {
-            $def->setPrivate($parentDef->isPrivate());
+            $def->setPrivate($definition->isPrivate() || $parentDef->isPrivate());
         }
         if (isset($changes['lazy'])) {
             $def->setLazy($definition->isLazy());

From f433c9a79dc0983e6067be9db7aeacc81646f4ca Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 11 Sep 2017 10:46:30 +0200
Subject: [PATCH 0862/1099] [Routing] Add PHP fluent DSL for configuring routes

---
 .../Configurator/CollectionConfigurator.php   |  79 ++++++++++
 .../Configurator/ImportConfigurator.php       |  49 +++++++
 .../Loader/Configurator/RouteConfigurator.php |  31 ++++
 .../Configurator/RoutingConfigurator.php      |  54 +++++++
 .../Loader/Configurator/Traits/AddTrait.php   |  54 +++++++
 .../Loader/Configurator/Traits/RouteTrait.php | 137 ++++++++++++++++++
 .../Routing/Loader/PhpFileLoader.php          |  35 +++--
 .../Routing/Tests/Fixtures/php_dsl.php        |  21 +++
 .../Routing/Tests/Fixtures/php_dsl_sub.php    |  14 ++
 .../Tests/Loader/PhpFileLoaderTest.php        |  37 +++++
 10 files changed, 498 insertions(+), 13 deletions(-)
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
 create mode 100644 src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub.php

diff --git a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
new file mode 100644
index 0000000000000..67d5c77de5459
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
@@ -0,0 +1,79 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class CollectionConfigurator
+{
+    use Traits\AddTrait;
+    use Traits\RouteTrait;
+
+    private $parent;
+
+    public function __construct(RouteCollection $parent, $name)
+    {
+        $this->parent = $parent;
+        $this->name = $name;
+        $this->collection = new RouteCollection();
+        $this->route = new Route('');
+    }
+
+    public function __destruct()
+    {
+        $this->collection->addPrefix(rtrim($this->route->getPath(), '/'));
+        $this->parent->addCollection($this->collection);
+    }
+
+    /**
+     * Adds a route.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return RouteConfigurator
+     */
+    final public function add($name, $path)
+    {
+        $this->collection->add($this->name.$name, $route = clone $this->route);
+
+        return new RouteConfigurator($this->collection, $route->setPath($path), $this->name);
+    }
+
+    /**
+     * Creates a sub-collection.
+     *
+     * @return self
+     */
+    final public function collection($name = '')
+    {
+        return new self($this->collection, $this->name.$name);
+    }
+
+    /**
+     * Sets the prefix to add to the path of all child routes.
+     *
+     * @param string $prefix
+     *
+     * @return $this
+     */
+    final public function prefix($prefix)
+    {
+        $this->route->setPath($prefix);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
new file mode 100644
index 0000000000000..d0a3c373ff23a
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
@@ -0,0 +1,49 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ImportConfigurator
+{
+    use Traits\RouteTrait;
+
+    private $parent;
+
+    public function __construct(RouteCollection $parent, RouteCollection $route)
+    {
+        $this->parent = $parent;
+        $this->route = $route;
+    }
+
+    public function __destruct()
+    {
+        $this->parent->addCollection($this->route);
+    }
+
+    /**
+     * Sets the prefix to add to the path of all child routes.
+     *
+     * @param string $prefix
+     *
+     * @return $this
+     */
+    final public function prefix($prefix)
+    {
+        $this->route->addPrefix($prefix);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
new file mode 100644
index 0000000000000..b8d87025435e0
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class RouteConfigurator
+{
+    use Traits\AddTrait;
+    use Traits\RouteTrait;
+
+    public function __construct(RouteCollection $collection, Route $route, $name = '')
+    {
+        $this->collection = $collection;
+        $this->route = $route;
+        $this->name = $name;
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php
new file mode 100644
index 0000000000000..4591a86ba5cf9
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php
@@ -0,0 +1,54 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+use Symfony\Component\Routing\Loader\PhpFileLoader;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class RoutingConfigurator
+{
+    use Traits\AddTrait;
+
+    private $loader;
+    private $path;
+    private $file;
+
+    public function __construct(RouteCollection $collection, PhpFileLoader $loader, $path, $file)
+    {
+        $this->collection = $collection;
+        $this->loader = $loader;
+        $this->path = $path;
+        $this->file = $file;
+    }
+
+    /**
+     * @return ImportConfigurator
+     */
+    final public function import($resource, $type = null, $ignoreErrors = false)
+    {
+        $this->loader->setCurrentDir(dirname($this->path));
+        $subCollection = $this->loader->import($resource, $type, $ignoreErrors, $this->file);
+
+        return new ImportConfigurator($this->collection, $subCollection);
+    }
+
+    /**
+     * @return CollectionConfigurator
+     */
+    final public function collection($name = '')
+    {
+        return new CollectionConfigurator($this->collection, $name);
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
new file mode 100644
index 0000000000000..abaf868c9c698
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
@@ -0,0 +1,54 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator\Traits;
+
+use Symfony\Component\Routing\Loader\Configurator\RouteConfigurator;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+trait AddTrait
+{
+    /**
+     * @var RouteCollection
+     */
+    private $collection;
+
+    private $name = '';
+
+    /**
+     * Adds a route.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return RouteConfigurator
+     */
+    final public function add($name, $path)
+    {
+        $this->collection->add($this->name.$name, $route = new Route($path));
+
+        return new RouteConfigurator($this->collection, $route);
+    }
+
+    /**
+     * Adds a route.
+     *
+     * @param string $name
+     * @param string $path
+     *
+     * @return RouteConfigurator
+     */
+    final public function __invoke($name, $path)
+    {
+        return $this->add($name, $path);
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
new file mode 100644
index 0000000000000..8eb3276500d89
--- /dev/null
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
@@ -0,0 +1,137 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Loader\Configurator\Traits;
+
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+trait RouteTrait
+{
+    /**
+     * @var RouteCollection|Route
+     */
+    private $route;
+
+    /**
+     * Adds defaults.
+     *
+     * @param array $defaults
+     *
+     * @return $this
+     */
+    final public function defaults(array $defaults)
+    {
+        $this->route->addDefaults($defaults);
+
+        return $this;
+    }
+
+    /**
+     * Adds requirements.
+     *
+     * @param array $requirements
+     *
+     * @return $this
+     */
+    final public function requirements(array $requirements)
+    {
+        $this->route->addRequirements($requirements);
+
+        return $this;
+    }
+
+    /**
+     * Adds options.
+     *
+     * @param array $options
+     *
+     * @return $this
+     */
+    final public function options(array $options)
+    {
+        $this->route->addOptions($options);
+
+        return $this;
+    }
+
+    /**
+     * Sets the condition.
+     *
+     * @param string $condition
+     *
+     * @return $this
+     */
+    final public function condition($condition)
+    {
+        $this->route->setCondition($condition);
+
+        return $this;
+    }
+
+    /**
+     * Sets the pattern for the host.
+     *
+     * @param string $pattern
+     *
+     * @return $this
+     */
+    final public function host($pattern)
+    {
+        $this->route->setHost($pattern);
+
+        return $this;
+    }
+
+    /**
+     * Sets the schemes (e.g. 'https') this route is restricted to.
+     * So an empty array means that any scheme is allowed.
+     *
+     * @param array $schemes
+     *
+     * @return $this
+     */
+    final public function schemes(array $schemes)
+    {
+        $this->route->setSchemes($schemes);
+
+        return $this;
+    }
+
+    /**
+     * Sets the HTTP methods (e.g. 'POST') this route is restricted to.
+     * So an empty array means that any method is allowed.
+     *
+     * @param array $methods
+     *
+     * @return $this
+     */
+    final public function methods(array $methods)
+    {
+        $this->route->setMethods($methods);
+
+        return $this;
+    }
+
+    /**
+     * Adds the "_controller" entry to defaults.
+     *
+     * @param callable $controller a callable or parseable pseudo-callable
+     *
+     * @return $this
+     */
+    final public function controller($controller)
+    {
+        $this->route->addDefaults(array('_controller' => $controller));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php
index b4ba5fbc7f8ba..3fcd692f92562 100644
--- a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -37,7 +38,21 @@ public function load($file, $type = null)
         $path = $this->locator->locate($file);
         $this->setCurrentDir(dirname($path));
 
-        $collection = self::includeFile($path, $this);
+        // the closure forbids access to the private scope in the included file
+        $loader = $this;
+        $load = \Closure::bind(function ($file) use ($loader) {
+            return include $file;
+        }, null, ProtectedPhpFileLoader::class);
+
+        $result = $load($path);
+
+        if ($result instanceof \Closure) {
+            $collection = new RouteCollection();
+            $result(new RoutingConfigurator($collection, $this, $path, $file), $this);
+        } else {
+            $collection = $result;
+        }
+
         $collection->addResource(new FileResource($path));
 
         return $collection;
@@ -50,17 +65,11 @@ public function supports($resource, $type = null)
     {
         return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'php' === $type);
     }
+}
 
-    /**
-     * Safe include. Used for scope isolation.
-     *
-     * @param string        $file   File to include
-     * @param PhpFileLoader $loader the loader variable is exposed to the included file below
-     *
-     * @return RouteCollection
-     */
-    private static function includeFile($file, PhpFileLoader $loader)
-    {
-        return include $file;
-    }
+/**
+ * @internal
+ */
+final class ProtectedPhpFileLoader extends PhpFileLoader
+{
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php b/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
new file mode 100644
index 0000000000000..04f6d7ed6eab2
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
@@ -0,0 +1,21 @@
+add('foo', '/foo')
+            ->condition('abc')
+            ->options(array('utf8' => true))
+        ->add('buz', 'zub')
+            ->controller('foo:act');
+
+    $routes->import('php_dsl_sub.php')
+        ->prefix('/sub')
+        ->requirements(array('id' => '\d+'));
+
+    $routes->add('ouf', '/ouf')
+        ->schemes(array('https'))
+        ->methods(array('GET'))
+        ->defaults(array('id' => 0));
+};
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub.php b/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub.php
new file mode 100644
index 0000000000000..9eb444ded0c1c
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub.php
@@ -0,0 +1,14 @@
+collection('c_')
+        ->prefix('pub');
+
+    $add('bar', '/bar');
+
+    $add->collection('pub_')
+        ->host('host')
+        ->add('buz', 'buz');
+};
diff --git a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
index bda64236f6022..608d84ed7a20f 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -13,7 +13,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Loader\PhpFileLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class PhpFileLoaderTest extends TestCase
 {
@@ -80,4 +83,38 @@ public function testThatDefiningVariableInConfigFileHasNoSideEffects()
             (string) $fileResource
         );
     }
+
+    public function testRoutingConfigurator()
+    {
+        $locator = new FileLocator(array(__DIR__.'/../Fixtures'));
+        $loader = new PhpFileLoader($locator);
+        $routeCollection = $loader->load('php_dsl.php');
+
+        $expectedCollection = new RouteCollection();
+
+        $expectedCollection->add('foo', (new Route('/foo'))
+            ->setOptions(array('utf8' => true))
+            ->setCondition('abc')
+        );
+        $expectedCollection->add('buz', (new Route('/zub'))
+            ->setDefaults(array('_controller' => 'foo:act'))
+        );
+        $expectedCollection->add('c_bar', (new Route('/sub/pub/bar'))
+            ->setRequirements(array('id' => '\d+'))
+        );
+        $expectedCollection->add('c_pub_buz', (new Route('/sub/pub/buz'))
+            ->setHost('host')
+            ->setRequirements(array('id' => '\d+'))
+        );
+        $expectedCollection->add('ouf', (new Route('/ouf'))
+            ->setSchemes(array('https'))
+            ->setMethods(array('GET'))
+            ->setDefaults(array('id' => 0))
+        );
+
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub.php')));
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl.php')));
+
+        $this->assertEquals($expectedCollection, $routeCollection);
+    }
 }

From 814cc31e577b2b68eeb1b990a865016387605c71 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 8 Aug 2017 19:11:20 +0200
Subject: [PATCH 0863/1099] [DI] Add "PHP fluent format" for configuring the
 container

---
 .../Configurator/AbstractConfigurator.php     | 102 ++++++++++++
 .../AbstractServiceConfigurator.php           | 118 ++++++++++++++
 .../Loader/Configurator/AliasConfigurator.php |  30 ++++
 .../Configurator/ContainerConfigurator.php    | 128 +++++++++++++++
 .../Configurator/DefaultsConfigurator.php     |  68 ++++++++
 .../InlineServiceConfigurator.php             |  36 ++++
 .../Configurator/InstanceofConfigurator.php   |  43 +++++
 .../Configurator/ParametersConfigurator.php   |  57 +++++++
 .../Configurator/PrototypeConfigurator.php    |  84 ++++++++++
 .../Configurator/ReferenceConfigurator.php    |  63 +++++++
 .../Configurator/ServiceConfigurator.php      |  68 ++++++++
 .../Configurator/ServicesConfigurator.php     | 154 ++++++++++++++++++
 .../Configurator/Traits/AbstractTrait.php     |  35 ++++
 .../Configurator/Traits/ArgumentTrait.php     |  44 +++++
 .../Traits/AutoconfigureTrait.php             |  36 ++++
 .../Configurator/Traits/AutowireTrait.php     |  29 ++++
 .../Loader/Configurator/Traits/BindTrait.php  |  43 +++++
 .../Loader/Configurator/Traits/CallTrait.php  |  34 ++++
 .../Loader/Configurator/Traits/ClassTrait.php |  32 ++++
 .../Configurator/Traits/ConfiguratorTrait.php |  29 ++++
 .../Configurator/Traits/DecorateTrait.php     |  35 ++++
 .../Configurator/Traits/DeprecateTrait.php    |  34 ++++
 .../Configurator/Traits/FactoryTrait.php      |  29 ++++
 .../Loader/Configurator/Traits/FileTrait.php  |  29 ++++
 .../Loader/Configurator/Traits/LazyTrait.php  |  29 ++++
 .../Configurator/Traits/ParentTrait.php       |  53 ++++++
 .../Configurator/Traits/PropertyTrait.php     |  30 ++++
 .../Configurator/Traits/PublicTrait.php       |  39 +++++
 .../Loader/Configurator/Traits/ShareTrait.php |  29 ++++
 .../Configurator/Traits/SyntheticTrait.php    |  30 ++++
 .../Loader/Configurator/Traits/TagTrait.php   |  43 +++++
 .../Loader/PhpFileLoader.php                  |  20 ++-
 .../Tests/Fixtures/Prototype/Foo.php          |   7 +
 .../Tests/Fixtures/config/basic.expected.yml  |  10 ++
 .../Tests/Fixtures/config/basic.php           |  13 ++
 .../Tests/Fixtures/config/child.expected.yml  |  15 ++
 .../Tests/Fixtures/config/child.php           |  24 +++
 .../Fixtures/config/defaults.expected.yml     |  27 +++
 .../Tests/Fixtures/config/defaults.php        |  23 +++
 .../Fixtures/config/instanceof.expected.yml   |  21 +++
 .../Tests/Fixtures/config/instanceof.php      |  24 +++
 .../Tests/Fixtures/config/php7.expected.yml   |  19 +++
 .../Tests/Fixtures/config/php7.php            |  21 +++
 .../Fixtures/config/prototype.expected.yml    |  25 +++
 .../Tests/Fixtures/config/prototype.php       |  24 +++
 .../Tests/Fixtures/config/services9.php       | 122 ++++++++++++++
 .../Tests/Loader/PhpFileLoaderTest.php        |  41 +++++
 47 files changed, 2048 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ArgumentTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutowireTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ClassTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConfiguratorTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FileTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/LazyTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PropertyTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PublicTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ShareTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/SyntheticTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
new file mode 100644
index 0000000000000..2c4538e20144a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
@@ -0,0 +1,102 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+abstract class AbstractConfigurator
+{
+    const FACTORY = 'unknown';
+
+    public function __call($method, $args)
+    {
+        if (method_exists($this, 'set'.$method)) {
+            return call_user_func_array(array($this, 'set'.$method), $args);
+        }
+
+        throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_class($this), $method));
+    }
+
+    /**
+     * Checks that a value is valid, optionally replacing Definition and Reference configurators by their configure value.
+     *
+     * @param mixed $value
+     * @param bool  $allowServices whether Definition and Reference are allowed; by default, only scalars and arrays are
+     *
+     * @return mixed the value, optionaly cast to a Definition/Reference
+     */
+    public static function processValue($value, $allowServices = false)
+    {
+        if (is_array($value)) {
+            foreach ($value as $k => $v) {
+                $value[$k] = static::processValue($v, $allowServices);
+            }
+
+            return $value;
+        }
+
+        if ($value instanceof ReferenceConfigurator) {
+            static $refCast;
+
+            if (!$refCast) {
+                $refCast = \Closure::bind(function ($value) {
+                    return new Reference($value->id, $value->invalidBehavior);
+                }, null, $value);
+            }
+
+            // cast ReferenceConfigurator to Reference
+            return $refCast($value);
+        }
+
+        if ($value instanceof InlineServiceConfigurator) {
+            static $defCast;
+
+            if (!$defCast) {
+                $defCast = \Closure::bind(function ($value) {
+                    $def = $value->definition;
+                    $value->definition = null;
+
+                    return $def;
+                }, null, $value);
+            }
+
+            // cast InlineServiceConfigurator to Definition
+            return $defCast($value);
+        }
+
+        if ($value instanceof self) {
+            throw new InvalidArgumentException(sprintf('"%s()" can be used only at the root of service configuration files.', $value::FACTORY));
+        }
+
+        switch (true) {
+            case null === $value:
+            case is_scalar($value):
+                return $value;
+
+            case $value instanceof ArgumentInterface:
+            case $value instanceof Definition:
+            case $value instanceof Expression:
+            case $value instanceof Parameter:
+            case $value instanceof Reference:
+                if ($allowServices) {
+                    return $value;
+                }
+        }
+
+        throw new InvalidArgumentException(sprintf('Cannot use values of type "%s" in service configuration files.', is_object($value) ? get_class($value) : gettype($value)));
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
new file mode 100644
index 0000000000000..72ca7320b9f69
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
@@ -0,0 +1,118 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+
+abstract class AbstractServiceConfigurator extends AbstractConfigurator
+{
+    protected $parent;
+    protected $definition;
+    protected $id;
+    protected $defaultTags = array();
+
+    public function __construct(ServicesConfigurator $parent, Definition $definition, $id = null, array $defaultTags = array())
+    {
+        $this->parent = $parent;
+        $this->definition = $definition;
+        $this->id = $id;
+        $this->defaultTags = $defaultTags;
+    }
+
+    public function __destruct()
+    {
+        // default tags should be added last
+        foreach ($this->defaultTags as $name => $attributes) {
+            foreach ($attributes as $attributes) {
+                $this->definition->addTag($name, $attributes);
+            }
+        }
+        $this->defaultTags = array();
+    }
+
+    /**
+     * Registers a service.
+     *
+     * @param string      $id
+     * @param string|null $class
+     *
+     * @return ServiceConfigurator
+     */
+    final public function set($id, $class = null)
+    {
+        $this->__destruct();
+
+        return $this->parent->set($id, $class);
+    }
+
+    /**
+     * Creates an alias.
+     *
+     * @param string $id
+     * @param string $ref
+     *
+     * @return AliasConfigurator
+     */
+    final public function alias($id, $referencedId)
+    {
+        $this->__destruct();
+
+        return $this->parent->alias($id, $referencedId);
+    }
+
+    /**
+     * Registers a PSR-4 namespace using a glob pattern.
+     *
+     * @param string $namespace
+     * @param string $resource
+     *
+     * @return PrototypeConfigurator
+     */
+    final public function load($namespace, $resource)
+    {
+        $this->__destruct();
+
+        return $this->parent->load($namespace, $resource);
+    }
+
+    /**
+     * Gets an already defined service definition.
+     *
+     * @param string $id
+     *
+     * @return ServiceConfigurator
+     *
+     * @throws ServiceNotFoundException if the service definition does not exist
+     */
+    final public function get($id)
+    {
+        $this->__destruct();
+
+        return $this->parent->get($id);
+    }
+
+    /**
+     * Registers a service.
+     *
+     * @param string      $id
+     * @param string|null $class
+     *
+     * @return ServiceConfigurator
+     */
+    final public function __invoke($id, $class = null)
+    {
+        $this->__destruct();
+
+        return $this->parent->set($id, $class);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
new file mode 100644
index 0000000000000..cb00f58c049d4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Alias;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class AliasConfigurator extends AbstractServiceConfigurator
+{
+    const FACTORY = 'alias';
+
+    use Traits\PublicTrait;
+
+    public function __construct(ServicesConfigurator $parent, Alias $alias)
+    {
+        $this->parent = $parent;
+        $this->definition = $alias;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
new file mode 100644
index 0000000000000..132529087ab1d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -0,0 +1,128 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ContainerConfigurator extends AbstractConfigurator
+{
+    const FACTORY = 'container';
+
+    private $container;
+    private $loader;
+    private $instanceof;
+    private $path;
+    private $file;
+
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, &$instanceof, $path, $file)
+    {
+        $this->container = $container;
+        $this->loader = $loader;
+        $this->instanceof = &$instanceof;
+        $this->path = $path;
+        $this->file = $file;
+    }
+
+    final public function extension($namespace, array $config)
+    {
+        if (!$this->container->hasExtension($namespace)) {
+            $extensions = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
+            throw new InvalidArgumentException(sprintf(
+                'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
+                $namespace,
+                $this->file,
+                $namespace,
+                $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'
+            ));
+        }
+
+        $this->container->loadFromExtension($namespace, static::processValue($config));
+    }
+
+    final public function import($resource, $type = null, $ignoreErrors = false)
+    {
+        $this->loader->setCurrentDir(dirname($this->path));
+        $this->loader->import($resource, $type, $ignoreErrors, $this->file);
+    }
+
+    /**
+     * @return ParametersConfigurator
+     */
+    public function parameters()
+    {
+        return new ParametersConfigurator($this->container);
+    }
+
+    /**
+     * @return ServicesConfigurator
+     */
+    public function services()
+    {
+        return new ServicesConfigurator($this->container, $this->loader, $this->instanceof);
+    }
+}
+
+/**
+ * Creates a service reference.
+ *
+ * @param string $id
+ *
+ * @return ReferenceConfigurator
+ */
+function ref($id)
+{
+    return new ReferenceConfigurator($id);
+}
+
+/**
+ * Creates an inline service.
+ *
+ * @param string|null $class
+ *
+ * @return InlineServiceConfigurator
+ */
+function inline($class = null)
+{
+    return new InlineServiceConfigurator(new Definition($class));
+}
+
+/**
+ * Creates a lazy iterator.
+ *
+ * @param ReferenceConfigurator[] $values
+ *
+ * @return IteratorArgument
+ */
+function iterator(array $values)
+{
+    return new IteratorArgument(AbstractConfigurator::processValue($values, true));
+}
+
+/**
+ * Creates an expression.
+ *
+ * @param string $expression an expression
+ *
+ * @return Expression
+ */
+function expr($expression)
+{
+    return new Expression($expression);
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
new file mode 100644
index 0000000000000..4c3f1dc0f8c31
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
@@ -0,0 +1,68 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+/**
+ * @author Nicolas Grekas 
+ *
+ * @method InstanceofConfigurator instanceof(string $fqcn)
+ */
+class DefaultsConfigurator extends AbstractServiceConfigurator
+{
+    const FACTORY = 'defaults';
+
+    use Traits\AutoconfigureTrait;
+    use Traits\AutowireTrait;
+    use Traits\BindTrait;
+    use Traits\PublicTrait;
+
+    /**
+     * Adds a tag for this definition.
+     *
+     * @param string $name       The tag name
+     * @param array  $attributes An array of attributes
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException when an invalid tag name or attribute is provided
+     */
+    final public function tag($name, array $attributes = array())
+    {
+        if (!is_string($name) || '' === $name) {
+            throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string.'));
+        }
+
+        foreach ($attributes as $attribute => $value) {
+            if (!is_scalar($value) && null !== $value) {
+                throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type.', $name, $attribute));
+            }
+        }
+
+        $this->definition->addTag($name, $attributes);
+
+        return $this;
+    }
+
+    /**
+     * Defines an instanceof-conditional to be applied to following service definitions.
+     *
+     * @param string $fqcn
+     *
+     * @return InstanceofConfigurator
+     */
+    final protected function setInstanceof($fqcn)
+    {
+        return $this->parent->instanceof($fqcn);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
new file mode 100644
index 0000000000000..362b374e55970
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
@@ -0,0 +1,36 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class InlineServiceConfigurator extends AbstractConfigurator
+{
+    const FACTORY = 'inline';
+
+    use Traits\ArgumentTrait;
+    use Traits\AutowireTrait;
+    use Traits\BindTrait;
+    use Traits\FactoryTrait;
+    use Traits\FileTrait;
+    use Traits\LazyTrait;
+    use Traits\ParentTrait;
+    use Traits\TagTrait;
+
+    public function __construct(Definition $definition)
+    {
+        $this->definition = $definition;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
new file mode 100644
index 0000000000000..1d3975bf8794e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+/**
+ * @author Nicolas Grekas 
+ *
+ * @method InstanceofConfigurator instanceof(string $fqcn)
+ */
+class InstanceofConfigurator extends AbstractServiceConfigurator
+{
+    const FACTORY = 'instanceof';
+
+    use Traits\AutowireTrait;
+    use Traits\CallTrait;
+    use Traits\ConfiguratorTrait;
+    use Traits\LazyTrait;
+    use Traits\PropertyTrait;
+    use Traits\PublicTrait;
+    use Traits\ShareTrait;
+    use Traits\TagTrait;
+
+    /**
+     * Defines an instanceof-conditional to be applied to following service definitions.
+     *
+     * @param string $fqcn
+     *
+     * @return InstanceofConfigurator
+     */
+    final protected function setInstanceof($fqcn)
+    {
+        return $this->parent->instanceof($fqcn);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
new file mode 100644
index 0000000000000..0d81869e8bb50
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
@@ -0,0 +1,57 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ParametersConfigurator extends AbstractConfigurator
+{
+    const FACTORY = 'parameters';
+
+    private $container;
+
+    public function __construct(ContainerBuilder $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Creates a parameter.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return $this
+     */
+    final public function set($name, $value)
+    {
+        $this->container->setParameter($name, static::processValue($value, true));
+
+        return $this;
+    }
+
+    /**
+     * Creates a parameter.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return $this
+     */
+    final public function __invoke($name, $value)
+    {
+        return $this->set($name, $value);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
new file mode 100644
index 0000000000000..76e7829e8fe99
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -0,0 +1,84 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class PrototypeConfigurator extends AbstractServiceConfigurator
+{
+    const FACTORY = 'load';
+
+    use Traits\AbstractTrait;
+    use Traits\ArgumentTrait;
+    use Traits\AutoconfigureTrait;
+    use Traits\AutowireTrait;
+    use Traits\BindTrait;
+    use Traits\CallTrait;
+    use Traits\ConfiguratorTrait;
+    use Traits\DeprecateTrait;
+    use Traits\FactoryTrait;
+    use Traits\LazyTrait;
+    use Traits\ParentTrait;
+    use Traits\PropertyTrait;
+    use Traits\PublicTrait;
+    use Traits\ShareTrait;
+    use Traits\TagTrait;
+
+    private $loader;
+    private $resource;
+    private $exclude;
+    private $allowParent;
+
+    public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, $namespace, $resource, $allowParent)
+    {
+        $definition = new Definition();
+        $definition->setPublic($defaults->isPublic());
+        $definition->setAutowired($defaults->isAutowired());
+        $definition->setAutoconfigured($defaults->isAutoconfigured());
+        $definition->setBindings($defaults->getBindings());
+        $definition->setChanges(array());
+
+        $this->loader = $loader;
+        $this->resource = $resource;
+        $this->allowParent = $allowParent;
+
+        parent::__construct($parent, $definition, $namespace, $defaults->getTags());
+    }
+
+    public function __destruct()
+    {
+        parent::__destruct();
+
+        if ($this->loader) {
+            $this->loader->registerClasses($this->definition, $this->id, $this->resource, $this->exclude);
+        }
+        $this->loader = null;
+    }
+
+    /**
+     * Excludes files from registration using a glob pattern.
+     *
+     * @param string $exclude
+     *
+     * @return $this
+     */
+    final public function exclude($exclude)
+    {
+        $this->exclude = $exclude;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
new file mode 100644
index 0000000000000..93fdf3960e0dd
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
@@ -0,0 +1,63 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ReferenceConfigurator
+{
+    private $id;
+    private $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
+
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return $this
+     */
+    final public function ignoreOnInvalid()
+    {
+        $this->invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    final public function nullOnInvalid()
+    {
+        $this->invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    final public function ignoreOnUninitialized()
+    {
+        $this->invalidBehavior = ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE;
+
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return $this->id;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
new file mode 100644
index 0000000000000..12054cad0c021
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -0,0 +1,68 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ServiceConfigurator extends AbstractServiceConfigurator
+{
+    const FACTORY = 'services';
+
+    use Traits\AbstractTrait;
+    use Traits\ArgumentTrait;
+    use Traits\AutoconfigureTrait;
+    use Traits\AutowireTrait;
+    use Traits\BindTrait;
+    use Traits\CallTrait;
+    use Traits\ClassTrait;
+    use Traits\ConfiguratorTrait;
+    use Traits\DecorateTrait;
+    use Traits\DeprecateTrait;
+    use Traits\FactoryTrait;
+    use Traits\FileTrait;
+    use Traits\LazyTrait;
+    use Traits\ParentTrait;
+    use Traits\PropertyTrait;
+    use Traits\PublicTrait;
+    use Traits\ShareTrait;
+    use Traits\SyntheticTrait;
+    use Traits\TagTrait;
+
+    private $container;
+    private $instanceof;
+    private $allowParent;
+
+    public function __construct(ContainerBuilder $container, array $instanceof, $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags)
+    {
+        $this->container = $container;
+        $this->instanceof = $instanceof;
+        $this->allowParent = $allowParent;
+
+        parent::__construct($parent, $definition, $id, $defaultTags);
+    }
+
+    public function __destruct()
+    {
+        parent::__destruct();
+
+        if (!$this->definition instanceof ChildDefinition) {
+            $this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof));
+        } else {
+            $this->container->setDefinition($this->id, $this->definition);
+        }
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
new file mode 100644
index 0000000000000..390a0796988ca
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
@@ -0,0 +1,154 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Nicolas Grekas 
+ *
+ * @method InstanceofConfigurator instanceof($fqcn)
+ */
+class ServicesConfigurator extends AbstractConfigurator
+{
+    const FACTORY = 'services';
+
+    private $defaults;
+    private $container;
+    private $loader;
+    private $instanceof;
+
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof)
+    {
+        $this->defaults = new Definition();
+        $this->container = $container;
+        $this->loader = $loader;
+        $this->instanceof = &$instanceof;
+        $instanceof = array();
+    }
+
+    /**
+     * Defines a set of defaults for following service definitions.
+     *
+     * @return DefaultsConfigurator
+     */
+    public function defaults()
+    {
+        return new DefaultsConfigurator($this, $this->defaults = new Definition());
+    }
+
+    /**
+     * Defines an instanceof-conditional to be applied to following service definitions.
+     *
+     * @param string $fqcn
+     *
+     * @return InstanceofConfigurator
+     */
+    final protected function setInstanceof($fqcn)
+    {
+        $this->instanceof[$fqcn] = $definition = new ChildDefinition('');
+
+        return new InstanceofConfigurator($this, $definition, $fqcn);
+    }
+
+    /**
+     * Registers a service.
+     *
+     * @param string      $id
+     * @param string|null $class
+     *
+     * @return ServiceConfigurator
+     */
+    final public function set($id, $class = null)
+    {
+        $defaults = $this->defaults;
+        $allowParent = !$defaults->getChanges() && empty($this->instanceof);
+
+        $definition = new Definition();
+        $definition->setPublic($defaults->isPublic());
+        $definition->setAutowired($defaults->isAutowired());
+        $definition->setAutoconfigured($defaults->isAutoconfigured());
+        $definition->setBindings($defaults->getBindings());
+        $definition->setChanges(array());
+
+        $configurator = new ServiceConfigurator($this->container, $this->instanceof, $allowParent, $this, $definition, $id, $defaults->getTags());
+
+        return null !== $class ? $configurator->class($class) : $configurator;
+    }
+
+    /**
+     * Creates an alias.
+     *
+     * @param string $id
+     * @param string $referencedId
+     *
+     * @return AliasConfigurator
+     */
+    final public function alias($id, $referencedId)
+    {
+        $ref = static::processValue($referencedId, true);
+        $alias = new Alias((string) $ref, $this->defaults->isPublic());
+        $this->container->setAlias($id, $alias);
+
+        return new AliasConfigurator($this, $alias);
+    }
+
+    /**
+     * Registers a PSR-4 namespace using a glob pattern.
+     *
+     * @param string $namespace
+     * @param string $resource
+     *
+     * @return PrototypeConfigurator
+     */
+    final public function load($namespace, $resource)
+    {
+        $allowParent = !$this->defaults->getChanges() && empty($this->instanceof);
+
+        return new PrototypeConfigurator($this, $this->loader, $this->defaults, $namespace, $resource, $allowParent);
+    }
+
+    /**
+     * Gets an already defined service definition.
+     *
+     * @param string $id
+     *
+     * @return ServiceConfigurator
+     *
+     * @throws ServiceNotFoundException if the service definition does not exist
+     */
+    final public function get($id)
+    {
+        $allowParent = !$this->defaults->getChanges() && empty($this->instanceof);
+        $definition = $this->container->getDefinition($id);
+
+        return new ServiceConfigurator($this->container, $definition->getInstanceofConditionals(), $allowParent, $this, $definition, $id, array());
+    }
+
+    /**
+     * Registers a service.
+     *
+     * @param string      $id
+     * @param string|null $class
+     *
+     * @return ServiceConfigurator
+     */
+    final public function __invoke($id, $class = null)
+    {
+        return $this->set($id, $class);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
new file mode 100644
index 0000000000000..47e0dee287e0e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
@@ -0,0 +1,35 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @method $this abstract(bool $abstract = true)
+ */
+trait AbstractTrait
+{
+    /**
+     * Whether this definition is abstract, that means it merely serves as a
+     * template for other definitions.
+     *
+     * @param bool $abstract
+     *
+     * @return $this
+     */
+    final protected function setAbstract($abstract = true)
+    {
+        $this->definition->setAbstract($abstract);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ArgumentTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ArgumentTrait.php
new file mode 100644
index 0000000000000..7ec8c51d478e8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ArgumentTrait.php
@@ -0,0 +1,44 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait ArgumentTrait
+{
+    /**
+     * Sets the arguments to pass to the service constructor/factory method.
+     *
+     * @param array $arguments An array of arguments
+     *
+     * @return $this
+     */
+    final public function args(array $arguments)
+    {
+        $this->definition->setArguments(static::processValue($arguments, true));
+
+        return $this;
+    }
+
+    /**
+     * Sets one argument to pass to the service constructor/factory method.
+     *
+     * @param string|int $key
+     * @param mixed      $value
+     *
+     * @return $this
+     */
+    final public function arg($key, $value)
+    {
+        $this->definition->setArgument($key, static::processValue($value, true));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
new file mode 100644
index 0000000000000..e3dccc9656951
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
@@ -0,0 +1,36 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+trait AutoconfigureTrait
+{
+    /**
+     * Sets whether or not instanceof conditionals should be prepended with a global set.
+     *
+     * @param bool $autoconfigured
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException when a parent is already set
+     */
+    final public function autoconfigure($autoconfigured = true)
+    {
+        if ($autoconfigured && $this->definition instanceof ChildDefinition) {
+            throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.', $this->id));
+        }
+        $this->definition->setAutoconfigured($autoconfigured);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutowireTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutowireTrait.php
new file mode 100644
index 0000000000000..3d4b2e854b4c7
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutowireTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait AutowireTrait
+{
+    /**
+     * Enables/disables autowiring.
+     *
+     * @param bool $autowired
+     *
+     * @return $this
+     */
+    final public function autowire($autowired = true)
+    {
+        $this->definition->setAutowired($autowired);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
new file mode 100644
index 0000000000000..4511ed659d4e5
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+
+trait BindTrait
+{
+    /**
+     * Sets bindings.
+     *
+     * Bindings map $named or FQCN arguments to values that should be
+     * injected in the matching parameters (of the constructor, of methods
+     * called and of controller actions).
+     *
+     * @param string $nameOrFqcn A parameter name with its "$" prefix, or a FQCN
+     * @param mixed  $valueOrRef The value or reference to bind
+     *
+     * @return $this
+     */
+    final public function bind($nameOrFqcn, $valueOrRef)
+    {
+        $valueOrRef = static::processValue($valueOrRef, true);
+        if (isset($nameOrFqcn[0]) && '$' !== $nameOrFqcn[0] && !$valueOrRef instanceof Reference) {
+            throw new InvalidArgumentException(sprintf('Invalid binding for service "%s": named arguments must start with a "$", and FQCN must map to references. Neither applies to binding "%s".', $this->id, $nameOrFqcn));
+        }
+        $bindings = $this->definition->getBindings();
+        $bindings[$nameOrFqcn] = $valueOrRef;
+        $this->definition->setBindings($bindings);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
new file mode 100644
index 0000000000000..abc14e2155591
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
@@ -0,0 +1,34 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+trait CallTrait
+{
+    /**
+     * Adds a method to call after service initialization.
+     *
+     * @param string $method    The method name to call
+     * @param array  $arguments An array of arguments to pass to the method call
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException on empty $method param
+     */
+    final public function call($method, array $arguments = array())
+    {
+        $this->definition->addMethodCall($method, static::processValue($arguments, true));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ClassTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ClassTrait.php
new file mode 100644
index 0000000000000..ae5b1c0a3d0c5
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ClassTrait.php
@@ -0,0 +1,32 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+/**
+ * @method $this class(string $class)
+ */
+trait ClassTrait
+{
+    /**
+     * Sets the service class.
+     *
+     * @param string $class The service class
+     *
+     * @return $this
+     */
+    final protected function setClass($class)
+    {
+        $this->definition->setClass($class);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConfiguratorTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConfiguratorTrait.php
new file mode 100644
index 0000000000000..a38283b0e739b
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConfiguratorTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait ConfiguratorTrait
+{
+    /**
+     * Sets a configurator to call after the service is fully initialized.
+     *
+     * @param string|array $configurator A PHP callable reference
+     *
+     * @return $this
+     */
+    final public function configurator($configurator)
+    {
+        $this->definition->setConfigurator(static::processValue($configurator, true));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
new file mode 100644
index 0000000000000..0891fd90612d4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
@@ -0,0 +1,35 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+trait DecorateTrait
+{
+    /**
+     * Sets the service that this service is decorating.
+     *
+     * @param null|string $id        The decorated service id, use null to remove decoration
+     * @param null|string $renamedId The new decorated service id
+     * @param int         $priority  The priority of decoration
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
+     */
+    final public function decorate($id, $renamedId = null, $priority = 0)
+    {
+        $this->definition->setDecoratedService($id, $renamedId, $priority);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
new file mode 100644
index 0000000000000..331be473e216c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
@@ -0,0 +1,34 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+trait DeprecateTrait
+{
+    /**
+     * Whether this definition is deprecated, that means it should not be called anymore.
+     *
+     * @param string $template Template message to use if the definition is deprecated
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException when the message template is invalid
+     */
+    final public function deprecate($template = null)
+    {
+        $this->definition->setDeprecated(true, $template);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php
new file mode 100644
index 0000000000000..71c15906cc9af
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait FactoryTrait
+{
+    /**
+     * Sets a factory.
+     *
+     * @param string|array $factory A PHP callable reference
+     *
+     * @return $this
+     */
+    final public function factory($factory)
+    {
+        $this->definition->setFactory(static::processValue($factory, true));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FileTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FileTrait.php
new file mode 100644
index 0000000000000..895f5304c3e74
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FileTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait FileTrait
+{
+    /**
+     * Sets a file to require before creating the service.
+     *
+     * @param string $file A full pathname to include
+     *
+     * @return $this
+     */
+    final public function file($file)
+    {
+        $this->definition->setFile($file);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/LazyTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/LazyTrait.php
new file mode 100644
index 0000000000000..d7ea8b27f5ea3
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/LazyTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait LazyTrait
+{
+    /**
+     * Sets the lazy flag of this service.
+     *
+     * @param bool $lazy
+     *
+     * @return $this
+     */
+    final public function lazy($lazy = true)
+    {
+        $this->definition->setLazy($lazy);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
new file mode 100644
index 0000000000000..651f94e617129
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
@@ -0,0 +1,53 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+/**
+ * @method $this parent(string $parent)
+ */
+trait ParentTrait
+{
+    /**
+     * Sets the Definition to inherit from.
+     *
+     * @param string $parent
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException when parent cannot be set
+     */
+    final protected function setParent($parent)
+    {
+        if (!$this->allowParent) {
+            throw new InvalidArgumentException(sprintf('A parent cannot be defined when either "_instanceof" or "_defaults" are also defined for service prototype "%s".', $this->id));
+        }
+
+        if ($this->definition instanceof ChildDefinition) {
+            $this->definition->setParent($parent);
+        } elseif ($this->definition->isAutoconfigured()) {
+            throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.', $this->id));
+        } else {
+            // cast Definition to ChildDefinition
+            $definition = serialize($this->definition);
+            $definition = substr_replace($definition, '53', 2, 2);
+            $definition = substr_replace($definition, 'Child', 44, 0);
+            $definition = unserialize($definition);
+
+            $this->definition = $definition->setParent($parent);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PropertyTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PropertyTrait.php
new file mode 100644
index 0000000000000..d5d938708e0a8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PropertyTrait.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait PropertyTrait
+{
+    /**
+     * Sets a specific property.
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return $this
+     */
+    final public function property($name, $value)
+    {
+        $this->definition->setProperty($name, static::processValue($value, true));
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PublicTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PublicTrait.php
new file mode 100644
index 0000000000000..8f7f79f1cc218
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PublicTrait.php
@@ -0,0 +1,39 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+/**
+ * @method $this public()
+ * @method $this private()
+ */
+trait PublicTrait
+{
+    /**
+     * @return $this
+     */
+    final protected function setPublic()
+    {
+        $this->definition->setPublic(true);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    final protected function setPrivate()
+    {
+        $this->definition->setPublic(false);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ShareTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ShareTrait.php
new file mode 100644
index 0000000000000..1c2f97b59761c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ShareTrait.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait ShareTrait
+{
+    /**
+     * Sets if the service must be shared or not.
+     *
+     * @param bool $shared Whether the service must be shared or not
+     *
+     * @return $this
+     */
+    final public function share($shared = true)
+    {
+        $this->definition->setShared($shared);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/SyntheticTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/SyntheticTrait.php
new file mode 100644
index 0000000000000..81eceff43d86d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/SyntheticTrait.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait SyntheticTrait
+{
+    /**
+     * Sets whether this definition is synthetic, that is not constructed by the
+     * container, but dynamically injected.
+     *
+     * @param bool $synthetic
+     *
+     * @return $this
+     */
+    final public function synthetic($synthetic = true)
+    {
+        $this->definition->setSynthetic($synthetic);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
new file mode 100644
index 0000000000000..4094acdbfce91
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+trait TagTrait
+{
+    /**
+     * Adds a tag for this definition.
+     *
+     * @param string $name       The tag name
+     * @param array  $attributes An array of attributes
+     *
+     * @return $this
+     */
+    final public function tag($name, array $attributes = array())
+    {
+        if (!is_string($name) || '' === $name) {
+            throw new InvalidArgumentException(sprintf('The tag name for service "%s" must be a non-empty string.', $this->id));
+        }
+
+        foreach ($attributes as $attribute => $value) {
+            if (!is_scalar($value) && null !== $value) {
+                throw new InvalidArgumentException(sprintf('A tag attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $this->id, $name, $attribute));
+            }
+        }
+
+        $this->definition->addTag($name, $attributes);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index 9d887e4af03f6..f0be7534ea67d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
 /**
  * PhpFileLoader loads service definitions from a PHP file.
  *
@@ -34,7 +36,16 @@ public function load($resource, $type = null)
         $this->setCurrentDir(dirname($path));
         $this->container->fileExists($path);
 
-        include $path;
+        // the closure forbids access to the private scope in the included file
+        $load = \Closure::bind(function ($path) use ($container, $loader, $resource, $type) {
+            return include $path;
+        }, $this, ProtectedPhpFileLoader::class);
+
+        $callback = $load($path);
+
+        if ($callback instanceof \Closure) {
+            $callback(new ContainerConfigurator($this->container, $this, $this->instanceof, $path, $resource), $this->container, $this);
+        }
     }
 
     /**
@@ -53,3 +64,10 @@ public function supports($resource, $type = null)
         return 'php' === $type;
     }
 }
+
+/**
+ * @internal
+ */
+final class ProtectedPhpFileLoader extends PhpFileLoader
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php
index 1e4f283c8f16e..ee533fecd9019 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php
@@ -4,4 +4,11 @@
 
 class Foo
 {
+    public function __construct($bar = null)
+    {
+    }
+
+    function setFoo(self $foo)
+    {
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.expected.yml
new file mode 100644
index 0000000000000..1137961ade139
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.expected.yml
@@ -0,0 +1,10 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    App\BarService:
+        class: App\BarService
+        public: true
+        arguments: [!service { class: FooClass }]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
new file mode 100644
index 0000000000000..bab4e1ec83f04
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
@@ -0,0 +1,13 @@
+services();
+    $s->set(BarService::class)
+        ->args(array(inline('FooClass')));
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
new file mode 100644
index 0000000000000..aaab7131c4697
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
@@ -0,0 +1,15 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Class2
+        public: true
+        file: file.php
+        lazy: true
+        arguments: [!service { class: Class1, public: false }]
+    bar:
+        alias: foo
+        public: true
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
new file mode 100644
index 0000000000000..30178217b6924
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
@@ -0,0 +1,24 @@
+services()
+        ->set('bar', 'Class1')
+        ->set(BarService::class)
+            ->abstract(true)
+            ->lazy()
+        ->set('foo')
+            ->parent(BarService::class)
+            ->decorate('bar', 'b', 1)
+            ->args(array(ref('b')))
+            ->class('Class2')
+            ->file('file.php')
+            ->parent('bar')
+            ->parent(BarService::class)
+    ;
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml
new file mode 100644
index 0000000000000..a534f7267a078
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml
@@ -0,0 +1,27 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    App\BarService:
+        class: App\BarService
+        public: true
+        arguments: [!service { class: FooClass }]
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: t, a: b }
+        autowire: true
+        autoconfigure: true
+        arguments: ['@bar']
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: false
+        tags:
+            - { name: t, a: b }
+        autowire: true
+        calls:
+            - [setFoo, ['@bar']]
+
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
new file mode 100644
index 0000000000000..7fa93d2a91d73
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
@@ -0,0 +1,23 @@
+import('basic.php');
+
+    $s = $c->services()->defaults()
+        ->public()
+        ->private()
+        ->autoconfigure()
+        ->autowire()
+        ->tag('t', array('a' => 'b'))
+        ->bind(Foo::class, ref('bar'))
+        ->private();
+
+    $s->set(Foo::class)->args(array(ref('bar')))->public();
+    $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml
new file mode 100644
index 0000000000000..b12a304221dd8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml
@@ -0,0 +1,21 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: tag, k: v }
+        lazy: true
+        properties: { p: 1 }
+        calls:
+            - [setFoo, ['@foo']]
+
+        shared: false
+        configurator: c
+    foo:
+        class: App\FooService
+        public: true
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
new file mode 100644
index 0000000000000..13d0213bf11e5
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
@@ -0,0 +1,24 @@
+services();
+    $s->instanceof(Prototype\Foo::class)
+        ->property('p', 0)
+        ->call('setFoo', array(ref('foo')))
+        ->tag('tag', array('k' => 'v'))
+        ->share(false)
+        ->lazy()
+        ->configurator('c')
+        ->property('p', 1);
+
+    $s->load(Prototype::class.'\\', '../Prototype')->exclude('../Prototype/*/*');
+
+    $s->set('foo', FooService::class);
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.expected.yml
new file mode 100644
index 0000000000000..7c5b714ffbd7e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.expected.yml
@@ -0,0 +1,19 @@
+parameters:
+    foo: Foo
+    bar: Bar
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        arguments: ['@bar']
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        calls:
+            - [setFoo, {  }]
+
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
new file mode 100644
index 0000000000000..22a98c2c571d5
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
@@ -0,0 +1,21 @@
+parameters()
+        ('foo', 'Foo')
+        ('bar', 'Bar')
+    ;
+    $c->services()
+        (Foo::class)
+            ->arg('$bar', ref('bar'))
+            ->public()
+        ('bar', Foo::class)
+            ->call('setFoo')
+    ;
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml
new file mode 100644
index 0000000000000..5394535caf1d8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml
@@ -0,0 +1,25 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: foo }
+            - { name: baz }
+        deprecated: %service_id%
+        arguments: [1]
+        factory: f
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
+        public: true
+        tags:
+            - { name: foo }
+            - { name: baz }
+        deprecated: %service_id%
+        lazy: true
+        arguments: [1]
+        factory: f
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
new file mode 100644
index 0000000000000..77bc132dcb78a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
@@ -0,0 +1,24 @@
+services()->defaults()
+        ->tag('baz');
+    $di->load(Prototype::class.'\\', '../Prototype')
+        ->autoconfigure()
+        ->exclude('../Prototype/{OtherDir}')
+        ->factory('f')
+        ->deprecate('%service_id%')
+        ->args(array(0))
+        ->args(array(1))
+        ->autoconfigure(false)
+        ->tag('foo')
+        ->parent('foo');
+    $di->set('foo')->lazy()->abstract();
+    $di->get(Prototype\Foo::class)->lazy(false);
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
new file mode 100644
index 0000000000000..85543b6ebbcc7
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
@@ -0,0 +1,122 @@
+parameters();
+    $p->set('baz_class', 'BazClass');
+    $p->set('foo_class', FooClass::class)
+      ->set('foo', 'bar');
+
+    $s = $c->services();
+    $s->set('foo')
+        ->args(array('foo', ref('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, ref('service_container')))
+        ->class(FooClass::class)
+        ->tag('foo', array('foo' => 'foo'))
+        ->tag('foo', array('bar' => 'bar', 'baz' => 'baz'))
+        ->factory(array(FooClass::class, 'getInstance'))
+        ->property('foo', 'bar')
+        ->property('moo', ref('foo.baz'))
+        ->property('qux', array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'))
+        ->call('setBar', array(ref('bar')))
+        ->call('initialize')
+        ->configurator('sc_configure');
+
+    $s->set('foo.baz', '%baz_class%')
+        ->factory(array('%baz_class%', 'getInstance'))
+        ->configurator(array('%baz_class%', 'configureStatic1'));
+
+    $s->set('bar', FooClass::class)
+        ->args(array('foo', ref('foo.baz'), new Parameter('foo_bar')))
+        ->configurator(array(ref('foo.baz'), 'configure'));
+
+    $s->set('foo_bar', '%foo_class%')
+        ->args(array(ref('deprecated_service')))
+        ->share(false);
+
+    $s->alias('alias_for_foo', 'foo')->private()->public();
+    $s->alias('alias_for_alias', ref('alias_for_foo'));
+
+    $s->set('method_call1', 'Bar\FooClass')
+        ->file(realpath(__DIR__.'/../includes/foo.php'))
+        ->call('setBar', array(ref('foo')))
+        ->call('setBar', array(ref('foo2')->nullOnInvalid()))
+        ->call('setBar', array(ref('foo3')->ignoreOnInvalid()))
+        ->call('setBar', array(ref('foobaz')->ignoreOnInvalid()))
+        ->call('setBar', array(expr('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')));
+
+    $s->set('foo_with_inline', 'Foo')
+        ->call('setBar', array(ref('inlined')));
+
+    $s->set('inlined', 'Bar')
+        ->property('pub', 'pub')
+        ->call('setBaz', array(ref('baz')))
+        ->private();
+
+    $s->set('baz', 'Baz')
+        ->call('setFoo', array(ref('foo_with_inline')));
+
+    $s->set('request', 'Request')
+        ->synthetic();
+
+    $s->set('configurator_service', 'ConfClass')
+        ->private()
+        ->call('setFoo', array(ref('baz')));
+
+    $s->set('configured_service', 'stdClass')
+        ->configurator(array(ref('configurator_service'), 'configureStdClass'));
+
+    $s->set('configurator_service_simple', 'ConfClass')
+        ->args(array('bar'))
+        ->private();
+
+    $s->set('configured_service_simple', 'stdClass')
+        ->configurator(array(ref('configurator_service_simple'), 'configureStdClass'));
+
+    $s->set('decorated', 'stdClass');
+
+    $s->set('decorator_service', 'stdClass')
+        ->decorate('decorated');
+
+    $s->set('decorator_service_with_name', 'stdClass')
+        ->decorate('decorated', 'decorated.pif-pouf');
+
+    $s->set('deprecated_service', 'stdClass')
+        ->deprecate();
+
+    $s->set('new_factory', 'FactoryClass')
+        ->property('foo', 'bar')
+        ->private();
+
+    $s->set('factory_service', 'Bar')
+        ->factory(array(ref('foo.baz'), 'getInstance'));
+
+    $s->set('new_factory_service', 'FooBarBaz')
+        ->property('foo', 'bar')
+        ->factory(array(ref('new_factory'), 'getInstance'));
+
+    $s->set('service_from_static_method', 'Bar\FooClass')
+        ->factory(array('Bar\FooClass', 'getInstance'));
+
+    $s->set('factory_simple', 'SimpleFactoryClass')
+        ->deprecate()
+        ->args(array('foo'))
+        ->private();
+
+    $s->set('factory_service_simple', 'Bar')
+        ->factory(array(ref('factory_simple'), 'getInstance'));
+
+    $s->set('lazy_context', 'LazyContext')
+        ->args(array(iterator(array('k1' => ref('foo.baz'), 'k2' => ref('service_container'))), iterator(array())));
+
+    $s->set('lazy_context_ignore_invalid_ref', 'LazyContext')
+        ->args(array(iterator(array(ref('foo.baz'), ref('invalid')->ignoreOnInvalid())), iterator(array())));
+
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index 4e01e6fae9c25..02f84311e689c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\Config\FileLocator;
 
@@ -35,4 +37,43 @@ public function testLoad()
 
         $this->assertEquals('foo', $container->getParameter('foo'), '->load() loads a PHP file resource');
     }
+
+    public function testConfigServices()
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+        $loader->load($fixtures.'/config/services9.php');
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile($fixtures.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', $fixtures.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), '%path%', $dumper->dump()));
+    }
+
+    /**
+     * @dataProvider provideConfig
+     */
+    public function testConfig($file)
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+        $loader->load($fixtures.'/config/'.$file.'.php');
+
+        $container->compile();
+
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile($fixtures.'/config/'.$file.'.expected.yml', $dumper->dump());
+    }
+
+    public function provideConfig()
+    {
+        yield array('basic');
+        yield array('defaults');
+        yield array('instanceof');
+        yield array('prototype');
+        yield array('child');
+
+        if (\PHP_VERSION_ID >= 70000) {
+            yield array('php7');
+        }
+    }
 }

From 6973a1ae3bb171024a1ce21f68d3bcc978aa476c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 19 Sep 2017 12:45:06 +0200
Subject: [PATCH 0864/1099] [HttpKernel][DI] Enable Kernel to implement
 CompilerPassInterface

---
 UPGRADE-4.0.md                                |  2 ++
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/PassConfig.php                   |  2 +-
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 src/Symfony/Component/HttpKernel/Kernel.php   |  5 ++++
 .../Component/HttpKernel/Tests/KernelTest.php | 23 +++++++++++++++++++
 6 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index fba86ef01c971..3aecb70070f0d 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -184,6 +184,8 @@ DependencyInjection
 
  * Top-level anonymous services in XML are no longer supported.
 
+ * The `ExtensionCompilerPass` has been moved to before-optimization passes with priority -1000.
+
 EventDispatcher
 ---------------
 
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index bc8fd3051870c..cea65b20b7504 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * moved the `ExtensionCompilerPass` to before-optimization passes with priority -1000
  * deprecated "public-by-default" definitions and aliases, the new default will be "private" in 4.0
  * added `EnvVarProcessorInterface` and corresponding "container.env_var_processor" tag for processing env vars
  * added support for ignore-on-uninitialized references
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 9e00be6827109..79792bee4a106 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -45,10 +45,10 @@ public function __construct()
                 new ResolveInstanceofConditionalsPass(),
                 new RegisterEnvVarProcessorsPass(),
             ),
+            -1000 => array(new ExtensionCompilerPass()),
         );
 
         $this->optimizationPasses = array(array(
-            new ExtensionCompilerPass(),
             new ResolveChildDefinitionsPass(),
             new ServiceLocatorTagPass(),
             new DecoratorServicePass(),
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 702394ade5bd4..8732b17dd83f5 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * made kernels implementing `CompilerPassInterface` able to process the container
  * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
  * deprecated commands auto registration
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 4f7ec2c289bac..cd4c26063d5d9 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -13,6 +13,8 @@
 
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -767,6 +769,9 @@ protected function getContainerBuilder()
         $container = new ContainerBuilder();
         $container->getParameterBag()->add($this->getKernelParameters());
 
+        if ($this instanceof CompilerPassInterface) {
+            $container->addCompilerPass($this, PassConfig::TYPE_BEFORE_OPTIMIZATION, -10000);
+        }
         if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {
             $container->setProxyInstantiator(new RuntimeInstantiator());
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index a408f87f87a32..fd7f6f09da13d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -831,6 +832,14 @@ public function testKernelReset()
         $this->assertFileNotExists($containerFile);
     }
 
+    public function testKernelPass()
+    {
+        $kernel = new PassKernel();
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->getParameter('test.processed'));
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      *
@@ -967,3 +976,17 @@ protected function build(ContainerBuilder $container)
         }
     }
 }
+
+class PassKernel extends CustomProjectDirKernel implements CompilerPassInterface
+{
+    public function __construct(\Closure $buildContainer = null)
+    {
+        parent::__construct();
+        Kernel::__construct('pass', true);
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $container->setParameter('test.processed', true);
+    }
+}

From 03cd9e553b26008707b82388f41910c49cbb9f7f Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sun, 17 Sep 2017 20:41:33 +0200
Subject: [PATCH 0865/1099] [TwigBundle] Hide logs if unavailable, i.e.
 webprofiler

---
 .../Resources/views/Exception/exception.html.twig           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
index d42a9dec47c58..2f29571ae3278 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
@@ -54,14 +54,15 @@
             
         
 
-        
+        {% if logger %}
+        
             
                 Logs
                 {% if logger.counterrors ?? false %}{{ logger.counterrors }}{% endif %}
             
 
             
-                {% if logger %}
+                {% if logger.logs %}
                     {{ include('@Twig/Exception/logs.html.twig', { logs: logger.logs }, with_context = false)  }}
                 {% else %}
                     
@@ -70,6 +71,7 @@
                 {% endif %}
             
         
+        {% endif %}
 
         
             

From 0c10f97f986797347ecdfdfd4b7c53f4ecd87435 Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sun, 17 Sep 2017 21:22:24 +0200
Subject: [PATCH 0866/1099] [TwigBundle] Make deprecations scream in logs

---
 .../Resources/views/Exception/logs.html.twig           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
index 02d2b546e8559..f2a190ad23743 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
@@ -11,7 +11,15 @@
 
     
     {% for log in logs %}
-        
+        {% if log.priority >= 400 %}
+            {% set status = 'error' %}
+        {% elseif log.priority >= 300 %}
+            {% set status = 'warning' %}
+        {% else %}
+            {% set severity = log.context.exception.severity|default(false) %}
+            {% set status = severity is constant('E_DEPRECATED') or severity is constant('E_USER_DEPRECATED') ? 'warning' : 'normal' %}
+        {% endif %}
+        
             
                 {{ log.priorityName }}
                 {{ log.timestamp|date('H:i:s') }}

From ea4b0966aba8a6c9c223aefe74412929492ac58c Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Wed, 20 Sep 2017 21:17:51 +0200
Subject: [PATCH 0867/1099] [WebProfilerBundle] Hide inactive tabs from CSS

---
 .../Resources/views/Profiler/profiler.css.twig                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 5b6647df8866a..ca55b28672d03 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -832,6 +832,8 @@ tr.status-warning td {
 .tab-navigation li .badge.status-warning { background: {{ colors.warning|raw }}; color: #FFF; }
 .tab-navigation li .badge.status-error { background: {{ colors.error|raw }}; color: #FFF; }
 
+.sf-tabs .tab:not(:first-child) { display: none; }
+
 {# Toggles
    ========================================================================= #}
 .sf-toggle-content {

From 1c595fcf48d689b49ca9f4b8790cdf5cd9275caf Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Thu, 21 Sep 2017 19:21:40 +0200
Subject: [PATCH 0868/1099] [TwigBundle][WebProfilerBundle] Switch to
 DOMContentLoaded event

---
 src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig | 2 +-
 .../Resources/views/Profiler/base_js.html.twig                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
index 036af2b025904..46016cb3747ba 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
@@ -525,7 +525,7 @@
         };
     })();
 
-    Sfjs.addEventListener(window, 'load', function() {
+    Sfjs.addEventListener(document, 'DOMContentLoaded', function() {
         Sfjs.createTabs();
         Sfjs.createToggles();
     });
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index b5f08f869168d..12a1e07bd74c6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -525,7 +525,7 @@
         };
     })();
 
-    Sfjs.addEventListener(window, 'load', function() {
+    Sfjs.addEventListener(document, 'DOMContentLoaded', function() {
         Sfjs.createTabs();
         Sfjs.createToggles();
     });

From 02dcdca01444bf303938971924e920f5aacaf515 Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Thu, 21 Sep 2017 20:21:04 +0200
Subject: [PATCH 0869/1099] [TwigBundle] Remove profiler related scripting

---
 .../Resources/views/base_js.html.twig         | 362 +-----------------
 .../views/Profiler/base_js.html.twig          |   8 +-
 2 files changed, 6 insertions(+), 364 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
index 036af2b025904..e2cd23e948fcf 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
@@ -1,5 +1,5 @@
-{# This file is duplicated in WebProfilerBundle/Resources/views/Profiler/base_js.html.twig.
-   If you make any change in this file, do the same change in the other file. #}
+{# This file is diverged from WebProfilerBundle/Resources/views/Profiler/base_js.html.twig.
+   If you make any change in this file, verify the same change is needed in the other file. #}
 /* 1) {
-                    setTimeout(function(){
-                        options.maxTries--;
-                        request(url, onSuccess, onError, payload, options);
-                    }, 500);
-
-                    return null;
-                }
-
-                if (200 === xhr.status) {
-                    (onSuccess || noop)(xhr);
-                } else {
-                    (onError || noop)(xhr);
-                }
-            };
-            xhr.send(payload || '');
-        };
-
-        var getPreference = function(name) {
-            if (!window.localStorage) {
-                return null;
-            }
-
-            return localStorage.getItem(profilerStorageKey + name);
-        };
-
-        var setPreference = function(name, value) {
-            if (!window.localStorage) {
-                return null;
-            }
-
-            localStorage.setItem(profilerStorageKey + name, value);
-        };
-
-        var requestStack = [];
-
-        var extractHeaders = function(xhr, stackElement) {
-            /* Here we avoid to call xhr.getResponseHeader in order to */
-            /* prevent polluting the console with CORS security errors */
-            var allHeaders = xhr.getAllResponseHeaders();
-            var ret;
-
-            if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) {
-                stackElement.profile = ret[1];
-            }
-            if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) {
-                stackElement.profilerUrl = ret[1];
-            }
-        };
-
-        var successStreak = 4;
-        var pendingRequests = 0;
-        var renderAjaxRequests = function() {
-            var requestCounter = document.querySelector('.sf-toolbar-ajax-request-counter');
-            if (!requestCounter) {
-                return;
-            }
-            requestCounter.textContent = requestStack.length;
-
-            var infoSpan = document.querySelector(".sf-toolbar-ajax-info");
-            if (infoSpan) {
-                infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length !== 1 ? 's' : '');
-            }
-
-            var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax');
-            if (requestStack.length) {
-                ajaxToolbarPanel.style.display = 'block';
-            } else {
-                ajaxToolbarPanel.style.display = 'none';
-            }
-            if (pendingRequests > 0) {
-                addClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
-            } else if (successStreak < 4) {
-                addClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
-                removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
-            } else {
-                removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
-                removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
-            }
-        };
-
-        var startAjaxRequest = function(index) {
-            var tbody = document.querySelector('.sf-toolbar-ajax-request-list');
-            if (!tbody) {
-                return;
-            }
-
-            var request = requestStack[index];
-            pendingRequests++;
-            var row = document.createElement('tr');
-            request.DOMNode = row;
-
-            var methodCell = document.createElement('td');
-            methodCell.textContent = request.method;
-            row.appendChild(methodCell);
-
-            var typeCell = document.createElement('td');
-            typeCell.textContent = request.type;
-            row.appendChild(typeCell);
-
-            var statusCodeCell = document.createElement('td');
-            var statusCode = document.createElement('span');
-            statusCode.textContent = 'n/a';
-            statusCodeCell.appendChild(statusCode);
-            row.appendChild(statusCodeCell);
-
-            var pathCell = document.createElement('td');
-            pathCell.className = 'sf-ajax-request-url';
-            if ('GET' === request.method) {
-                var pathLink = document.createElement('a');
-                pathLink.setAttribute('href', request.url);
-                pathLink.textContent = request.url;
-                pathCell.appendChild(pathLink);
-            } else {
-                pathCell.textContent = request.url;
-            }
-            pathCell.setAttribute('title', request.url);
-            row.appendChild(pathCell);
-
-            var durationCell = document.createElement('td');
-            durationCell.className = 'sf-ajax-request-duration';
-            durationCell.textContent = 'n/a';
-            row.appendChild(durationCell);
-
-            var profilerCell = document.createElement('td');
-            profilerCell.textContent = 'n/a';
-            row.appendChild(profilerCell);
-
-            row.className = 'sf-ajax-request sf-ajax-request-loading';
-            tbody.insertBefore(row, tbody.firstChild);
-
-            renderAjaxRequests();
-        };
-
-        var finishAjaxRequest = function(index) {
-            var request = requestStack[index];
-            if (!request.DOMNode) {
-                return;
-            }
-            pendingRequests--;
-            var row = request.DOMNode;
-            /* Unpack the children from the row */
-            var methodCell = row.children[0];
-            var statusCodeCell = row.children[2];
-            var statusCodeElem = statusCodeCell.children[0];
-            var durationCell = row.children[4];
-            var profilerCell = row.children[5];
-
-            if (request.error) {
-                row.className = 'sf-ajax-request sf-ajax-request-error';
-                methodCell.className = 'sf-ajax-request-error';
-                successStreak = 0;
-            } else {
-                row.className = 'sf-ajax-request sf-ajax-request-ok';
-                successStreak++;
-            }
-
-            if (request.statusCode) {
-                if (request.statusCode < 300) {
-                    statusCodeElem.setAttribute('class', 'sf-toolbar-status');
-                } else if (request.statusCode < 400) {
-                    statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-yellow');
-                } else {
-                    statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red');
-                }
-                statusCodeElem.textContent = request.statusCode;
-            } else {
-                statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red');
-            }
-
-            if (request.duration) {
-                durationCell.textContent = request.duration + 'ms';
-            }
-
-            if (request.profilerUrl) {
-                profilerCell.textContent = '';
-                var profilerLink = document.createElement('a');
-                profilerLink.setAttribute('href', request.profilerUrl);
-                profilerLink.textContent = request.profile;
-                profilerCell.appendChild(profilerLink);
-            }
-
-            renderAjaxRequests();
-        };
-
         var addEventListener;
 
         var el = document.createElement('div');
@@ -235,163 +33,9 @@
             };
         }
 
-        {% if excluded_ajax_paths is defined %}
-            if (window.fetch && window.fetch.polyfill === undefined) {
-                var oldFetch = window.fetch;
-                window.fetch = function () {
-                    var promise = oldFetch.apply(this, arguments);
-                    var url = arguments[0];
-                    var params = arguments[1];
-                    var paramType = Object.prototype.toString.call(arguments[0]);
-                    if (paramType === '[object Request]') {
-                        url = arguments[0].url;
-                        params = {
-                            method: arguments[0].method,
-                            credentials: arguments[0].credentials,
-                            headers: arguments[0].headers,
-                            mode: arguments[0].mode,
-                            redirect: arguments[0].redirect
-                        };
-                    }
-                    if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
-                        var method = 'GET';
-                        if (params && params.method !== undefined) {
-                            method = params.method;
-                        }
-
-                        var stackElement = {
-                            error: false,
-                            url: url,
-                            method: method,
-                            type: 'fetch',
-                            start: new Date()
-                        };
-
-                        var idx = requestStack.push(stackElement) - 1;
-                        promise.then(function (r) {
-                            stackElement.duration = new Date() - stackElement.start;
-                            stackElement.error = r.status < 200 || r.status >= 400;
-                            stackElement.statusCode = r.status;
-                            stackElement.profile = r.headers.get('x-debug-token');
-                            stackElement.profilerUrl = r.headers.get('x-debug-token-link');
-                            finishAjaxRequest(idx);
-                        }, function (e){
-                            stackElement.error = true;
-                            finishAjaxRequest(idx);
-                        });
-                        startAjaxRequest(idx);
-                    }
-
-                    return promise;
-                };
-            }
-            if (window.XMLHttpRequest && XMLHttpRequest.prototype.addEventListener) {
-                var proxied = XMLHttpRequest.prototype.open;
-
-                XMLHttpRequest.prototype.open = function(method, url, async, user, pass) {
-                    var self = this;
-
-                    /* prevent logging AJAX calls to static and inline files, like templates */
-                    var path = url;
-                    if (url.substr(0, 1) === '/') {
-                        if (0 === url.indexOf('{{ request.basePath|e('js') }}')) {
-                            path = url.substr({{ request.basePath|length }});
-                        }
-                    }
-                    else if (0 === url.indexOf('{{ (request.schemeAndHttpHost ~ request.basePath)|e('js') }}')) {
-                        path = url.substr({{ (request.schemeAndHttpHost ~ request.basePath)|length }});
-                    }
-
-                    if (!path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
-                        var stackElement = {
-                            error: false,
-                            url: url,
-                            method: method,
-                            type: 'xhr',
-                            start: new Date()
-                        };
-
-                        var idx = requestStack.push(stackElement) - 1;
-
-                        this.addEventListener('readystatechange', function() {
-                            if (self.readyState == 4) {
-                                stackElement.duration = new Date() - stackElement.start;
-                                stackElement.error = self.status < 200 || self.status >= 400;
-                                stackElement.statusCode = self.status;
-                                extractHeaders(self, stackElement);
-
-                                finishAjaxRequest(idx);
-                            }
-                        }, false);
-
-                        startAjaxRequest(idx);
-                    }
-
-                    proxied.apply(this, Array.prototype.slice.call(arguments));
-                };
-            }
-        {% endif %}
-
         return {
-            hasClass: hasClass,
-
-            removeClass: removeClass,
-
-            addClass: addClass,
-
-            toggleClass: toggleClass,
-
-            getPreference: getPreference,
-
-            setPreference: setPreference,
-
             addEventListener: addEventListener,
 
-            request: request,
-
-            renderAjaxRequests: renderAjaxRequests,
-
-            load: function(selector, url, onSuccess, onError, options) {
-                var el = document.getElementById(selector);
-
-                if (el && el.getAttribute('data-sfurl') !== url) {
-                    request(
-                        url,
-                        function(xhr) {
-                            el.innerHTML = xhr.responseText;
-                            el.setAttribute('data-sfurl', url);
-                            removeClass(el, 'loading');
-                            for (var i = 0; i < requestStack.length; i++) {
-                                startAjaxRequest(i);
-                                if (requestStack[i].duration) {
-                                    finishAjaxRequest(i);
-                                }
-                            }
-                            (onSuccess || noop)(xhr, el);
-                        },
-                        function(xhr) { (onError || noop)(xhr, el); },
-                        '',
-                        options
-                    );
-                }
-
-                return this;
-            },
-
-            toggle: function(selector, elOn, elOff) {
-                var tmp = elOn.style.display,
-                    el = document.getElementById(selector);
-
-                elOn.style.display = elOff.style.display;
-                elOff.style.display = tmp;
-
-                if (el) {
-                    el.style.display = 'none' === tmp ? 'none' : 'block';
-                }
-
-                return this;
-            },
-
             createTabs: function() {
                 var tabGroups = document.querySelectorAll('.sf-tabs');
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index b5f08f869168d..d382f8a2591c2 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -1,5 +1,5 @@
-{# This file is duplicated in TwigBundle/Resources/views/base_js.html.twig. If you
-   make any change in this file, do the same change in the other file. #}
+{# This file is partially duplicated in TwigBundle/Resources/views/base_js.html.twig. If you
+   make any change in this file, verify the same change is needed in the other file. #}
 /*
Date: Fri, 22 Sep 2017 11:57:45 +0100
Subject: [PATCH 0870/1099] [DI] Dont use JSON_BIGINT_AS_STRING

---
 src/Symfony/Component/DependencyInjection/EnvVarProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index 51a19367e2179..73514712e8b71 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -119,7 +119,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('json' === $prefix) {
-            $env = json_decode($env, true, JSON_BIGINT_AS_STRING);
+            $env = json_decode($env, true);
 
             if (JSON_ERROR_NONE !== json_last_error()) {
                 throw new RuntimeException(sprintf('Invalid JSON in env var "%s": '.json_last_error_msg(), $name));

From cb935e789e397d3134f7d32be0bb58324d5a5405 Mon Sep 17 00:00:00 2001
From: Maarten de Boer 
Date: Thu, 21 Sep 2017 14:46:00 +0200
Subject: [PATCH 0871/1099] [Serializer] Getter for extra attributes in
 ExtraAttributesException

---
 src/Symfony/Component/Serializer/CHANGELOG.md      |  1 +
 .../Exception/ExtraAttributesException.php         | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index ef59f22499264..9e48c5c41e927 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * added `AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT` context option
    to disable throwing an `UnexpectedValueException` on a type mismatch
  * added support for serializing `DateInterval` objects
+ * added getter for extra attributes in `ExtraAttributesException`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
index d321618b8eb11..74d87f87f5e8d 100644
--- a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
+++ b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
@@ -18,10 +18,24 @@
  */
 class ExtraAttributesException extends RuntimeException
 {
+    private $extraAttributes;
+
     public function __construct(array $extraAttributes, \Exception $previous = null)
     {
         $msg = sprintf('Extra attributes are not allowed ("%s" are unknown).', implode('", "', $extraAttributes));
 
+        $this->extraAttributes = $extraAttributes;
+
         parent::__construct($msg, 0, $previous);
     }
+
+    /**
+     * Get the extra attributes that are not allowed.
+     *
+     * @return array
+     */
+    public function getExtraAttributes()
+    {
+        return $this->extraAttributes;
+    }
 }

From e46b366fc52eb4c2bee683797b8569dc4186c9a9 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Fri, 22 Sep 2017 20:41:17 +0200
Subject: [PATCH 0872/1099] Reset the authentication token between requests.

---
 .../Bundle/SecurityBundle/Resources/config/security.xml       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 79a4866d8cbe4..049d67f5a05b1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -21,7 +21,9 @@
         
         
 
-        
+        
+            
+        
         
 
         

From 35f9c0ba2d26cb21eca8f75f135a35052ca22ef3 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Fri, 22 Sep 2017 22:13:43 +0200
Subject: [PATCH 0873/1099] [Form] Add ambiguous & exception debug:form tests

---
 .../Component/Form/Command/DebugCommand.php   |  2 +-
 .../Form/Tests/Command/DebugCommandTest.php   | 99 +++++++++++++------
 .../Tests/Fixtures/Debug/A/AmbiguousType.php  | 18 ++++
 .../Tests/Fixtures/Debug/B/AmbiguousType.php  | 18 ++++
 4 files changed, 104 insertions(+), 33 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Debug/A/AmbiguousType.php
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Debug/B/AmbiguousType.php

diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index d9b3eee838244..d8e1f5a0789b0 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -118,7 +118,7 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shor
             return $classes[0];
         }
         if (!$input->isInteractive()) {
-            throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
+            throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\n\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
         }
 
         return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\n Select one of the following form types to display its information:", $shortClassName), $classes, $classes[0]);
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index 610f6197d62cb..d24af0a4b1bc5 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -13,11 +13,11 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Form\Command\DebugCommand;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Symfony\Component\Form\FormRegistryInterface;
-use Symfony\Component\Form\ResolvedFormTypeInterface;
+use Symfony\Component\Form\FormRegistry;
+use Symfony\Component\Form\ResolvedFormTypeFactory;
 
 class DebugCommandTest extends TestCase
 {
@@ -39,6 +39,67 @@ public function testDebugSingleFormType()
         $this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (Block prefix: "form")', $tester->getDisplay());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Could not find type "NonExistentType"
+     */
+    public function testDebugSingleFormTypeNotFound()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(array('class' => 'NonExistentType'), array('decorated' => false, 'interactive' => false));
+    }
+
+    public function testDebugAmbiguousFormType()
+    {
+        $expectedMessage = <<expectException(InvalidArgumentException::class);
+            $this->expectExceptionMessage($expectedMessage);
+        } else {
+            $this->setExpectedException(InvalidArgumentException::class, $expectedMessage);
+        }
+
+        $tester = $this->createCommandTester(array(
+            'Symfony\Component\Form\Tests\Fixtures\Debug\A',
+            'Symfony\Component\Form\Tests\Fixtures\Debug\B',
+        ));
+
+        $tester->execute(array('class' => 'AmbiguousType'), array('decorated' => false, 'interactive' => false));
+    }
+
+    public function testDebugAmbiguousFormTypeInteractive()
+    {
+        $tester = $this->createCommandTester(array(
+            'Symfony\Component\Form\Tests\Fixtures\Debug\A',
+            'Symfony\Component\Form\Tests\Fixtures\Debug\B',
+        ));
+
+        $tester->setInputs(array(0));
+        $tester->execute(array('class' => 'AmbiguousType'), array('decorated' => false, 'interactive' => true));
+
+        $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
+        $output = $tester->getDisplay(true);
+        $this->assertStringMatchesFormat(<<createCommandTester()->execute(array('class' => 'test'));
     }
 
-    /**
-     * @return CommandTester
-     */
-    private function createCommandTester()
+    private function createCommandTester(array $namespaces = null)
     {
-        $resolvedFormType = $this->getMockBuilder(ResolvedFormTypeInterface::class)->getMock();
-        $resolvedFormType
-            ->expects($this->any())
-            ->method('getParent')
-            ->willReturn(null)
-        ;
-        $resolvedFormType
-            ->expects($this->any())
-            ->method('getInnerType')
-            ->willReturn(new FormType())
-        ;
-        $resolvedFormType
-            ->expects($this->any())
-            ->method('getTypeExtensions')
-            ->willReturn(array())
-        ;
-
-        $formRegistry = $this->getMockBuilder(FormRegistryInterface::class)->getMock();
-        $formRegistry
-            ->expects($this->any())
-            ->method('getType')
-            ->will($this->returnValue($resolvedFormType))
-        ;
-
-        $command = new DebugCommand($formRegistry);
+        $formRegistry = new FormRegistry(array(), new ResolvedFormTypeFactory());
+        $command = null === $namespaces ? new DebugCommand($formRegistry) : new DebugCommand($formRegistry, $namespaces);
         $application = new Application();
         $application->add($command);
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Debug/A/AmbiguousType.php b/src/Symfony/Component/Form/Tests/Fixtures/Debug/A/AmbiguousType.php
new file mode 100644
index 0000000000000..e6e183902882c
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Debug/A/AmbiguousType.php
@@ -0,0 +1,18 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures\Debug\A;
+
+use Symfony\Component\Form\AbstractType;
+
+class AmbiguousType extends AbstractType
+{
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Debug/B/AmbiguousType.php b/src/Symfony/Component/Form/Tests/Fixtures/Debug/B/AmbiguousType.php
new file mode 100644
index 0000000000000..c670e8e925bdf
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Debug/B/AmbiguousType.php
@@ -0,0 +1,18 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures\Debug\B;
+
+use Symfony\Component\Form\AbstractType;
+
+class AmbiguousType extends AbstractType
+{
+}

From 42f0984e71fa38c72bf95ff58264274456e3f115 Mon Sep 17 00:00:00 2001
From: Freek Van der Herten 
Date: Thu, 21 Sep 2017 18:42:43 +0200
Subject: [PATCH 0874/1099] [VarDumper] Make `dump()` a little bit more easier
 to use

---
 .../Component/VarDumper/Resources/functions/dump.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
index b6c243c8b6e2f..0e5216abc2958 100644
--- a/src/Symfony/Component/VarDumper/Resources/functions/dump.php
+++ b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -20,5 +20,11 @@ function dump($var)
         foreach (func_get_args() as $var) {
             VarDumper::dump($var);
         }
+
+        if ($moreVars) {
+            return func_get_args();
+        }
+
+        return $var;
     }
 }

From cb6ead1635a13875a486814b5314a1d4feb08c01 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Sun, 24 Sep 2017 10:13:45 +0100
Subject: [PATCH 0875/1099] allow forms without translations and validator

---
 .../DependencyInjection/FrameworkExtension.php | 18 ++++++++++++------
 .../Resources/config/form_csrf.xml             |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index e0d7258902f4d..4a940a70f0b76 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -74,6 +74,7 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
+use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\ObjectInitializerInterface;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
@@ -189,15 +190,13 @@ public function load(array $configs, ContainerBuilder $container)
                 throw new LogicException('Translation support cannot be enabled as the Translation component is not installed.');
             }
 
-            if (!class_exists('Symfony\Component\Translation\Translator') && $this->isConfigEnabled($container, $config['form'])) {
-                throw new LogicException('Form support cannot be enabled as the Translation component is not installed.');
-            }
-
             if (!class_exists('Symfony\Component\Translation\Translator') && $this->isConfigEnabled($container, $config['validation'])) {
                 throw new LogicException('Validation support cannot be enabled as the Translation component is not installed.');
             }
 
-            $loader->load('identity_translator.xml');
+            if (class_exists(Translator::class)) {
+                $loader->load('identity_translator.xml');
+            }
         }
 
         if (isset($config['secret'])) {
@@ -250,7 +249,10 @@ public function load(array $configs, ContainerBuilder $container)
             $config['validation']['enabled'] = true;
 
             if (!class_exists('Symfony\Component\Validator\Validation')) {
-                throw new LogicException('The Validator component is required to use the Form component.');
+                $container->setParameter('validator.translation_domain', 'validators');
+
+                $container->removeDefinition('form.type_extension.form.validator');
+                $container->removeDefinition('form.type_guesser.validator');
             }
         } else {
             $container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');
@@ -448,6 +450,10 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
         } else {
             $container->setParameter('form.type_extension.csrf.enabled', false);
         }
+
+        if (!class_exists(Translator::class)) {
+            $container->removeDefinition('form.type_extension.upload.validator');
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
index 22b0c119e2084..d0162ea09816c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
@@ -12,7 +12,7 @@
             
             %form.type_extension.csrf.enabled%
             %form.type_extension.csrf.field_name%
-            
+            
             %validator.translation_domain%
             
         

From 1ebc31aa9f62e0c715ab7074be71211c1bd0cd6f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 24 Sep 2017 15:31:29 +0200
Subject: [PATCH 0876/1099] Fix tests

---
 .../Tests/Functional/app/ContainerDebug/config.yml               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
index f4a5425808440..d00d6f235ec67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: ../config/default.yml }
 
 services:
+    _defaults: { public: true }
     public:
         class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass
     private_alias:

From f0f9a6691cef3ffe2491009143a314008c047845 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 24 Sep 2017 11:49:51 +0200
Subject: [PATCH 0877/1099] [HttpKernel] Make array vs "::" controller
 definitions consistent

---
 .../ContainerControllerResolver.php           | 15 ++++++
 .../ContainerControllerResolverTest.php       | 50 +++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
index 1a107c62f60b1..fbcecad25e18a 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
@@ -13,6 +13,7 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * A controller resolver searching for a controller in a psr-11 container when using the "service:method" notation.
@@ -31,6 +32,20 @@ public function __construct(ContainerInterface $container, LoggerInterface $logg
         parent::__construct($logger);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getController(Request $request)
+    {
+        $controller = parent::getController($request);
+
+        if (is_array($controller) && isset($controller[0]) && is_string($controller[0]) && $this->container->has($controller[0])) {
+            $controller[0] = $this->instantiateController($controller[0]);
+        }
+
+        return $controller;
+    }
+
     /**
      * Returns a callable for the given controller.
      *
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
index 30b535e825f67..b3deb03c9138a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -88,6 +88,49 @@ public function testGetControllerInvokableServiceWithClassNameAsName()
         $this->assertEquals($invokableController, $controller);
     }
 
+    public function testNonInstantiableController()
+    {
+        $container = $this->createMockContainer();
+        $container->expects($this->once())
+            ->method('has')
+            ->with(NonInstantiableController::class)
+            ->will($this->returnValue(false))
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', array(NonInstantiableController::class, 'action'));
+
+        $controller = $resolver->getController($request);
+
+        $this->assertSame(array(NonInstantiableController::class, 'action'), $controller);
+    }
+
+    public function testNonInstantiableControllerWithCorrespondingService()
+    {
+        $service = new \stdClass();
+
+        $container = $this->createMockContainer();
+        $container->expects($this->atLeastOnce())
+            ->method('has')
+            ->with(NonInstantiableController::class)
+            ->will($this->returnValue(true))
+        ;
+        $container->expects($this->atLeastOnce())
+            ->method('get')
+            ->with(NonInstantiableController::class)
+            ->will($this->returnValue($service))
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', array(NonInstantiableController::class, 'action'));
+
+        $controller = $resolver->getController($request);
+
+        $this->assertSame(array($service, 'action'), $controller);
+    }
+
     /**
      * @dataProvider getUndefinedControllers
      */
@@ -146,3 +189,10 @@ public function __invoke()
     {
     }
 }
+
+abstract class NonInstantiableController
+{
+    public static function action()
+    {
+    }
+}

From e17426c65cda22b71d19f4a6ed918003f9eda587 Mon Sep 17 00:00:00 2001
From: Oskar Stark 
Date: Fri, 22 Sep 2017 13:07:23 +0200
Subject: [PATCH 0878/1099] added missing @author tag for new class

---
 src/Symfony/Component/DependencyInjection/EnvVarProcessor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index 73514712e8b71..63bb5bc8c0079 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -15,6 +15,9 @@
 use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
+/**
+ * @author Nicolas Grekas 
+ */
 class EnvVarProcessor implements EnvVarProcessorInterface
 {
     private $container;

From a69c1b2ae1dd3f35ce255c0bf5ca66f4d7f1f888 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 24 Sep 2017 11:20:06 +0200
Subject: [PATCH 0879/1099] [FrameworkBundle] Fix Routing\DelegatingLoader

---
 .../Bundle/FrameworkBundle/Routing/DelegatingLoader.php       | 2 +-
 .../Functional/Bundle/TestBundle/Resources/config/routing.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
index 29f3072a897cd..fa07f832f894b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -85,7 +85,7 @@ public function load($resource, $type = null)
         $this->loading = false;
 
         foreach ($collection->all() as $route) {
-            if (!$controller = $route->getDefault('_controller')) {
+            if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
                 continue;
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
index 57d83eb9c649c..11b85a86d3299 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -44,3 +44,7 @@ fragment_home:
 fragment_inlined:
     path:     /fragment_inlined
     defaults: { _controller: TestBundle:Fragment:inlined }
+
+array_controller:
+    path:     /array_controller
+    defaults: { _controller: [ArrayController, someAction] }

From e66e5381d3b86c94628194f5c5dd8ec5cdc79f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= 
Date: Sun, 24 Sep 2017 17:01:32 +0200
Subject: [PATCH 0880/1099] Add missing methods in LockInterface

---
 src/Symfony/Component/Lock/Lock.php          |  6 ++----
 src/Symfony/Component/Lock/LockInterface.php | 12 ++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
index d8271569d8c05..07807a915c2c3 100644
--- a/src/Symfony/Component/Lock/Lock.php
+++ b/src/Symfony/Component/Lock/Lock.php
@@ -133,7 +133,7 @@ public function release()
     }
 
     /**
-     * @return bool
+     * {@inheritdoc}
      */
     public function isExpired()
     {
@@ -141,9 +141,7 @@ public function isExpired()
     }
 
     /**
-     * Returns the remaining lifetime.
-     *
-     * @return float|null Remaining lifetime in seconds. Null when the lock won't expire.
+     * {@inheritdoc}
      */
     public function getRemainingLifetime()
     {
diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php
index 437a4cc2770c8..4a3cc3f5bec86 100644
--- a/src/Symfony/Component/Lock/LockInterface.php
+++ b/src/Symfony/Component/Lock/LockInterface.php
@@ -56,4 +56,16 @@ public function isAcquired();
      * @throws LockReleasingException If the lock can not be released
      */
     public function release();
+
+    /**
+     * @return bool
+     */
+    public function isExpired();
+
+    /**
+     * Returns the remaining lifetime.
+     *
+     * @return float|null Remaining lifetime in seconds. Null when the lock won't expire.
+     */
+    public function getRemainingLifetime();
 }

From 88549fff5b4eb4c2739562d666ebfaf12aca56ba Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Sat, 23 Sep 2017 12:08:51 +0200
Subject: [PATCH 0881/1099] [DI][DX] Throw exception on some ContainerBuilder
 methods used from extensions

---
 .../MergeExtensionConfigurationPass.php       | 46 ++++++++++++++++++-
 .../MergeExtensionConfigurationPassTest.php   | 17 +++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index c3b4d78dd622d..af3a6baf0b898 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 /**
  * Merges extension configs into the container builder.
@@ -52,7 +55,7 @@ public function process(ContainerBuilder $container)
             }
             $config = $resolvingBag->resolveValue($config);
 
-            $tmpContainer = new ContainerBuilder($resolvingBag);
+            $tmpContainer = new MergeExtensionConfigurationContainerBuilder($extension, $resolvingBag);
             $tmpContainer->setResourceTracking($container->isTrackingResources());
             $tmpContainer->addObjectResource($extension);
             if ($extension instanceof ConfigurationExtensionInterface && null !== $configuration = $extension->getConfiguration($config, $tmpContainer)) {
@@ -121,3 +124,44 @@ public function getEnvPlaceholders()
         return null !== $this->processedEnvPlaceholders ? $this->processedEnvPlaceholders : parent::getEnvPlaceholders();
     }
 }
+
+/**
+ * A container builder preventing using methods that wouldn't have any effect from extensions.
+ *
+ * @internal
+ */
+class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
+{
+    private $extensionClass;
+
+    public function __construct(ExtensionInterface $extension, ParameterBagInterface $parameterBag = null)
+    {
+        parent::__construct($parameterBag);
+
+        $this->extensionClass = get_class($extension);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
+    {
+        throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', get_class($pass), $this->extensionClass));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerExtension(ExtensionInterface $extension)
+    {
+        throw new LogicException(sprintf('You cannot register extension "%s" from "%s". Extensions must be registered before the container is compiled.', get_class($extension), $this->extensionClass));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function compile($resolveEnvPlaceholders = false)
+    {
+        throw new LogicException(sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index 44d1933a80fa8..57bb634f4bff0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass;
+use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -54,6 +55,22 @@ public function testExpressionLanguageProviderForwarding()
         $this->assertEquals(array($provider), $tmpProviders);
     }
 
+    public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilderInstance()
+    {
+        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(array('load'))->getMock();
+        $extension->expects($this->once())
+            ->method('load')
+            ->with($this->isType('array'), $this->isInstanceOf(MergeExtensionConfigurationContainerBuilder::class))
+        ;
+
+        $container = new ContainerBuilder(new ParameterBag());
+        $container->registerExtension($extension);
+        $container->prependExtensionConfig('foo', array());
+
+        $pass = new MergeExtensionConfigurationPass();
+        $pass->process($container);
+    }
+
     public function testExtensionConfigurationIsTrackedByDefault()
     {
         $extension = $this->getMockBuilder(FooExtension::class)->setMethods(array('getConfiguration'))->getMock();

From 1ba4dd9b449288005af310bf6173a67229cec9a8 Mon Sep 17 00:00:00 2001
From: Iltar van der Berg 
Date: Mon, 25 Sep 2017 09:46:32 +0200
Subject: [PATCH 0882/1099] Added null as explicit return type
 (?TokenInterface)

---
 .../Component/Security/Http/Firewall/ContextListener.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index b443fa14881a4..43af1105bf76e 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -174,7 +174,7 @@ protected function refreshUser(TokenInterface $token)
         }
 
         if ($userNotFoundByProvider) {
-            return;
+            return null;
         }
 
         throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));

From 14c91f2bc98978c400eef484cdf7d274b1aa002c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 15 Sep 2017 22:03:33 +0200
Subject: [PATCH 0883/1099] [Cache] Add ResettableInterface to allow resetting
 any pool's local state

---
 .../Compiler/CachePoolPass.php                | 11 +++-
 .../FrameworkExtension.php                    |  3 ++
 .../Resources/config/cache.xml                |  4 +-
 .../Cache/Adapter/AbstractAdapter.php         |  3 +-
 .../Component/Cache/Adapter/ArrayAdapter.php  |  3 +-
 .../Component/Cache/Adapter/ChainAdapter.php  | 15 +++++-
 .../Cache/Adapter/PhpArrayAdapter.php         | 22 ++++----
 .../Component/Cache/Adapter/ProxyAdapter.php  |  8 ++-
 .../Cache/Adapter/SimpleCacheAdapter.php      |  8 ++-
 .../Cache/Adapter/TagAwareAdapter.php         | 51 ++++++++-----------
 .../Cache/Adapter/TraceableAdapter.php        | 36 ++++++++++++-
 .../Component/Cache/DoctrineProvider.php      | 21 +++++++-
 .../Component/Cache/ResettableInterface.php   | 20 ++++++++
 .../Component/Cache/Simple/AbstractCache.php  |  3 +-
 .../Component/Cache/Simple/ArrayCache.php     |  3 +-
 .../Component/Cache/Simple/ChainCache.php     | 15 +++++-
 .../Component/Cache/Simple/PhpArrayCache.php  | 20 ++++----
 .../Component/Cache/Simple/Psr6Cache.php      |  8 ++-
 .../Component/Cache/Simple/TraceableCache.php | 36 ++++++++++++-
 .../Tests/Adapter/PhpArrayAdapterTest.php     |  1 +
 .../PhpArrayAdapterWithFallbackTest.php       |  1 +
 .../Cache/Tests/Adapter/ProxyAdapterTest.php  |  1 +
 .../Tests/Adapter/SimpleCacheAdapterTest.php  |  4 ++
 .../Tests/Adapter/TraceableAdapterTest.php    |  4 ++
 .../Cache/Tests/Simple/PhpArrayCacheTest.php  |  1 +
 .../Simple/PhpArrayCacheWithFallbackTest.php  |  1 +
 .../Cache/Tests/Simple/Psr6CacheTest.php      |  4 ++
 .../Cache/Tests/Simple/TraceableCacheTest.php |  4 ++
 .../Component/Cache/Traits/AbstractTrait.php  | 11 ++++
 .../Component/Cache/Traits/ArrayTrait.php     |  8 +++
 .../Component/Cache/Traits/DoctrineTrait.php  |  9 ++++
 .../Component/Cache/Traits/PhpArrayTrait.php  |  5 +-
 .../Component/Cache/Traits/ProxyTrait.php     | 41 +++++++++++++++
 33 files changed, 315 insertions(+), 70 deletions(-)
 create mode 100644 src/Symfony/Component/Cache/ResettableInterface.php
 create mode 100644 src/Symfony/Component/Cache/Traits/ProxyTrait.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
index 6a633c7b25361..dafe0b7b8fce4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -43,6 +43,7 @@ public function process(ContainerBuilder $container)
             'provider',
             'namespace',
             'default_lifetime',
+            'reset',
         );
         foreach ($container->findTaggedServiceIds('cache.pool') as $id => $tags) {
             $adapter = $pool = $container->getDefinition($id);
@@ -73,13 +74,19 @@ public function process(ContainerBuilder $container)
             }
             $i = 0;
             foreach ($attributes as $attr) {
-                if (isset($tags[0][$attr]) && ('namespace' !== $attr || ArrayAdapter::class !== $adapter->getClass())) {
+                if (!isset($tags[0][$attr])) {
+                    // no-op
+                } elseif ('reset' === $attr) {
+                    if ($tags[0][$attr]) {
+                        $pool->addTag('kernel.reset', array('method' => $tags[0][$attr]));
+                    }
+                } elseif ('namespace' !== $attr || ArrayAdapter::class !== $adapter->getClass()) {
                     $pool->replaceArgument($i++, $tags[0][$attr]);
                 }
                 unset($tags[0][$attr]);
             }
             if (!empty($tags[0])) {
-                throw new InvalidArgumentException(sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "clearer", "provider", "namespace" and "default_lifetime", found "%s".', $id, implode('", "', array_keys($tags[0]))));
+                throw new InvalidArgumentException(sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "clearer", "provider", "namespace", "default_lifetime" and "reset", found "%s".', $id, implode('", "', array_keys($tags[0]))));
             }
 
             if (null !== $clearer) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 489bfed43c146..69d8fa64aa09b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -25,6 +25,7 @@
 use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\DirectoryResource;
@@ -336,6 +337,8 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('kernel.cache_warmer');
         $container->registerForAutoconfiguration(EventSubscriberInterface::class)
             ->addTag('kernel.event_subscriber');
+        $container->registerForAutoconfiguration(ResettableInterface::class)
+            ->addTag('kernel.reset', array('method' => 'reset'));
         $container->registerForAutoconfiguration(PropertyListExtractorInterface::class)
             ->addTag('property_info.list_extractor');
         $container->registerForAutoconfiguration(PropertyTypeExtractorInterface::class)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index cbed70e4e11a1..16b15a661768c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -8,7 +8,7 @@
         
 
         
-            
+            
         
 
         
@@ -90,7 +90,7 @@
         
 
         
-            
+            
             
              
              
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 6b38991b77e1e..a2fae2fc2f548 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -17,12 +17,13 @@
 use Psr\Log\NullLogger;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\AbstractTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
+abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
 {
     use AbstractTrait;
 
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
index 45c19c7a6c7af..2118e9c6ffa57 100644
--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -14,12 +14,13 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
+class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait;
 
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index c38949975d884..6bdf6b2d54f14 100644
--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * Chains several adapters together.
@@ -25,7 +26,7 @@
  *
  * @author Kévin Dunglas 
  */
-class ChainAdapter implements AdapterInterface, PruneableInterface
+class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     private $adapters = array();
     private $adapterCount;
@@ -248,4 +249,16 @@ public function prune()
 
         return $pruned;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        foreach ($this->adapters as $adapter) {
+            if ($adapter instanceof ResettableInterface) {
+                $adapter->reset();
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 7e9686a01855e..511224f854202 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -15,6 +15,8 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\PhpArrayTrait;
 
 /**
@@ -24,7 +26,7 @@
  * @author Titouan Galopin 
  * @author Nicolas Grekas 
  */
-class PhpArrayAdapter implements AdapterInterface
+class PhpArrayAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     use PhpArrayTrait;
 
@@ -37,7 +39,7 @@ class PhpArrayAdapter implements AdapterInterface
     public function __construct($file, AdapterInterface $fallbackPool)
     {
         $this->file = $file;
-        $this->fallbackPool = $fallbackPool;
+        $this->pool = $fallbackPool;
         $this->zendDetectUnicode = ini_get('zend.detect_unicode');
         $this->createCacheItem = \Closure::bind(
             function ($key, $value, $isHit) {
@@ -89,7 +91,7 @@ public function getItem($key)
             $this->initialize();
         }
         if (!isset($this->values[$key])) {
-            return $this->fallbackPool->getItem($key);
+            return $this->pool->getItem($key);
         }
 
         $value = $this->values[$key];
@@ -144,7 +146,7 @@ public function hasItem($key)
             $this->initialize();
         }
 
-        return isset($this->values[$key]) || $this->fallbackPool->hasItem($key);
+        return isset($this->values[$key]) || $this->pool->hasItem($key);
     }
 
     /**
@@ -159,7 +161,7 @@ public function deleteItem($key)
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->fallbackPool->deleteItem($key);
+        return !isset($this->values[$key]) && $this->pool->deleteItem($key);
     }
 
     /**
@@ -186,7 +188,7 @@ public function deleteItems(array $keys)
         }
 
         if ($fallbackKeys) {
-            $deleted = $this->fallbackPool->deleteItems($fallbackKeys) && $deleted;
+            $deleted = $this->pool->deleteItems($fallbackKeys) && $deleted;
         }
 
         return $deleted;
@@ -201,7 +203,7 @@ public function save(CacheItemInterface $item)
             $this->initialize();
         }
 
-        return !isset($this->values[$item->getKey()]) && $this->fallbackPool->save($item);
+        return !isset($this->values[$item->getKey()]) && $this->pool->save($item);
     }
 
     /**
@@ -213,7 +215,7 @@ public function saveDeferred(CacheItemInterface $item)
             $this->initialize();
         }
 
-        return !isset($this->values[$item->getKey()]) && $this->fallbackPool->saveDeferred($item);
+        return !isset($this->values[$item->getKey()]) && $this->pool->saveDeferred($item);
     }
 
     /**
@@ -221,7 +223,7 @@ public function saveDeferred(CacheItemInterface $item)
      */
     public function commit()
     {
-        return $this->fallbackPool->commit();
+        return $this->pool->commit();
     }
 
     /**
@@ -259,7 +261,7 @@ private function generateItems(array $keys)
         }
 
         if ($fallbackKeys) {
-            foreach ($this->fallbackPool->getItems($fallbackKeys) as $key => $item) {
+            foreach ($this->pool->getItems($fallbackKeys) as $key => $item) {
                 yield $key => $item;
             }
         }
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index cd310be062069..82c95c5b04582 100644
--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -14,13 +14,17 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class ProxyAdapter implements AdapterInterface
+class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
-    private $pool;
+    use ProxyTrait;
+
     private $namespace;
     private $namespaceLen;
     private $createCacheItem;
diff --git a/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php b/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
index f17662441041b..24db5d504ab68 100644
--- a/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
@@ -12,13 +12,17 @@
 namespace Symfony\Component\Cache\Adapter;
 
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class SimpleCacheAdapter extends AbstractAdapter
+class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
 {
-    private $pool;
+    use ProxyTrait;
+
     private $miss;
 
     public function __construct(CacheInterface $pool, $namespace = '', $defaultLifetime = 0)
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 96df1128bb895..cb71ed3fd8cb8 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -15,26 +15,29 @@
 use Psr\Cache\InvalidArgumentException;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface
+class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, ResettableInterface
 {
     const TAGS_PREFIX = "\0tags\0";
 
-    private $itemsAdapter;
+    use ProxyTrait;
+
     private $deferred = array();
     private $createCacheItem;
     private $setCacheItemTags;
     private $getTagsByKey;
     private $invalidateTags;
-    private $tagsAdapter;
+    private $tagsPool;
 
-    public function __construct(AdapterInterface $itemsAdapter, AdapterInterface $tagsAdapter = null)
+    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null)
     {
-        $this->itemsAdapter = $itemsAdapter;
-        $this->tagsAdapter = $tagsAdapter ?: $itemsAdapter;
+        $this->pool = $itemsPool;
+        $this->tags = $tagsPool ?: $itemsPool;
         $this->createCacheItem = \Closure::bind(
             function ($key, $value, CacheItem $protoItem) {
                 $item = new CacheItem();
@@ -110,7 +113,7 @@ public function invalidateTags(array $tags)
         }
         $f = $this->invalidateTags;
 
-        return $f($this->tagsAdapter, $tags);
+        return $f($this->tags, $tags);
     }
 
     /**
@@ -121,10 +124,10 @@ public function hasItem($key)
         if ($this->deferred) {
             $this->commit();
         }
-        if (!$this->itemsAdapter->hasItem($key)) {
+        if (!$this->pool->hasItem($key)) {
             return false;
         }
-        if (!$itemTags = $this->itemsAdapter->getItem(static::TAGS_PREFIX.$key)->get()) {
+        if (!$itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key)->get()) {
             return true;
         }
 
@@ -165,9 +168,9 @@ public function getItems(array $keys = array())
         }
 
         try {
-            $items = $this->itemsAdapter->getItems($tagKeys + $keys);
+            $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
-            $this->itemsAdapter->getItems($keys); // Should throw an exception
+            $this->pool->getItems($keys); // Should throw an exception
 
             throw $e;
         }
@@ -182,7 +185,7 @@ public function clear()
     {
         $this->deferred = array();
 
-        return $this->itemsAdapter->clear();
+        return $this->pool->clear();
     }
 
     /**
@@ -204,7 +207,7 @@ public function deleteItems(array $keys)
             }
         }
 
-        return $this->itemsAdapter->deleteItems($keys);
+        return $this->pool->deleteItems($keys);
     }
 
     /**
@@ -243,7 +246,7 @@ public function commit()
         if ($this->deferred) {
             $items = $this->deferred;
             foreach ($items as $key => $item) {
-                if (!$this->itemsAdapter->saveDeferred($item)) {
+                if (!$this->pool->saveDeferred($item)) {
                     unset($this->deferred[$key]);
                     $ok = false;
                 }
@@ -257,17 +260,17 @@ public function commit()
 
             foreach ($tagsByKey as $key => $tags) {
                 if ($tags) {
-                    $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
+                    $this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
                 } else {
                     $deletedTags[] = static::TAGS_PREFIX.$key;
                 }
             }
             if ($deletedTags) {
-                $this->itemsAdapter->deleteItems($deletedTags);
+                $this->pool->deleteItems($deletedTags);
             }
         }
 
-        return $this->itemsAdapter->commit() && $ok;
+        return $this->pool->commit() && $ok;
     }
 
     public function __destruct()
@@ -328,23 +331,11 @@ private function getTagVersions(array $tagsByKey)
                 $tagVersions[$tag] = $tag.static::TAGS_PREFIX;
                 $tags[$tag.static::TAGS_PREFIX] = $tag;
             }
-            foreach ($this->tagsAdapter->getItems($tagVersions) as $tag => $version) {
+            foreach ($this->tags->getItems($tagVersions) as $tag => $version) {
                 $tagVersions[$tags[$tag]] = $version->get() ?: 0;
             }
         }
 
         return $tagVersions;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function prune()
-    {
-        if ($this->itemsAdapter instanceof PruneableInterface) {
-            return $this->itemsAdapter->prune();
-        }
-
-        return false;
-    }
 }
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
index 9959199f67ccc..e8563521baef8 100644
--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * An adapter that collects data about all cache calls.
@@ -20,7 +22,7 @@
  * @author Tobias Nyholm 
  * @author Nicolas Grekas 
  */
-class TraceableAdapter implements AdapterInterface
+class TraceableAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     protected $pool;
     private $calls = array();
@@ -168,6 +170,38 @@ public function commit()
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prune()
+    {
+        if (!$this->pool instanceof PruneableInterface) {
+            return false;
+        }
+        $event = $this->start(__FUNCTION__);
+        try {
+            return $event->result = $this->pool->prune();
+        } finally {
+            $event->end = microtime(true);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if (!$this->pool instanceof ResettableInterface) {
+            return;
+        }
+        $event = $this->start(__FUNCTION__);
+        try {
+            $this->pool->reset();
+        } finally {
+            $event->end = microtime(true);
+        }
+    }
+
     public function getCalls()
     {
         try {
diff --git a/src/Symfony/Component/Cache/DoctrineProvider.php b/src/Symfony/Component/Cache/DoctrineProvider.php
index 5d9c2faed7187..cebe95fbc7733 100644
--- a/src/Symfony/Component/Cache/DoctrineProvider.php
+++ b/src/Symfony/Component/Cache/DoctrineProvider.php
@@ -17,7 +17,7 @@
 /**
  * @author Nicolas Grekas 
  */
-class DoctrineProvider extends CacheProvider
+class DoctrineProvider extends CacheProvider implements PruneableInterface, ResettableInterface
 {
     private $pool;
 
@@ -26,6 +26,25 @@ public function __construct(CacheItemPoolInterface $pool)
         $this->pool = $pool;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prune()
+    {
+        return $this->pool instanceof PruneableInterface && $this->pool->prune();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if ($this->pool instanceof ResettableInterface) {
+            $this->pool->reset();
+        }
+        $this->setNamespace($this->getNamespace());
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Cache/ResettableInterface.php b/src/Symfony/Component/Cache/ResettableInterface.php
new file mode 100644
index 0000000000000..6be72861e709c
--- /dev/null
+++ b/src/Symfony/Component/Cache/ResettableInterface.php
@@ -0,0 +1,20 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache;
+
+/**
+ * Resets a pool's local state.
+ */
+interface ResettableInterface
+{
+    public function reset();
+}
diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php
index 264eb60653339..e666effaf93f9 100644
--- a/src/Symfony/Component/Cache/Simple/AbstractCache.php
+++ b/src/Symfony/Component/Cache/Simple/AbstractCache.php
@@ -16,11 +16,12 @@
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Traits\AbstractTrait;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * @author Nicolas Grekas 
  */
-abstract class AbstractCache implements CacheInterface, LoggerAwareInterface
+abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use AbstractTrait {
         deleteItems as private;
diff --git a/src/Symfony/Component/Cache/Simple/ArrayCache.php b/src/Symfony/Component/Cache/Simple/ArrayCache.php
index a89768b0e2331..8d027cd2a3722 100644
--- a/src/Symfony/Component/Cache/Simple/ArrayCache.php
+++ b/src/Symfony/Component/Cache/Simple/ArrayCache.php
@@ -15,12 +15,13 @@
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class ArrayCache implements CacheInterface, LoggerAwareInterface
+class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait {
         ArrayTrait::deleteItem as delete;
diff --git a/src/Symfony/Component/Cache/Simple/ChainCache.php b/src/Symfony/Component/Cache/Simple/ChainCache.php
index 8bb944fd4773f..9d0c75870eb7e 100644
--- a/src/Symfony/Component/Cache/Simple/ChainCache.php
+++ b/src/Symfony/Component/Cache/Simple/ChainCache.php
@@ -14,6 +14,7 @@
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * Chains several caches together.
@@ -23,7 +24,7 @@
  *
  * @author Nicolas Grekas 
  */
-class ChainCache implements CacheInterface, PruneableInterface
+class ChainCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $miss;
     private $caches = array();
@@ -236,4 +237,16 @@ public function prune()
 
         return $pruned;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        foreach ($this->caches as $cache) {
+            if ($cache instanceof ResettableInterface) {
+                $cache->reset();
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
index 92180e63168bc..3db8a2ac1c044 100644
--- a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
+++ b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
@@ -14,6 +14,8 @@
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Traits\PhpArrayTrait;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
@@ -22,7 +24,7 @@
  * @author Titouan Galopin 
  * @author Nicolas Grekas 
  */
-class PhpArrayCache implements CacheInterface
+class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     use PhpArrayTrait;
 
@@ -33,7 +35,7 @@ class PhpArrayCache implements CacheInterface
     public function __construct($file, CacheInterface $fallbackPool)
     {
         $this->file = $file;
-        $this->fallbackPool = $fallbackPool;
+        $this->pool = $fallbackPool;
         $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 
@@ -68,7 +70,7 @@ public function get($key, $default = null)
             $this->initialize();
         }
         if (!isset($this->values[$key])) {
-            return $this->fallbackPool->get($key, $default);
+            return $this->pool->get($key, $default);
         }
 
         $value = $this->values[$key];
@@ -124,7 +126,7 @@ public function has($key)
             $this->initialize();
         }
 
-        return isset($this->values[$key]) || $this->fallbackPool->has($key);
+        return isset($this->values[$key]) || $this->pool->has($key);
     }
 
     /**
@@ -139,7 +141,7 @@ public function delete($key)
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->fallbackPool->delete($key);
+        return !isset($this->values[$key]) && $this->pool->delete($key);
     }
 
     /**
@@ -170,7 +172,7 @@ public function deleteMultiple($keys)
         }
 
         if ($fallbackKeys) {
-            $deleted = $this->fallbackPool->deleteMultiple($fallbackKeys) && $deleted;
+            $deleted = $this->pool->deleteMultiple($fallbackKeys) && $deleted;
         }
 
         return $deleted;
@@ -188,7 +190,7 @@ public function set($key, $value, $ttl = null)
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->fallbackPool->set($key, $value, $ttl);
+        return !isset($this->values[$key]) && $this->pool->set($key, $value, $ttl);
     }
 
     /**
@@ -216,7 +218,7 @@ public function setMultiple($values, $ttl = null)
         }
 
         if ($fallbackValues) {
-            $saved = $this->fallbackPool->setMultiple($fallbackValues, $ttl) && $saved;
+            $saved = $this->pool->setMultiple($fallbackValues, $ttl) && $saved;
         }
 
         return $saved;
@@ -249,7 +251,7 @@ private function generateItems(array $keys, $default)
         }
 
         if ($fallbackKeys) {
-            foreach ($this->fallbackPool->getMultiple($fallbackKeys, $default) as $key => $item) {
+            foreach ($this->pool->getMultiple($fallbackKeys, $default) as $key => $item) {
                 yield $key => $item;
             }
         }
diff --git a/src/Symfony/Component/Cache/Simple/Psr6Cache.php b/src/Symfony/Component/Cache/Simple/Psr6Cache.php
index 55fa98da1274c..81f14d4a7045c 100644
--- a/src/Symfony/Component/Cache/Simple/Psr6Cache.php
+++ b/src/Symfony/Component/Cache/Simple/Psr6Cache.php
@@ -18,13 +18,17 @@
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas 
  */
-class Psr6Cache implements CacheInterface
+class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterface
 {
-    private $pool;
+    use ProxyTrait;
+
     private $createCacheItem;
 
     public function __construct(CacheItemPoolInterface $pool)
diff --git a/src/Symfony/Component/Cache/Simple/TraceableCache.php b/src/Symfony/Component/Cache/Simple/TraceableCache.php
index 29cc10bbb27a1..756403bf1430e 100644
--- a/src/Symfony/Component/Cache/Simple/TraceableCache.php
+++ b/src/Symfony/Component/Cache/Simple/TraceableCache.php
@@ -12,13 +12,15 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * An adapter that collects data about all cache calls.
  *
  * @author Nicolas Grekas 
  */
-class TraceableCache implements CacheInterface
+class TraceableCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $pool;
     private $miss;
@@ -177,6 +179,38 @@ public function deleteMultiple($keys)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prune()
+    {
+        if (!$this->pool instanceof PruneableInterface) {
+            return false;
+        }
+        $event = $this->start(__FUNCTION__);
+        try {
+            return $event->result = $this->pool->prune();
+        } finally {
+            $event->end = microtime(true);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if (!$this->pool instanceof ResettableInterface) {
+            return;
+        }
+        $event = $this->start(__FUNCTION__);
+        try {
+            $this->pool->reset();
+        } finally {
+            $event->end = microtime(true);
+        }
+    }
+
     public function getCalls()
     {
         try {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
index 134dba7c90444..14b61263c5892 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -50,6 +50,7 @@ class PhpArrayAdapterTest extends AdapterTestCase
         'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
 
         'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.',
+        'testPrune' => 'PhpArrayAdapter just proxies',
     );
 
     protected static $file;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
index 45a50d2323a61..1a23198c2f98d 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
@@ -25,6 +25,7 @@ class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
         'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testPrune' => 'PhpArrayAdapter just proxies',
     );
 
     protected static $file;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
index c0174dd248222..5e6abd16c18c4 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
@@ -24,6 +24,7 @@ class ProxyAdapterTest extends AdapterTestCase
     protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testPrune' => 'ProxyAdapter just proxies',
     );
 
     public function createCachePool($defaultLifetime = 0)
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
index 1e0297c69e993..d5795d52e7128 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
@@ -19,6 +19,10 @@
  */
 class SimpleCacheAdapterTest extends AdapterTestCase
 {
+    protected $skippedTests = array(
+        'testPrune' => 'SimpleCache just proxies',
+    );
+
     public function createCachePool($defaultLifetime = 0)
     {
         return new SimpleCacheAdapter(new FilesystemCache(), '', $defaultLifetime);
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
index dec2f255555be..3755e88db5f15 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
@@ -19,6 +19,10 @@
  */
 class TraceableAdapterTest extends AdapterTestCase
 {
+    protected $skippedTests = array(
+        'testPrune' => 'TraceableAdapter just proxies',
+    );
+
     public function createCachePool($defaultLifetime = 0)
     {
         return new TraceableAdapter(new FilesystemAdapter('', $defaultLifetime));
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
index 57361905f8869..1bd0ca2778bb4 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
@@ -44,6 +44,7 @@ class PhpArrayCacheTest extends CacheTestCase
         'testSetValidData' => 'PhpArrayCache does no validation',
 
         'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
+        'testPrune' => 'PhpArrayCache just proxies',
     );
 
     protected static $file;
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
index a624fa73e783a..4b6a94f709b6d 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
@@ -31,6 +31,7 @@ class PhpArrayCacheWithFallbackTest extends CacheTestCase
         'testSetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
         'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
         'testHasInvalidKeys' => 'PhpArrayCache does no validation',
+        'testPrune' => 'PhpArrayCache just proxies',
     );
 
     protected static $file;
diff --git a/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
index 16e21d0c0b63b..78582894fbe1e 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
@@ -19,6 +19,10 @@
  */
 class Psr6CacheTest extends CacheTestCase
 {
+    protected $skippedTests = array(
+        'testPrune' => 'Psr6Cache just proxies',
+    );
+
     public function createSimpleCache($defaultLifetime = 0)
     {
         return new Psr6Cache(new FilesystemAdapter('', $defaultLifetime));
diff --git a/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
index 7feccba1af905..535f93da4be5a 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
@@ -19,6 +19,10 @@
  */
 class TraceableCacheTest extends CacheTestCase
 {
+    protected $skippedTests = array(
+        'testPrune' => 'TraceableCache just proxies',
+    );
+
     public function createSimpleCache($defaultLifetime = 0)
     {
         return new TraceableCache(new FilesystemCache('', $defaultLifetime));
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
index 108ac67c8e12f..d7af3b559e0ee 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -189,6 +189,17 @@ public function enableVersioning($enable = true)
         return $wasEnabled;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if ($this->deferred) {
+            $this->commit();
+        }
+        $this->namespaceVersion = '';
+    }
+
     /**
      * Like the native unserialize() function but throws an exception if anything goes wrong.
      *
diff --git a/src/Symfony/Component/Cache/Traits/ArrayTrait.php b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
index 3fb5fa36bef2c..b7d2ad6d6299c 100644
--- a/src/Symfony/Component/Cache/Traits/ArrayTrait.php
+++ b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
@@ -69,6 +69,14 @@ public function deleteItem($key)
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->clear();
+    }
+
     private function generateItems(array $keys, $now, $f)
     {
         foreach ($keys as $i => $key) {
diff --git a/src/Symfony/Component/Cache/Traits/DoctrineTrait.php b/src/Symfony/Component/Cache/Traits/DoctrineTrait.php
index be351cf53a552..c87ecabafc803 100644
--- a/src/Symfony/Component/Cache/Traits/DoctrineTrait.php
+++ b/src/Symfony/Component/Cache/Traits/DoctrineTrait.php
@@ -20,6 +20,15 @@ trait DoctrineTrait
 {
     private $provider;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        parent::reset();
+        $this->provider->setNamespace($this->provider->getNamespace());
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
index ccc48886d0cc3..ae634d6baa295 100644
--- a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
+++ b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
@@ -22,9 +22,10 @@
  */
 trait PhpArrayTrait
 {
+    use ProxyTrait;
+
     private $file;
     private $values;
-    private $fallbackPool;
     private $zendDetectUnicode;
 
     /**
@@ -119,7 +120,7 @@ public function clear()
 
         $cleared = @unlink($this->file) || !file_exists($this->file);
 
-        return $this->fallbackPool->clear() && $cleared;
+        return $this->pool->clear() && $cleared;
     }
 
     /**
diff --git a/src/Symfony/Component/Cache/Traits/ProxyTrait.php b/src/Symfony/Component/Cache/Traits/ProxyTrait.php
new file mode 100644
index 0000000000000..06dba7e59bf7e
--- /dev/null
+++ b/src/Symfony/Component/Cache/Traits/ProxyTrait.php
@@ -0,0 +1,41 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+
+/**
+ * @author Nicolas Grekas 
+ */
+trait ProxyTrait
+{
+    private $pool;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prune()
+    {
+        return $this->pool instanceof PruneableInterface && $this->pool->prune();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if ($this->pool instanceof ResettableInterface) {
+            $this->pool->reset();
+        }
+    }
+}

From dc55dd2c99a337d9baf803f017f139f1b280124b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 24 Sep 2017 00:04:06 +0200
Subject: [PATCH 0884/1099] [DI] Add AutowireRequiredMethodsPass to fix
 bindings for `@required` methods

---
 .../Compiler/AbstractRecursivePass.php        |  18 +-
 .../Compiler/AutowirePass.php                 |  60 +--
 .../Compiler/AutowireRequiredMethodsPass.php  |  70 ++++
 .../Compiler/PassConfig.php                   |   1 +
 .../Compiler/ResolveNamedArgumentsPass.php    |   6 +-
 .../Tests/Compiler/AutowirePassTest.php       | 342 +----------------
 .../AutowireRequiredMethodsPassTest.php       |  80 ++++
 .../Compiler/ResolveBindingsPassTest.php      |  16 +
 .../Fixtures/includes/autowiring_classes.php  | 343 ++++++++++++++++++
 9 files changed, 535 insertions(+), 401 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index bbe869b935e5c..ddc7d004da40d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -90,7 +90,7 @@ protected function getConstructor(Definition $definition, $required)
     {
         if (is_string($factory = $definition->getFactory())) {
             if (!function_exists($factory)) {
-                throw new RuntimeException(sprintf('Unable to resolve service "%s": function "%s" does not exist.', $this->currentId, $factory));
+                throw new RuntimeException(sprintf('Invalid service "%s": function "%s" does not exist.', $this->currentId, $factory));
             }
             $r = new \ReflectionFunction($factory);
             if (false !== $r->getFileName() && file_exists($r->getFileName())) {
@@ -108,7 +108,7 @@ protected function getConstructor(Definition $definition, $required)
                 $class = $definition->getClass();
             }
             if ('__construct' === $method) {
-                throw new RuntimeException(sprintf('Unable to resolve service "%s": "__construct()" cannot be used as a factory method.', $this->currentId));
+                throw new RuntimeException(sprintf('Invalid service "%s": "__construct()" cannot be used as a factory method.', $this->currentId));
             }
 
             return $this->getReflectionMethod(new Definition($class), $method);
@@ -117,14 +117,14 @@ protected function getConstructor(Definition $definition, $required)
         $class = $definition->getClass();
 
         if (!$r = $this->container->getReflectionClass($class)) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": class "%s" does not exist.', $this->currentId, $class));
+            throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
         }
         if (!$r = $r->getConstructor()) {
             if ($required) {
-                throw new RuntimeException(sprintf('Unable to resolve service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
+                throw new RuntimeException(sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
             }
         } elseif (!$r->isPublic()) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": %s must be public.', $this->currentId, sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class)));
+            throw new RuntimeException(sprintf('Invalid service "%s": %s must be public.', $this->currentId, sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class)));
         }
 
         return $r;
@@ -145,20 +145,20 @@ protected function getReflectionMethod(Definition $definition, $method)
         }
 
         if (!$class = $definition->getClass()) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": the class is not set.', $this->currentId));
+            throw new RuntimeException(sprintf('Invalid service "%s": the class is not set.', $this->currentId));
         }
 
         if (!$r = $this->container->getReflectionClass($class)) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": class "%s" does not exist.', $this->currentId, $class));
+            throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
         }
 
         if (!$r->hasMethod($method)) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
+            throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 
         $r = $r->getMethod($method);
         if (!$r->isPublic()) {
-            throw new RuntimeException(sprintf('Unable to resolve service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
+            throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 
         return $r;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 8cb1978ef675d..ace116fb9b515 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -130,7 +130,6 @@ private function doProcessValue($value, $isRoot = false)
             return $value;
         }
 
-        $autowiredMethods = $this->getMethodsToAutowire($reflectionClass);
         $methodCalls = $value->getMethodCalls();
 
         try {
@@ -143,7 +142,7 @@ private function doProcessValue($value, $isRoot = false)
             array_unshift($methodCalls, array($constructor, $value->getArguments()));
         }
 
-        $methodCalls = $this->autowireCalls($reflectionClass, $methodCalls, $autowiredMethods);
+        $methodCalls = $this->autowireCalls($reflectionClass, $methodCalls);
 
         if ($constructor) {
             list(, $arguments) = array_shift($methodCalls);
@@ -161,61 +160,18 @@ private function doProcessValue($value, $isRoot = false)
     }
 
     /**
-     * Gets the list of methods to autowire.
-     *
      * @param \ReflectionClass $reflectionClass
-     *
-     * @return \ReflectionMethod[]
-     */
-    private function getMethodsToAutowire(\ReflectionClass $reflectionClass)
-    {
-        $methodsToAutowire = array();
-
-        foreach ($reflectionClass->getMethods() as $reflectionMethod) {
-            $r = $reflectionMethod;
-
-            if ($r->isConstructor()) {
-                continue;
-            }
-
-            while (true) {
-                if (false !== $doc = $r->getDocComment()) {
-                    if (false !== stripos($doc, '@required') && preg_match('#(?:^/\*\*|\n\s*+\*)\s*+@required(?:\s|\*/$)#i', $doc)) {
-                        $methodsToAutowire[strtolower($reflectionMethod->name)] = $reflectionMethod;
-                        break;
-                    }
-                    if (false === stripos($doc, '@inheritdoc') || !preg_match('#(?:^/\*\*|\n\s*+\*)\s*+(?:\{@inheritdoc\}|@inheritdoc)(?:\s|\*/$)#i', $doc)) {
-                        break;
-                    }
-                }
-                try {
-                    $r = $r->getPrototype();
-                } catch (\ReflectionException $e) {
-                    break; // method has no prototype
-                }
-            }
-        }
-
-        return $methodsToAutowire;
-    }
-
-    /**
-     * @param \ReflectionClass    $reflectionClass
-     * @param array               $methodCalls
-     * @param \ReflectionMethod[] $autowiredMethods
+     * @param array            $methodCalls
      *
      * @return array
      */
-    private function autowireCalls(\ReflectionClass $reflectionClass, array $methodCalls, array $autowiredMethods)
+    private function autowireCalls(\ReflectionClass $reflectionClass, array $methodCalls)
     {
         foreach ($methodCalls as $i => $call) {
             list($method, $arguments) = $call;
 
             if ($method instanceof \ReflectionFunctionAbstract) {
                 $reflectionMethod = $method;
-            } elseif (isset($autowiredMethods[$lcMethod = strtolower($method)]) && $autowiredMethods[$lcMethod]->isPublic()) {
-                $reflectionMethod = $autowiredMethods[$lcMethod];
-                unset($autowiredMethods[$lcMethod]);
             } else {
                 $reflectionMethod = $this->getReflectionMethod(new Definition($reflectionClass->name), $method);
             }
@@ -227,16 +183,6 @@ private function autowireCalls(\ReflectionClass $reflectionClass, array $methodC
             }
         }
 
-        foreach ($autowiredMethods as $lcMethod => $reflectionMethod) {
-            $method = $reflectionMethod->name;
-
-            if (!$reflectionMethod->isPublic()) {
-                $class = $reflectionClass->name;
-                throw new AutowiringFailedException($this->currentId, sprintf('Cannot autowire service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
-            }
-            $methodCalls[] = array($method, $this->autowireMethod($reflectionMethod, array()));
-        }
-
         return $methodCalls;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
new file mode 100644
index 0000000000000..6c744f88f6a94
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
@@ -0,0 +1,70 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * Looks for definitions with autowiring enabled and registers their corresponding "@required" methods as setters.
+ *
+ * @author Nicolas Grekas 
+ */
+class AutowireRequiredMethodsPass extends AbstractRecursivePass
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function processValue($value, $isRoot = false)
+    {
+        $value = parent::processValue($value, $isRoot);
+
+        if (!$value instanceof Definition || !$value->isAutowired() || $value->isAbstract() || !$value->getClass()) {
+            return $value;
+        }
+        if (!$reflectionClass = $this->container->getReflectionClass($value->getClass(), false)) {
+            return $value;
+        }
+
+        $alreadyCalledMethods = array();
+
+        foreach ($value->getMethodCalls() as list($method)) {
+            $alreadyCalledMethods[strtolower($method)] = true;
+        }
+
+        foreach ($reflectionClass->getMethods() as $reflectionMethod) {
+            $r = $reflectionMethod;
+
+            if ($r->isConstructor() || isset($alreadyCalledMethods[strtolower($r->name)])) {
+                continue;
+            }
+
+            while (true) {
+                if (false !== $doc = $r->getDocComment()) {
+                    if (false !== stripos($doc, '@required') && preg_match('#(?:^/\*\*|\n\s*+\*)\s*+@required(?:\s|\*/$)#i', $doc)) {
+                        $value->addMethodCall($reflectionMethod->name);
+                        break;
+                    }
+                    if (false === stripos($doc, '@inheritdoc') || !preg_match('#(?:^/\*\*|\n\s*+\*)\s*+(?:\{@inheritdoc\}|@inheritdoc)(?:\s|\*/$)#i', $doc)) {
+                        break;
+                    }
+                }
+                try {
+                    $r = $r->getPrototype();
+                } catch (\ReflectionException $e) {
+                    break; // method has no prototype
+                }
+            }
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 79792bee4a106..e80b8e6cc8623 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -58,6 +58,7 @@ public function __construct()
             new CheckDefinitionValidityPass(),
             new RegisterServiceSubscribersPass(),
             new ResolveNamedArgumentsPass(),
+            new AutowireRequiredMethodsPass(),
             new ResolveBindingsPass(),
             $autowirePass = new AutowirePass(false),
             new ResolveServiceSubscribersPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
index e4d592d0c6473..a96f981d074b4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -61,11 +61,11 @@ protected function processValue($value, $isRoot = false)
                         }
                     }
 
-                    throw new InvalidArgumentException(sprintf('Unable to resolve service "%s": method "%s()" has no argument named "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
+                    throw new InvalidArgumentException(sprintf('Invalid service "%s": method "%s()" has no argument named "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
                 }
 
                 if (null !== $argument && !$argument instanceof Reference && !$argument instanceof Definition) {
-                    throw new InvalidArgumentException(sprintf('Unable to resolve service "%s": the value of argument "%s" of method "%s()" must be null, an instance of %s or an instance of %s, %s given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, gettype($argument)));
+                    throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of %s or an instance of %s, %s given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, gettype($argument)));
                 }
 
                 foreach ($parameters as $j => $p) {
@@ -76,7 +76,7 @@ protected function processValue($value, $isRoot = false)
                     }
                 }
 
-                throw new InvalidArgumentException(sprintf('Unable to resolve service "%s": method "%s()" has no argument type-hinted as "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
+                throw new InvalidArgumentException(sprintf('Invalid service "%s": method "%s()" has no argument type-hinted as "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
             }
 
             if ($resolvedArguments !== $call[1]) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 94666df608391..dbf839b4eac83 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -20,6 +21,8 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\TypedReference;
 
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
 /**
  * @author Kévin Dunglas 
  */
@@ -174,7 +177,7 @@ public function testExceptionsAreStored()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
-     * @expectedExceptionMessage Unable to resolve service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.
+     * @expectedExceptionMessage Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.
      */
     public function testPrivateConstructorThrowsAutowireException()
     {
@@ -554,6 +557,7 @@ public function testSetterInjection()
         ;
 
         (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
         (new AutowirePass())->process($container);
 
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
@@ -590,6 +594,7 @@ public function testExplicitMethodInjection()
         ;
 
         (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
         (new AutowirePass())->process($container);
 
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
@@ -687,6 +692,8 @@ public function testSetterInjectionCollisionThrowsException()
         $aDefinition = $container->register('setter_injection_collision', SetterInjectionCollision::class);
         $aDefinition->setAutowired(true);
 
+        (new AutowireRequiredMethodsPass())->process($container);
+
         $pass = new AutowirePass();
         $pass->process($container);
     }
@@ -770,6 +777,7 @@ public function testNotWireableCalls($method, $expectedMsg)
         }
 
         (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
         (new AutowirePass())->process($container);
     }
 
@@ -778,7 +786,7 @@ public function provideNotWireableCalls()
         return array(
             array('setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class cannot be loaded.'),
             array('setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists. It cannot be auto-registered because it is from a different root namespace.'),
-            array(null, 'Cannot autowire service "foo": method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setProtectedMethod()" must be public.'),
+            array(null, 'Invalid service "foo": method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setProtectedMethod()" must be public.'),
         );
     }
 
@@ -859,333 +867,3 @@ public function testExceptionWhenAliasDoesNotExist()
         $pass->process($container);
     }
 }
-
-class Foo
-{
-}
-
-class Bar
-{
-    public function __construct(Foo $foo)
-    {
-    }
-}
-
-interface AInterface
-{
-}
-
-class A implements AInterface
-{
-    public static function create(Foo $foo)
-    {
-    }
-}
-
-class B extends A
-{
-}
-
-class C
-{
-    public function __construct(A $a)
-    {
-    }
-}
-
-interface DInterface
-{
-}
-
-interface EInterface extends DInterface
-{
-}
-
-interface IInterface
-{
-}
-
-class I implements IInterface
-{
-}
-
-class F extends I implements EInterface
-{
-}
-
-class G
-{
-    public function __construct(DInterface $d, EInterface $e, IInterface $i)
-    {
-    }
-}
-
-class H
-{
-    public function __construct(B $b, DInterface $d)
-    {
-    }
-}
-
-class D
-{
-    public function __construct(A $a, DInterface $d)
-    {
-    }
-}
-
-class E
-{
-    public function __construct(D $d = null)
-    {
-    }
-}
-
-class J
-{
-    public function __construct(I $i)
-    {
-    }
-}
-
-interface CollisionInterface
-{
-}
-
-class CollisionA implements CollisionInterface
-{
-}
-
-class CollisionB implements CollisionInterface
-{
-}
-
-class CannotBeAutowired
-{
-    public function __construct(CollisionInterface $collision)
-    {
-    }
-}
-
-class CannotBeAutowiredForwardOrder
-{
-    public function __construct(CollisionA $a, CollisionInterface $b, CollisionB $c)
-    {
-    }
-}
-
-class CannotBeAutowiredReverseOrder
-{
-    public function __construct(CollisionA $a, CollisionB $c, CollisionInterface $b)
-    {
-    }
-}
-
-class Lille
-{
-}
-
-class Dunglas
-{
-    public function __construct(Lille $l)
-    {
-    }
-}
-
-class LesTilleuls
-{
-    public function __construct(Dunglas $j, Dunglas $k)
-    {
-    }
-}
-
-class OptionalParameter
-{
-    public function __construct(CollisionInterface $c = null, A $a, Foo $f = null)
-    {
-    }
-}
-
-class BadTypeHintedArgument
-{
-    public function __construct(Dunglas $k, NotARealClass $r)
-    {
-    }
-}
-class BadParentTypeHintedArgument
-{
-    public function __construct(Dunglas $k, OptionalServiceClass $r)
-    {
-    }
-}
-class NotGuessableArgument
-{
-    public function __construct(Foo $k)
-    {
-    }
-}
-class NotGuessableArgumentForSubclass
-{
-    public function __construct(A $k)
-    {
-    }
-}
-class MultipleArguments
-{
-    public function __construct(A $k, $foo, Dunglas $dunglas)
-    {
-    }
-}
-
-class MultipleArgumentsOptionalScalar
-{
-    public function __construct(A $a, $foo = 'default_val', Lille $lille = null)
-    {
-    }
-}
-class MultipleArgumentsOptionalScalarLast
-{
-    public function __construct(A $a, Lille $lille, $foo = 'some_val')
-    {
-    }
-}
-class MultipleArgumentsOptionalScalarNotReallyOptional
-{
-    public function __construct(A $a, $foo = 'default_val', Lille $lille)
-    {
-    }
-}
-
-/*
- * Classes used for testing createResourceForClass
- */
-class ClassForResource
-{
-    public function __construct($foo, Bar $bar = null)
-    {
-    }
-
-    public function setBar(Bar $bar)
-    {
-    }
-}
-class IdenticalClassResource extends ClassForResource
-{
-}
-
-class ClassChangedConstructorArgs extends ClassForResource
-{
-    public function __construct($foo, Bar $bar, $baz)
-    {
-    }
-}
-
-class SetterInjection extends SetterInjectionParent
-{
-    /**
-     * @required
-     */
-    public function setFoo(Foo $foo)
-    {
-        // should be called
-    }
-
-    /** @inheritdoc*/
-    public function setDependencies(Foo $foo, A $a)
-    {
-        // should be called
-    }
-
-    /** {@inheritdoc} */
-    public function setWithCallsConfigured(A $a)
-    {
-        // this method has a calls configured on it
-    }
-
-    public function notASetter(A $a)
-    {
-        // should be called only when explicitly specified
-    }
-
-    /**
-     * @required*/
-    public function setChildMethodWithoutDocBlock(A $a)
-    {
-    }
-}
-
-class SetterInjectionParent
-{
-    /** @required*/
-    public function setDependencies(Foo $foo, A $a)
-    {
-        // should be called
-    }
-
-    public function notASetter(A $a)
-    {
-        // @required should be ignored when the child does not add @inheritdoc
-    }
-
-    /**	@required  prefix is on purpose */
-    public function setWithCallsConfigured(A $a)
-    {
-    }
-
-    /** @required */
-    public function setChildMethodWithoutDocBlock(A $a)
-    {
-    }
-}
-
-class SetterInjectionCollision
-{
-    /**
-     * @required
-     */
-    public function setMultipleInstancesForOneArg(CollisionInterface $collision)
-    {
-        // The CollisionInterface cannot be autowired - there are multiple
-
-        // should throw an exception
-    }
-}
-
-class NotWireable
-{
-    public function setNotAutowireable(NotARealClass $n)
-    {
-    }
-
-    public function setBar()
-    {
-    }
-
-    public function setOptionalNotAutowireable(NotARealClass $n = null)
-    {
-    }
-
-    public function setDifferentNamespace(\stdClass $n)
-    {
-    }
-
-    public function setOptionalNoTypeHint($foo = null)
-    {
-    }
-
-    public function setOptionalArgNoAutowireable($other = 'default_val')
-    {
-    }
-
-    /** @required */
-    protected function setProtectedMethod(A $a)
-    {
-    }
-}
-
-class PrivateConstructor
-{
-    private function __construct()
-    {
-    }
-}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
new file mode 100644
index 0000000000000..3b067150ff5a1
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
@@ -0,0 +1,80 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+class AutowireRequiredMethodsPassTest extends TestCase
+{
+    public function testSetterInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        // manually configure *one* call, to override autowiring
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'));
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            array('setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'),
+            array_column($methodCalls, 0)
+        );
+
+        // test setWithCallsConfigured args
+        $this->assertEquals(
+            array('manual_arg1', 'manual_arg2'),
+            $methodCalls[0][1]
+        );
+        // test setFoo args
+        $this->assertEquals(array(), $methodCalls[1][1]);
+    }
+
+    public function testExplicitMethodInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('notASetter', array());
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'),
+            array_column($methodCalls, 0)
+        );
+        $this->assertEquals(array(), $methodCalls[0][1]);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
index f7e29d2110ff1..16e486afafe2e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,6 +21,8 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\TypedReference;
 
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
 class ResolveBindingsPassTest extends TestCase
 {
     public function testProcess()
@@ -79,4 +82,17 @@ public function testTypedReferenceSupport()
         $this->assertEquals(array($typedRef), $container->getDefinition('def1')->getArguments());
         $this->assertEquals(array(new Reference('foo')), $container->getDefinition('def2')->getArguments());
     }
+
+    public function testScalarSetter()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->autowire('foo', ScalarSetter::class);
+        $definition->setBindings(array('$defaultLocale' => 'fr'));
+
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new ResolveBindingsPass())->process($container);
+
+        $this->assertEquals(array(array('setDefaultLocale', array('fr'))), $definition->getMethodCalls());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
new file mode 100644
index 0000000000000..bf99eff6a2838
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -0,0 +1,343 @@
+ prefix is on purpose */
+    public function setWithCallsConfigured(A $a)
+    {
+    }
+
+    /** @required */
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
+}
+
+class NotWireable
+{
+    public function setNotAutowireable(NotARealClass $n)
+    {
+    }
+
+    public function setBar()
+    {
+    }
+
+    public function setOptionalNotAutowireable(NotARealClass $n = null)
+    {
+    }
+
+    public function setDifferentNamespace(\stdClass $n)
+    {
+    }
+
+    public function setOptionalNoTypeHint($foo = null)
+    {
+    }
+
+    public function setOptionalArgNoAutowireable($other = 'default_val')
+    {
+    }
+
+    /** @required */
+    protected function setProtectedMethod(A $a)
+    {
+    }
+}
+
+class PrivateConstructor
+{
+    private function __construct()
+    {
+    }
+}
+
+class ScalarSetter
+{
+    /**
+     * @required
+     */
+    public function setDefaultLocale($defaultLocale)
+    {
+    }
+}

From a85b37a0e68e4a5b23113f41f79d6a88b53a61b8 Mon Sep 17 00:00:00 2001
From: Ryan Weaver 
Date: Fri, 22 Sep 2017 13:54:05 -0400
Subject: [PATCH 0885/1099] Adding Definition::addError() and a compiler pass
 to throw errors as exceptions

---
 .../Compiler/AbstractRecursivePass.php        |  3 ++
 .../Compiler/AutowireExceptionPass.php        |  4 ++
 .../Compiler/AutowirePass.php                 |  7 ++-
 .../Compiler/CheckArgumentsValidityPass.php   | 35 ++++++++++--
 .../Compiler/DefinitionErrorExceptionPass.php | 39 ++++++++++++++
 .../Compiler/InlineServiceDefinitionsPass.php |  4 ++
 .../Compiler/PassConfig.php                   |  8 +--
 .../DependencyInjection/Definition.php        | 21 ++++++++
 .../Compiler/AutowireExceptionPassTest.php    |  3 ++
 .../Tests/Compiler/AutowirePassTest.php       |  3 ++
 .../CheckArgumentsValidityPassTest.php        | 11 ++++
 .../DefinitionErrorExceptionPassTest.php      | 53 +++++++++++++++++++
 .../InlineServiceDefinitionsPassTest.php      |  3 ++
 .../Tests/DefinitionTest.php                  |  9 ++++
 14 files changed, 194 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index bbe869b935e5c..0851d33e7e9cf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -22,6 +22,9 @@
  */
 abstract class AbstractRecursivePass implements CompilerPassInterface
 {
+    /**
+     * @var ContainerBuilder
+     */
     protected $container;
     protected $currentId;
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
index 12be3d915fd10..f01617dd633c6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
@@ -11,11 +11,15 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+@trigger_error('The '.__NAMESPACE__.'\AutowireExceptionPass class is deprecated since version 3.4 and will be removed in 4.0. Use the DefinitionErrorExceptionPass class instead.', E_USER_DEPRECATED);
+
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Throws autowire exceptions from AutowirePass for definitions that still exist.
  *
+ * @deprecated since version 3.4, will be removed in 4.0.
+ *
  * @author Ryan Weaver 
  */
 class AutowireExceptionPass implements CompilerPassInterface
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 8cb1978ef675d..607b70c85fb61 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -36,7 +36,7 @@ class AutowirePass extends AbstractRecursivePass
     private $autowiringExceptions = array();
 
     /**
-     * @param bool $throwOnAutowireException If false, retrieved errors via getAutowiringExceptions
+     * @param bool $throwOnAutowireException Errors can be retrieved via Definition::getErrors()
      */
     public function __construct($throwOnAutowireException = true)
     {
@@ -44,10 +44,14 @@ public function __construct($throwOnAutowireException = true)
     }
 
     /**
+     * @deprecated since version 3.4, to be removed in 4.0.
+     *
      * @return AutowiringFailedException[]
      */
     public function getAutowiringExceptions()
     {
+        @trigger_error('Calling AutowirePass::getAutowiringExceptions() is deprecated since Symfony 3.4 and will be removed in 4.0. Use Definition::getErrors() instead.', E_USER_DEPRECATED);
+
         return $this->autowiringExceptions;
     }
 
@@ -106,6 +110,7 @@ protected function processValue($value, $isRoot = false)
             }
 
             $this->autowiringExceptions[] = $e;
+            $this->container->getDefinition($this->currentId)->addError($e->getMessage());
 
             return parent::processValue($value, $isRoot);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
index 6b48a156919da..7f032058ab139 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
@@ -22,6 +22,13 @@
  */
 class CheckArgumentsValidityPass extends AbstractRecursivePass
 {
+    private $throwExceptions;
+
+    public function __construct($throwExceptions = true)
+    {
+        $this->throwExceptions = $throwExceptions;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -35,10 +42,20 @@ protected function processValue($value, $isRoot = false)
         foreach ($value->getArguments() as $k => $v) {
             if ($k !== $i++) {
                 if (!is_int($k)) {
-                    throw new RuntimeException(sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k));
+                    $msg = sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k);
+                    $value->addError($msg);
+                    if ($this->throwExceptions) {
+                        throw new RuntimeException($msg);
+                    }
+
+                    break;
                 }
 
-                throw new RuntimeException(sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i));
+                $msg = sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i);
+                $value->addError($msg);
+                if ($this->throwExceptions) {
+                    throw new RuntimeException($msg);
+                }
             }
         }
 
@@ -47,10 +64,20 @@ protected function processValue($value, $isRoot = false)
             foreach ($methodCall[1] as $k => $v) {
                 if ($k !== $i++) {
                     if (!is_int($k)) {
-                        throw new RuntimeException(sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k));
+                        $msg = sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k);
+                        $value->addError($msg);
+                        if ($this->throwExceptions) {
+                            throw new RuntimeException($msg);
+                        }
+
+                        break;
                     }
 
-                    throw new RuntimeException(sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i));
+                    $msg = sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i);
+                    $value->addError($msg);
+                    if ($this->throwExceptions) {
+                        throw new RuntimeException($msg);
+                    }
                 }
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
new file mode 100644
index 0000000000000..69cd899f2a5d4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
@@ -0,0 +1,39 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
+/**
+ * Throws an exception for any Definitions that have errors and still exist.
+ *
+ * @author Ryan Weaver 
+ */
+class DefinitionErrorExceptionPass extends AbstractRecursivePass
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function processValue($value, $isRoot = false)
+    {
+        if (!$value instanceof Definition || empty($value->getErrors())) {
+            return parent::processValue($value, $isRoot);
+        }
+
+        // only show the first error so they user can focus on it
+        $errors = $value->getErrors();
+        $message = reset($errors);
+
+        throw new RuntimeException($message);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 73f75b30a982c..05e7786798d2c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -38,10 +38,14 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
      *
      * The key is the inlined service id and its value is the list of services it was inlined into.
      *
+     * @deprecated since version 3.4, to be removed in 4.0.
+     *
      * @return array
      */
     public function getInlinedServiceIds()
     {
+        @trigger_error('Calling InlineServiceDefinitionsPass::getInlinedServiceIds() is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
         return $this->inlinedServiceIds;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 79792bee4a106..1edc4c21b10f0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -59,14 +59,14 @@ public function __construct()
             new RegisterServiceSubscribersPass(),
             new ResolveNamedArgumentsPass(),
             new ResolveBindingsPass(),
-            $autowirePass = new AutowirePass(false),
+            new AutowirePass(false),
             new ResolveServiceSubscribersPass(),
             new ResolveReferencesToAliasesPass(),
             new ResolveInvalidReferencesPass(),
             new AnalyzeServiceReferencesPass(true),
             new CheckCircularReferencesPass(),
             new CheckReferenceValidityPass(),
-            new CheckArgumentsValidityPass(),
+            new CheckArgumentsValidityPass(false),
         ));
 
         $this->removingPasses = array(array(
@@ -75,11 +75,11 @@ public function __construct()
             new RemoveAbstractDefinitionsPass(),
             new RepeatedPass(array(
                 new AnalyzeServiceReferencesPass(),
-                $inlinedServicePass = new InlineServiceDefinitionsPass(),
+                new InlineServiceDefinitionsPass(),
                 new AnalyzeServiceReferencesPass(),
                 new RemoveUnusedDefinitionsPass(),
             )),
-            new AutowireExceptionPass($autowirePass, $inlinedServicePass),
+            new DefinitionErrorExceptionPass(),
             new CheckExceptionOnInvalidReferenceBehaviorPass(),
         ));
     }
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 34d6f46cacca4..464932fc0acae 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -44,6 +44,7 @@ class Definition
     private $autowiringTypes = array();
     private $changes = array();
     private $bindings = array();
+    private $errors = array();
 
     protected $arguments = array();
 
@@ -959,4 +960,24 @@ public function setBindings(array $bindings)
 
         return $this;
     }
+
+    /**
+     * Add an error that occurred when building this Definition.
+     *
+     * @param string $error
+     */
+    public function addError($error)
+    {
+        $this->errors[] = $error;
+    }
+
+    /**
+     * Returns any errors that occurred while building this Definition.
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
index 4f0b3d6c2566c..a9c3445cefdd8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
@@ -18,6 +18,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
 
+/**
+ * @group legacy
+ */
 class AutowireExceptionPassTest extends TestCase
 {
     public function testThrowsException()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 94666df608391..3a48cfae8d6dc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -157,6 +157,9 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
         $this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
     }
 
+    /**
+     * @group legacy
+     */
     public function testExceptionsAreStored()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
index 891acbeee0d89..d121689ff9c6a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
@@ -64,4 +64,15 @@ public function definitionProvider()
             array(array(), array(array('baz', array(1 => 1)))),
         );
     }
+
+    public function testNoException()
+    {
+        $container = new ContainerBuilder();
+        $definition = $container->register('foo');
+        $definition->setArguments(array(null, 'a' => 'a'));
+
+        $pass = new CheckArgumentsValidityPass(false);
+        $pass->process($container);
+        $this->assertCount(1, $definition->getErrors());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
new file mode 100644
index 0000000000000..e0585e21324b3
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
@@ -0,0 +1,53 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+class DefinitionErrorExceptionPassTest extends TestCase
+{
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Things went wrong!
+     */
+    public function testThrowsException()
+    {
+        $container = new ContainerBuilder();
+        $def = new Definition();
+        $def->addError('Things went wrong!');
+        $def->addError('Now something else!');
+        $container->register('foo_service_id')
+            ->setArguments(array(
+                $def,
+            ));
+
+        $pass = new DefinitionErrorExceptionPass();
+        $pass->process($container);
+    }
+
+    public function testNoExceptionThrown()
+    {
+        $container = new ContainerBuilder();
+        $def = new Definition();
+        $container->register('foo_service_id')
+            ->setArguments(array(
+                $def,
+            ));
+
+        $pass = new DefinitionErrorExceptionPass();
+        $pass->process($container);
+        $this->assertSame($def, $container->getDefinition('foo_service_id')->getArgument(0));
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
index 26b24fa713242..6154080c8bc0e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -252,6 +252,9 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
         $this->assertSame('inline', (string) $values[0]);
     }
 
+    /**
+     * @group legacy
+     */
     public function testGetInlinedServiceIdData()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 2821dc17c0dc2..5fe4236ad9384 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -387,4 +387,13 @@ public function testShouldAutoconfigure()
         $def->setAutoconfigured(true);
         $this->assertTrue($def->isAutoconfigured());
     }
+
+    public function testAddError()
+    {
+        $def = new Definition('stdClass');
+        $this->assertEmpty($def->getErrors());
+        $def->addError('First error');
+        $def->addError('Second error');
+        $this->assertSame(array('First error', 'Second error'), $def->getErrors());
+    }
 }

From 709f134dc8f5c62a1f116d922e7ce3ee66c92f39 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Mon, 25 Sep 2017 17:11:48 +0200
Subject: [PATCH 0886/1099] Removed unneeded wrapping quotes around a Twig key

---
 .../views/Form/bootstrap_4_horizontal_layout.html.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
index 046cf3cdd1703..32b4944bab3d0 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -7,7 +7,7 @@
         
     {%- else -%}
         {%- if expanded is not defined or not expanded -%}
-            {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
         {%- endif -%}
         {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%}
         {{- parent() -}}

From f12e5887ff51266519226c8eea9ffb268f1273d0 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Mon, 25 Sep 2017 17:12:23 +0200
Subject: [PATCH 0887/1099] Removed unneeded wrapping quotes around a Twig key

---
 .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index b3c71a74ea5aa..7dda32ace2fc4 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -72,9 +72,9 @@
 {% block form_label -%}
     {%- if expanded is defined and expanded -%}
         {%- set element = 'legend' -%}
-        {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' col-form-legend')|trim}) -%}
+        {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-legend')|trim}) -%}
     {%- endif -%}
-    {%- set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
+    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
     {{- parent() -}}
 {%- endblock form_label %}
 

From 9becb8ae34b70208f0f47968309ad6612243bd3d Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 19 Sep 2017 10:04:34 +0100
Subject: [PATCH 0888/1099] [Yaml] support parsing files

---
 src/Symfony/Component/Yaml/CHANGELOG.md       |  2 +
 src/Symfony/Component/Yaml/Inline.php         | 56 ++++++++--------
 src/Symfony/Component/Yaml/Parser.php         | 64 ++++++++++++++-----
 .../Yaml/Tests/Fixtures/not_readable.yml      | 18 ++++++
 .../Component/Yaml/Tests/InlineTest.php       | 23 +++++--
 .../Component/Yaml/Tests/ParserTest.php       | 41 +++++++++++-
 src/Symfony/Component/Yaml/Yaml.php           | 23 +++++++
 7 files changed, 177 insertions(+), 50 deletions(-)
 create mode 100644 src/Symfony/Component/Yaml/Tests/Fixtures/not_readable.yml

diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
index cdd49352d5185..1b07b239cd6e5 100644
--- a/src/Symfony/Component/Yaml/CHANGELOG.md
+++ b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.4.0
 -----
 
+ * added support for parsing YAML files using the `Yaml::parseFile()` or `Parser::parseFile()` method
+
  * the `Dumper`, `Parser`, and `Yaml` classes are marked as final
 
  * Deprecated the `!php/object:` tag which will be replaced by the
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 4410d221c7df7..b1653137fc135 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -26,7 +26,8 @@ class Inline
 {
     const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
 
-    public static $parsedLineNumber;
+    public static $parsedLineNumber = -1;
+    public static $parsedFilename;
 
     private static $exceptionOnInvalidType = false;
     private static $objectSupport = false;
@@ -34,19 +35,18 @@ class Inline
     private static $constantSupport = false;
 
     /**
-     * @param int      $flags
-     * @param int|null $parsedLineNumber
+     * @param int         $flags
+     * @param int|null    $parsedLineNumber
+     * @param string|null $parsedFilename
      */
-    public static function initialize($flags, $parsedLineNumber = null)
+    public static function initialize($flags, $parsedLineNumber = null, $parsedFilename = null)
     {
         self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
         self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
         self::$objectForMap = (bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags);
         self::$constantSupport = (bool) (Yaml::PARSE_CONSTANT & $flags);
-
-        if (null !== $parsedLineNumber) {
-            self::$parsedLineNumber = $parsedLineNumber;
-        }
+        self::$parsedFilename = $parsedFilename;
+        self::$parsedLineNumber = null !== $parsedLineNumber ? $parsedLineNumber : -1;
     }
 
     /**
@@ -128,7 +128,7 @@ public static function parse($value, $flags = 0, $references = array())
 
         // some comments are allowed at the end
         if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
-            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)));
+            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber, $value, self::$parsedFilename);
         }
 
         if (isset($mbEncoding)) {
@@ -322,7 +322,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
             if (null !== $delimiters) {
                 $tmp = ltrim(substr($scalar, $i), ' ');
                 if (!in_array($tmp[0], $delimiters)) {
-                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
+                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber, $scalar, self::$parsedFilename);
                 }
             }
         } else {
@@ -339,12 +339,12 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
                 $output = $match[1];
                 $i += strlen($output);
             } else {
-                throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar));
+                throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar), self::$parsedLineNumber, null, self::$parsedFilename);
             }
 
             // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
             if ($output && ('@' === $output[0] || '`' === $output[0] || '|' === $output[0] || '>' === $output[0])) {
-                throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]));
+                throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]), self::$parsedLineNumber, $output, self::$parsedFilename);
             }
 
             if ($output && '%' === $output[0]) {
@@ -372,7 +372,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
     private static function parseQuotedScalar($scalar, &$i)
     {
         if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
-            throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)));
+            throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)), self::$parsedLineNumber, $scalar, self::$parsedFilename);
         }
 
         $output = substr($match[0], 1, strlen($match[0]) - 2);
@@ -455,7 +455,7 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
             ++$i;
         }
 
-        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence));
+        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence), self::$parsedLineNumber, null, self::$parsedFilename);
     }
 
     /**
@@ -572,7 +572,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
             }
         }
 
-        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping));
+        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping), self::$parsedLineNumber, null, self::$parsedFilename);
     }
 
     /**
@@ -600,11 +600,11 @@ private static function evaluateScalar($scalar, $flags, $references = array())
 
             // an unquoted *
             if (false === $value || '' === $value) {
-                throw new ParseException('A reference must contain at least one character.');
+                throw new ParseException('A reference must contain at least one character.', self::$parsedLineNumber, $value, self::$parsedFilename);
             }
 
             if (!array_key_exists($value, $references)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value));
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), self::$parsedLineNumber, $value, self::$parsedFilename);
             }
 
             return $references[$value];
@@ -639,7 +639,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         }
 
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
 
                         return;
@@ -651,7 +651,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         }
 
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
 
                         return;
@@ -661,7 +661,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         }
 
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
 
                         return;
@@ -673,10 +673,10 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                                 return constant($const);
                             }
 
-                            throw new ParseException(sprintf('The constant "%s" is not defined.', $const));
+                            throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar));
+                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
 
                         return;
@@ -686,10 +686,10 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                                 return constant($const);
                             }
 
-                            throw new ParseException(sprintf('The constant "%s" is not defined.', $const));
+                            throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar));
+                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber, $scalar, self::$parsedFilename);
                         }
 
                         return;
@@ -781,7 +781,7 @@ private static function parseTag($value, &$i, $flags)
 
         // Built-in tags
         if ($tag && '!' === $tag[0]) {
-            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag));
+            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag), self::$parsedLineNumber, $value, self::$parsedFilename);
         }
 
         if (Yaml::PARSE_CUSTOM_TAGS & $flags) {
@@ -790,7 +790,7 @@ private static function parseTag($value, &$i, $flags)
             return $tag;
         }
 
-        throw new ParseException(sprintf('Tags support is not enabled. Enable the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!%s".', $tag));
+        throw new ParseException(sprintf('Tags support is not enabled. Enable the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!%s".', $tag), self::$parsedLineNumber, $value, self::$parsedFilename);
     }
 
     /**
@@ -805,11 +805,11 @@ public static function evaluateBinaryScalar($scalar)
         $parsedBinaryData = self::parseScalar(preg_replace('/\s/', '', $scalar));
 
         if (0 !== (strlen($parsedBinaryData) % 4)) {
-            throw new ParseException(sprintf('The normalized base64 encoded data (data without whitespace characters) length must be a multiple of four (%d bytes given).', strlen($parsedBinaryData)));
+            throw new ParseException(sprintf('The normalized base64 encoded data (data without whitespace characters) length must be a multiple of four (%d bytes given).', strlen($parsedBinaryData)), self::$parsedLineNumber, $scalar, self::$parsedFilename);
         }
 
         if (!Parser::preg_match('#^[A-Z0-9+/]+={0,2}$#i', $parsedBinaryData)) {
-            throw new ParseException(sprintf('The base64 encoded data (%s) contains invalid characters.', $parsedBinaryData));
+            throw new ParseException(sprintf('The base64 encoded data (%s) contains invalid characters.', $parsedBinaryData), self::$parsedLineNumber, $scalar, self::$parsedFilename);
         }
 
         return base64_decode($parsedBinaryData, true);
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 49eae8f0cc633..be1c13cddbf98 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -26,6 +26,7 @@ class Parser
     const TAG_PATTERN = '(?P![\w!.\/:-]+)';
     const BLOCK_SCALAR_HEADER_PATTERN = '(?P\||>)(?P\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P +#.*)?';
 
+    private $filename;
     private $offset = 0;
     private $totalNumberOfLines;
     private $lines = array();
@@ -50,6 +51,35 @@ public function __construct()
         }
     }
 
+    /**
+     * Parses a YAML file into a PHP value.
+     *
+     * @param string $filename The path to the YAML file to be parsed
+     * @param int    $flags    A bit field of PARSE_* constants to customize the YAML parser behavior
+     *
+     * @return mixed The YAML converted to a PHP value
+     *
+     * @throws ParseException If the file could not be read or the YAML is not valid
+     */
+    public function parseFile($filename, $flags = 0)
+    {
+        if (!is_file($filename)) {
+            throw new ParseException(sprintf('File "%s" does not exist.', $filename));
+        }
+
+        if (!is_readable($filename)) {
+            throw new ParseException(sprintf('File "%s" cannot be read.', $filename));
+        }
+
+        $this->filename = $filename;
+
+        try {
+            return $this->parse(file_get_contents($filename), $flags);
+        } finally {
+            $this->filename = null;
+        }
+    }
+
     /**
      * Parses a YAML string to a PHP value.
      *
@@ -93,7 +123,7 @@ public function parse($value, $flags = 0)
         }
 
         if (false === preg_match('//u', $value)) {
-            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
+            throw new ParseException('The YAML value does not appear to be valid UTF-8.', -1, null, $this->filename);
         }
 
         $this->refs = array();
@@ -168,13 +198,13 @@ private function doParse($value, $flags)
 
             // tab?
             if ("\t" === $this->currentLine[0]) {
-                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
             }
 
             $isRef = $mergeNode = false;
             if (self::preg_match('#^\-((?P\s+)(?P.+))?$#u', rtrim($this->currentLine), $values)) {
                 if ($context && 'mapping' == $context) {
-                    throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                    throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                 }
                 $context = 'sequence';
 
@@ -218,11 +248,11 @@ private function doParse($value, $flags)
                 && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))
             ) {
                 if ($context && 'sequence' == $context) {
-                    throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);
+                    throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine, $this->filename);
                 }
                 $context = 'mapping';
 
-                Inline::initialize($flags, $this->getRealCurrentLineNb());
+                Inline::initialize($flags, $this->getRealCurrentLineNb(), $this->filename);
                 try {
                     $i = 0;
                     $evaluateKey = !(Yaml::PARSE_KEYS_AS_STRINGS & $flags);
@@ -256,13 +286,13 @@ private function doParse($value, $flags)
                     if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
                         $refName = substr(rtrim($values['value']), 1);
                         if (!array_key_exists($refName, $this->refs)) {
-                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
                         $refValue = $this->refs[$refName];
 
                         if (!is_array($refValue)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
                         $data += $refValue; // array union
@@ -275,7 +305,7 @@ private function doParse($value, $flags)
                         $parsed = $this->parseBlock($this->getRealCurrentLineNb() + 1, $value, $flags);
 
                         if (!is_array($parsed)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
                         if (isset($parsed[0])) {
@@ -284,7 +314,7 @@ private function doParse($value, $flags)
                             // in the sequence override keys specified in later mapping nodes.
                             foreach ($parsed as $parsedItem) {
                                 if (!is_array($parsedItem)) {
-                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
+                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem, $this->filename);
                                 }
 
                                 $data += $parsedItem; // array union
@@ -350,7 +380,7 @@ private function doParse($value, $flags)
             } else {
                 // multiple documents are not supported
                 if ('---' === $this->currentLine) {
-                    throw new ParseException('Multiple documents are not supported.', $this->currentLineNb + 1, $this->currentLine);
+                    throw new ParseException('Multiple documents are not supported.', $this->currentLineNb + 1, $this->currentLine, $this->filename);
                 }
 
                 if (isset($this->currentLine[1]) && '?' === $this->currentLine[0] && ' ' === $this->currentLine[1]) {
@@ -412,7 +442,7 @@ private function doParse($value, $flags)
                     }
                 }
 
-                throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
             }
         } while ($this->moveToNextLine());
 
@@ -515,7 +545,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
             $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem();
 
             if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
             }
         } else {
             $newIndent = $indentation;
@@ -594,7 +624,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
 
                 break;
             } else {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
             }
         }
 
@@ -654,7 +684,7 @@ private function parseValue($value, $flags, $context)
             }
 
             if (!array_key_exists($value, $this->refs)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine);
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
             }
 
             return $this->refs[$value];
@@ -704,7 +734,7 @@ private function parseValue($value, $flags, $context)
             $parsedValue = Inline::parse($value, $flags, $this->refs);
 
             if ('mapping' === $context && is_string($parsedValue) && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
-                throw new ParseException('A colon cannot be used in an unquoted mapping value.');
+                throw new ParseException('A colon cannot be used in an unquoted mapping value.', $this->getRealCurrentLineNb() + 1, $value, $this->filename);
             }
 
             return $parsedValue;
@@ -1044,13 +1074,13 @@ private function getLineTag($value, $flags, $nextLineCheck = true)
 
         // Built-in tags
         if ($tag && '!' === $tag[0]) {
-            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag));
+            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
         }
 
         if (Yaml::PARSE_CUSTOM_TAGS & $flags) {
             return $tag;
         }
 
-        throw new ParseException(sprintf('Tags support is not enabled. You must use the flag `Yaml::PARSE_CUSTOM_TAGS` to use "%s".', $matches['tag']));
+        throw new ParseException(sprintf('Tags support is not enabled. You must use the flag `Yaml::PARSE_CUSTOM_TAGS` to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
     }
 }
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/not_readable.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/not_readable.yml
new file mode 100644
index 0000000000000..3216a89ebbc39
--- /dev/null
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/not_readable.yml
@@ -0,0 +1,18 @@
+- escapedCharacters
+- sfComments
+- sfCompact
+- sfTests
+- sfObjects
+- sfMergeKey
+- sfQuotes
+- YtsAnchorAlias
+- YtsBasicTests
+- YtsBlockMapping
+- YtsDocumentSeparator
+- YtsErrorTests
+- YtsFlowCollections
+- YtsFoldedScalars
+- YtsNullsAndEmpties
+- YtsSpecificationExamples
+- YtsTypeTransfers
+- unindentedCollections
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 2933ee67ceea9..5fdf2957fb7ac 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -18,6 +18,11 @@
 
 class InlineTest extends TestCase
 {
+    protected function setUp()
+    {
+        Inline::initialize(0);
+    }
+
     /**
      * @dataProvider getTestsForParse
      */
@@ -283,11 +288,16 @@ public function testParseUnquotedAsteriskFollowedByAComment()
 
     /**
      * @dataProvider getReservedIndicators
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
      */
     public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
     {
+        if (method_exists($this, 'expectExceptionMessage')) {
+            $this->expectException(ParseException::class);
+            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar (near "%sfoo ").', $indicator));
+        } else {
+            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar (near "%sfoo ").', $indicator));
+        }
+
         Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
     }
 
@@ -298,11 +308,16 @@ public function getReservedIndicators()
 
     /**
      * @dataProvider getScalarIndicators
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
      */
     public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
     {
+        if (method_exists($this, 'expectExceptionMessage')) {
+            $this->expectException(ParseException::class);
+            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar (near "%sfoo ").', $indicator));
+        } else {
+            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar (near "%sfoo ").', $indicator));
+        }
+
         Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
     }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 59e7b4986a302..553b762384c29 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -30,6 +30,8 @@ protected function setUp()
     protected function tearDown()
     {
         $this->parser = null;
+
+        chmod(__DIR__.'/Fixtures/not_readable.yml', 0644);
     }
 
     /**
@@ -1696,7 +1698,7 @@ public function testUnsupportedTagWithScalar()
 
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage The built-in tag "!!foo" is not implemented.
+     * @expectedExceptionMessage The built-in tag "!!foo" is not implemented at line 1 (near "!!foo").
      */
     public function testExceptionWhenUsingUnsuportedBuiltInTags()
     {
@@ -1903,6 +1905,43 @@ public function testPhpConstantTagMappingKeyWithKeysCastToStrings()
 
         $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT | Yaml::PARSE_KEYS_AS_STRINGS));
     }
+
+    public function testFilenamesAreParsedAsStringsWithoutFlag()
+    {
+        $file = __DIR__.'/Fixtures/index.yml';
+
+        $this->assertSame($file, $this->parser->parse($file));
+    }
+
+    public function testParseFile()
+    {
+        $this->assertInternalType('array', $this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessageRegExp #^File ".+/Fixtures/nonexistent.yml" does not exist\.$#
+     */
+    public function testParsingNonExistentFilesThrowsException()
+    {
+        $this->parser->parseFile(__DIR__.'/Fixtures/nonexistent.yml');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessageRegExp #^File ".+/Fixtures/not_readable.yml" cannot be read\.$#
+     */
+    public function testParsingNotReadableFilesThrowsException()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod is not supported on Windows');
+        }
+
+        $file = __DIR__.'/Fixtures/not_readable.yml';
+        chmod($file, 0200);
+
+        $this->parser->parseFile($file);
+    }
 }
 
 class B
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
index 52a064f70b5fb..24e3e95cba32d 100644
--- a/src/Symfony/Component/Yaml/Yaml.php
+++ b/src/Symfony/Component/Yaml/Yaml.php
@@ -39,6 +39,29 @@ class Yaml
      */
     const PARSE_KEYS_AS_STRINGS = 2048;
 
+    /**
+     * Parses a YAML file into a PHP value.
+     *
+     *  Usage:
+     *  
+     *   $array = Yaml::parseFile('config.yml');
+     *   print_r($array);
+     *  
+     *
+     * @param string $filename The path to the YAML file to be parsed
+     * @param int    $flags    A bit field of PARSE_* constants to customize the YAML parser behavior
+     *
+     * @return mixed The YAML converted to a PHP value
+     *
+     * @throws ParseException If the file could not be read or the YAML is not valid
+     */
+    public static function parseFile($filename, $flags = 0)
+    {
+        $yaml = new Parser();
+
+        return $yaml->parseFile($filename, $flags);
+    }
+
     /**
      * Parses YAML into a PHP value.
      *

From 8bf465f48d3560f97b0a27b37222e812f6a3fd09 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Mon, 25 Sep 2017 21:59:34 +0200
Subject: [PATCH 0889/1099] use the parseFile() method of the YAML parser

---
 .../Component/DependencyInjection/Loader/YamlFileLoader.php   | 2 +-
 src/Symfony/Component/Routing/Loader/YamlFileLoader.php       | 2 +-
 src/Symfony/Component/Routing/composer.json                   | 4 ++--
 .../Component/Serializer/Mapping/Loader/YamlFileLoader.php    | 2 +-
 src/Symfony/Component/Translation/Loader/YamlFileLoader.php   | 2 +-
 src/Symfony/Component/Translation/composer.json               | 4 ++--
 .../Component/Validator/Mapping/Loader/YamlFileLoader.php     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index be0c75b2cac73..d9fd24c3d71a6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -654,7 +654,7 @@ protected function loadFile($file)
         }
 
         try {
-            $configuration = $this->yamlParser->parse(file_get_contents($file), Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
+            $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
         } catch (ParseException $e) {
             throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
         }
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index 5a087513215a6..f3072c927b73e 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -58,7 +58,7 @@ public function load($file, $type = null)
         }
 
         try {
-            $parsedConfig = $this->yamlParser->parse(file_get_contents($path));
+            $parsedConfig = $this->yamlParser->parseFile($path);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
         }
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
index 1226ffde886d7..2ad746ec53c24 100644
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "symfony/config": "~2.8|~3.0|~4.0",
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
+        "symfony/yaml": "~3.4|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
@@ -31,7 +31,7 @@
     "conflict": {
         "symfony/config": "<2.8",
         "symfony/dependency-injection": "<3.3",
-        "symfony/yaml": "<3.3"
+        "symfony/yaml": "<3.4"
     },
     "suggest": {
         "symfony/http-foundation": "For using a Symfony Request object",
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
index e3afa4763271e..970241d34767f 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -113,7 +113,7 @@ private function getClassesFromYaml()
             $this->yamlParser = new Parser();
         }
 
-        $classes = $this->yamlParser->parse(file_get_contents($this->file));
+        $classes = $this->yamlParser->parseFile($this->file);
 
         if (empty($classes)) {
             return array();
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
index 41e390d0e967d..874fa3a8943e8 100644
--- a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -39,7 +39,7 @@ protected function loadResource($resource)
         }
 
         try {
-            $messages = $this->yamlParser->parse(file_get_contents($resource));
+            $messages = $this->yamlParser->parseFile($resource);
         } catch (ParseException $e) {
             throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
         }
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index 48873b98268c4..3a1e1589f5460 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -23,14 +23,14 @@
         "symfony/config": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/intl": "^2.8.18|^3.2.5|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
+        "symfony/yaml": "~3.4|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "psr/log": "~1.0"
     },
     "conflict": {
         "symfony/config": "<2.8",
         "symfony/dependency-injection": "<3.4",
-        "symfony/yaml": "<3.3"
+        "symfony/yaml": "<3.4"
     },
     "suggest": {
         "symfony/config": "",
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index ff6c65d05e763..e5e84c38c35dd 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -116,7 +116,7 @@ protected function parseNodes(array $nodes)
     private function parseFile($path)
     {
         try {
-            $classes = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_CONSTANT);
+            $classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
         }

From af9e2534df64b202ecceffa6d62db2bbab154d2c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Tue, 26 Sep 2017 08:23:35 +0200
Subject: [PATCH 0890/1099] Fix merge

---
 .../Compiler/MergeExtensionConfigurationPass.php              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index af3a6baf0b898..c801f473cf25c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -144,7 +144,7 @@ public function __construct(ExtensionInterface $extension, ParameterBagInterface
     /**
      * {@inheritdoc}
      */
-    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
+    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
     {
         throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', get_class($pass), $this->extensionClass));
     }
@@ -160,7 +160,7 @@ public function registerExtension(ExtensionInterface $extension)
     /**
      * {@inheritdoc}
      */
-    public function compile($resolveEnvPlaceholders = false)
+    public function compile(bool $resolveEnvPlaceholders = false)
     {
         throw new LogicException(sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
     }

From 7a475595e2dd64790b3f1caf56f5b57cefcef27f Mon Sep 17 00:00:00 2001
From: Qingshan Luo 
Date: Tue, 26 Sep 2017 10:03:27 +0800
Subject: [PATCH 0891/1099] Use PHP_MAXPATHLEN in Filesystem.

---
 src/Symfony/Component/Filesystem/Filesystem.php      | 12 ++++++++----
 .../Component/Filesystem/Tests/FilesystemTest.php    |  7 ++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 223e116090d6f..1c10366cee414 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -117,9 +117,11 @@ public function mkdir($dirs, $mode = 0777)
      */
     public function exists($files)
     {
+        $maxPathLength = PHP_MAXPATHLEN - 2;
+
         foreach ($this->toIterator($files) as $file) {
-            if ('\\' === DIRECTORY_SEPARATOR && strlen($file) > 258) {
-                throw new IOException('Could not check if file exist because path length exceeds 258 characters.', 0, null, $file);
+            if (strlen($file) > $maxPathLength) {
+                throw new IOException(sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);
             }
 
             if (!file_exists($file)) {
@@ -301,8 +303,10 @@ public function rename($origin, $target, $overwrite = false)
      */
     private function isReadable($filename)
     {
-        if ('\\' === DIRECTORY_SEPARATOR && strlen($filename) > 258) {
-            throw new IOException('Could not check if file is readable because path length exceeds 258 characters.', 0, null, $filename);
+        $maxPathLength = PHP_MAXPATHLEN - 2;
+
+        if (strlen($filename) > $maxPathLength) {
+            throw new IOException(sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);
         }
 
         return is_readable($filename);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 1228b2d8e2afc..fb6c135f925b3 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -374,16 +374,13 @@ public function testFilesExists()
      */
     public function testFilesExistsFails()
     {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Test covers edge case on Windows only.');
-        }
-
         $basePath = $this->workspace.'\\directory\\';
+        $maxPathLength = PHP_MAXPATHLEN - 2;
 
         $oldPath = getcwd();
         mkdir($basePath);
         chdir($basePath);
-        $file = str_repeat('T', 259 - strlen($basePath));
+        $file = str_repeat('T', $maxPathLength - strlen($basePath) + 1);
         $path = $basePath.$file;
         exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation
         $this->longPathNamesWindows[] = $path; // save this so we can clean up later

From 484e3fd3f240fc80a0d7f4963c7ea11247bce37a Mon Sep 17 00:00:00 2001
From: Kamil Kokot 
Date: Tue, 26 Sep 2017 11:35:56 +0200
Subject: [PATCH 0892/1099] Use correct verb form in the pull request template

When "forget" is used with a gerund, it refers to an action that has already happened.
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1bad363eca810..04567c68e04e8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,9 +2,9 @@
 | ------------- | ---
 | Branch?       | 3.4 or master / 2.7, 2.8 or 3.3 
 | Bug fix?      | yes/no
-| New feature?  | yes/no 
+| New feature?  | yes/no 
 | BC breaks?    | yes/no
-| Deprecations? | yes/no 
+| Deprecations? | yes/no 
 | Tests pass?   | yes/no
 | Fixed tickets | #... 
 | License       | MIT

From 091f943900059df01bafef2c5579b244ca1c9075 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 24 Sep 2017 19:51:14 +0200
Subject: [PATCH 0893/1099] [DI] Fix tracking of bound arguments when using
 autoconfiguration

---
 .../Compiler/ResolveInstanceofConditionalsPass.php     |  3 +++
 .../Loader/Configurator/Traits/ParentTrait.php         |  2 ++
 .../RegisterControllerArgumentLocatorsPass.php         | 10 ++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 32d7ad2911408..f6603b1499c9f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -90,9 +90,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
         }
 
         if ($parent) {
+            $bindings = $definition->getBindings();
             $abstract = $container->setDefinition('abstract.instanceof.'.$id, $definition);
 
             // cast Definition to ChildDefinition
+            $definition->setBindings(array());
             $definition = serialize($definition);
             $definition = substr_replace($definition, '53', 2, 2);
             $definition = substr_replace($definition, 'Child', 44, 0);
@@ -117,6 +119,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
 
             // reset fields with "merge" behavior
             $abstract
+                ->setBindings($bindings)
                 ->setArguments(array())
                 ->setMethodCalls(array())
                 ->setTags(array())
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
index 651f94e617129..43f1223e324a6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
@@ -38,6 +38,8 @@ final protected function setParent($parent)
             $this->definition->setParent($parent);
         } elseif ($this->definition->isAutoconfigured()) {
             throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.', $this->id));
+        } elseif ($this->definition->getBindings()) {
+            throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also "bind" arguments.', $this->id));
         } else {
             // cast Definition to ChildDefinition
             $definition = serialize($this->definition);
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index 6c15b427ecc42..6a9f0586f7b77 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -14,7 +14,6 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -54,11 +53,13 @@ public function process(ContainerBuilder $container)
             $def->setPublic(true);
             $class = $def->getClass();
             $autowire = $def->isAutowired();
+            $bindings = $def->getBindings();
 
             // resolve service class, taking parent definitions into account
-            while (!$class && $def instanceof ChildDefinition) {
+            while ($def instanceof ChildDefinition) {
                 $def = $container->findDefinition($def->getParent());
-                $class = $def->getClass();
+                $class = $class ?: $def->getClass();
+                $bindings = $def->getBindings();
             }
             $class = $parameterBag->resolveValue($class);
 
@@ -111,9 +112,6 @@ public function process(ContainerBuilder $container)
                 }
             }
 
-            // not validated, they are later in ResolveBindingsPass
-            $bindings = $def->getBindings();
-
             foreach ($methods as list($r, $parameters)) {
                 /** @var \ReflectionMethod $r */
 

From 6522c05876939234117c5fcdc93afb7b3d0708bc Mon Sep 17 00:00:00 2001
From: Iltar van der Berg 
Date: Tue, 26 Sep 2017 12:02:43 +0200
Subject: [PATCH 0894/1099] Removed unused private property

---
 .../Component/Security/Http/Firewall/ContextListener.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index 43af1105bf76e..6a9ba672b21e1 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -33,7 +33,6 @@
 class ContextListener implements ListenerInterface
 {
     private $tokenStorage;
-    private $contextKey;
     private $sessionKey;
     private $logger;
     private $userProviders;
@@ -54,7 +53,6 @@ public function __construct(TokenStorageInterface $tokenStorage, array $userProv
 
         $this->tokenStorage = $tokenStorage;
         $this->userProviders = $userProviders;
-        $this->contextKey = $contextKey;
         $this->sessionKey = '_security_'.$contextKey;
         $this->logger = $logger;
         $this->dispatcher = $dispatcher;

From eb520e1e5bd31c08be73ac0a4c6b9a9382f29768 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz 
Date: Tue, 26 Sep 2017 12:10:40 +0200
Subject: [PATCH 0895/1099] Minor reword

---
 src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
index e2cd23e948fcf..cb85328d9ad67 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
@@ -1,4 +1,4 @@
-{# This file is diverged from WebProfilerBundle/Resources/views/Profiler/base_js.html.twig.
+{# This file is based on WebProfilerBundle/Resources/views/Profiler/base_js.html.twig.
    If you make any change in this file, verify the same change is needed in the other file. #}
 /*
Date: Tue, 19 Sep 2017 10:03:04 +0200
Subject: [PATCH 0896/1099] Set a NullLogger in ApcuAdapter when Apcu is
 disabled in CLI

Same check as in https://github.com/symfony/symfony/pull/23390/files#diff-a5185cd58702e8e073786794a423cb27R112
---
 src/Symfony/Component/Cache/Adapter/AbstractAdapter.php   | 2 +-
 src/Symfony/Component/PropertyAccess/PropertyAccessor.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 6b38991b77e1e..6bfedd3bc39cf 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -116,7 +116,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
         }
 
         $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
-        if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
             $apcu->setLogger(new NullLogger());
         } elseif (null !== $logger) {
             $apcu->setLogger($logger);
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index b4c27f928421b..1d2558a4cc688 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -13,6 +13,7 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
@@ -928,7 +929,9 @@ public static function createCache($namespace, $defaultLifetime, $version, Logge
         }
 
         $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
-        if (null !== $logger) {
+        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
+            $apcu->setLogger(new NullLogger());
+        } elseif (null !== $logger) {
             $apcu->setLogger($logger);
         }
 

From d0235a00cc36c173ca3885991f8ed07609e2238e Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 26 Sep 2017 12:29:00 +0200
Subject: [PATCH 0897/1099] register class metadata factory alias

---
 .../Bundle/FrameworkBundle/Resources/config/serializer.xml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 924ebf18d8b0f..5fed443127d5a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -52,6 +52,8 @@
             null
         
 
+        
+
         
         
             

From b6b6d31b71b3b0eca74409b3a4198e48e38cbb00 Mon Sep 17 00:00:00 2001
From: Fabien Lucas 
Date: Thu, 14 Sep 2017 09:57:27 +0100
Subject: [PATCH 0898/1099] Added an alias for FlashBagInterface in config

---
 src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 0cb86362a231e..335c14a8a6611 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -38,6 +38,7 @@
         
 
         
+        
 
         
 

From 22f525b01fdace2f42b457ac807bef1528a19811 Mon Sep 17 00:00:00 2001
From: Iltar van der Berg 
Date: Mon, 14 Aug 2017 10:19:33 +0200
Subject: [PATCH 0899/1099] [Security] Deprecated not being logged out after
 user change

---
 UPGRADE-3.4.md                                |  4 +++
 UPGRADE-4.0.md                                |  6 ++++
 .../Bundle/SecurityBundle/CHANGELOG.md        |  3 ++
 .../DependencyInjection/MainConfiguration.php | 15 ++++++++
 .../DependencyInjection/SecurityExtension.php | 12 +++++--
 .../Fixtures/php/container1.php               |  3 ++
 .../Fixtures/php/firewall_provider.php        |  2 ++
 .../php/firewall_undefined_provider.php       |  1 +
 .../Fixtures/php/listener_provider.php        |  1 +
 .../php/listener_undefined_provider.php       |  1 +
 .../Fixtures/php/merge.php                    |  1 +
 .../Fixtures/php/merge_import.php             |  1 +
 .../Fixtures/php/no_custom_user_checker.php   |  3 +-
 .../Fixtures/php/remember_me_options.php      |  1 +
 .../Fixtures/xml/container1.xml               |  4 +--
 .../Fixtures/xml/firewall_provider.xml        |  2 +-
 .../xml/firewall_undefined_provider.xml       |  2 +-
 .../Fixtures/xml/listener_provider.xml        |  2 +-
 .../xml/listener_undefined_provider.xml       |  2 +-
 .../Fixtures/xml/merge.xml                    |  2 +-
 .../Fixtures/xml/merge_import.xml             |  2 +-
 .../Fixtures/xml/remember_me_options.xml      |  2 +-
 .../Fixtures/yml/container1.yml               |  2 ++
 .../Fixtures/yml/firewall_provider.yml        |  2 ++
 .../yml/firewall_undefined_provider.yml       |  1 +
 .../Fixtures/yml/listener_provider.yml        |  1 +
 .../yml/listener_undefined_provider.yml       |  1 +
 .../Fixtures/yml/merge.yml                    |  1 +
 .../Fixtures/yml/merge_import.yml             |  1 +
 .../Fixtures/yml/remember_me_options.yml      |  1 +
 .../MainConfigurationTest.php                 |  3 ++
 .../SecurityExtensionTest.php                 | 29 ++++++++++++++++
 src/Symfony/Component/Security/CHANGELOG.md   |  4 +++
 .../Http/Firewall/ContextListener.php         | 30 ++++++++++++++--
 .../Tests/Firewall/ContextListenerTest.php    | 34 ++++++++++++++++---
 35 files changed, 161 insertions(+), 21 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index cdc062008bf4b..44afe9be5dc63 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -269,6 +269,10 @@ SecurityBundle
     as first argument. Not passing it is deprecated and will throw a `TypeError`
     in 4.0.
 
+ * Added `logout_on_user_change` to the firewall options. This config item will
+   trigger a logout when the user has changed. Should be set to true to avoid
+   deprecations in the configuration.
+
 Translation
 -----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 3aecb70070f0d..2fc980b92fafc 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -642,6 +642,9 @@ Security
 
  * Support for defining voters that don't implement the `VoterInterface` has been removed.
 
+ * Calling `ContextListener::setLogoutOnUserChange(false)` won't have any
+   effect anymore.
+
 SecurityBundle
 --------------
 
@@ -660,6 +663,9 @@ SecurityBundle
    `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
     as first argument.
 
+ * The firewall option `logout_on_user_change` is now always true, which will
+   trigger a logout if the user changes between requests.
+
 Serializer
 ----------
 
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 0c62ce6e2aa9e..b60e2e7e882e0 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -13,6 +13,9 @@ CHANGELOG
  * `SetAclCommand::__construct()` now takes an instance of
    `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
    as first argument
+ * Added `logout_on_user_change` to the firewall options. This config item will
+   trigger a logout when the user has changed. Should be set to true to avoid
+   deprecations in the configuration.
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 35db5bd83949a..e9863145e798f 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -252,6 +252,10 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
             ->scalarNode('provider')->end()
             ->booleanNode('stateless')->defaultFalse()->end()
             ->scalarNode('context')->cannotBeEmpty()->end()
+            ->booleanNode('logout_on_user_change')
+                ->defaultFalse()
+                ->info('When true, it will trigger a logout for the user if something has changed. This will be the default behavior as of Syfmony 4.0.')
+            ->end()
             ->arrayNode('logout')
                 ->treatTrueLike(array())
                 ->canBeUnset()
@@ -340,6 +344,17 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     return $firewall;
                 })
             ->end()
+            ->validate()
+                ->ifTrue(function ($v) {
+                    return (isset($v['stateless']) && true === $v['stateless']) || (isset($v['security']) && false === $v['security']);
+                })
+                ->then(function ($v) {
+                    // this option doesn't change behavior when true when stateless, so prevent deprecations
+                    $v['logout_on_user_change'] = true;
+
+                    return $v;
+                })
+            ->end()
         ;
     }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 21fc056e382f2..b19f6b1b8d58c 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -265,14 +265,14 @@ private function createFirewalls($config, ContainerBuilder $container)
         $providerIds = $this->createUserProviders($config, $container);
 
         // make the ContextListener aware of the configured user providers
-        $definition = $container->getDefinition('security.context_listener');
-        $arguments = $definition->getArguments();
+        $contextListenerDefinition = $container->getDefinition('security.context_listener');
+        $arguments = $contextListenerDefinition->getArguments();
         $userProviders = array();
         foreach ($providerIds as $userProviderId) {
             $userProviders[] = new Reference($userProviderId);
         }
         $arguments[1] = new IteratorArgument($userProviders);
-        $definition->setArguments($arguments);
+        $contextListenerDefinition->setArguments($arguments);
 
         $customUserChecker = false;
 
@@ -284,6 +284,12 @@ private function createFirewalls($config, ContainerBuilder $container)
                 $customUserChecker = true;
             }
 
+            if (!isset($firewall['logout_on_user_change']) || !$firewall['logout_on_user_change']) {
+                @trigger_error('Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.', E_USER_DEPRECATED);
+            }
+
+            $contextListenerDefinition->addMethodCall('setLogoutOnUserChange', array($firewall['logout_on_user_change']));
+
             $configId = 'security.firewall.map.config.'.$name;
 
             list($matcher, $listeners, $exceptionListener) = $this->createFirewall($container, $name, $firewall, $authenticationProviders, $providerIds, $configId);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index fc9b07c4f18b2..581407fcc05a5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -73,6 +73,7 @@
             'logout' => true,
             'remember_me' => array('secret' => 'TheSecret'),
             'user_checker' => null,
+            'logout_on_user_change' => true,
         ),
         'host' => array(
             'pattern' => '/test',
@@ -80,11 +81,13 @@
             'methods' => array('GET', 'POST'),
             'anonymous' => true,
             'http_basic' => true,
+            'logout_on_user_change' => true,
         ),
         'with_user_checker' => array(
             'user_checker' => 'app.user_checker',
             'anonymous' => true,
             'http_basic' => true,
+            'logout_on_user_change' => true,
         ),
     ),
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
index ff9d9f6b89df6..da218fc61c9cf 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_provider.php
@@ -15,10 +15,12 @@
         'main' => array(
             'provider' => 'default',
             'form_login' => true,
+            'logout_on_user_change' => true,
         ),
         'other' => array(
             'provider' => 'with-dash',
             'form_login' => true,
+            'logout_on_user_change' => true,
         ),
     ),
 ));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
index 78d461efe38d1..46a51f91fdd22 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/firewall_undefined_provider.php
@@ -12,6 +12,7 @@
         'main' => array(
             'provider' => 'undefined',
             'form_login' => true,
+            'logout_on_user_change' => true,
         ),
     ),
 ));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
index d7f1cd6973f36..072b70b078a58 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_provider.php
@@ -11,6 +11,7 @@
     'firewalls' => array(
         'main' => array(
             'form_login' => array('provider' => 'default'),
+            'logout_on_user_change' => true,
         ),
     ),
 ));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
index da54f025d1a70..567f8a0d4b2d7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/listener_undefined_provider.php
@@ -11,6 +11,7 @@
     'firewalls' => array(
         'main' => array(
             'form_login' => array('provider' => 'undefined'),
+            'logout_on_user_change' => true,
         ),
     ),
 ));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php
index 50ef504ea4d43..eb34a6a6f64b6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php
@@ -11,6 +11,7 @@
         'main' => array(
             'form_login' => false,
             'http_basic' => null,
+            'logout_on_user_change' => true,
         ),
     ),
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge_import.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge_import.php
index 912b9127ef369..6ed2d18a36709 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge_import.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge_import.php
@@ -6,6 +6,7 @@
             'form_login' => array(
                 'login_path' => '/login',
             ),
+        'logout_on_user_change' => true,
         ),
     ),
     'role_hierarchy' => array(
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
index b08d9c60c82f8..91c475418b450 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
@@ -12,7 +12,8 @@
     ),
     'firewalls' => array(
         'simple' => array('pattern' => '/login', 'security' => false),
-        'secure' => array('stateless' => true,
+        'secure' => array(
+            'stateless' => true,
             'http_basic' => true,
             'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/remember_me_options.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/remember_me_options.php
index e0ca4f6dedf3e..a61fde3dc7309 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/remember_me_options.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/remember_me_options.php
@@ -13,6 +13,7 @@
                 'catch_exceptions' => false,
                 'token_provider' => 'token_provider_id',
             ),
+            'logout_on_user_change' => true,
         ),
     ),
 ));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index 19167551025e2..e5049f2033e51 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -60,12 +60,12 @@
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
             app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
index bd87fee4abae9..9d37164e8d409 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
@@ -11,7 +11,7 @@
         
 
         
-            
+            
                 
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
index f596ac5a6240b..6a05d48e539b9 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
@@ -11,7 +11,7 @@
         
 
         
-            
+            
                 
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
index b1bcd8eae8155..f53b91b00ef78 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
@@ -11,7 +11,7 @@
         
 
         
-            
+            
                 
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
index 725e85a1d0f27..75271ad075f37 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
@@ -11,7 +11,7 @@
         
 
         
-            
+            
                 
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
index 8a17f6db23c55..42dc91c9975ef 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
@@ -12,7 +12,7 @@
     
         
 
-        
+        
             
         
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
index 81b8cffd68d9e..051e2a40b3a16 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     
-        
+        
             
         
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
index b6ade91a07970..583720ea1de9b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
@@ -9,7 +9,7 @@
         
             
         
-        
+        
             
             
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index e8ed61ef031b9..a2b57201bfbd2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -64,11 +64,13 @@ security:
             methods: [GET,POST]
             anonymous: true
             http_basic: true
+            logout_on_user_change: true
 
         with_user_checker:
             anonymous: ~
             http_basic: ~
             user_checker: app.user_checker
+            logout_on_user_change: true
 
     role_hierarchy:
         ROLE_ADMIN:       ROLE_USER
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
index 11c329aa8e2fe..b8da52b6e45d3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_provider.yml
@@ -11,6 +11,8 @@ security:
         main:
             provider: default
             form_login: true
+            logout_on_user_change: true
         other:
             provider: with-dash
             form_login: true
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
index ec2664054009c..3385fc3485a0e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/firewall_undefined_provider.yml
@@ -8,3 +8,4 @@ security:
         main:
             provider: undefined
             form_login: true
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml
index 652f23b5f0425..53e2784c4b3a9 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_provider.yml
@@ -8,3 +8,4 @@ security:
         main:
             form_login:
                 provider: default
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml
index 1916df4c2e7ca..ba5f69ede665d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/listener_undefined_provider.yml
@@ -8,3 +8,4 @@ security:
         main:
             form_login:
                 provider: undefined
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge.yml
index 60c0bbea558e7..d8f443c62f34e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge.yml
@@ -9,6 +9,7 @@ security:
         main:
             form_login: false
             http_basic: ~
+            logout_on_user_change: true
 
     role_hierarchy:
         FOO: [MOO]
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge_import.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge_import.yml
index 4f8db0a09f7b4..a081003a49578 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge_import.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/merge_import.yml
@@ -3,6 +3,7 @@ security:
         main:
             form_login:
                 login_path: /login
+            logout_on_user_change: true
 
     role_hierarchy:
         FOO: BAR
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/remember_me_options.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/remember_me_options.yml
index a521c8c6a803d..716cd4cf99d14 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/remember_me_options.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/remember_me_options.yml
@@ -10,3 +10,4 @@ security:
                 secret: TheSecret
                 catch_exceptions: false
                 token_provider: token_provider_id
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
index a64c4fe4101f1..02e8062c269f4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
@@ -31,6 +31,7 @@ class MainConfigurationTest extends TestCase
         ),
         'firewalls' => array(
             'stub' => array(),
+            'logout_on_user_change' => true,
         ),
     );
 
@@ -78,6 +79,7 @@ public function testCsrfAliases()
                         'csrf_token_generator' => 'a_token_generator',
                         'csrf_token_id' => 'a_token_id',
                     ),
+                    'logout_on_user_change' => true,
                 ),
             ),
         );
@@ -107,6 +109,7 @@ public function testUserCheckers()
             'firewalls' => array(
                 'stub' => array(
                     'user_checker' => 'app.henk_checker',
+                    'logout_on_user_change' => true,
                 ),
             ),
         );
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 72ef2e0c3ed56..1055e4afd40f6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -38,6 +38,7 @@ public function testInvalidCheckPath()
                     'form_login' => array(
                         'check_path' => '/some_area/login_check',
                     ),
+                    'logout_on_user_change' => true,
                 ),
             ),
         ));
@@ -61,6 +62,7 @@ public function testFirewallWithoutAuthenticationListener()
             'firewalls' => array(
                 'some_firewall' => array(
                     'pattern' => '/.*',
+                    'logout_on_user_change' => true,
                 ),
             ),
         ));
@@ -88,6 +90,7 @@ public function testFirewallWithInvalidUserProvider()
                 'some_firewall' => array(
                     'pattern' => '/.*',
                     'http_basic' => array(),
+                    'logout_on_user_change' => true,
                 ),
             ),
         ));
@@ -110,6 +113,7 @@ public function testDisableRoleHierarchyVoter()
                 'some_firewall' => array(
                     'pattern' => '/.*',
                     'http_basic' => null,
+                    'logout_on_user_change' => true,
                 ),
             ),
         ));
@@ -119,6 +123,31 @@ public function testDisableRoleHierarchyVoter()
         $this->assertFalse($container->hasDefinition('security.access.role_hierarchy_voter'));
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.
+     */
+    public function testDeprecationForUserLogout()
+    {
+        $container = $this->getRawContainer();
+
+        $container->loadFromExtension('security', array(
+            'providers' => array(
+                'default' => array('id' => 'foo'),
+            ),
+
+            'firewalls' => array(
+                'some_firewall' => array(
+                    'pattern' => '/.*',
+                    'http_basic' => null,
+                    'logout_on_user_change' => false,
+                ),
+            ),
+        ));
+
+        $container->compile();
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 292c304fc68c7..99032dae9da9b 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -6,6 +6,10 @@ CHANGELOG
 
  * Using voters that do not implement the `VoterInterface`is now deprecated in
    the `AccessDecisionManager` and this functionality will be removed in 4.0.
+ * Using the `ContextListener` without setting the `logoutOnUserChange`
+   property will trigger a deprecation when the user has changed. As of 4.0
+   the user will always be logged out when the user has changed between
+   requests.
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index cd26d83ef7291..e018f704dd659 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -44,6 +44,7 @@ class ContextListener implements ListenerInterface
     private $dispatcher;
     private $registered;
     private $trustResolver;
+    private $logoutOnUserChange = false;
 
     /**
      * @param TokenStorageInterface                     $tokenStorage
@@ -68,6 +69,16 @@ public function __construct(TokenStorageInterface $tokenStorage, $userProviders,
         $this->trustResolver = $trustResolver ?: new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
     }
 
+    /**
+     * Enables deauthentication during refreshUser when the user has changed.
+     *
+     * @param bool $logoutOnUserChange
+     */
+    public function setLogoutOnUserChange($logoutOnUserChange)
+    {
+        $this->logoutOnUserChange = (bool) $logoutOnUserChange;
+    }
+
     /**
      * Reads the Security Token from the session.
      *
@@ -122,14 +133,14 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if (!$event->getRequest()->hasSession()) {
+        $request = $event->getRequest();
+
+        if (!$request->hasSession()) {
             return;
         }
 
         $this->dispatcher->removeListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse'));
         $this->registered = false;
-
-        $request = $event->getRequest();
         $session = $request->getSession();
 
         if ((null === $token = $this->tokenStorage->getToken()) || $this->trustResolver->isAnonymous($token)) {
@@ -172,6 +183,19 @@ protected function refreshUser(TokenInterface $token)
                 $refreshedUser = $provider->refreshUser($user);
                 $token->setUser($refreshedUser);
 
+                // tokens can be deauthenticated if the user has been changed.
+                if (!$token->isAuthenticated()) {
+                    if ($this->logoutOnUserChange) {
+                        if (null !== $this->logger) {
+                            $this->logger->debug('Token was deauthenticated after trying to refresh it.', array('username' => $refreshedUser->getUsername(), 'provider' => get_class($provider)));
+                        }
+
+                        return null;
+                    }
+
+                    @trigger_error('Refreshing a deauthenticated user is deprecated as of 3.4 and will trigger a logout in 4.0.', E_USER_DEPRECATED);
+                }
+
                 if (null !== $this->logger) {
                     $context = array('provider' => get_class($provider), 'username' => $refreshedUser->getUsername());
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 66cf4458bc4de..d27569fa3a0ba 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -249,7 +249,11 @@ public function testHandleRemovesTokenIfNoPreviousSessionWasFound()
         $listener->handle($event);
     }
 
-    public function testTryAllUserProvidersUntilASupportingUserProviderIsFound()
+    /**
+     * @group legacy
+     * @expectedDeprecation Refreshing a deauthenticated user is deprecated as of 3.4 and will trigger a logout in 4.0.
+     */
+    public function testIfTokenIsDeauthenticatedTriggersDeprecations()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
@@ -258,11 +262,29 @@ public function testTryAllUserProvidersUntilASupportingUserProviderIsFound()
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
 
+    public function testIfTokenIsDeauthenticated()
+    {
+        $tokenStorage = new TokenStorage();
+        $refreshedUser = new User('foobar', 'baz');
+        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)), null, true);
+
+        $this->assertNull($tokenStorage->getToken());
+    }
+
+    public function testTryAllUserProvidersUntilASupportingUserProviderIsFound()
+    {
+        $tokenStorage = new TokenStorage();
+        $refreshedUser = new User('foobar', 'baz');
+        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)), $refreshedUser);
+
+        $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
+    }
+
     public function testNextSupportingUserProviderIsTriedIfPreviousSupportingUserProviderDidNotLoadTheUser()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, array(new SupportingUserProvider(), new SupportingUserProvider($refreshedUser)));
+        $this->handleEventWithPreviousSession($tokenStorage, array(new SupportingUserProvider(), new SupportingUserProvider($refreshedUser)), $refreshedUser);
 
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
@@ -287,7 +309,7 @@ public function testAcceptsProvidersAsTraversable()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, new \ArrayObject(array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser))));
+        $this->handleEventWithPreviousSession($tokenStorage, new \ArrayObject(array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser))), $refreshedUser);
 
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
@@ -320,16 +342,18 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
         return $session;
     }
 
-    private function handleEventWithPreviousSession(TokenStorageInterface $tokenStorage, $userProviders)
+    private function handleEventWithPreviousSession(TokenStorageInterface $tokenStorage, $userProviders, UserInterface $user = null, $logoutOnUserChange = false)
     {
+        $user = $user ?: new User('foo', 'bar');
         $session = new Session(new MockArraySessionStorage());
-        $session->set('_security_context_key', serialize(new UsernamePasswordToken(new User('foo', 'bar'), '', 'context_key')));
+        $session->set('_security_context_key', serialize(new UsernamePasswordToken($user, '', 'context_key', array('ROLE_USER'))));
 
         $request = new Request();
         $request->setSession($session);
         $request->cookies->set('MOCKSESSID', true);
 
         $listener = new ContextListener($tokenStorage, $userProviders, 'context_key');
+        $listener->setLogoutOnUserChange($logoutOnUserChange);
         $listener->handle(new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 }

From e3b7dc54243fe54e952e9d45301903561cb31453 Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Mon, 25 Sep 2017 11:36:55 +0200
Subject: [PATCH 0900/1099] [SecurityBundle] Deprecate ACL related code

---
 UPGRADE-3.4.md                                |   9 +-
 UPGRADE-4.0.md                                |   7 +-
 .../Bundle/SecurityBundle/CHANGELOG.md        |   7 +-
 .../SecurityBundle/Command/InitAclCommand.php |  17 ++-
 .../SecurityBundle/Command/SetAclCommand.php  |  15 ++-
 .../DependencyInjection/MainConfiguration.php |   1 +
 .../CompleteConfigurationTest.php             |  31 ++++--
 .../Fixtures/php/container1.php               |   1 -
 .../Fixtures/php/container1_with_acl.php      | 102 ++++++++++++++++++
 .../Fixtures/xml/container1.xml               |   2 -
 .../Fixtures/xml/container1_with_acl.xml      |  81 ++++++++++++++
 .../Fixtures/yml/container1.yml               |   1 -
 .../Fixtures/yml/container1_with_acl.yml      |  83 ++++++++++++++
 .../Tests/Functional/SetAclCommandTest.php    |   4 +-
 14 files changed, 315 insertions(+), 46 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 44afe9be5dc63..ca244024ea259 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -264,10 +264,11 @@ SecurityBundle
    `Doctrine\DBAL\Connection`  as first argument. Not passing it is
     deprecated and will throw a `TypeError` in 4.0.
 
- * `SetAclCommand::__construct()` now takes an instance of
-   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
-    as first argument. Not passing it is deprecated and will throw a `TypeError`
-    in 4.0.
+ * The `acl:set` command has been deprecated along with the `SetAclCommand` class,
+   both will be removed in 4.0. Install symfony/acl-bundle instead
+
+ * The `init:acl` command has been deprecated along with the `InitAclCommand` class,
+   both will be removed in 4.0. Install symfony/acl-bundle and use `acl:init` instead
 
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2fc980b92fafc..5dd6e56fdb668 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -656,12 +656,9 @@ SecurityBundle
 
  * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` nor implement `ContainerAwareInterface` anymore.
 
- * `InitAclCommand::__construct()` now requires an instance of
-   `Doctrine\DBAL\Connection`  as first argument.
+ * `InitAclCommand` has been removed. Use `Symfony\Bundle\AclBundle\Command\InitAclCommand` instead
 
- * `SetAclCommand::__construct()` now requires an instance of
-   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
-    as first argument.
+ * `SetAclCommand` has been removed. Use `Symfony\Bundle\AclBundle\Command\SetAclCommand` instead
 
  * The firewall option `logout_on_user_change` is now always true, which will
    trigger a logout if the user changes between requests.
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index b60e2e7e882e0..deb2eacdc266a 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -8,14 +8,11 @@ CHANGELOG
    `VoterInterface` on the class is now deprecated and will be removed in 4.0.
  * [BC BREAK] `FirewallContext::getListeners()` now returns `\Traversable|array`
  * added info about called security listeners in profiler 
- * `InitAclCommand::__construct()` now takes an instance of
-   `Doctrine\DBAL\Connection`  as first argument
- * `SetAclCommand::__construct()` now takes an instance of
-   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
-   as first argument
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
+ * deprecated command `acl:set` along with `SetAclCommand` class
+ * deprecated command `init:acl` along with `InitAclCommand` class
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
index 72e62c3f48d10..42e4f8825d888 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -11,9 +11,13 @@
 
 namespace Symfony\Bundle\SecurityBundle\Command;
 
+@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), E_USER_DEPRECATED);
+
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Security\Acl\Dbal\Schema;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -23,7 +27,7 @@
  *
  * @author Johannes M. Schmitt 
  *
- * @final since version 3.4
+ * @deprecated since version 3.4, to be removed in 4.0. See Symfony\Bundle\AclBundle\Command\SetAclCommand instead.
  */
 class InitAclCommand extends ContainerAwareCommand
 {
@@ -32,15 +36,9 @@ class InitAclCommand extends ContainerAwareCommand
     private $connection;
     private $schema;
 
-    /**
-     * @param Connection $connection
-     * @param Schema     $schema
-     */
     public function __construct($connection = null, Schema $schema = null)
     {
         if (!$connection instanceof Connection) {
-            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Connection::class), E_USER_DEPRECATED);
-
             parent::__construct($connection);
 
             return;
@@ -54,8 +52,6 @@ public function __construct($connection = null, Schema $schema = null)
 
     /**
      * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
      */
     public function isEnabled()
     {
@@ -93,7 +89,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
+        (new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output))->warning('Command "init:acl" is deprecated since version 3.4 and will be removed from SecurityBundle in 4.0. Install symfony/acl-bundle and use "acl:init" instead.');
+
         if (null === $this->connection) {
             $this->connection = $this->getContainer()->get('security.acl.dbal.connection');
             $this->schema = $this->getContainer()->get('security.acl.dbal.schema');
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
index 8782ae7281ce1..c0c51eff4e8c7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
@@ -11,11 +11,15 @@
 
 namespace Symfony\Bundle\SecurityBundle\Command;
 
+@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), E_USER_DEPRECATED);
+
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
@@ -28,7 +32,7 @@
  *
  * @author Kévin Dunglas 
  *
- * @final since version 3.4
+ * @deprecated since version 3.4, to be removed in 4.0. See Symfony\Bundle\AclBundle\Command\SetAclCommand instead.
  */
 class SetAclCommand extends ContainerAwareCommand
 {
@@ -42,8 +46,6 @@ class SetAclCommand extends ContainerAwareCommand
     public function __construct($provider = null)
     {
         if (!$provider instanceof MutableAclProviderInterface) {
-            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, MutableAclProviderInterface::class), E_USER_DEPRECATED);
-
             parent::__construct($provider);
 
             return;
@@ -56,8 +58,6 @@ public function __construct($provider = null)
 
     /**
      * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
      */
     public function isEnabled()
     {
@@ -117,7 +117,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
+        (new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output))->warning('Command "acl:set" is deprecated since version 3.4 and will be removed from SecurityBundle in 4.0. Install symfony/acl-bundle to use this command.');
+
         if (null === $this->provider) {
             $this->provider = $this->getContainer()->get('security.acl.provider');
         }
@@ -192,8 +193,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * Gets the mask builder.
      *
-     * BC to be removed in 4.0
-     *
      * @return MaskBuilder
      */
     protected function getMaskBuilder()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index e9863145e798f..533b52cd4b1c6 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -121,6 +121,7 @@ private function addAclSection(ArrayNodeDefinition $rootNode)
         $rootNode
             ->children()
                 ->arrayNode('acl')
+                    ->setDeprecated('The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.')
                     ->children()
                         ->scalarNode('connection')
                             ->defaultNull()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index c7451496d48c2..ce387de9f5bdf 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -22,8 +22,6 @@
 
 abstract class CompleteConfigurationTest extends TestCase
 {
-    private static $containerCache = array();
-
     abstract protected function getLoader(ContainerBuilder $container);
 
     abstract protected function getFileExtension();
@@ -38,6 +36,20 @@ public function testRolesHierarchy()
         ), $container->getParameter('security.role_hierarchy.roles'));
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
+     */
+    public function testRolesHierarchyWithAcl()
+    {
+        $container = $this->getContainer('container1_with_acl');
+        $this->assertEquals(array(
+            'ROLE_ADMIN' => array('ROLE_USER'),
+            'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
+            'ROLE_REMOTE' => array('ROLE_USER', 'ROLE_ADMIN'),
+        ), $container->getParameter('security.role_hierarchy.roles'));
+    }
+
     public function testUserProviders()
     {
         $container = $this->getContainer('container1');
@@ -314,14 +326,22 @@ public function testEncoders()
         )), $container->getDefinition('security.encoder_factory.generic')->getArguments());
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
+     */
     public function testAcl()
     {
-        $container = $this->getContainer('container1');
+        $container = $this->getContainer('container1_with_acl');
 
         $this->assertTrue($container->hasDefinition('security.acl.dbal.provider'));
         $this->assertEquals('security.acl.dbal.provider', (string) $container->getAlias('security.acl.provider'));
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
+     */
     public function testCustomAclProvider()
     {
         $container = $this->getContainer('custom_acl_provider');
@@ -421,9 +441,6 @@ protected function getContainer($file)
     {
         $file = $file.'.'.$this->getFileExtension();
 
-        if (isset(self::$containerCache[$file])) {
-            return self::$containerCache[$file];
-        }
         $container = new ContainerBuilder();
         $security = new SecurityExtension();
         $container->registerExtension($security);
@@ -436,6 +453,6 @@ protected function getContainer($file)
         $container->getCompilerPassConfig()->setRemovingPasses(array());
         $container->compile();
 
-        return self::$containerCache[$file] = $container;
+        return $container;
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index 581407fcc05a5..2860e6f587822 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -1,7 +1,6 @@
 loadFromExtension('security', array(
-    'acl' => array(),
     'encoders' => array(
         'JMS\FooBundle\Entity\User1' => 'plaintext',
         'JMS\FooBundle\Entity\User2' => array(
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
new file mode 100644
index 0000000000000..fc9b07c4f18b2
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
@@ -0,0 +1,102 @@
+loadFromExtension('security', array(
+    'acl' => array(),
+    'encoders' => array(
+        'JMS\FooBundle\Entity\User1' => 'plaintext',
+        'JMS\FooBundle\Entity\User2' => array(
+            'algorithm' => 'sha1',
+            'encode_as_base64' => false,
+            'iterations' => 5,
+        ),
+        'JMS\FooBundle\Entity\User3' => array(
+            'algorithm' => 'md5',
+        ),
+        'JMS\FooBundle\Entity\User4' => array(
+            'id' => 'security.encoder.foo',
+        ),
+        'JMS\FooBundle\Entity\User5' => array(
+            'algorithm' => 'pbkdf2',
+            'hash_algorithm' => 'sha1',
+            'encode_as_base64' => false,
+            'iterations' => 5,
+            'key_length' => 30,
+        ),
+        'JMS\FooBundle\Entity\User6' => array(
+            'algorithm' => 'bcrypt',
+            'cost' => 15,
+        ),
+    ),
+    'providers' => array(
+        'default' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
+                ),
+            ),
+        ),
+        'digest' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER, ROLE_ADMIN'),
+                ),
+            ),
+        ),
+        'basic' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => 'ROLE_SUPER_ADMIN'),
+                    'bar' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => array('ROLE_USER', 'ROLE_ADMIN')),
+                ),
+            ),
+        ),
+        'service' => array(
+            'id' => 'user.manager',
+        ),
+        'chain' => array(
+            'chain' => array(
+                'providers' => array('service', 'basic'),
+            ),
+        ),
+    ),
+
+    'firewalls' => array(
+        'simple' => array('pattern' => '/login', 'security' => false),
+        'secure' => array('stateless' => true,
+            'http_basic' => true,
+            'http_digest' => array('secret' => 'TheSecret'),
+            'form_login' => true,
+            'anonymous' => true,
+            'switch_user' => true,
+            'x509' => true,
+            'remote_user' => true,
+            'logout' => true,
+            'remember_me' => array('secret' => 'TheSecret'),
+            'user_checker' => null,
+        ),
+        'host' => array(
+            'pattern' => '/test',
+            'host' => 'foo\\.example\\.org',
+            'methods' => array('GET', 'POST'),
+            'anonymous' => true,
+            'http_basic' => true,
+        ),
+        'with_user_checker' => array(
+            'user_checker' => 'app.user_checker',
+            'anonymous' => true,
+            'http_basic' => true,
+        ),
+    ),
+
+    'access_control' => array(
+        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https', 'methods' => array('get', 'POST')),
+        array('path' => '/blog/.*', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
+        array('path' => '/blog/524', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'allow_if' => "token.getUsername() matches '/^admin/'"),
+    ),
+
+    'role_hierarchy' => array(
+        'ROLE_ADMIN' => 'ROLE_USER',
+        'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
+        'ROLE_REMOTE' => 'ROLE_USER,ROLE_ADMIN',
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index e5049f2033e51..da02e78d0af34 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -6,8 +6,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     
-        
-
         
 
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
new file mode 100644
index 0000000000000..6d43fcdc4ff80
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
@@ -0,0 +1,81 @@
+
+
+
+
+    
+        
+        
+
+        
+
+        
+
+        
+
+        
+
+        
+
+        
+            
+                
+            
+        
+
+        
+            
+                
+            
+        
+
+        
+            
+                
+                
+            
+        
+
+        
+
+        
+            
+        
+
+        
+
+        
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+        
+
+        
+            
+            
+        
+
+        
+            
+            
+            app.user_checker
+        
+
+        ROLE_USER
+        ROLE_USER,ROLE_ADMIN,ROLE_ALLOWED_TO_SWITCH
+        ROLE_USER,ROLE_ADMIN
+
+        
+        
+        
+    
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index a2b57201bfbd2..d45846ee5892b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -1,5 +1,4 @@
 security:
-    acl: ~
     encoders:
         JMS\FooBundle\Entity\User1: plaintext
         JMS\FooBundle\Entity\User2:
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
new file mode 100644
index 0000000000000..e8ed61ef031b9
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
@@ -0,0 +1,83 @@
+security:
+    acl: ~
+    encoders:
+        JMS\FooBundle\Entity\User1: plaintext
+        JMS\FooBundle\Entity\User2:
+            algorithm: sha1
+            encode_as_base64: false
+            iterations: 5
+        JMS\FooBundle\Entity\User3:
+            algorithm: md5
+        JMS\FooBundle\Entity\User4:
+            id: security.encoder.foo
+        JMS\FooBundle\Entity\User5:
+            algorithm: pbkdf2
+            hash_algorithm: sha1
+            encode_as_base64: false
+            iterations: 5
+            key_length: 30
+        JMS\FooBundle\Entity\User6:
+            algorithm: bcrypt
+            cost: 15
+
+    providers:
+        default:
+            memory:
+                users:
+                    foo: { password: foo, roles: ROLE_USER }
+        digest:
+            memory:
+                users:
+                    foo: { password: foo, roles: 'ROLE_USER, ROLE_ADMIN' }
+        basic:
+            memory:
+                users:
+                    foo: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: ROLE_SUPER_ADMIN }
+                    bar: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: [ROLE_USER, ROLE_ADMIN] }
+        service:
+            id: user.manager
+        chain:
+            chain:
+                providers: [service, basic]
+
+
+    firewalls:
+        simple: { pattern: /login, security: false }
+        secure:
+            stateless: true
+            http_basic: true
+            http_digest:
+                secret: TheSecret
+            form_login: true
+            anonymous: true
+            switch_user: true
+            x509: true
+            remote_user: true
+            logout: true
+            remember_me:
+                secret: TheSecret
+            user_checker: ~
+
+        host:
+            pattern: /test
+            host: foo\.example\.org
+            methods: [GET,POST]
+            anonymous: true
+            http_basic: true
+
+        with_user_checker:
+            anonymous: ~
+            http_basic: ~
+            user_checker: app.user_checker
+
+    role_hierarchy:
+        ROLE_ADMIN:       ROLE_USER
+        ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
+        ROLE_REMOTE:      ROLE_USER,ROLE_ADMIN
+
+    access_control:
+        - { path: /blog/524, role: ROLE_USER, requires_channel: https, methods: [get, POST]}
+        -
+            path: /blog/.*
+            role: IS_AUTHENTICATED_ANONYMOUSLY
+        - { path: /blog/524, role: IS_AUTHENTICATED_ANONYMOUSLY, allow_if: "token.getUsername() matches '/^admin/'" }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
index 803109ec2097c..85f6cf86a403d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
@@ -33,15 +33,13 @@
  *
  * @author Kévin Dunglas 
  * @requires extension pdo_sqlite
+ * @group legacy
  */
 class SetAclCommandTest extends WebTestCase
 {
     const OBJECT_CLASS = 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\Entity\Car';
     const SECURITY_CLASS = 'Symfony\Component\Security\Core\User\User';
 
-    /**
-     * @group legacy
-     */
     public function testSetAclUser()
     {
         $objectId = 1;

From 3deb3940ab194d3f16985a2ed8a31d9576e2753f Mon Sep 17 00:00:00 2001
From: Alexandru Furculita 
Date: Sun, 17 Sep 2017 15:54:32 +0300
Subject: [PATCH 0901/1099] [HttpFoundation] Deprecate compatibility with PHP
 <5.4 sessions

---
 UPGRADE-3.4.md                                | 18 +++++++++
 UPGRADE-4.0.md                                |  7 ++++
 .../Bridge/Twig/Tests/AppVariableTest.php     |  8 ++--
 .../Tests/Controller/ControllerTraitTest.php  |  2 +-
 .../Component/HttpFoundation/CHANGELOG.md     |  7 ++++
 .../Handler/MemcacheSessionHandler.php        |  2 -
 .../Handler/MemcachedSessionHandler.php       |  2 -
 .../Storage/Handler/MongoDbSessionHandler.php |  2 -
 .../Handler/NativeFileSessionHandler.php      |  5 +--
 .../Storage/Handler/NativeSessionHandler.php  |  5 ++-
 .../Storage/Handler/NullSessionHandler.php    |  2 -
 .../Session/Storage/MetadataBag.php           |  2 -
 .../Storage/MockArraySessionStorage.php       |  2 -
 .../Storage/MockFileSessionStorage.php        |  2 -
 .../Session/Storage/NativeSessionStorage.php  | 31 +++++++-------
 .../Storage/PhpBridgeSessionStorage.php       |  9 +----
 .../Session/Storage/Proxy/AbstractProxy.php   |  4 +-
 .../Session/Storage/Proxy/NativeProxy.php     |  6 ++-
 .../Storage/Proxy/SessionHandlerProxy.php     |  9 ++---
 .../Handler/NativeSessionHandlerTest.php      |  1 +
 .../Storage/Proxy/AbstractProxyTest.php       | 40 +++----------------
 .../Session/Storage/Proxy/NativeProxyTest.php |  2 +
 .../Storage/Proxy/SessionHandlerProxyTest.php |  1 +
 23 files changed, 79 insertions(+), 90 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index cdc062008bf4b..04d107e512c59 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -205,6 +205,24 @@ FrameworkBundle
    `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
     and `YamlLintCommand` classes have been marked as final
 
+HttpFoundation
+--------------
+
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`
+   class has been deprecated and will be removed in 4.0. Use the `\SessionHandler` class instead.
+
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy` class has been
+   deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
+
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` class has been
+   deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
+
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy` class has been
+   deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
+
+ * `NativeSessionStorage::setSaveHandler()` now takes an instance of `\SessionHandlerInterface` as argument.
+   Not passing it is deprecated and will throw a `TypeError` in 4.0.
+
 HttpKernel
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 3aecb70070f0d..dc0bd0d82503d 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -524,6 +524,13 @@ HttpFoundation
  * The ability to check only for cacheable HTTP methods using `Request::isMethodSafe()` is
    not supported anymore, use `Request::isMethodCacheable()` instead.
 
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`, 
+   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy`,
+   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` and 
+   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy` classes have been removed.
+
+ * `NativeSessionStorage::setSaveHandler()` now requires an instance of `\SessionHandlerInterface` as argument.
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index 2a97c269031c8..c258ad41a1465 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -47,8 +47,9 @@ public function testEnvironment()
 
     public function testGetSession()
     {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn($session = new Session());
+        $request->method('getSession')->willReturn($session);
 
         $this->setRequestStack($request);
 
@@ -167,8 +168,9 @@ public function testGetFlashesWithNoRequest()
 
     public function testGetFlashesWithNoSessionStarted()
     {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn(new Session());
+        $request->method('getSession')->willReturn($session);
 
         $this->setRequestStack($request);
 
@@ -257,7 +259,7 @@ private function setFlashMessages()
         $flashBag = new FlashBag();
         $flashBag->initialize($flashMessages);
 
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
         $session->method('isStarted')->willReturn(true);
         $session->method('getFlashBag')->willReturn($flashBag);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
index 3feabfd12e273..71e6f581e7389 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -376,7 +376,7 @@ public function testRedirectToRoute()
     public function testAddFlash()
     {
         $flashBag = new FlashBag();
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
         $session->expects($this->once())->method('getFlashBag')->willReturn($flashBag);
 
         $container = new Container();
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index e1fdf77b9b8ae..d60ebdfe8daaa 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * deprecated the `NativeSessionHandler` class,
+ * deprecated the `AbstractProxy`, `NativeProxy` and `SessionHandlerProxy` classes,
+ * deprecated setting session save handlers that do not implement `\SessionHandlerInterface` in `NativeSessionStorage::setSaveHandler()`
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
index 4e490a05d4ce0..26a0a17e98ff0 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MemcacheSessionHandler.
- *
  * @author Drak 
  */
 class MemcacheSessionHandler implements \SessionHandlerInterface
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index dfe2fee0d44be..5e9ba7103bdfe 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MemcachedSessionHandler.
- *
  * Memcached based session storage handler based on the Memcached class
  * provided by the PHP memcached extension.
  *
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 8408f000cdbf8..cfc427bceaed5 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MongoDB session handler.
- *
  * @author Markus Bachmann 
  */
 class MongoDbSessionHandler implements \SessionHandlerInterface
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 1be0a39837333..4e9704bd5858f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * NativeFileSessionHandler.
- *
  * Native session handler using PHP's built in file storage.
  *
  * @author Drak 
@@ -21,8 +19,6 @@
 class NativeFileSessionHandler extends NativeSessionHandler
 {
     /**
-     * Constructor.
-     *
      * @param string $savePath Path of directory to save session files
      *                         Default null will leave setting as defined by PHP.
      *                         '/path', 'N;/path', or 'N;octal-mode;/path
@@ -30,6 +26,7 @@ class NativeFileSessionHandler extends NativeSessionHandler
      * @see http://php.net/session.configuration.php#ini.session.save-path for further details.
      *
      * @throws \InvalidArgumentException On invalid $savePath
+     * @throws \RuntimeException         When failing to create the save directory
      */
     public function __construct($savePath = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
index 4ae410f9b9e1f..daa7dbd15b7c8 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
+@trigger_error('The '.__NAMESPACE__.'\NativeSessionHandler class is deprecated since version 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.', E_USER_DEPRECATED);
+
 /**
- * Adds SessionHandler functionality if available.
- *
+ * @deprecated since version 3.4, to be removed in 4.0. Use \SessionHandler instead.
  * @see http://php.net/sessionhandler
  */
 class NativeSessionHandler extends \SessionHandler
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
index 1516d4314a430..981d96d93a978 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * NullSessionHandler.
- *
  * Can be used in unit testing or in a situations where persisted sessions are not desired.
  *
  * @author Drak 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
index 322dd560f8087..6f59af486981e 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
@@ -54,8 +54,6 @@ class MetadataBag implements SessionBagInterface
     private $updateThreshold;
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey      The key used to store bag in the session
      * @param int    $updateThreshold The time to wait between two UPDATED updates
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
index 348fd23018a03..0349a43367d76 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -63,8 +63,6 @@ class MockArraySessionStorage implements SessionStorageInterface
     protected $bags = array();
 
     /**
-     * Constructor.
-     *
      * @param string      $name    Session name
      * @param MetadataBag $metaBag MetadataBag instance
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
index 71f9e555121fa..8c1bf73caefb3 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -30,8 +30,6 @@ class MockFileSessionStorage extends MockArraySessionStorage
     private $savePath;
 
     /**
-     * Constructor.
-     *
      * @param string      $savePath Path of directory to save session files
      * @param string      $name     Session name
      * @param MetadataBag $metaBag  MetadataBag instance
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 97161b8d0f8a1..48bef335bae31 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
@@ -25,8 +24,6 @@
 class NativeSessionStorage implements SessionStorageInterface
 {
     /**
-     * Array of SessionBagInterface.
-     *
      * @var SessionBagInterface[]
      */
     protected $bags;
@@ -42,7 +39,7 @@ class NativeSessionStorage implements SessionStorageInterface
     protected $closed = false;
 
     /**
-     * @var AbstractProxy
+     * @var AbstractProxy|\SessionHandlerInterface
      */
     protected $saveHandler;
 
@@ -52,8 +49,6 @@ class NativeSessionStorage implements SessionStorageInterface
     protected $metadataBag;
 
     /**
-     * Constructor.
-     *
      * Depending on how you want the storage driver to behave you probably
      * want to override this constructor entirely.
      *
@@ -97,9 +92,9 @@ class NativeSessionStorage implements SessionStorageInterface
      * trans_sid_hosts, $_SERVER['HTTP_HOST']
      * trans_sid_tags, "a=href,area=href,frame=src,form="
      *
-     * @param array                                                            $options Session configuration options
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag
+     * @param array                         $options Session configuration options
+     * @param \SessionHandlerInterface|null $handler
+     * @param MetadataBag                   $metaBag MetadataBag
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
@@ -116,7 +111,7 @@ public function __construct(array $options = array(), $handler = null, MetadataB
     /**
      * Gets the save handler instance.
      *
-     * @return AbstractProxy
+     * @return AbstractProxy|\SessionHandlerInterface
      */
     public function getSaveHandler()
     {
@@ -276,7 +271,7 @@ public function getBag($name)
             throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
         }
 
-        if ($this->saveHandler->isActive() && !$this->started) {
+        if (!$this->started && $this->saveHandler->isActive()) {
             $this->loadSession();
         } elseif (!$this->started) {
             $this->start();
@@ -358,7 +353,7 @@ public function setOptions(array $options)
      *     ini_set('session.save_handler', 'files');
      *     ini_set('session.save_path', '/tmp');
      *
-     * or pass in a NativeSessionHandler instance which configures session.save_handler in the
+     * or pass in a \SessionHandler instance which configures session.save_handler in the
      * constructor, for a template see NativeFileSessionHandler or use handlers in
      * composer package drak/native-session
      *
@@ -367,17 +362,23 @@ public function setOptions(array $options)
      * @see http://php.net/sessionhandler
      * @see http://github.com/drak/NativeSession
      *
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $saveHandler
+     * @param \SessionHandlerInterface|null $saveHandler
      *
      * @throws \InvalidArgumentException
      */
     public function setSaveHandler($saveHandler = null)
     {
         if (!$saveHandler instanceof AbstractProxy &&
-            !$saveHandler instanceof NativeSessionHandler &&
             !$saveHandler instanceof \SessionHandlerInterface &&
             null !== $saveHandler) {
-            throw new \InvalidArgumentException('Must be instance of AbstractProxy or NativeSessionHandler; implement \SessionHandlerInterface; or be null.');
+            throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');
+        }
+
+        if ($saveHandler instanceof AbstractProxy) {
+            @trigger_error(
+                'Using session save handlers that are instances of AbstractProxy is deprecated since version 3.4 and will be removed in 4.0.',
+                E_USER_DEPRECATED
+            );
         }
 
         // Wrap $saveHandler in proxy and prevent double wrapping of proxy
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
index 6f02a7fd73d23..662ed5015adec 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
-
 /**
  * Allows session to be started by PHP and managed by Symfony.
  *
@@ -22,10 +19,8 @@
 class PhpBridgeSessionStorage extends NativeSessionStorage
 {
     /**
-     * Constructor.
-     *
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag
+     * @param \SessionHandlerInterface|null $handler
+     * @param MetadataBag                   $metaBag MetadataBag
      */
     public function __construct($handler = null, MetadataBag $metaBag = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
index a7478656d672d..c1c8b9b1f7dd2 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
+@trigger_error('The '.__NAMESPACE__.'\AbstractProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
+
 /**
- * AbstractProxy.
+ * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
  *
  * @author Drak 
  */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
index 0db34aa28d385..e75497d57c3b3 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
+@trigger_error('The '.__NAMESPACE__.'\NativeProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
+
 /**
- * NativeProxy.
+ * This proxy is built-in session handlers in PHP 5.3.x.
  *
- * This proxy is built-in session handlers in PHP 5.3.x
+ * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
  *
  * @author Drak 
  */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
index 68ed713c22ffe..d6adef82dbf65 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
+@trigger_error('The '.__NAMESPACE__.'\SessionHandlerProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
+
 /**
- * SessionHandler proxy.
+ * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
  *
  * @author Drak 
  */
@@ -23,11 +25,6 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
      */
     protected $handler;
 
-    /**
-     * Constructor.
-     *
-     * @param \SessionHandlerInterface $handler
-     */
     public function __construct(\SessionHandlerInterface $handler)
     {
         $this->handler = $handler;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
index 5486b2d655ea8..fe4cc72d23b56 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
@@ -21,6 +21,7 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
+ * @group legacy
  */
 class NativeSessionHandlerTest extends TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
index ef1da130a2a1a..f2be722c8f522 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -13,43 +13,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-
-// Note until PHPUnit_Mock_Objects 1.2 is released you cannot mock abstracts due to
-// https://github.com/sebastianbergmann/phpunit-mock-objects/issues/73
-class ConcreteProxy extends AbstractProxy
-{
-}
-
-class ConcreteSessionHandlerInterfaceProxy extends AbstractProxy implements \SessionHandlerInterface
-{
-    public function open($savePath, $sessionName)
-    {
-    }
-
-    public function close()
-    {
-    }
-
-    public function read($id)
-    {
-    }
-
-    public function write($id, $data)
-    {
-    }
-
-    public function destroy($id)
-    {
-    }
-
-    public function gc($maxlifetime)
-    {
-    }
-}
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
 /**
  * Test class for AbstractProxy.
  *
+ * @group legacy
+ *
  * @author Drak 
  */
 class AbstractProxyTest extends TestCase
@@ -61,7 +31,7 @@ class AbstractProxyTest extends TestCase
 
     protected function setUp()
     {
-        $this->proxy = new ConcreteProxy();
+        $this->proxy = $this->getMockForAbstractClass(AbstractProxy::class);
     }
 
     protected function tearDown()
@@ -77,7 +47,7 @@ public function testGetSaveHandlerName()
     public function testIsSessionHandlerInterface()
     {
         $this->assertFalse($this->proxy->isSessionHandlerInterface());
-        $sh = new ConcreteSessionHandlerInterfaceProxy();
+        $sh = new SessionHandlerProxy(new \SessionHandler());
         $this->assertTrue($sh->isSessionHandlerInterface());
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
index 8ec3053441366..ed4fee6bfec0f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
@@ -17,6 +17,8 @@
 /**
  * Test class for NativeProxy.
  *
+ * @group legacy
+ *
  * @author Drak 
  */
 class NativeProxyTest extends TestCase
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 682825356a724..fdd1dae254198 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -21,6 +21,7 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
+ * @group legacy
  */
 class SessionHandlerProxyTest extends TestCase
 {

From 685c3538fbf7584ad10d4b639d95572af06bfa08 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla 
Date: Sun, 30 Apr 2017 17:08:55 +0200
Subject: [PATCH 0902/1099] Extract method refactoring for
 ResourceCheckerConfigCache

---
 .../Config/ResourceCheckerConfigCache.php     | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
index c0aef1d8f9560..421db6408af91 100644
--- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -73,37 +73,19 @@ public function isFresh()
         }
 
         $metadata = $this->getMetaFile();
+
         if (!is_file($metadata)) {
             return false;
         }
 
-        $e = null;
-        $meta = false;
-        $time = filemtime($this->file);
-        $signalingException = new \UnexpectedValueException();
-        $prevUnserializeHandler = ini_set('unserialize_callback_func', '');
-        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) use (&$prevErrorHandler, $signalingException) {
-            if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
-                throw $signalingException;
-            }
-
-            return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
-        });
+        $meta = $this->safelyUnserialize($metadata);
 
-        try {
-            $meta = unserialize(file_get_contents($metadata));
-        } catch (\Error $e) {
-        } catch (\Exception $e) {
-        }
-        restore_error_handler();
-        ini_set('unserialize_callback_func', $prevUnserializeHandler);
-        if (null !== $e && $e !== $signalingException) {
-            throw $e;
-        }
         if (false === $meta) {
             return false;
         }
 
+        $time = filemtime($this->file);
+
         foreach ($meta as $resource) {
             /* @var ResourceInterface $resource */
             foreach ($this->resourceCheckers as $checker) {
@@ -161,4 +143,32 @@ private function getMetaFile()
     {
         return $this->file.'.meta';
     }
+
+    private function safelyUnserialize($file)
+    {
+        $e = null;
+        $meta = false;
+        $signalingException = new \UnexpectedValueException();
+        $prevUnserializeHandler = ini_set('unserialize_callback_func', '');
+        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) use (&$prevErrorHandler, $signalingException) {
+            if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
+                throw $signalingException;
+            }
+
+            return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
+        });
+
+        try {
+            $meta = unserialize(file_get_contents($file));
+        } catch (\Error $e) {
+        } catch (\Exception $e) {
+        }
+        restore_error_handler();
+        ini_set('unserialize_callback_func', $prevUnserializeHandler);
+        if (null !== $e && $e !== $signalingException) {
+            throw $e;
+        }
+
+        return $meta;
+    }
 }

From 4812e6054c14994eab0513d6dc4ba108c2d0f156 Mon Sep 17 00:00:00 2001
From: Kevin Bond 
Date: Wed, 24 May 2017 11:00:21 -0400
Subject: [PATCH 0903/1099] add ability to configure catching exceptions

---
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 src/Symfony/Component/HttpKernel/Client.php   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 8732b17dd83f5..66e3b38e25ce6 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * added `AddCacheClearerPass`
  * added `AddCacheWarmerPass`
  * deprecated `EnvParametersResource`
+ * added `Symfony\Component\HttpKernel\Client::catchExceptions()`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
index 94f70cd6f7a02..4a86564c9f9f2 100644
--- a/src/Symfony/Component/HttpKernel/Client.php
+++ b/src/Symfony/Component/HttpKernel/Client.php
@@ -31,6 +31,7 @@
 class Client extends BaseClient
 {
     protected $kernel;
+    private $catchExceptions = true;
 
     /**
      * Constructor.
@@ -49,6 +50,16 @@ public function __construct(HttpKernelInterface $kernel, array $server = array()
         parent::__construct($server, $history, $cookieJar);
     }
 
+    /**
+     * Sets whether to catch exceptions when the kernel is handling a request.
+     *
+     * @param bool $catchExceptions Whether to catch exceptions
+     */
+    public function catchExceptions($catchExceptions)
+    {
+        $this->catchExceptions = $catchExceptions;
+    }
+
     /**
      * Makes a request.
      *
@@ -58,7 +69,7 @@ public function __construct(HttpKernelInterface $kernel, array $server = array()
      */
     protected function doRequest($request)
     {
-        $response = $this->kernel->handle($request);
+        $response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $this->catchExceptions);
 
         if ($this->kernel instanceof TerminableInterface) {
             $this->kernel->terminate($request, $response);

From 24dcb5202c898e0c6f1a97cca53b6863bb43ca7c Mon Sep 17 00:00:00 2001
From: Craig Duncan 
Date: Mon, 10 Jul 2017 22:30:02 +0100
Subject: [PATCH 0904/1099] Add a method to check if any results were found

---
 src/Symfony/Component/Finder/CHANGELOG.md         |  1 +
 src/Symfony/Component/Finder/Finder.php           | 14 ++++++++++++++
 src/Symfony/Component/Finder/Tests/FinderTest.php | 14 ++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
index 1c6419658bff5..53c34be860c56 100644
--- a/src/Symfony/Component/Finder/CHANGELOG.md
+++ b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * deprecated `Symfony\Component\Finder\Iterator\FilterIterator`
+ * added Finder::hasResults() method to check if any results were found
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 9a1b31a1ae861..8ea457ddeb0a9 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -613,6 +613,20 @@ public function append($iterator)
         return $this;
     }
 
+    /**
+     * Check if the any results were found.
+     *
+     * @return bool
+     */
+    public function hasResults()
+    {
+        foreach ($this->getIterator() as $_) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Counts all the results collected by the iterators.
      *
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index f4050d1f765e1..7e75f14128a99 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -424,6 +424,20 @@ public function testCountWithoutIn()
         count($finder);
     }
 
+    public function testHasResults()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__);
+        $this->assertTrue($finder->hasResults());
+    }
+
+    public function testNoResults()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__)->name('DoesNotExist');
+        $this->assertFalse($finder->hasResults());
+    }
+
     /**
      * @dataProvider getContainsTestData
      */

From ab47c7878ed9fc20884b10bc522fd07cf3369e48 Mon Sep 17 00:00:00 2001
From: Tim Jabs 
Date: Tue, 26 Sep 2017 17:16:57 +0200
Subject: [PATCH 0905/1099] Added improvement for accuracy in
 MoneyToLocalizedStringTransformer.

---
 .../MoneyToLocalizedStringTransformer.php              | 10 ++++------
 .../MoneyToLocalizedStringTransformerTest.php          |  8 ++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
index 5993c01cb0da9..7449fedfc69cc 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -54,12 +54,11 @@ public function __construct($scale = 2, $grouping = true, $roundingMode = self::
      */
     public function transform($value)
     {
-        if (null !== $value) {
+        if (null !== $value && 1 !== $this->divisor) {
             if (!is_numeric($value)) {
                 throw new TransformationFailedException('Expected a numeric.');
             }
-
-            $value /= $this->divisor;
+            $value = (string) ($value / $this->divisor);
         }
 
         return parent::transform($value);
@@ -78,9 +77,8 @@ public function transform($value)
     public function reverseTransform($value)
     {
         $value = parent::reverseTransform($value);
-
-        if (null !== $value) {
-            $value *= $this->divisor;
+        if (null !== $value && 1 !== $this->divisor) {
+            $value = (float) (string) ($value * $this->divisor);
         }
 
         return $value;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
index 68face130b535..1ad3aa1615c98 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -72,4 +72,12 @@ public function testReverseTransformEmpty()
 
         $this->assertNull($transformer->reverseTransform(''));
     }
+
+    public function testFloatToIntConversionMismatchOnReversTransform()
+    {
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
+        IntlTestHelper::requireFullIntl($this, false);
+        \Locale::setDefault('de_AT');
+        $this->assertSame(3655, (int) $transformer->reverseTransform('36,55'));
+    }
 }

From fba7e543d17833453f0c7b53d57e46338c6d489a Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Tue, 26 Sep 2017 19:24:24 +0200
Subject: [PATCH 0906/1099] added foward compatibility for the removal of
 bundle inheritance in 4.0

---
 .../Controller/ControllerNameParser.php          |  5 +++++
 .../Command/TranslationDebugCommandTest.php      | 16 ++++++++++++----
 .../Command/TranslationUpdateCommandTest.php     | 15 +++++++++++----
 .../Controller/ControllerNameParserTest.php      | 14 +++++++++++---
 .../DependencyInjection/TwigExtension.php        |  2 +-
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index 323c5122a531f..cf1ebdc128e42 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -73,6 +73,11 @@ public function parse($controller)
             throw new \InvalidArgumentException($message, 0, $e);
         }
 
+        if (!is_array($allBundles)) {
+            // happens when HttpKernel is version 4+
+            $allBundles = array($allBundles);
+        }
+
         foreach ($allBundles as $b) {
             $try = $b->getNamespace().'\\Controller\\'.$controller.'Controller';
             if (class_exists($try)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
index 55ed4c7449f27..7e516c7cc5589 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel;
 
 class TranslationDebugCommandTest extends TestCase
 {
@@ -141,14 +142,21 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
             );
 
         if (null === $kernel) {
+            $returnValues = array(
+                array('foo', $this->getBundle($this->translationDir)),
+                array('test', $this->getBundle('test')),
+            );
+            if (HttpKernel\Kernel::VERSION_ID < 40000) {
+                $returnValues = array(
+                    array('foo', true, $this->getBundle($this->translationDir)),
+                    array('test', true, $this->getBundle('test')),
+                );
+            }
             $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
             $kernel
                 ->expects($this->any())
                 ->method('getBundle')
-                ->will($this->returnValueMap(array(
-                    array('foo', true, $this->getBundle($this->translationDir)),
-                    array('test', true, $this->getBundle('test')),
-                )));
+                ->will($this->returnValueMap($returnValues));
         }
 
         $kernel
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
index c7c93d533a301..2cb8e0e2593d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -120,14 +120,21 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
             );
 
         if (null === $kernel) {
+            $returnValues = array(
+                array('foo', $this->getBundle($this->translationDir)),
+                array('test', $this->getBundle('test')),
+            );
+            if (HttpKernel\Kernel::VERSION_ID < 40000) {
+                $returnValues = array(
+                    array('foo', true, $this->getBundle($this->translationDir)),
+                    array('test', true, $this->getBundle('test')),
+                );
+            }
             $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
             $kernel
                 ->expects($this->any())
                 ->method('getBundle')
-                ->will($this->returnValueMap(array(
-                    array('foo', true, $this->getBundle($this->translationDir)),
-                    array('test', true, $this->getBundle('test')),
-                )));
+                ->will($this->returnValueMap($returnValues));
         }
 
         $kernel
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
index 57eaf269f4424..efe72b5b8029f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -14,6 +14,7 @@
 use Composer\Autoload\ClassLoader;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Component\HttpKernel\Kernel;
 
 class ControllerNameParserTest extends TestCase
 {
@@ -98,10 +99,17 @@ public function testMissingControllers($name)
 
     public function getMissingControllersTest()
     {
-        return array(
-            array('FooBundle:Fake:index'),          // a normal bundle
-            array('SensioFooBundle:Fake:index'),    // a bundle with children
+        // a normal bundle
+        $bundles = array(
+            array('FooBundle:Fake:index'),
         );
+
+        // a bundle with children
+        if (Kernel::VERSION_ID < 40000) {
+            $bundles[] = array('SensioFooBundle:Fake:index');
+        }
+
+        return $bundles;
     }
 
     /**
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index d4450f531c322..262594a5f4768 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -214,7 +214,7 @@ private function getBundleHierarchy(ContainerBuilder $container, array $config)
             }
             $container->addResource(new FileExistenceResource($dir));
 
-            if (null === $bundle['parent']) {
+            if (!isset($bundle['parent']) || null === $bundle['parent']) {
                 continue;
             }
 

From 11fe79d77fb4ebae8cf77c0a4ce09d20fa363df9 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Tue, 26 Sep 2017 19:05:58 +0200
Subject: [PATCH 0907/1099] [Security][SecurityBundle] Deprecate the HTTP
 digest auth

---
 UPGRADE-3.4.md                                |  10 ++
 UPGRADE-4.0.md                                |   7 +
 .../Bundle/SecurityBundle/CHANGELOG.md        |   1 +
 .../Security/Factory/HttpDigestFactory.php    |  10 ++
 .../Bundle/SecurityBundle/SecurityBundle.php  |   2 +-
 .../CompleteConfigurationTest.php             | 125 ++++++++++++++++++
 .../Fixtures/php/container1.php               |   1 -
 .../Fixtures/php/container1_with_digest.php   | 105 +++++++++++++++
 .../Fixtures/php/no_custom_user_checker.php   |   1 -
 .../Fixtures/xml/container1.xml               |   1 -
 .../Fixtures/xml/container1_with_digest.xml   |  82 ++++++++++++
 .../Fixtures/xml/no_custom_user_checker.xml   |   1 -
 .../Fixtures/yml/container1.yml               |   2 -
 .../Fixtures/yml/container1_with_digest.yml   |  85 ++++++++++++
 .../Fixtures/yml/no_custom_user_checker.yml   |   2 -
 src/Symfony/Component/Security/CHANGELOG.md   |   1 +
 .../Core/Exception/NonceExpiredException.php  |   4 +
 .../DigestAuthenticationEntryPoint.php        |   4 +
 .../Firewall/DigestAuthenticationListener.php |   9 ++
 .../DigestAuthenticationEntryPointTest.php    |   3 +
 .../DigestAuthenticationListenerTest.php      |   3 +
 .../Http/Tests/Firewall/DigestDataTest.php    |   3 +
 22 files changed, 453 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 44afe9be5dc63..8edd0e1ba67b6 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -252,6 +252,13 @@ Profiler
 
  * The `profiler.matcher` option has been deprecated.
 
+Security
+--------
+
+ * Deprecated the HTTP digest authentication: `NonceExpiredException`, 
+   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` will be 
+   removed in 4.0. Use another authentication system like `http_basic` instead.
+
 SecurityBundle
 --------------
 
@@ -272,6 +279,9 @@ SecurityBundle
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
+   
+ * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
+   Use another authentication system like `http_basic` instead.
 
 Translation
 -----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2fc980b92fafc..e7774c1f9e83b 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -645,6 +645,10 @@ Security
  * Calling `ContextListener::setLogoutOnUserChange(false)` won't have any
    effect anymore.
 
+ * Removed the HTTP digest authentication system. The `NonceExpiredException`,
+   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` classes
+   have been removed. Use another authentication system like `http_basic` instead.
+
 SecurityBundle
 --------------
 
@@ -665,6 +669,9 @@ SecurityBundle
 
  * The firewall option `logout_on_user_change` is now always true, which will
    trigger a logout if the user changes between requests.
+   
+ * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
+   has been removed. Use another authentication system like `http_basic` instead.
 
 Serializer
 ----------
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index b60e2e7e882e0..7b8647081163d 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
+ * deprecated HTTP digest authentication
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
index bedc87864c235..8d764795c1b64 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
@@ -20,9 +20,18 @@
  * HttpDigestFactory creates services for HTTP digest authentication.
  *
  * @author Fabien Potencier 
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class HttpDigestFactory implements SecurityFactoryInterface
 {
+    public function __construct($triggerDeprecation = true)
+    {
+        if ($triggerDeprecation) {
+            @trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+    }
+
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
@@ -59,6 +68,7 @@ public function getKey()
     public function addConfiguration(NodeDefinition $node)
     {
         $node
+            ->setDeprecated('The HTTP digest authentication is deprecated since 3.4 and will be removed in 4.0.')
             ->children()
                 ->scalarNode('provider')->end()
                 ->scalarNode('realm')->defaultValue('Secured Area')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
index 3b8f6dda85580..4f17e12236659 100644
--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -47,7 +47,7 @@ public function build(ContainerBuilder $container)
         $extension->addSecurityListenerFactory(new JsonLoginFactory());
         $extension->addSecurityListenerFactory(new HttpBasicFactory());
         $extension->addSecurityListenerFactory(new HttpBasicLdapFactory());
-        $extension->addSecurityListenerFactory(new HttpDigestFactory());
+        $extension->addSecurityListenerFactory(new HttpDigestFactory(false));
         $extension->addSecurityListenerFactory(new RememberMeFactory());
         $extension->addSecurityListenerFactory(new X509Factory());
         $extension->addSecurityListenerFactory(new RemoteUserFactory());
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index c7451496d48c2..9a461285f5e0f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -86,6 +86,131 @@ public function testFirewalls()
         $configs[0][2] = strtolower($configs[0][2]);
         $configs[2][2] = strtolower($configs[2][2]);
 
+        $this->assertEquals(array(
+            array(
+                'simple',
+                'security.user_checker',
+                'security.request_matcher.6tndozi',
+                false,
+            ),
+            array(
+                'secure',
+                'security.user_checker',
+                null,
+                true,
+                true,
+                'security.user.provider.concrete.default',
+                null,
+                'security.authentication.form_entry_point.secure',
+                null,
+                null,
+                array(
+                    'logout',
+                    'switch_user',
+                    'x509',
+                    'remote_user',
+                    'form_login',
+                    'http_basic',
+                    'remember_me',
+                    'anonymous',
+                ),
+                array(
+                    'parameter' => '_switch_user',
+                    'role' => 'ROLE_ALLOWED_TO_SWITCH',
+                ),
+            ),
+            array(
+                'host',
+                'security.user_checker',
+                'security.request_matcher.and0kk1',
+                true,
+                false,
+                'security.user.provider.concrete.default',
+                'host',
+                'security.authentication.basic_entry_point.host',
+                null,
+                null,
+                array(
+                    'http_basic',
+                    'anonymous',
+                ),
+                null,
+            ),
+            array(
+                'with_user_checker',
+                'app.user_checker',
+                null,
+                true,
+                false,
+                'security.user.provider.concrete.default',
+                'with_user_checker',
+                'security.authentication.basic_entry_point.with_user_checker',
+                null,
+                null,
+                array(
+                    'http_basic',
+                    'anonymous',
+                ),
+                null,
+            ),
+        ), $configs);
+
+        $this->assertEquals(array(
+            array(),
+            array(
+                'security.channel_listener',
+                'security.logout_listener.secure',
+                'security.authentication.listener.x509.secure',
+                'security.authentication.listener.remote_user.secure',
+                'security.authentication.listener.form.secure',
+                'security.authentication.listener.basic.secure',
+                'security.authentication.listener.rememberme.secure',
+                'security.authentication.listener.anonymous.secure',
+                'security.authentication.switchuser_listener.secure',
+                'security.access_listener',
+            ),
+            array(
+                'security.channel_listener',
+                'security.context_listener.0',
+                'security.authentication.listener.basic.host',
+                'security.authentication.listener.anonymous.host',
+                'security.access_listener',
+            ),
+            array(
+                'security.channel_listener',
+                'security.context_listener.1',
+                'security.authentication.listener.basic.with_user_checker',
+                'security.authentication.listener.anonymous.with_user_checker',
+                'security.access_listener',
+            ),
+        ), $listeners);
+
+        $this->assertFalse($container->hasAlias('Symfony\Component\Security\Core\User\UserCheckerInterface', 'No user checker alias is registered when custom user checker services are registered'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testFirewallsWithDigest()
+    {
+        $container = $this->getContainer('container1_with_digest');
+        $arguments = $container->getDefinition('security.firewall.map')->getArguments();
+        $listeners = array();
+        $configs = array();
+        foreach (array_keys($arguments[1]->getValues()) as $contextId) {
+            $contextDef = $container->getDefinition($contextId);
+            $arguments = $contextDef->getArguments();
+            $listeners[] = array_map('strval', $arguments['index_0']->getValues());
+
+            $configDef = $container->getDefinition((string) $arguments['index_2']);
+            $configs[] = array_values($configDef->getArguments());
+        }
+
+        // the IDs of the services are case sensitive or insensitive depending on
+        // the Symfony version. Transform them to lowercase to simplify tests.
+        $configs[0][2] = strtolower($configs[0][2]);
+        $configs[2][2] = strtolower($configs[2][2]);
+
         $this->assertEquals(array(
             array(
                 'simple',
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index 581407fcc05a5..3748f05012b87 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -64,7 +64,6 @@
         'simple' => array('pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
             'http_basic' => true,
-            'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
new file mode 100644
index 0000000000000..581407fcc05a5
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
@@ -0,0 +1,105 @@
+loadFromExtension('security', array(
+    'acl' => array(),
+    'encoders' => array(
+        'JMS\FooBundle\Entity\User1' => 'plaintext',
+        'JMS\FooBundle\Entity\User2' => array(
+            'algorithm' => 'sha1',
+            'encode_as_base64' => false,
+            'iterations' => 5,
+        ),
+        'JMS\FooBundle\Entity\User3' => array(
+            'algorithm' => 'md5',
+        ),
+        'JMS\FooBundle\Entity\User4' => array(
+            'id' => 'security.encoder.foo',
+        ),
+        'JMS\FooBundle\Entity\User5' => array(
+            'algorithm' => 'pbkdf2',
+            'hash_algorithm' => 'sha1',
+            'encode_as_base64' => false,
+            'iterations' => 5,
+            'key_length' => 30,
+        ),
+        'JMS\FooBundle\Entity\User6' => array(
+            'algorithm' => 'bcrypt',
+            'cost' => 15,
+        ),
+    ),
+    'providers' => array(
+        'default' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
+                ),
+            ),
+        ),
+        'digest' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER, ROLE_ADMIN'),
+                ),
+            ),
+        ),
+        'basic' => array(
+            'memory' => array(
+                'users' => array(
+                    'foo' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => 'ROLE_SUPER_ADMIN'),
+                    'bar' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => array('ROLE_USER', 'ROLE_ADMIN')),
+                ),
+            ),
+        ),
+        'service' => array(
+            'id' => 'user.manager',
+        ),
+        'chain' => array(
+            'chain' => array(
+                'providers' => array('service', 'basic'),
+            ),
+        ),
+    ),
+
+    'firewalls' => array(
+        'simple' => array('pattern' => '/login', 'security' => false),
+        'secure' => array('stateless' => true,
+            'http_basic' => true,
+            'http_digest' => array('secret' => 'TheSecret'),
+            'form_login' => true,
+            'anonymous' => true,
+            'switch_user' => true,
+            'x509' => true,
+            'remote_user' => true,
+            'logout' => true,
+            'remember_me' => array('secret' => 'TheSecret'),
+            'user_checker' => null,
+            'logout_on_user_change' => true,
+        ),
+        'host' => array(
+            'pattern' => '/test',
+            'host' => 'foo\\.example\\.org',
+            'methods' => array('GET', 'POST'),
+            'anonymous' => true,
+            'http_basic' => true,
+            'logout_on_user_change' => true,
+        ),
+        'with_user_checker' => array(
+            'user_checker' => 'app.user_checker',
+            'anonymous' => true,
+            'http_basic' => true,
+            'logout_on_user_change' => true,
+        ),
+    ),
+
+    'access_control' => array(
+        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https', 'methods' => array('get', 'POST')),
+        array('path' => '/blog/.*', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
+        array('path' => '/blog/524', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'allow_if' => "token.getUsername() matches '/^admin/'"),
+    ),
+
+    'role_hierarchy' => array(
+        'ROLE_ADMIN' => 'ROLE_USER',
+        'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
+        'ROLE_REMOTE' => 'ROLE_USER,ROLE_ADMIN',
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
index 91c475418b450..3889752f8f928 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
@@ -15,7 +15,6 @@
         'secure' => array(
             'stateless' => true,
             'http_basic' => true,
-            'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index e5049f2033e51..05c31e1854c93 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -49,7 +49,6 @@
 
         
             
-            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
new file mode 100644
index 0000000000000..e5049f2033e51
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
@@ -0,0 +1,82 @@
+
+
+
+
+    
+        
+
+        
+
+        
+
+        
+
+        
+
+        
+
+        
+
+        
+            
+                
+            
+        
+
+        
+            
+                
+            
+        
+
+        
+            
+                
+                
+            
+        
+
+        
+
+        
+            
+        
+
+        
+
+        
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+        
+
+        
+            
+            
+        
+
+        
+            
+            
+            app.user_checker
+        
+
+        ROLE_USER
+        ROLE_USER,ROLE_ADMIN,ROLE_ALLOWED_TO_SWITCH
+        ROLE_USER,ROLE_ADMIN
+
+        
+        
+        
+    
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
index 7d648ae1baec2..b97d39adb5a78 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -15,7 +15,6 @@
 
         
             
-            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index a2b57201bfbd2..b016adb851e98 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -46,8 +46,6 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest:
-                secret: TheSecret
             form_login: true
             anonymous: true
             switch_user: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
new file mode 100644
index 0000000000000..a2b57201bfbd2
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
@@ -0,0 +1,85 @@
+security:
+    acl: ~
+    encoders:
+        JMS\FooBundle\Entity\User1: plaintext
+        JMS\FooBundle\Entity\User2:
+            algorithm: sha1
+            encode_as_base64: false
+            iterations: 5
+        JMS\FooBundle\Entity\User3:
+            algorithm: md5
+        JMS\FooBundle\Entity\User4:
+            id: security.encoder.foo
+        JMS\FooBundle\Entity\User5:
+            algorithm: pbkdf2
+            hash_algorithm: sha1
+            encode_as_base64: false
+            iterations: 5
+            key_length: 30
+        JMS\FooBundle\Entity\User6:
+            algorithm: bcrypt
+            cost: 15
+
+    providers:
+        default:
+            memory:
+                users:
+                    foo: { password: foo, roles: ROLE_USER }
+        digest:
+            memory:
+                users:
+                    foo: { password: foo, roles: 'ROLE_USER, ROLE_ADMIN' }
+        basic:
+            memory:
+                users:
+                    foo: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: ROLE_SUPER_ADMIN }
+                    bar: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: [ROLE_USER, ROLE_ADMIN] }
+        service:
+            id: user.manager
+        chain:
+            chain:
+                providers: [service, basic]
+
+
+    firewalls:
+        simple: { pattern: /login, security: false }
+        secure:
+            stateless: true
+            http_basic: true
+            http_digest:
+                secret: TheSecret
+            form_login: true
+            anonymous: true
+            switch_user: true
+            x509: true
+            remote_user: true
+            logout: true
+            remember_me:
+                secret: TheSecret
+            user_checker: ~
+
+        host:
+            pattern: /test
+            host: foo\.example\.org
+            methods: [GET,POST]
+            anonymous: true
+            http_basic: true
+            logout_on_user_change: true
+
+        with_user_checker:
+            anonymous: ~
+            http_basic: ~
+            user_checker: app.user_checker
+            logout_on_user_change: true
+
+    role_hierarchy:
+        ROLE_ADMIN:       ROLE_USER
+        ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
+        ROLE_REMOTE:      ROLE_USER,ROLE_ADMIN
+
+    access_control:
+        - { path: /blog/524, role: ROLE_USER, requires_channel: https, methods: [get, POST]}
+        -
+            path: /blog/.*
+            role: IS_AUTHENTICATED_ANONYMOUSLY
+        - { path: /blog/524, role: IS_AUTHENTICATED_ANONYMOUSLY, allow_if: "token.getUsername() matches '/^admin/'" }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
index 23afa8cd9b3c5..6a196597c51e7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
@@ -10,8 +10,6 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest:
-                secret: TheSecret
             form_login: true
             anonymous: true
             switch_user: true
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 99032dae9da9b..a48ee0cd871e9 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
    property will trigger a deprecation when the user has changed. As of 4.0
    the user will always be logged out when the user has changed between
    requests.
+ * deprecated HTTP digest authentication
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php b/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
index 998e987e403de..bc03a03ac70d4 100644
--- a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
+++ b/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Component\Security\Core\Exception;
 
+@trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since 3.4 and will be removed in 4.0.', NonceExpiredException::class), E_USER_DEPRECATED);
+
 /**
  * NonceExpiredException is thrown when an authentication is rejected because
  * the digest nonce has expired.
  *
  * @author Fabien Potencier 
  * @author Alexander 
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class NonceExpiredException extends AuthenticationException
 {
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
index 9dfd5929459fb..185426599187e 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
@@ -21,6 +21,8 @@
  * DigestAuthenticationEntryPoint starts an HTTP Digest authentication.
  *
  * @author Fabien Potencier 
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class DigestAuthenticationEntryPoint implements AuthenticationEntryPointInterface
 {
@@ -31,6 +33,8 @@ class DigestAuthenticationEntryPoint implements AuthenticationEntryPointInterfac
 
     public function __construct($realmName, $secret, $nonceValiditySeconds = 300, LoggerInterface $logger = null)
     {
+        @trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+
         $this->realmName = $realmName;
         $this->secret = $secret;
         $this->nonceValiditySeconds = $nonceValiditySeconds;
diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
index 4479a5cae9dc1..ce8e435aa8f82 100644
--- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
@@ -28,6 +28,8 @@
  * DigestAuthenticationListener implements Digest HTTP authentication.
  *
  * @author Fabien Potencier 
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class DigestAuthenticationListener implements ListenerInterface
 {
@@ -39,6 +41,8 @@ class DigestAuthenticationListener implements ListenerInterface
 
     public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, $providerKey, DigestAuthenticationEntryPoint $authenticationEntryPoint, LoggerInterface $logger = null)
     {
+        @trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+
         if (empty($providerKey)) {
             throw new \InvalidArgumentException('$providerKey must not be empty.');
         }
@@ -137,6 +141,9 @@ private function fail(GetResponseEvent $event, Request $request, AuthenticationE
     }
 }
 
+/**
+ * @deprecated since 3.4, to be removed in 4.0.
+ */
 class DigestData
 {
     private $elements = array();
@@ -145,6 +152,8 @@ class DigestData
 
     public function __construct($header)
     {
+        @trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+
         $this->header = $header;
         preg_match_all('/(\w+)=("((?:[^"\\\\]|\\\\.)+)"|([^\s,$]+))/', $header, $matches, PREG_SET_ORDER);
         foreach ($matches as $match) {
diff --git a/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php b/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
index e08570dbbd9fc..035a5baae99cf 100644
--- a/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
@@ -16,6 +16,9 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\NonceExpiredException;
 
+/**
+ * @group legacy
+ */
 class DigestAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
index 495dae4262162..b6f7efa8b5aa3 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
@@ -8,6 +8,9 @@
 use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
 use Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener;
 
+/**
+ * @group legacy
+ */
 class DigestAuthenticationListenerTest extends TestCase
 {
     public function testHandleWithValidDigest()
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php
index 7317e2f83c7cc..185055efceb68 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php
@@ -14,6 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Firewall\DigestData;
 
+/**
+ * @group legacy
+ */
 class DigestDataTest extends TestCase
 {
     public function testGetResponse()

From 7473981c1499a030893213488a86c4fb58e37476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20R=C3=B6=C3=9Fner?= 
Date: Wed, 12 Jul 2017 10:05:49 +0200
Subject: [PATCH 0908/1099] [Config] extracted the xml parsing from
 XmlUtils::loadFile into XmlUtils::parse

---
 .../Config/Tests/Util/XmlUtilsTest.php        | 16 +++++-
 .../Util/Exception/InvalidXmlException.php    | 21 +++++++
 .../Util/Exception/XmlParsingException.php    | 21 +++++++
 .../Component/Config/Util/XmlUtils.php        | 56 ++++++++++++++-----
 4 files changed, 98 insertions(+), 16 deletions(-)
 create mode 100644 src/Symfony/Component/Config/Util/Exception/InvalidXmlException.php
 create mode 100644 src/Symfony/Component/Config/Util/Exception/XmlParsingException.php

diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
index 161dc61721c12..a26a994d91050 100644
--- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -55,13 +55,27 @@ public function testLoadFile()
             XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate'));
             $this->fail();
         } catch (\InvalidArgumentException $e) {
-            $this->assertContains('is not valid', $e->getMessage());
+            $this->assertRegExp('/The XML file "[\w:\/\\\.]+" is not valid\./', $e->getMessage());
         }
 
         $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
         $this->assertSame(array(), libxml_get_errors());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Config\Util\Exception\InvalidXmlException
+     * @expectedExceptionMessage The XML is not valid
+     */
+    public function testParseWithInvalidValidatorCallable()
+    {
+        $fixtures = __DIR__.'/../Fixtures/Util/';
+
+        $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
+        $mock->expects($this->once())->method('validate')->willReturn(false);
+
+        XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), array($mock, 'validate'));
+    }
+
     public function testLoadFileWithInternalErrorsEnabled()
     {
         $internalErrors = libxml_use_internal_errors(true);
diff --git a/src/Symfony/Component/Config/Util/Exception/InvalidXmlException.php b/src/Symfony/Component/Config/Util/Exception/InvalidXmlException.php
new file mode 100644
index 0000000000000..a335bbd2eed7c
--- /dev/null
+++ b/src/Symfony/Component/Config/Util/Exception/InvalidXmlException.php
@@ -0,0 +1,21 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Util\Exception;
+
+/**
+ * Exception class for when XML parsing with an XSD schema file path or a callable validator produces errors unrelated
+ * to the actual XML parsing.
+ *
+ * @author Ole Rößner 
+ */
+class InvalidXmlException extends XmlParsingException
+{
+}
diff --git a/src/Symfony/Component/Config/Util/Exception/XmlParsingException.php b/src/Symfony/Component/Config/Util/Exception/XmlParsingException.php
new file mode 100644
index 0000000000000..9bceed660baed
--- /dev/null
+++ b/src/Symfony/Component/Config/Util/Exception/XmlParsingException.php
@@ -0,0 +1,21 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Util\Exception;
+
+/**
+ * Exception class for when XML cannot be parsed properly.
+ *
+ * @author Ole Rößner 
+ */
+class XmlParsingException extends \InvalidArgumentException
+{
+}
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index 9c7ac126ef1ca..130384ea87030 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Config\Util;
 
+use Symfony\Component\Config\Util\Exception\InvalidXmlException;
+use Symfony\Component\Config\Util\Exception\XmlParsingException;
+
 /**
  * XMLUtils is a bunch of utility methods to XML operations.
  *
@@ -18,6 +21,7 @@
  *
  * @author Fabien Potencier 
  * @author Martin Hasoň 
+ * @author Ole Rößner 
  */
 class XmlUtils
 {
@@ -29,27 +33,23 @@ private function __construct()
     }
 
     /**
-     * Loads an XML file.
+     * Parses an XML string.
      *
-     * @param string               $file             An XML file path
+     * @param string               $content          An XML string
      * @param string|callable|null $schemaOrCallable An XSD schema file path, a callable, or null to disable validation
      *
      * @return \DOMDocument
      *
-     * @throws \InvalidArgumentException When loading of XML file returns error
-     * @throws \RuntimeException         When DOM extension is missing
+     * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException When parsing of XML file returns error
+     * @throws \Symfony\Component\Config\Util\Exception\InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself
+     * @throws \RuntimeException                                            When DOM extension is missing
      */
-    public static function loadFile($file, $schemaOrCallable = null)
+    public static function parse($content, $schemaOrCallable = null)
     {
         if (!extension_loaded('dom')) {
             throw new \RuntimeException('Extension DOM is required.');
         }
 
-        $content = @file_get_contents($file);
-        if ('' === trim($content)) {
-            throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file));
-        }
-
         $internalErrors = libxml_use_internal_errors(true);
         $disableEntities = libxml_disable_entity_loader(true);
         libxml_clear_errors();
@@ -59,7 +59,7 @@ public static function loadFile($file, $schemaOrCallable = null)
         if (!$dom->loadXML($content, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
             libxml_disable_entity_loader($disableEntities);
 
-            throw new \InvalidArgumentException(implode("\n", static::getXmlErrors($internalErrors)));
+            throw new XmlParsingException(implode("\n", static::getXmlErrors($internalErrors)));
         }
 
         $dom->normalizeDocument();
@@ -69,7 +69,7 @@ public static function loadFile($file, $schemaOrCallable = null)
 
         foreach ($dom->childNodes as $child) {
             if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
-                throw new \InvalidArgumentException('Document types are not allowed.');
+                throw new XmlParsingException('Document types are not allowed.');
             }
         }
 
@@ -90,15 +90,15 @@ public static function loadFile($file, $schemaOrCallable = null)
             } else {
                 libxml_use_internal_errors($internalErrors);
 
-                throw new \InvalidArgumentException('The schemaOrCallable argument has to be a valid path to XSD file or callable.');
+                throw new XmlParsingException('The schemaOrCallable argument has to be a valid path to XSD file or callable.');
             }
 
             if (!$valid) {
                 $messages = static::getXmlErrors($internalErrors);
                 if (empty($messages)) {
-                    $messages = array(sprintf('The XML file "%s" is not valid.', $file));
+                    throw new InvalidXmlException('The XML is not valid.', 0, $e);
                 }
-                throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);
+                throw new XmlParsingException(implode("\n", $messages), 0, $e);
             }
         }
 
@@ -108,6 +108,32 @@ public static function loadFile($file, $schemaOrCallable = null)
         return $dom;
     }
 
+    /**
+     * Loads an XML file.
+     *
+     * @param string               $file             An XML file path
+     * @param string|callable|null $schemaOrCallable An XSD schema file path, a callable, or null to disable validation
+     *
+     * @return \DOMDocument
+     *
+     * @throws \InvalidArgumentException                                    When loading of XML file returns error
+     * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException when XML parsing returns any errors
+     * @throws \RuntimeException                                            When DOM extension is missing
+     */
+    public static function loadFile($file, $schemaOrCallable = null)
+    {
+        $content = @file_get_contents($file);
+        if ('' === trim($content)) {
+            throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file));
+        }
+
+        try {
+            return static::parse($content, $schemaOrCallable);
+        } catch (InvalidXmlException $e) {
+            throw new XmlParsingException(sprintf('The XML file "%s" is not valid.', $file), 0, $e->getPrevious());
+        }
+    }
+
     /**
      * Converts a \DomElement object to a PHP array.
      *

From 6fcb0756836a3c24a340d88d7f8300bf430d8d3c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Tue, 26 Sep 2017 22:01:10 +0200
Subject: [PATCH 0909/1099] Fix changelog and minor tweak for #23485

---
 src/Symfony/Component/Config/CHANGELOG.md      |  1 +
 src/Symfony/Component/Config/Util/XmlUtils.php | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md
index ffa347dbf4976..f8a2028e558db 100644
--- a/src/Symfony/Component/Config/CHANGELOG.md
+++ b/src/Symfony/Component/Config/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `setDeprecated()` method to indicate a deprecated node
+ * added `XmlUtils::parse()` method to parse an XML string
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index 130384ea87030..c6e1869f9be51 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -40,9 +40,9 @@ private function __construct()
      *
      * @return \DOMDocument
      *
-     * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException When parsing of XML file returns error
-     * @throws \Symfony\Component\Config\Util\Exception\InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself
-     * @throws \RuntimeException                                            When DOM extension is missing
+     * @throws XmlParsingException When parsing of XML file returns error
+     * @throws InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself
+     * @throws \RuntimeException   When DOM extension is missing
      */
     public static function parse($content, $schemaOrCallable = null)
     {
@@ -116,9 +116,9 @@ public static function parse($content, $schemaOrCallable = null)
      *
      * @return \DOMDocument
      *
-     * @throws \InvalidArgumentException                                    When loading of XML file returns error
-     * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException when XML parsing returns any errors
-     * @throws \RuntimeException                                            When DOM extension is missing
+     * @throws \InvalidArgumentException When loading of XML file returns error
+     * @throws XmlParsingException       When XML parsing returns any errors
+     * @throws \RuntimeException         When DOM extension is missing
      */
     public static function loadFile($file, $schemaOrCallable = null)
     {

From 4205f1bc686c75f0a925134642f797acd17962c1 Mon Sep 17 00:00:00 2001
From: VJ 
Date: Wed, 19 Apr 2017 12:13:04 -0400
Subject: [PATCH 0910/1099] Passing the newly generated security token to the
 event during user switching.

Event allows listeners to easily switch out the token if custom token updates are required
---
 src/Symfony/Component/Security/CHANGELOG.md   |  2 +
 .../Security/Http/Event/SwitchUserEvent.php   | 18 ++++++++-
 .../Http/Firewall/SwitchUserListener.php      |  7 +++-
 .../Tests/Firewall/SwitchUserListenerTest.php | 39 +++++++++++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 292c304fc68c7..7d30f22f777e7 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.4.0
 -----
 
+ * added a `setToken()` method to the `SwitchUserEvent` class to allow to replace the created token while switching users
+   when custom token generation is required by application. 
  * Using voters that do not implement the `VoterInterface`is now deprecated in
    the `AccessDecisionManager` and this functionality will be removed in 4.0.
 
diff --git a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
index 7cf94a70d3136..2681fb6c602bd 100644
--- a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Http\Event;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -24,11 +25,13 @@ class SwitchUserEvent extends Event
 {
     private $request;
     private $targetUser;
+    private $token;
 
-    public function __construct(Request $request, UserInterface $targetUser)
+    public function __construct(Request $request, UserInterface $targetUser, TokenInterface $token = null)
     {
         $this->request = $request;
         $this->targetUser = $targetUser;
+        $this->token = $token;
     }
 
     /**
@@ -46,4 +49,17 @@ public function getTargetUser()
     {
         return $this->targetUser;
     }
+
+    /**
+     * @return TokenInterface|null
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
+    public function setToken(TokenInterface $token)
+    {
+        $this->token = $token;
+    }
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 2caab2a35363b..2fc06140cfd37 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -145,8 +145,10 @@ private function attemptSwitchUser(Request $request)
         $token = new UsernamePasswordToken($user, $user->getPassword(), $this->providerKey, $roles);
 
         if (null !== $this->dispatcher) {
-            $switchEvent = new SwitchUserEvent($request, $token->getUser());
+            $switchEvent = new SwitchUserEvent($request, $token->getUser(), $token);
             $this->dispatcher->dispatch(SecurityEvents::SWITCH_USER, $switchEvent);
+            // use the token from the event in case any listeners have replaced it.
+            $token = $switchEvent->getToken();
         }
 
         return $token;
@@ -169,8 +171,9 @@ private function attemptExitUser(Request $request)
 
         if (null !== $this->dispatcher && $original->getUser() instanceof UserInterface) {
             $user = $this->provider->refreshUser($original->getUser());
-            $switchEvent = new SwitchUserEvent($request, $user);
+            $switchEvent = new SwitchUserEvent($request, $user, $original);
             $this->dispatcher->dispatch(SecurityEvents::SWITCH_USER, $switchEvent);
+            $original = $switchEvent->getToken();
         }
 
         return $original;
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index 57cba1127a9b1..c97eda759330b 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -227,4 +227,43 @@ public function testSwitchUserKeepsOtherQueryStringParameters()
         $this->assertSame('page=3§ion=2', $this->request->server->get('QUERY_STRING'));
         $this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $this->tokenStorage->getToken());
     }
+
+    public function testSwitchUserWithReplacedToken()
+    {
+        $user = new User('username', 'password', array());
+        $token = new UsernamePasswordToken($user, '', 'provider123', array('ROLE_FOO'));
+
+        $user = new User('replaced', 'password', array());
+        $replacedToken = new UsernamePasswordToken($user, '', 'provider123', array('ROLE_BAR'));
+
+        $this->tokenStorage->setToken($token);
+        $this->request->query->set('_switch_user', 'kuba');
+
+        $this->accessDecisionManager->expects($this->any())
+            ->method('decide')->with($token, array('ROLE_ALLOWED_TO_SWITCH'))
+            ->will($this->returnValue(true));
+
+        $this->userProvider->expects($this->any())
+            ->method('loadUserByUsername')->with('kuba')
+            ->will($this->returnValue($user));
+
+        $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+        $dispatcher
+            ->expects($this->once())
+            ->method('dispatch')
+            ->with(SecurityEvents::SWITCH_USER,
+                $this->callback(function (SwitchUserEvent $event) use ($replacedToken, $user) {
+                    if ($user !== $event->getTargetUser()) {
+                        return false;
+                    }
+                    $event->setToken($replacedToken);
+
+                    return true;
+                }));
+
+        $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', $dispatcher);
+        $listener->handle($this->event);
+
+        $this->assertSame($replacedToken, $this->tokenStorage->getToken());
+    }
 }

From 8ff716b1f3b2481601e220c0588d62f6b6ee590a Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Tue, 26 Sep 2017 19:05:58 +0200
Subject: [PATCH 0911/1099] 	 [Security][SecurityBundle] Remove the HTTP
 digest auth

---
 UPGRADE-3.4.md                                |  10 +
 UPGRADE-4.0.md                                |   7 +
 .../Bundle/SecurityBundle/CHANGELOG.md        |   2 +
 .../Security/Factory/HttpDigestFactory.php    |  85 -------
 .../Resources/config/security_listeners.xml   |  11 -
 .../Bundle/SecurityBundle/SecurityBundle.php  |   2 -
 .../CompleteConfigurationTest.php             |   2 -
 .../Fixtures/php/container1.php               |   1 -
 .../Fixtures/php/no_custom_user_checker.php   |   1 -
 .../Fixtures/xml/container1.xml               |   1 -
 .../Fixtures/xml/no_custom_user_checker.xml   |   1 -
 .../Fixtures/yml/container1.yml               |   2 -
 .../Fixtures/yml/no_custom_user_checker.yml   |   2 -
 src/Symfony/Component/Security/CHANGELOG.md   |   2 +
 .../Core/Exception/NonceExpiredException.php  |  30 ---
 .../Resources/translations/security.ar.xlf    |   4 -
 .../Resources/translations/security.az.xlf    |   4 -
 .../Resources/translations/security.bg.xlf    |   4 -
 .../Resources/translations/security.ca.xlf    |   4 -
 .../Resources/translations/security.cs.xlf    |   4 -
 .../Resources/translations/security.da.xlf    |   4 -
 .../Resources/translations/security.de.xlf    |   4 -
 .../Resources/translations/security.el.xlf    |   4 -
 .../Resources/translations/security.en.xlf    |   4 -
 .../Resources/translations/security.es.xlf    |   4 -
 .../Resources/translations/security.fa.xlf    |   4 -
 .../Resources/translations/security.fr.xlf    |   4 -
 .../Resources/translations/security.gl.xlf    |   4 -
 .../Resources/translations/security.he.xlf    |   4 -
 .../Resources/translations/security.hr.xlf    |   4 -
 .../Resources/translations/security.hu.xlf    |   4 -
 .../Resources/translations/security.id.xlf    |   4 -
 .../Resources/translations/security.it.xlf    |   4 -
 .../Resources/translations/security.ja.xlf    |   4 -
 .../Resources/translations/security.lb.xlf    |   4 -
 .../Resources/translations/security.lt.xlf    |   4 -
 .../Resources/translations/security.lv.xlf    |   6 +-
 .../Resources/translations/security.nl.xlf    |   4 -
 .../Resources/translations/security.no.xlf    |   4 -
 .../Resources/translations/security.pl.xlf    |   4 -
 .../Resources/translations/security.pt_BR.xlf |   4 -
 .../Resources/translations/security.pt_PT.xlf |   4 -
 .../Resources/translations/security.ro.xlf    |   4 -
 .../Resources/translations/security.ru.xlf    |   4 -
 .../Resources/translations/security.sk.xlf    |   4 -
 .../Resources/translations/security.sl.xlf    |   4 -
 .../translations/security.sr_Cyrl.xlf         |   4 -
 .../translations/security.sr_Latn.xlf         |   4 -
 .../Resources/translations/security.sv.xlf    |   4 -
 .../Resources/translations/security.th.xlf    |   4 -
 .../Resources/translations/security.tr.xlf    |   4 -
 .../Resources/translations/security.ua.xlf    |   4 -
 .../Resources/translations/security.vi.xlf    |   4 -
 .../Resources/translations/security.zh_CN.xlf |   4 -
 .../DigestAuthenticationEntryPoint.php        |  82 -------
 .../Firewall/DigestAuthenticationListener.php | 219 ------------------
 .../DigestAuthenticationEntryPointTest.php    |  57 -----
 .../DigestAuthenticationListenerTest.php      |  80 -------
 .../Http/Tests/Firewall/DigestDataTest.php    | 185 ---------------
 59 files changed, 22 insertions(+), 918 deletions(-)
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
 delete mode 100644 src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
 delete mode 100644 src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
 delete mode 100644 src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
 delete mode 100644 src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
 delete mode 100644 src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
 delete mode 100644 src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 5f44e9785d03b..61cd356096d41 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -270,6 +270,13 @@ Profiler
 
  * The `profiler.matcher` option has been deprecated.
 
+Security
+--------
+
+ * Deprecated the HTTP digest authentication: `NonceExpiredException`, 
+   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` will be 
+   removed in 4.0. Use another authentication system like `http_basic` instead.
+
 SecurityBundle
 --------------
 
@@ -290,6 +297,9 @@ SecurityBundle
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
+   
+ * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
+   Use another authentication system like `http_basic` instead.
 
 Translation
 -----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 4e567ed50fd11..b416ffb6a75e6 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -652,6 +652,10 @@ Security
  * Calling `ContextListener::setLogoutOnUserChange(false)` won't have any
    effect anymore.
 
+ * Removed the HTTP digest authentication system. The `NonceExpiredException`,
+   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` classes
+   have been removed. Use another authentication system like `http_basic` instead.
+
 SecurityBundle
 --------------
 
@@ -672,6 +676,9 @@ SecurityBundle
 
  * The firewall option `logout_on_user_change` is now always true, which will
    trigger a logout if the user changes between requests.
+   
+ * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
+   has been removed. Use another authentication system like `http_basic` instead.
 
 Serializer
 ----------
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 6e7961d30a294..685560664d88e 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * made the first `UserPasswordEncoderCommand::_construct()` argument mandatory
  * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` anymore
  * removed support for voters that don't implement the `VoterInterface`
+ * removed HTTP digest authentication
 
 3.4.0
 -----
@@ -25,6 +26,7 @@ CHANGELOG
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
+ * deprecated HTTP digest authentication
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
deleted file mode 100644
index bedc87864c235..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
-
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * HttpDigestFactory creates services for HTTP digest authentication.
- *
- * @author Fabien Potencier 
- */
-class HttpDigestFactory implements SecurityFactoryInterface
-{
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
-    {
-        $provider = 'security.authentication.provider.dao.'.$id;
-        $container
-            ->setDefinition($provider, new ChildDefinition('security.authentication.provider.dao'))
-            ->replaceArgument(0, new Reference($userProvider))
-            ->replaceArgument(1, new Reference('security.user_checker.'.$id))
-            ->replaceArgument(2, $id)
-        ;
-
-        // entry point
-        $entryPointId = $this->createEntryPoint($container, $id, $config, $defaultEntryPoint);
-
-        // listener
-        $listenerId = 'security.authentication.listener.digest.'.$id;
-        $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.digest'));
-        $listener->replaceArgument(1, new Reference($userProvider));
-        $listener->replaceArgument(2, $id);
-        $listener->replaceArgument(3, new Reference($entryPointId));
-
-        return array($provider, $listenerId, $entryPointId);
-    }
-
-    public function getPosition()
-    {
-        return 'http';
-    }
-
-    public function getKey()
-    {
-        return 'http-digest';
-    }
-
-    public function addConfiguration(NodeDefinition $node)
-    {
-        $node
-            ->children()
-                ->scalarNode('provider')->end()
-                ->scalarNode('realm')->defaultValue('Secured Area')->end()
-                ->scalarNode('secret')->isRequired()->cannotBeEmpty()->end()
-            ->end()
-        ;
-    }
-
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)
-    {
-        if (null !== $defaultEntryPoint) {
-            return $defaultEntryPoint;
-        }
-
-        $entryPointId = 'security.authentication.digest_entry_point.'.$id;
-        $container
-            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.digest_entry_point'))
-            ->addArgument($config['realm'])
-            ->addArgument($config['secret'])
-        ;
-
-        return $entryPointId;
-    }
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index ab9a587ad7d18..829524c2197d4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -26,8 +26,6 @@
 
         
 
-        
-
         
             
             
@@ -180,15 +178,6 @@
             
         
 
-        
-            
-            
-             
-             
-             
-            
-        
-
         
              
              
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
index 3b8f6dda85580..3fad75f6263ef 100644
--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FormLoginLdapFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\HttpBasicFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\HttpBasicLdapFactory;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\HttpDigestFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\RememberMeFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\X509Factory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\RemoteUserFactory;
@@ -47,7 +46,6 @@ public function build(ContainerBuilder $container)
         $extension->addSecurityListenerFactory(new JsonLoginFactory());
         $extension->addSecurityListenerFactory(new HttpBasicFactory());
         $extension->addSecurityListenerFactory(new HttpBasicLdapFactory());
-        $extension->addSecurityListenerFactory(new HttpDigestFactory());
         $extension->addSecurityListenerFactory(new RememberMeFactory());
         $extension->addSecurityListenerFactory(new X509Factory());
         $extension->addSecurityListenerFactory(new RemoteUserFactory());
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index c7451496d48c2..b567cb197462d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -111,7 +111,6 @@ public function testFirewalls()
                     'remote_user',
                     'form_login',
                     'http_basic',
-                    'http_digest',
                     'remember_me',
                     'anonymous',
                 ),
@@ -165,7 +164,6 @@ public function testFirewalls()
                 'security.authentication.listener.remote_user.secure',
                 'security.authentication.listener.form.secure',
                 'security.authentication.listener.basic.secure',
-                'security.authentication.listener.digest.secure',
                 'security.authentication.listener.rememberme.secure',
                 'security.authentication.listener.anonymous.secure',
                 'security.authentication.switchuser_listener.secure',
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index 581407fcc05a5..3748f05012b87 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -64,7 +64,6 @@
         'simple' => array('pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
             'http_basic' => true,
-            'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
index 91c475418b450..3889752f8f928 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
@@ -15,7 +15,6 @@
         'secure' => array(
             'stateless' => true,
             'http_basic' => true,
-            'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index e5049f2033e51..05c31e1854c93 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -49,7 +49,6 @@
 
         
             
-            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
index 7d648ae1baec2..b97d39adb5a78 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -15,7 +15,6 @@
 
         
             
-            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index a2b57201bfbd2..b016adb851e98 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -46,8 +46,6 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest:
-                secret: TheSecret
             form_login: true
             anonymous: true
             switch_user: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
index 23afa8cd9b3c5..6a196597c51e7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
@@ -10,8 +10,6 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest:
-                secret: TheSecret
             form_login: true
             anonymous: true
             switch_user: true
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 69eeb1d9fd395..abfa98bfad65b 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * removed the `RoleInterface`
  * removed support for voters that don't implement the `VoterInterface`
  * added a sixth `string $context` argument to `LogoutUrlGenerator::registerListener()`
+ * removed HTTP digest authentication
 
 3.4.0
 -----
@@ -20,6 +21,7 @@ CHANGELOG
    property will trigger a deprecation when the user has changed. As of 4.0
    the user will always be logged out when the user has changed between
    requests.
+ * deprecated HTTP digest authentication
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php b/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
deleted file mode 100644
index 998e987e403de..0000000000000
--- a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Exception;
-
-/**
- * NonceExpiredException is thrown when an authentication is rejected because
- * the digest nonce has expired.
- *
- * @author Fabien Potencier 
- * @author Alexander 
- */
-class NonceExpiredException extends AuthenticationException
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getMessageKey()
-    {
-        return 'Digest nonce has expired.';
-    }
-}
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
index fd18ee6ad9faf..49381ba347f6f 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 رمز الموقع غير صحيح.
             
-            
-                Digest nonce has expired.
-                انتهت صلاحية(digest nonce).
-            
             
                 No authentication provider found to support the authentication token.
                 لا يوجد معرف للدخول يدعم الرمز المستخدم للدخول.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
index a974ed0f024c8..d9d5425cefb9c 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Yanlış CSRF nişanı.
             
-            
-                Digest nonce has expired.
-                Dərləmə istifadə müddəti bitib.
-            
             
                 No authentication provider found to support the authentication token.
                 Doğrulama nişanını dəstəkləyəcək provayder tapılmadı.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf
index 06692ea66a843..28c1360eb946e 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Невалиден CSRF токен.
             
-            
-                Digest nonce has expired.
-                Digest nonce е изтекъл.
-            
             
                 No authentication provider found to support the authentication token.
                 Не е открит провайдър, който да поддържа този токен за автентикация.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf
index 7ece2603ae477..b009c6205c362 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF no vàlid.
             
-            
-                Digest nonce has expired.
-                El vector d'inicialització (digest nonce) ha expirat.
-            
             
                 No authentication provider found to support the authentication token.
                 No s'ha trobat un proveïdor d'autenticació que suporti el token d'autenticació.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
index bd146c68049cb..b455779cb6f20 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Neplatný CSRF token.
             
-            
-                Digest nonce has expired.
-                Platnost inicializačního vektoru (digest nonce) vypršela.
-            
             
                 No authentication provider found to support the authentication token.
                 Poskytovatel pro ověřovací token nebyl nalezen.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf
index 2ac41502d2c7f..102c8f1179521 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Ugyldigt CSRF token.
             
-            
-                Digest nonce has expired.
-                Digest nonce er udløbet.
-            
             
                 No authentication provider found to support the authentication token.
                 Ingen godkendelsesudbyder er fundet til understøttelsen af godkendelsestoken.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
index e5946ed4aa42d..093d92d2d1fa9 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Ungültiges CSRF-Token.
             
-            
-                Digest nonce has expired.
-                Digest nonce ist abgelaufen.
-            
             
                 No authentication provider found to support the authentication token.
                 Es wurde kein Authentifizierungs-Provider gefunden, der das Authentifizierungs-Token unterstützt.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf
index 07eabe7ed29e2..02393d0805252 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Μη έγκυρο CSRF token.
             
-            
-                Digest nonce has expired.
-                Το digest nonce έχει λήξει.
-            
             
                 No authentication provider found to support the authentication token.
                 Δε βρέθηκε κάποιος πάροχος πιστοποίησης που να υποστηρίζει το token πιστοποίησης.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf
index 3640698ce9fb3..3c89e44f9380e 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Invalid CSRF token.
             
-            
-                Digest nonce has expired.
-                Digest nonce has expired.
-            
             
                 No authentication provider found to support the authentication token.
                 No authentication provider found to support the authentication token.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
index 00cefbb2dad67..369f11b9b41d4 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF no válido.
             
-            
-                Digest nonce has expired.
-                El vector de inicialización (digest nonce) ha expirado.
-            
             
                 No authentication provider found to support the authentication token.
                 No se encontró un proveedor de autenticación que soporte el token de autenticación.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf
index 0b7629078063c..1b3246feb3d5a 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 توکن CSRF معتبر نیست.
             
-            
-                Digest nonce has expired.
-                Digest nonce منقضی شده است.
-            
             
                 No authentication provider found to support the authentication token.
                 هیچ ارایه کننده تعیین اعتباری برای ساپورت توکن تعیین اعتبار پیدا نشد.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf
index 5a77c6e9ff795..d67dcaefc5029 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Jeton CSRF invalide.
             
-            
-                Digest nonce has expired.
-                Le digest nonce a expiré.
-            
             
                 No authentication provider found to support the authentication token.
                 Aucun fournisseur d'authentification n'a été trouvé pour supporter le jeton d'authentification.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf
index ed6491f7ef97a..ddc838e66af8b 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF non válido.
             
-            
-                Digest nonce has expired.
-                O vector de inicialización (digest nonce) expirou.
-            
             
                 No authentication provider found to support the authentication token.
                 Non se atopou un provedor de autenticación que soporte o token de autenticación.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
index 3640698ce9fb3..3c89e44f9380e 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Invalid CSRF token.
             
-            
-                Digest nonce has expired.
-                Digest nonce has expired.
-            
             
                 No authentication provider found to support the authentication token.
                 No authentication provider found to support the authentication token.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf
index 147b6e311a22f..411a48572a097 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Neispravan CSRF token.
             
-            
-                Digest nonce has expired.
-                Digest nonce je isteko.
-            
             
                 No authentication provider found to support the authentication token.
                 Nije pronađen autentifikacijski provider koji bi podržao autentifikacijski token.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
index 724397038cb66..f3a163904d367 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Érvénytelen CSRF token.
             
-            
-                Digest nonce has expired.
-                A kivonat bélyege (nonce) lejárt.
-            
             
                 No authentication provider found to support the authentication token.
                 Nem található a hitelesítési tokent támogató hitelesítési szolgáltatás.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf
index ab1153b8a27ff..6289481d03265 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF salah.
             
-            
-                Digest nonce has expired.
-                Digest nonce telah berakhir.
-            
             
                 No authentication provider found to support the authentication token.
                 Tidak ditemukan penyedia otentikasi untuk mendukung token otentikasi.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
index 75d81cc8d9312..f2cb0fa48fab5 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 CSRF token non valido.
             
-            
-                Digest nonce has expired.
-                Il numero di autenticazione è scaduto.
-            
             
                 No authentication provider found to support the authentication token.
                 Non è stato trovato un valido fornitore di autenticazione per supportare il token.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
index 6a6b062d946c3..2dad8dee6a927 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 CSRF トークンが無効です。
             
-            
-                Digest nonce has expired.
-                Digest の nonce 値が期限切れです。
-            
             
                 No authentication provider found to support the authentication token.
                 認証トークンをサポートする認証プロバイダーが見つかりません。
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf
index 3dc76d5486883..0a7096caea526 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Ongëltegen CSRF-Token.
             
-            
-                Digest nonce has expired.
-                Den eemolege Schlëssel ass ofgelaf.
-            
             
                 No authentication provider found to support the authentication token.
                 Et gouf keen Authentifizéierungs-Provider fonnt deen den Authentifizéierungs-Token ënnerstëtzt.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf
index da6c332b43829..0b426dcc01f6e 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Neteisingas CSRF raktas.
             
-            
-                Digest nonce has expired.
-                Prieigos kodas yra pasibaigęs.
-            
             
                 No authentication provider found to support the authentication token.
                 Nerastas autentifikacijos tiekėjas, kuris palaikytų autentifikacijos raktą.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf
index 33c48c617461c..0ad9125e711e9 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Nederīgs CSRF talons.
             
-            
-                Digest nonce has expired.
-                Vienreiz lietojamās atslēgas darbības laiks ir beidzies.
-            
             
                 No authentication provider found to support the authentication token.
                 Nav atrasts, autentifikācijas talonu atbalstošs, autentifikācijas sniedzējs.
@@ -68,4 +64,4 @@
             
         
     
-
\ No newline at end of file
+
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
index 8969e9ef8ca69..5160143ab7380 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 CSRF-code is ongeldig.
             
-            
-                Digest nonce has expired.
-                Serverauthenticatiesleutel (digest nonce) is verlopen.
-            
             
                 No authentication provider found to support the authentication token.
                 Geen authenticatieprovider gevonden die de authenticatietoken ondersteunt.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf
index 3635916971476..c5ab83efc5906 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Ugyldig CSRF token.
             
-            
-                Digest nonce has expired.
-                Digest nonce er utløpt.
-            
             
                 No authentication provider found to support the authentication token.
                 Ingen autentiserings tilbyder funnet som støtter gitt autentiserings token.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
index 8d563d21206a9..9940d2940003d 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Nieprawidłowy token CSRF.
             
-            
-                Digest nonce has expired.
-                Kod dostępu wygasł.
-            
             
                 No authentication provider found to support the authentication token.
                 Nie znaleziono mechanizmu uwierzytelniania zdolnego do obsługi przesłanego tokenu.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
index 61685d9f052ea..5981976f167ea 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF inválido.
             
-            
-                Digest nonce has expired.
-                Digest nonce expirado.
-            
             
                 No authentication provider found to support the authentication token.
                 Nenhum provedor de autenticação encontrado para suportar o token de autenticação.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_PT.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_PT.xlf
index f2af13ea3d082..b1a4af5154faa 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_PT.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_PT.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Token CSRF inválido.
             
-            
-                Digest nonce has expired.
-                Digest nonce expirado.
-            
             
                 No authentication provider found to support the authentication token.
                 Nenhum fornecedor de autenticação encontrado para suportar o token de autenticação.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
index 440f11036770d..f35a2bb815878 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Tokenul CSRF este invalid.
             
-            
-                Digest nonce has expired.
-                Tokenul temporar a expirat.
-            
             
                 No authentication provider found to support the authentication token.
                 Nu a fost găsit nici un agent de autentificare pentru tokenul specificat.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
index 1964f95e09a64..3f2690b2d3d7c 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Недействительный токен CSRF.
             
-            
-                Digest nonce has expired.
-                Время действия одноразового ключа дайджеста истекло.
-            
             
                 No authentication provider found to support the authentication token.
                 Не найден провайдер аутентификации, поддерживающий токен аутентификации.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf
index e6552a6a0914e..1447b4ef5a3c8 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Neplatný CSRF token.
             
-            
-                Digest nonce has expired.
-                Platnosť inicializačného vektoru (digest nonce) skončila.
-            
             
                 No authentication provider found to support the authentication token.
                 Poskytovateľ pre overovací token nebol nájdený.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf
index ee70c9aaa4af0..bc171812f8de3 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Neveljaven CSRF žeton.
             
-            
-                Digest nonce has expired.
-                Začasni žeton je potekel.
-            
             
                 No authentication provider found to support the authentication token.
                 Ponudnika avtentikacije za podporo prijavnega žetona ni bilo mogoče najti.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf
index 35e4ddf29b28c..f677254cce202 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Невалидан CSRF токен.
             
-            
-                Digest nonce has expired.
-                Време криптографског кључа је истекло.
-            
             
                 No authentication provider found to support the authentication token.
                 Аутентификациони провајдер за подршку токена није пронађен.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf
index ddc48076a2a6e..a38c75a9f810f 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Nevalidan CSRF token.
             
-            
-                Digest nonce has expired.
-                Vreme kriptografskog ključa je isteklo.
-            
             
                 No authentication provider found to support the authentication token.
                 Autentifikacioni provajder za podršku tokena nije pronađen.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf
index b5f62092365fa..ec3616f58620f 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Ogiltig CSRF-token.
             
-            
-                Digest nonce has expired.
-                Förfallen digest nonce.
-            
             
                 No authentication provider found to support the authentication token.
                 Ingen leverantör för autentisering hittades för angiven autentiseringstoken.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf
index a8cb8d5ce7e3b..84ae66769c611 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 CSRF token ไม่ถูกต้อง
             
-            
-                Digest nonce has expired.
-                Digest nonce หมดอายุ
-            
             
                 No authentication provider found to support the authentication token.
                 ไม่พบ authentication provider ที่รองรับสำหรับ authentication token
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
index 68c44213d18c3..1ffa76e4d4457 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Geçersiz CSRF fişi.
             
-            
-                Digest nonce has expired.
-                Derleme zaman aşımına uğradı.
-            
             
                 No authentication provider found to support the authentication token.
                 Yetkilendirme fişini destekleyecek yetkilendirme sağlayıcısı bulunamadı.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ua.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ua.xlf
index 79721212068db..f60a9c18eb711 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ua.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ua.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Невірний токен CSRF.
             
-            
-                Digest nonce has expired.
-                Закінчився термін дії одноразового ключа дайджесту.
-            
             
                 No authentication provider found to support the authentication token.
                 Не знайдено провайдера автентифікації, що підтримує токен автентифікаціії.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
index b85a43995fc0a..87e20252183f0 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 Mã CSRF không hợp lệ.
             
-            
-                Digest nonce has expired.
-                Mã dùng một lần đã hết hạn.
-            
             
                 No authentication provider found to support the authentication token.
                 Không tìm thấy nhà cung cấp dịch vụ xác thực nào cho mã xác thực mà bạn sử dụng.
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf
index 2d6affecec2cc..460c0ac68bf48 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf
@@ -30,10 +30,6 @@
                 Invalid CSRF token.
                 无效的 CSRF token 。
             
-            
-                Digest nonce has expired.
-                摘要随机串（digest nonce）已过期。
-            
             
                 No authentication provider found to support the authentication token.
                 没有找到支持此 token 的身份验证服务提供方。
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
deleted file mode 100644
index 9dfd5929459fb..0000000000000
--- a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Http\EntryPoint;
-
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Exception\NonceExpiredException;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
-use Psr\Log\LoggerInterface;
-
-/**
- * DigestAuthenticationEntryPoint starts an HTTP Digest authentication.
- *
- * @author Fabien Potencier 
- */
-class DigestAuthenticationEntryPoint implements AuthenticationEntryPointInterface
-{
-    private $secret;
-    private $realmName;
-    private $nonceValiditySeconds;
-    private $logger;
-
-    public function __construct($realmName, $secret, $nonceValiditySeconds = 300, LoggerInterface $logger = null)
-    {
-        $this->realmName = $realmName;
-        $this->secret = $secret;
-        $this->nonceValiditySeconds = $nonceValiditySeconds;
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start(Request $request, AuthenticationException $authException = null)
-    {
-        $expiryTime = microtime(true) + $this->nonceValiditySeconds * 1000;
-        $signatureValue = md5($expiryTime.':'.$this->secret);
-        $nonceValue = $expiryTime.':'.$signatureValue;
-        $nonceValueBase64 = base64_encode($nonceValue);
-
-        $authenticateHeader = sprintf('Digest realm="%s", qop="auth", nonce="%s"', $this->realmName, $nonceValueBase64);
-
-        if ($authException instanceof NonceExpiredException) {
-            $authenticateHeader .= ', stale="true"';
-        }
-
-        if (null !== $this->logger) {
-            $this->logger->debug('WWW-Authenticate header sent.', array('header' => $authenticateHeader));
-        }
-
-        $response = new Response();
-        $response->headers->set('WWW-Authenticate', $authenticateHeader);
-        $response->setStatusCode(401);
-
-        return $response;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSecret()
-    {
-        return $this->secret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRealmName()
-    {
-        return $this->realmName;
-    }
-}
diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
deleted file mode 100644
index 4479a5cae9dc1..0000000000000
--- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
+++ /dev/null
@@ -1,219 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Http\Firewall;
-
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Exception\BadCredentialsException;
-use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\Exception\NonceExpiredException;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-
-/**
- * DigestAuthenticationListener implements Digest HTTP authentication.
- *
- * @author Fabien Potencier 
- */
-class DigestAuthenticationListener implements ListenerInterface
-{
-    private $tokenStorage;
-    private $provider;
-    private $providerKey;
-    private $authenticationEntryPoint;
-    private $logger;
-
-    public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, $providerKey, DigestAuthenticationEntryPoint $authenticationEntryPoint, LoggerInterface $logger = null)
-    {
-        if (empty($providerKey)) {
-            throw new \InvalidArgumentException('$providerKey must not be empty.');
-        }
-
-        $this->tokenStorage = $tokenStorage;
-        $this->provider = $provider;
-        $this->providerKey = $providerKey;
-        $this->authenticationEntryPoint = $authenticationEntryPoint;
-        $this->logger = $logger;
-    }
-
-    /**
-     * Handles digest authentication.
-     *
-     * @param GetResponseEvent $event A GetResponseEvent instance
-     *
-     * @throws AuthenticationServiceException
-     */
-    public function handle(GetResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        if (!$header = $request->server->get('PHP_AUTH_DIGEST')) {
-            return;
-        }
-
-        $digestAuth = new DigestData($header);
-
-        if (null !== $token = $this->tokenStorage->getToken()) {
-            if ($token instanceof UsernamePasswordToken && $token->isAuthenticated() && $token->getUsername() === $digestAuth->getUsername()) {
-                return;
-            }
-        }
-
-        if (null !== $this->logger) {
-            $this->logger->debug('Digest Authorization header received from user agent.', array('header' => $header));
-        }
-
-        try {
-            $digestAuth->validateAndDecode($this->authenticationEntryPoint->getSecret(), $this->authenticationEntryPoint->getRealmName());
-        } catch (BadCredentialsException $e) {
-            $this->fail($event, $request, $e);
-
-            return;
-        }
-
-        try {
-            $user = $this->provider->loadUserByUsername($digestAuth->getUsername());
-
-            if (null === $user) {
-                throw new AuthenticationServiceException('Digest User provider returned null, which is an interface contract violation');
-            }
-
-            $serverDigestMd5 = $digestAuth->calculateServerDigest($user->getPassword(), $request->getMethod());
-        } catch (UsernameNotFoundException $e) {
-            $this->fail($event, $request, new BadCredentialsException(sprintf('Username %s not found.', $digestAuth->getUsername())));
-
-            return;
-        }
-
-        if (!hash_equals($serverDigestMd5, $digestAuth->getResponse())) {
-            if (null !== $this->logger) {
-                $this->logger->debug('Unexpected response from the DigestAuth received; is the header returning a clear text passwords?', array('expected' => $serverDigestMd5, 'received' => $digestAuth->getResponse()));
-            }
-
-            $this->fail($event, $request, new BadCredentialsException('Incorrect response'));
-
-            return;
-        }
-
-        if ($digestAuth->isNonceExpired()) {
-            $this->fail($event, $request, new NonceExpiredException('Nonce has expired/timed out.'));
-
-            return;
-        }
-
-        if (null !== $this->logger) {
-            $this->logger->info('Digest authentication successful.', array('username' => $digestAuth->getUsername(), 'received' => $digestAuth->getResponse()));
-        }
-
-        $this->tokenStorage->setToken(new UsernamePasswordToken($user, $user->getPassword(), $this->providerKey));
-    }
-
-    private function fail(GetResponseEvent $event, Request $request, AuthenticationException $authException)
-    {
-        $token = $this->tokenStorage->getToken();
-        if ($token instanceof UsernamePasswordToken && $this->providerKey === $token->getProviderKey()) {
-            $this->tokenStorage->setToken(null);
-        }
-
-        if (null !== $this->logger) {
-            $this->logger->info('Digest authentication failed.', array('exception' => $authException));
-        }
-
-        $event->setResponse($this->authenticationEntryPoint->start($request, $authException));
-    }
-}
-
-class DigestData
-{
-    private $elements = array();
-    private $header;
-    private $nonceExpiryTime;
-
-    public function __construct($header)
-    {
-        $this->header = $header;
-        preg_match_all('/(\w+)=("((?:[^"\\\\]|\\\\.)+)"|([^\s,$]+))/', $header, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            if (isset($match[1]) && isset($match[3])) {
-                $this->elements[$match[1]] = isset($match[4]) ? $match[4] : $match[3];
-            }
-        }
-    }
-
-    public function getResponse()
-    {
-        return $this->elements['response'];
-    }
-
-    public function getUsername()
-    {
-        return strtr($this->elements['username'], array('\\"' => '"', '\\\\' => '\\'));
-    }
-
-    public function validateAndDecode($entryPointKey, $expectedRealm)
-    {
-        if ($keys = array_diff(array('username', 'realm', 'nonce', 'uri', 'response'), array_keys($this->elements))) {
-            throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s)', $this->header, implode(', ', $keys)));
-        }
-
-        if ('auth' === $this->elements['qop'] && !isset($this->elements['nc'], $this->elements['cnonce'])) {
-            throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header));
-        }
-
-        if ($expectedRealm !== $this->elements['realm']) {
-            throw new BadCredentialsException(sprintf('Response realm name "%s" does not match system realm name of "%s".', $this->elements['realm'], $expectedRealm));
-        }
-
-        if (false === $nonceAsPlainText = base64_decode($this->elements['nonce'])) {
-            throw new BadCredentialsException(sprintf('Nonce is not encoded in Base64; received nonce "%s".', $this->elements['nonce']));
-        }
-
-        $nonceTokens = explode(':', $nonceAsPlainText);
-
-        if (2 !== count($nonceTokens)) {
-            throw new BadCredentialsException(sprintf('Nonce should have yielded two tokens but was "%s".', $nonceAsPlainText));
-        }
-
-        $this->nonceExpiryTime = $nonceTokens[0];
-
-        if (md5($this->nonceExpiryTime.':'.$entryPointKey) !== $nonceTokens[1]) {
-            throw new BadCredentialsException(sprintf('Nonce token compromised "%s".', $nonceAsPlainText));
-        }
-    }
-
-    public function calculateServerDigest($password, $httpMethod)
-    {
-        $a2Md5 = md5(strtoupper($httpMethod).':'.$this->elements['uri']);
-        $a1Md5 = md5($this->elements['username'].':'.$this->elements['realm'].':'.$password);
-
-        $digest = $a1Md5.':'.$this->elements['nonce'];
-        if (!isset($this->elements['qop'])) {
-        } elseif ('auth' === $this->elements['qop']) {
-            $digest .= ':'.$this->elements['nc'].':'.$this->elements['cnonce'].':'.$this->elements['qop'];
-        } else {
-            throw new \InvalidArgumentException(sprintf('This method does not support a qop: "%s".', $this->elements['qop']));
-        }
-        $digest .= ':'.$a2Md5;
-
-        return md5($digest);
-    }
-
-    public function isNonceExpired()
-    {
-        return $this->nonceExpiryTime < microtime(true);
-    }
-}
diff --git a/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php b/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
deleted file mode 100644
index e08570dbbd9fc..0000000000000
--- a/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Http\Tests\EntryPoint;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Exception\NonceExpiredException;
-
-class DigestAuthenticationEntryPointTest extends TestCase
-{
-    public function testStart()
-    {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-
-        $authenticationException = new AuthenticationException('TheAuthenticationExceptionMessage');
-
-        $entryPoint = new DigestAuthenticationEntryPoint('TheRealmName', 'TheSecret');
-        $response = $entryPoint->start($request, $authenticationException);
-
-        $this->assertEquals(401, $response->getStatusCode());
-        $this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
-    }
-
-    public function testStartWithNoException()
-    {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-
-        $entryPoint = new DigestAuthenticationEntryPoint('TheRealmName', 'TheSecret');
-        $response = $entryPoint->start($request);
-
-        $this->assertEquals(401, $response->getStatusCode());
-        $this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}"$/', $response->headers->get('WWW-Authenticate'));
-    }
-
-    public function testStartWithNonceExpiredException()
-    {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-
-        $nonceExpiredException = new NonceExpiredException('TheNonceExpiredExceptionMessage');
-
-        $entryPoint = new DigestAuthenticationEntryPoint('TheRealmName', 'TheSecret');
-        $response = $entryPoint->start($request, $nonceExpiredException);
-
-        $this->assertEquals(401, $response->getStatusCode());
-        $this->assertRegExp('/^Digest realm="TheRealmName", qop="auth", nonce="[a-zA-Z0-9\/+]+={0,2}", stale="true"$/', $response->headers->get('WWW-Authenticate'));
-    }
-}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
deleted file mode 100644
index 495dae4262162..0000000000000
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-calculateServerDigest($username, $realm, $password, $nc, $nonce, $cnonce, $qop, 'GET', $uri);
-
-        $digestData =
-            'username="'.$username.'", realm="'.$realm.'", nonce="'.$nonce.'", '.
-            'uri="'.$uri.'", cnonce="'.$cnonce.'", nc='.$nc.', qop="'.$qop.'", '.
-            'response="'.$serverDigest.'"'
-        ;
-
-        $request = new Request(array(), array(), array(), array(), array(), array('PHP_AUTH_DIGEST' => $digestData));
-
-        $entryPoint = new DigestAuthenticationEntryPoint($realm, $secret);
-
-        $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
-        $user->method('getPassword')->willReturn($password);
-
-        $providerKey = 'TheProviderKey';
-
-        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
-        $tokenStorage
-            ->expects($this->once())
-            ->method('getToken')
-            ->will($this->returnValue(null))
-        ;
-        $tokenStorage
-            ->expects($this->once())
-            ->method('setToken')
-            ->with($this->equalTo(new UsernamePasswordToken($user, $password, $providerKey)))
-        ;
-
-        $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
-        $userProvider->method('loadUserByUsername')->willReturn($user);
-
-        $listener = new DigestAuthenticationListener($tokenStorage, $userProvider, $providerKey, $entryPoint);
-
-        $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->will($this->returnValue($request))
-        ;
-
-        $listener->handle($event);
-    }
-
-    private function calculateServerDigest($username, $realm, $password, $nc, $nonce, $cnonce, $qop, $method, $uri)
-    {
-        $response = md5(
-            md5($username.':'.$realm.':'.$password).':'.$nonce.':'.$nc.':'.$cnonce.':'.$qop.':'.md5($method.':'.$uri)
-        );
-
-        return sprintf('username="%s", realm="%s", nonce="%s", uri="%s", cnonce="%s", nc=%s, qop="%s", response="%s"',
-            $username, $realm, $nonce, $uri, $cnonce, $nc, $qop, $response
-        );
-    }
-}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php
deleted file mode 100644
index 7317e2f83c7cc..0000000000000
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/DigestDataTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Http\Tests\Firewall;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Security\Http\Firewall\DigestData;
-
-class DigestDataTest extends TestCase
-{
-    public function testGetResponse()
-    {
-        $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('b52938fc9e6d7c01be7702ece9031b42', $digestAuth->getResponse());
-    }
-
-    public function testGetUsername()
-    {
-        $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('user', $digestAuth->getUsername());
-    }
-
-    public function testGetUsernameWithQuote()
-    {
-        $digestAuth = new DigestData(
-            'username="\"user\"", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('"user"', $digestAuth->getUsername());
-    }
-
-    public function testGetUsernameWithQuoteAndEscape()
-    {
-        $digestAuth = new DigestData(
-            'username="\"u\\\\\"ser\"", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('"u\\"ser"', $digestAuth->getUsername());
-    }
-
-    public function testGetUsernameWithSingleQuote()
-    {
-        $digestAuth = new DigestData(
-            'username="\"u\'ser\"", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('"u\'ser"', $digestAuth->getUsername());
-    }
-
-    public function testGetUsernameWithSingleQuoteAndEscape()
-    {
-        $digestAuth = new DigestData(
-            'username="\"u\\\'ser\"", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('"u\\\'ser"', $digestAuth->getUsername());
-    }
-
-    public function testGetUsernameWithEscape()
-    {
-        $digestAuth = new DigestData(
-            'username="\"u\\ser\"", realm="Welcome, robot!", '.
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $this->assertEquals('"u\\ser"', $digestAuth->getUsername());
-    }
-
-    /**
-     * @group time-sensitive
-     */
-    public function testValidateAndDecode()
-    {
-        $time = microtime(true);
-        $key = 'ThisIsAKey';
-        $nonce = base64_encode($time.':'.md5($time.':'.$key));
-
-        $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $digestAuth->validateAndDecode($key, 'Welcome, robot!');
-
-        sleep(1);
-
-        $this->assertTrue($digestAuth->isNonceExpired());
-    }
-
-    public function testCalculateServerDigest()
-    {
-        $this->calculateServerDigest('user', 'Welcome, robot!', 'pass,word=password', 'ThisIsAKey', '00000001', 'MDIwODkz', 'auth', 'GET', '/path/info?p1=5&p2=5');
-    }
-
-    public function testCalculateServerDigestWithQuote()
-    {
-        $this->calculateServerDigest('\"user\"', 'Welcome, \"robot\"!', 'pass,word=password', 'ThisIsAKey', '00000001', 'MDIwODkz', 'auth', 'GET', '/path/info?p1=5&p2=5');
-    }
-
-    public function testCalculateServerDigestWithQuoteAndEscape()
-    {
-        $this->calculateServerDigest('\"u\\\\\"ser\"', 'Welcome, \"robot\"!', 'pass,word=password', 'ThisIsAKey', '00000001', 'MDIwODkz', 'auth', 'GET', '/path/info?p1=5&p2=5');
-    }
-
-    public function testCalculateServerDigestEscape()
-    {
-        $this->calculateServerDigest('\"u\\ser\"', 'Welcome, \"robot\"!', 'pass,word=password', 'ThisIsAKey', '00000001', 'MDIwODkz', 'auth', 'GET', '/path/info?p1=5&p2=5');
-        $this->calculateServerDigest('\"u\\ser\\\\\"', 'Welcome, \"robot\"!', 'pass,word=password', 'ThisIsAKey', '00000001', 'MDIwODkz', 'auth', 'GET', '/path/info?p1=5&p2=5');
-    }
-
-    public function testIsNonceExpired()
-    {
-        $time = microtime(true) + 10;
-        $key = 'ThisIsAKey';
-        $nonce = base64_encode($time.':'.md5($time.':'.$key));
-
-        $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", '.
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
-            'response="b52938fc9e6d7c01be7702ece9031b42"'
-        );
-
-        $digestAuth->validateAndDecode($key, 'Welcome, robot!');
-
-        $this->assertFalse($digestAuth->isNonceExpired());
-    }
-
-    protected function setUp()
-    {
-        class_exists('Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener', true);
-    }
-
-    private function calculateServerDigest($username, $realm, $password, $key, $nc, $cnonce, $qop, $method, $uri)
-    {
-        $time = microtime(true);
-        $nonce = base64_encode($time.':'.md5($time.':'.$key));
-
-        $response = md5(
-            md5($username.':'.$realm.':'.$password).':'.$nonce.':'.$nc.':'.$cnonce.':'.$qop.':'.md5($method.':'.$uri)
-        );
-
-        $digest = sprintf('username="%s", realm="%s", nonce="%s", uri="%s", cnonce="%s", nc=%s, qop="%s", response="%s"',
-            $username, $realm, $nonce, $uri, $cnonce, $nc, $qop, $response
-        );
-
-        $digestAuth = new DigestData($digest);
-
-        $this->assertEquals($digestAuth->getResponse(), $digestAuth->calculateServerDigest($password, $method));
-    }
-}

From a8a0a2104929e24e9f0440618d2821ed89ad3969 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Mon, 11 Sep 2017 11:36:05 -0700
Subject: [PATCH 0912/1099] [HttpKernel] removed bundle inheritance

---
 .../Controller/ControllerNameParser.php       |  31 +--
 .../Controller/ControllerNameParserTest.php   |  10 +-
 .../FrameworkExtensionTest.php                |   8 +-
 .../DependencyInjection/TwigExtension.php     |  55 +---
 .../Resources/views/layout.html.twig          |   1 -
 .../Resources/views/layout.html.twig          |   1 -
 .../Resources/views/layout.html.twig          |   1 -
 .../Resources/views/layout.html.twig          |   1 -
 .../DependencyInjection/TwigExtensionTest.php |  39 ---
 .../Component/HttpKernel/Bundle/Bundle.php    |   9 -
 .../HttpKernel/Bundle/BundleInterface.php     |  13 -
 src/Symfony/Component/HttpKernel/Kernel.php   | 108 ++------
 .../Component/HttpKernel/KernelInterface.php  |  12 +-
 .../Component/HttpKernel/Tests/KernelTest.php | 242 +-----------------
 14 files changed, 50 insertions(+), 481 deletions(-)
 delete mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
 delete mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
 delete mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
 delete mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index cf1ebdc128e42..30fa2c352b955 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -52,47 +52,32 @@ public function parse($controller)
         }
 
         $originalController = $controller;
-        list($bundle, $controller, $action) = $parts;
+        list($bundleName, $controller, $action) = $parts;
         $controller = str_replace('/', '\\', $controller);
-        $bundles = array();
 
         try {
             // this throws an exception if there is no such bundle
-            $allBundles = $this->kernel->getBundle($bundle, false, true);
+            $bundle = $this->kernel->getBundle($bundleName);
         } catch (\InvalidArgumentException $e) {
             $message = sprintf(
                 'The "%s" (from the _controller value "%s") does not exist or is not enabled in your kernel!',
-                $bundle,
+                $bundleName,
                 $originalController
             );
 
-            if ($alternative = $this->findAlternative($bundle)) {
+            if ($alternative = $this->findAlternative($bundleName)) {
                 $message .= sprintf(' Did you mean "%s:%s:%s"?', $alternative, $controller, $action);
             }
 
             throw new \InvalidArgumentException($message, 0, $e);
         }
 
-        if (!is_array($allBundles)) {
-            // happens when HttpKernel is version 4+
-            $allBundles = array($allBundles);
+        $try = $bundle->getNamespace().'\\Controller\\'.$controller.'Controller';
+        if (class_exists($try)) {
+            return $try.'::'.$action.'Action';
         }
 
-        foreach ($allBundles as $b) {
-            $try = $b->getNamespace().'\\Controller\\'.$controller.'Controller';
-            if (class_exists($try)) {
-                return $try.'::'.$action.'Action';
-            }
-
-            $bundles[] = $b->getName();
-            $msg = sprintf('The _controller value "%s:%s:%s" maps to a "%s" class, but this class was not found. Create this class or check the spelling of the class and its namespace.', $bundle, $controller, $action, $try);
-        }
-
-        if (count($bundles) > 1) {
-            $msg = sprintf('Unable to find controller "%s:%s" in bundles %s.', $bundle, $controller, implode(', ', $bundles));
-        }
-
-        throw new \InvalidArgumentException($msg);
+        throw new \InvalidArgumentException(sprintf('The _controller value "%s:%s:%s" maps to a "%s" class, but this class was not found. Create this class or check the spelling of the class and its namespace.', $bundleName, $controller, $action, $try));
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
index efe72b5b8029f..0dfed269ec20e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -40,7 +40,6 @@ public function testParse()
 
         $this->assertEquals('TestBundle\FooBundle\Controller\DefaultController::indexAction', $parser->parse('FooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
         $this->assertEquals('TestBundle\FooBundle\Controller\Sub\DefaultController::indexAction', $parser->parse('FooBundle:Sub\Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
-        $this->assertEquals('TestBundle\Fabpot\FooBundle\Controller\DefaultController::indexAction', $parser->parse('SensioFooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
         $this->assertEquals('TestBundle\Sensio\Cms\FooBundle\Controller\DefaultController::indexAction', $parser->parse('SensioCmsFooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
         $this->assertEquals('TestBundle\FooBundle\Controller\Test\DefaultController::indexAction', $parser->parse('FooBundle:Test\\Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
         $this->assertEquals('TestBundle\FooBundle\Controller\Test\DefaultController::indexAction', $parser->parse('FooBundle:Test/Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
@@ -138,7 +137,6 @@ public function getInvalidBundleNameTests()
     {
         return array(
             'Alternative will be found using levenshtein' => array('FoodBundle:Default:index', 'FooBundle:Default:index'),
-            'Alternative will be found using partial match' => array('FabpotFooBund:Default:index', 'FabpotFooBundle:Default:index'),
             'Bundle does not exist at all' => array('CrazyBundle:Default:index', false),
         );
     }
@@ -146,10 +144,8 @@ public function getInvalidBundleNameTests()
     private function createParser()
     {
         $bundles = array(
-            'SensioFooBundle' => array($this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'), $this->getBundle('TestBundle\Sensio\FooBundle', 'SensioFooBundle')),
-            'SensioCmsFooBundle' => array($this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle')),
-            'FooBundle' => array($this->getBundle('TestBundle\FooBundle', 'FooBundle')),
-            'FabpotFooBundle' => array($this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'), $this->getBundle('TestBundle\Sensio\FooBundle', 'SensioFooBundle')),
+            'SensioCmsFooBundle' => $this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle'),
+            'FooBundle' => $this->getBundle('TestBundle\FooBundle', 'FooBundle'),
         );
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
@@ -166,11 +162,9 @@ private function createParser()
         ;
 
         $bundles = array(
-            'SensioFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
             'SensioCmsFooBundle' => $this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle'),
             'FoooooBundle' => $this->getBundle('TestBundle\FooBundle', 'FoooooBundle'),
             'FooBundle' => $this->getBundle('TestBundle\FooBundle', 'FooBundle'),
-            'FabpotFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
         );
         $kernel
             ->expects($this->any())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index f313518dfc24b..8542a2f4f05c6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -605,7 +605,7 @@ public function testValidationPaths()
 
         $container = $this->createContainerFromFile('validation_annotations', array(
             'kernel.bundles' => array('TestBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\TestBundle'),
-            'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/TestBundle')),
+            'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle')),
         ));
 
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
@@ -641,7 +641,7 @@ public function testValidationPathsUsingCustomBundlePath()
 
         $container = $this->createContainerFromFile('validation_annotations', array(
             'kernel.bundles' => array('CustomPathBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\CustomPathBundle'),
-            'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/CustomPathBundle')),
+            'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/CustomPathBundle')),
         ));
 
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
@@ -848,7 +848,7 @@ public function testSerializerCacheDisabled()
 
     public function testSerializerMapping()
     {
-        $container = $this->createContainerFromFile('serializer_mapping', array('kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle', 'parent' => null))));
+        $container = $this->createContainerFromFile('serializer_mapping', array('kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle'))));
         $configDir = __DIR__.'/Fixtures/TestBundle/Resources/config';
         $expectedLoaders = array(
             new Definition(AnnotationLoader::class, array(new Reference('annotation_reader'))),
@@ -980,7 +980,7 @@ protected function createContainer(array $data = array())
     {
         return new ContainerBuilder(new ParameterBag(array_merge(array(
             'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
-            'kernel.bundles_metadata' => array('FrameworkBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..', 'parent' => null)),
+            'kernel.bundles_metadata' => array('FrameworkBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..')),
             'kernel.cache_dir' => __DIR__,
             'kernel.project_dir' => __DIR__,
             'kernel.debug' => false,
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index 408fd802e92c5..e58662406d3a4 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -109,18 +109,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $config['paths']);
         $container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
 
-        $bundleHierarchy = $this->getBundleHierarchy($container, $config);
-
-        foreach ($bundleHierarchy as $name => $bundle) {
+        foreach ($this->getBundleTemplatePaths($container, $config) as $name => $paths) {
             $namespace = $this->normalizeBundleName($name);
-
-            foreach ($bundle['children'] as $child) {
-                foreach ($bundleHierarchy[$child]['paths'] as $path) {
-                    $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
-                }
-            }
-
-            foreach ($bundle['paths'] as $path) {
+            foreach ($paths as $path) {
                 $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
             }
         }
@@ -166,58 +157,24 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerForAutoconfiguration(RuntimeExtensionInterface::class)->addTag('twig.runtime');
     }
 
-    private function getBundleHierarchy(ContainerBuilder $container, array $config)
+    private function getBundleTemplatePaths(ContainerBuilder $container, array $config)
     {
         $bundleHierarchy = array();
-
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
-            if (!array_key_exists($name, $bundleHierarchy)) {
-                $bundleHierarchy[$name] = array(
-                    'paths' => array(),
-                    'parents' => array(),
-                    'children' => array(),
-                );
-            }
-
             if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) {
-                $bundleHierarchy[$name]['paths'][] = $dir;
+                $bundleHierarchy[$name][] = $dir;
             }
             $container->addResource(new FileExistenceResource($dir));
 
             if (file_exists($dir = $container->getParameterBag()->resolveValue($config['default_path']).'/bundles/'.$name)) {
-                $bundleHierarchy[$name]['paths'][] = $dir;
+                $bundleHierarchy[$name][] = $dir;
             }
             $container->addResource(new FileExistenceResource($dir));
 
             if (file_exists($dir = $bundle['path'].'/Resources/views')) {
-                $bundleHierarchy[$name]['paths'][] = $dir;
+                $bundleHierarchy[$name][] = $dir;
             }
             $container->addResource(new FileExistenceResource($dir));
-
-            if (!isset($bundle['parent']) || null === $bundle['parent']) {
-                continue;
-            }
-
-            $bundleHierarchy[$name]['parents'][] = $bundle['parent'];
-
-            if (!array_key_exists($bundle['parent'], $bundleHierarchy)) {
-                $bundleHierarchy[$bundle['parent']] = array(
-                    'paths' => array(),
-                    'parents' => array(),
-                    'children' => array(),
-                );
-            }
-
-            $bundleHierarchy[$bundle['parent']]['children'] = array_merge($bundleHierarchy[$name]['children'], array($name), $bundleHierarchy[$bundle['parent']]['children']);
-
-            foreach ($bundleHierarchy[$bundle['parent']]['parents'] as $parent) {
-                $bundleHierarchy[$name]['parents'][] = $parent;
-                $bundleHierarchy[$parent]['children'] = array_merge($bundleHierarchy[$name]['children'], array($name), $bundleHierarchy[$parent]['children']);
-            }
-
-            foreach ($bundleHierarchy[$name]['children'] as $child) {
-                $bundleHierarchy[$child]['parents'] = array_merge($bundleHierarchy[$child]['parents'], $bundleHierarchy[$name]['parents']);
-            }
         }
 
         return $bundleHierarchy;
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
deleted file mode 100644
index bb07ecfe55a36..0000000000000
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
deleted file mode 100644
index bb07ecfe55a36..0000000000000
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
deleted file mode 100644
index bb07ecfe55a36..0000000000000
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig
deleted file mode 100644
index bb07ecfe55a36..0000000000000
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-This is a layout
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 9d47948d67b77..58756f1e3c8ab 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -188,23 +188,9 @@ public function testTwigLoaderPaths($format)
             array('namespaced_path1', 'namespace1'),
             array('namespaced_path2', 'namespace2'),
             array('namespaced_path3', 'namespace3'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'Twig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'Twig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'Twig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'Twig'),
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'ChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
-            array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
             array(__DIR__.'/Fixtures/Resources/views'),
             array(__DIR__.'/Fixtures/templates'),
         ), $paths);
@@ -284,37 +270,12 @@ private function createContainer()
             'kernel.debug' => false,
             'kernel.bundles' => array(
                 'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
-                'ChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
-                'ChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
-                'ChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
-                'ChildChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
             ),
             'kernel.bundles_metadata' => array(
-                'ChildChildChildChildTwigBundle' => array(
-                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
-                    'parent' => 'ChildChildChildTwigBundle',
-                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle',
-                ),
                 'TwigBundle' => array(
                     'namespace' => 'Symfony\\Bundle\\TwigBundle',
-                    'parent' => null,
                     'path' => realpath(__DIR__.'/../..'),
                 ),
-                'ChildTwigBundle' => array(
-                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
-                    'parent' => 'TwigBundle',
-                    'path' => __DIR__.'/Fixtures/Bundle/ChildTwigBundle',
-                ),
-                'ChildChildChildTwigBundle' => array(
-                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
-                    'parent' => 'ChildChildTwigBundle',
-                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle',
-                ),
-                'ChildChildTwigBundle' => array(
-                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
-                    'parent' => 'ChildTwigBundle',
-                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildTwigBundle',
-                ),
             ),
         )));
 
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
index 609b48fd074a2..4cc4a2a24516b 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -128,15 +128,6 @@ public function getPath()
         return $this->path;
     }
 
-    /**
-     * Returns the bundle parent name.
-     *
-     * @return string|null The Bundle parent name it overrides or null if no parent
-     */
-    public function getParent()
-    {
-    }
-
     /**
      * Returns the bundle name (the class short name).
      *
diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
index f4a160c2fd587..1d58422527feb 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
@@ -48,19 +48,6 @@ public function build(ContainerBuilder $container);
      */
     public function getContainerExtension();
 
-    /**
-     * Returns the bundle name that this bundle overrides.
-     *
-     * Despite its name, this method does not imply any parent/child relationship
-     * between the bundles, just a way to extend and override an existing
-     * bundle.
-     *
-     * @return string The Bundle name it overrides or null if no parent
-     *
-     * @deprecated This method is deprecated as of 3.4 and will be removed in 4.0.
-     */
-    public function getParent();
-
     /**
      * Returns the bundle name (the class short name).
      *
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index f4e677206c7cf..10fe0213e7578 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -50,7 +50,6 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     protected $bundles = array();
 
-    protected $bundleMap;
     protected $container;
     protected $rootDir;
     protected $environment;
@@ -199,26 +198,13 @@ public function getBundles()
     /**
      * {@inheritdoc}
      */
-    public function getBundle($name, $first = true/*, $noDeprecation = false */)
+    public function getBundle($name)
     {
-        $noDeprecation = false;
-        if (func_num_args() >= 3) {
-            $noDeprecation = func_get_arg(2);
-        }
-
-        if (!$first && !$noDeprecation) {
-            @trigger_error(sprintf('Passing "false" as the second argument to %s() is deprecated as of 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        if (!isset($this->bundleMap[$name])) {
+        if (!isset($this->bundles[$name])) {
             throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
         }
 
-        if (true === $first) {
-            return $this->bundleMap[$name][0];
-        }
-
-        return $this->bundleMap[$name];
+        return $this->bundles[$name];
     }
 
     /**
@@ -245,32 +231,27 @@ public function locateResource($name, $dir = null, $first = true)
         $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
         $overridePath = substr($path, 9);
         $resourceBundle = null;
-        $bundles = $this->getBundle($bundleName, false, true);
+        $bundle = $this->getBundle($bundleName);
         $files = array();
 
-        foreach ($bundles as $bundle) {
-            if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
-                if (null !== $resourceBundle) {
-                    throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. Create a "%s" file to override the bundle resource.',
-                        $file,
-                        $resourceBundle,
-                        $dir.'/'.$bundles[0]->getName().$overridePath
-                    ));
-                }
-
-                if ($first) {
-                    return $file;
-                }
-                $files[] = $file;
+        if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
+            if (null !== $resourceBundle) {
+                throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. Create a "%s" file to override the bundle resource.',
+                    $file,
+                    $resourceBundle,
+                    $dir.'/'.$bundles[0]->getName().$overridePath
+                ));
             }
 
-            if (file_exists($file = $bundle->getPath().'/'.$path)) {
-                if ($first && !$isResource) {
-                    return $file;
-                }
-                $files[] = $file;
-                $resourceBundle = $bundle->getName();
+            $files[] = $file;
+        }
+
+        if (file_exists($file = $bundle->getPath().'/'.$path)) {
+            if ($first && !$isResource) {
+                return $file;
             }
+            $files[] = $file;
+            $resourceBundle = $bundle->getName();
         }
 
         if (count($files) > 0) {
@@ -395,68 +376,20 @@ public function getCharset()
     }
 
     /**
-     * Initializes the data structures related to the bundle management.
-     *
-     *  - the bundles property maps a bundle name to the bundle instance,
-     *  - the bundleMap property maps a bundle name to the bundle inheritance hierarchy (most derived bundle first).
+     * Initializes bundles.
      *
      * @throws \LogicException if two bundles share a common name
-     * @throws \LogicException if a bundle tries to extend a non-registered bundle
-     * @throws \LogicException if a bundle tries to extend itself
-     * @throws \LogicException if two bundles extend the same ancestor
      */
     protected function initializeBundles()
     {
         // init bundles
         $this->bundles = array();
-        $topMostBundles = array();
-        $directChildren = array();
-
         foreach ($this->registerBundles() as $bundle) {
             $name = $bundle->getName();
             if (isset($this->bundles[$name])) {
                 throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
             }
             $this->bundles[$name] = $bundle;
-
-            if ($parentName = $bundle->getParent()) {
-                @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-                if (isset($directChildren[$parentName])) {
-                    throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
-                }
-                if ($parentName == $name) {
-                    throw new \LogicException(sprintf('Bundle "%s" can not extend itself.', $name));
-                }
-                $directChildren[$parentName] = $name;
-            } else {
-                $topMostBundles[$name] = $bundle;
-            }
-        }
-
-        // look for orphans
-        if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
-            $diff = array_keys($diff);
-
-            throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
-        }
-
-        // inheritance
-        $this->bundleMap = array();
-        foreach ($topMostBundles as $name => $bundle) {
-            $bundleMap = array($bundle);
-            $hierarchy = array($name);
-
-            while (isset($directChildren[$name])) {
-                $name = $directChildren[$name];
-                array_unshift($bundleMap, $this->bundles[$name]);
-                $hierarchy[] = $name;
-            }
-
-            foreach ($hierarchy as $hierarchyBundle) {
-                $this->bundleMap[$hierarchyBundle] = $bundleMap;
-                array_pop($bundleMap);
-            }
         }
     }
 
@@ -588,7 +521,6 @@ protected function getKernelParameters()
         foreach ($this->bundles as $name => $bundle) {
             $bundles[$name] = get_class($bundle);
             $bundlesMetadata[$name] = array(
-                'parent' => $bundle->getParent(),
                 'path' => $bundle->getPath(),
                 'namespace' => $bundle->getNamespace(),
             );
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
index 9fd3777889289..65c1a17fba779 100644
--- a/src/Symfony/Component/HttpKernel/KernelInterface.php
+++ b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -58,19 +58,15 @@ public function shutdown();
     public function getBundles();
 
     /**
-     * Returns a bundle and optionally its descendants by its name.
+     * Returns a bundle.
      *
-     * The second argument is deprecated as of 3.4 and will be removed in 4.0. This method
-     * will always return an instance of BundleInterface in 4.0.
+     * @param string $name Bundle name
      *
-     * @param string $name  Bundle name
-     * @param bool   $first Whether to return the first bundle only or together with its descendants
-     *
-     * @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false
+     * @return BundleInterface A BundleInterface instance
      *
      * @throws \InvalidArgumentException when the bundle is not enabled
      */
-    public function getBundle($name, $first = true);
+    public function getBundle($name);
 
     /**
      * Returns the file path for a given resource.
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 45529fca33468..352e71f4bdc2d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -331,7 +331,7 @@ public function testLocateResourceThrowsExceptionWhenResourceDoesNotExist()
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $kernel->locateResource('@Bundle1Bundle/config/routing.xml');
@@ -343,80 +343,19 @@ public function testLocateResourceReturnsTheFirstThatMatches()
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt', $kernel->locateResource('@Bundle1Bundle/foo.txt'));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsTheFirstThatMatchesWithParent()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->exactly(2))
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(__DIR__.'/Fixtures/Bundle2Bundle/foo.txt', $kernel->locateResource('@ParentAABundle/foo.txt'));
-        $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/bar.txt', $kernel->locateResource('@ParentAABundle/bar.txt'));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsAllMatches()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Bundle2Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt', ),
-            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsAllMatchesBis()
-    {
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array(
-                $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'),
-                $this->getBundle(__DIR__.'/Foobar'),
-            )))
-        ;
-
-        $this->assertEquals(
-            array(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt'),
-            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false)
-        );
-    }
-
     public function testLocateResourceIgnoresDirOnNonResource()
     {
         $kernel = $this->getKernel(array('getBundle'));
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $this->assertEquals(
@@ -431,7 +370,7 @@ public function testLocateResourceReturnsTheDirOneForResources()
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')))
         ;
 
         $this->assertEquals(
@@ -440,73 +379,13 @@ public function testLocateResourceReturnsTheDirOneForResources()
         );
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
-    {
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle'))))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Resources/Bundle1Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt', ),
-            $kernel->locateResource('@Bundle1Bundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
-        );
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceOverrideBundleAndResourcesFolders()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/BaseBundle', null, 'BaseBundle', 'BaseBundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/ChildBundle', 'ParentBundle', 'ChildBundle', 'ChildBundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->exactly(4))
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
-            __DIR__.'/Fixtures/ChildBundle/Resources/foo.txt',
-            __DIR__.'/Fixtures/BaseBundle/Resources/foo.txt',
-            ),
-            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
-        );
-
-        $this->assertEquals(
-            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
-            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources')
-        );
-
-        try {
-            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', false);
-            $this->fail('Hidden resources should raise an exception when returning an array of matching paths');
-        } catch (\RuntimeException $e) {
-        }
-
-        try {
-            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', true);
-            $this->fail('Hidden resources should raise an exception when returning the first matching path');
-        } catch (\RuntimeException $e) {
-        }
-    }
-
     public function testLocateResourceOnDirectories()
     {
         $kernel = $this->getKernel(array('getBundle'));
         $kernel
             ->expects($this->exactly(2))
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')))
         ;
 
         $this->assertEquals(
@@ -522,7 +401,7 @@ public function testLocateResourceOnDirectories()
         $kernel
             ->expects($this->exactly(2))
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle')))
         ;
 
         $this->assertEquals(
@@ -535,102 +414,6 @@ public function testLocateResourceOnDirectories()
         );
     }
 
-    /**
-     * @group legacy
-     */
-    public function testInitializeBundles()
-    {
-        $parent = $this->getBundle(null, null, 'ParentABundle');
-        $child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($parent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent), $map['ParentABundle']);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testInitializeBundlesSupportInheritanceCascade()
-    {
-        $grandparent = $this->getBundle(null, null, 'GrandParentBBundle');
-        $parent = $this->getBundle(null, 'GrandParentBBundle', 'ParentBBundle');
-        $child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($grandparent, $parent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentBBundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentBBundle']);
-        $this->assertEquals(array($child), $map['ChildBBundle']);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.
-     */
-    public function testInitializeBundlesThrowsExceptionWhenAParentDoesNotExists()
-    {
-        $child = $this->getBundle(null, 'FooBar', 'ChildCBundle');
-        $kernel = $this->getKernel(array(), array($child));
-        $kernel->boot();
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
-    {
-        $grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
-        $parent = $this->getBundle(null, 'GrandParentCBundle', 'ParentCBundle');
-        $child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($parent, $grandparent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentCBundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentCBundle']);
-        $this->assertEquals(array($child), $map['ChildCBundle']);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".
-     */
-    public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtendedByTwoBundles()
-    {
-        $parent = $this->getBundle(null, null, 'ParentCBundle');
-        $child1 = $this->getBundle(null, 'ParentCBundle', 'ChildC1Bundle');
-        $child2 = $this->getBundle(null, 'ParentCBundle', 'ChildC2Bundle');
-
-        $kernel = $this->getKernel(array(), array($parent, $child1, $child2));
-        $kernel->boot();
-    }
-
     /**
      * @group legacy
      * @expectedException \LogicException
@@ -645,19 +428,6 @@ public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWith
         $kernel->boot();
     }
 
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "CircularRefBundle" can not extend itself.
-     */
-    public function testInitializeBundleThrowsExceptionWhenABundleExtendsItself()
-    {
-        $circularRef = $this->getBundle(null, 'CircularRefBundle', 'CircularRefBundle');
-
-        $kernel = $this->getKernel(array(), array($circularRef));
-        $kernel->boot();
-    }
-
     public function testTerminateReturnsSilentlyIfKernelIsNotBooted()
     {
         $kernel = $this->getKernel(array('getHttpKernel'));

From e17206debdb6079569124ae198916725ddd69b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Mon, 12 Jun 2017 16:39:22 +0200
Subject: [PATCH 0913/1099] [PhpUnitBridge] Added a CoverageListener to enhance
 the code coverage report

---
 src/Symfony/Bridge/PhpUnit/CHANGELOG.md       |   5 +
 .../Bridge/PhpUnit/CoverageListener.php       |  44 +++++++
 .../PhpUnit/Legacy/CoverageListener.php       |  35 ++++++
 .../PhpUnit/Legacy/CoverageListenerTrait.php  | 113 ++++++++++++++++++
 .../PhpUnit/Tests/CoverageListenerTest.php    |  35 ++++++
 .../coverage/phpunit-with-listener.xml.dist   |  32 +++++
 .../phpunit-without-listener.xml.dist         |  23 ++++
 .../Tests/Fixtures/coverage/src/Bar.php       |  29 +++++
 .../Tests/Fixtures/coverage/src/Foo.php       |  20 ++++
 .../Tests/Fixtures/coverage/tests/BarTest.php |  29 +++++
 .../coverage/tests/CoversDefaultClassTest.php |  23 ++++
 .../coverage/tests/CoversNothingTest.php      |  23 ++++
 .../Fixtures/coverage/tests/CoversTest.php    |  23 ++++
 .../coverage/tests/SutNotFindTest.php         |  20 ++++
 .../Fixtures/coverage/tests/bootstrap.php     |  19 +++
 15 files changed, 473 insertions(+)
 create mode 100644 src/Symfony/Bridge/PhpUnit/CoverageListener.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Legacy/CoverageListener.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-with-listener.xml.dist
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-without-listener.xml.dist
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversDefaultClassTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversNothingTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php

diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
index 1cb07da782b6d..39ae3a881b3b1 100644
--- a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
+++ b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * added a `CoverageListener` to enhance the code coverage report
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Bridge/PhpUnit/CoverageListener.php b/src/Symfony/Bridge/PhpUnit/CoverageListener.php
new file mode 100644
index 0000000000000..e6b4e7ec98b8b
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/CoverageListener.php
@@ -0,0 +1,44 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit;
+
+use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\Test;
+use Symfony\Bridge\PhpUnit\Legacy\CoverageListenerTrait;
+
+if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
+    class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListener', 'Symfony\Bridge\PhpUnit\CoverageListener');
+// Using an early return instead of a else does not work when using the PHPUnit
+// phar due to some weird PHP behavior (the class gets defined without executing
+// the code before it and so the definition is not properly conditional)
+} else {
+    /**
+     * CoverageListener adds `@covers ` on each test suite when possible
+     * to make the code coverage more accurate.
+     *
+     * @author Grégoire Pineau 
+     */
+    class CoverageListener extends BaseTestListener
+    {
+        private $trait;
+
+        public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
+        {
+            $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
+        }
+
+        public function startTest(Test $test)
+        {
+            $this->trait->startTest($test);
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListener.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListener.php
new file mode 100644
index 0000000000000..0227828515760
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListener.php
@@ -0,0 +1,35 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * CoverageListener adds `@covers ` on each test suite when possible
+ * to make the code coverage more accurate.
+ *
+ * @author Grégoire Pineau 
+ *
+ * @internal
+ */
+class CoverageListener extends \PHPUnit_Framework_BaseTestListener
+{
+    private $trait;
+
+    public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
+    {
+        $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
+    }
+
+    public function startTest(\PHPUnit_Framework_Test $test)
+    {
+        $this->trait->startTest($test);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
new file mode 100644
index 0000000000000..0a1603e646cbf
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
@@ -0,0 +1,113 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\Warning;
+
+/**
+ * PHP 5.3 compatible trait-like shared implementation.
+ *
+ * @author Grégoire Pineau 
+ *
+ * @internal
+ */
+class CoverageListenerTrait
+{
+    private $sutFqcnResolver;
+    private $warningOnSutNotFound;
+    private $warnings;
+
+    public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
+    {
+        $this->sutFqcnResolver = $sutFqcnResolver;
+        $this->warningOnSutNotFound = $warningOnSutNotFound;
+        $this->warnings = array();
+    }
+
+    public function startTest($test)
+    {
+        $annotations = $test->getAnnotations();
+
+        $ignoredAnnotations = array('covers', 'coversDefaultClass', 'coversNothing');
+
+        foreach ($ignoredAnnotations as $annotation) {
+            if (isset($annotations['class'][$annotation]) || isset($annotations['method'][$annotation])) {
+                return;
+            }
+        }
+
+        $sutFqcn = $this->findSutFqcn($test);
+        if (!$sutFqcn) {
+            if ($this->warningOnSutNotFound) {
+                $message = 'Could not find the tested class.';
+                // addWarning does not exist on old PHPUnit version
+                if (method_exists($test->getTestResultObject(), 'addWarning') && class_exists(Warning::class)) {
+                    $test->getTestResultObject()->addWarning($test, new Warning($message), 0);
+                } else {
+                    $this->warnings[] = sprintf("%s::%s\n%s", get_class($test), $test->getName(), $message);
+                }
+            }
+
+            return;
+        }
+
+        $testClass = \PHPUnit\Util\Test::class;
+        if (!class_exists($testClass, false)) {
+            $testClass = \PHPUnit_Util_Test::class;
+        }
+
+        $r = new \ReflectionProperty($testClass, 'annotationCache');
+        $r->setAccessible(true);
+
+        $cache = $r->getValue();
+        $cache = array_replace_recursive($cache, array(
+            get_class($test) => array(
+                'covers' => array($sutFqcn),
+            ),
+        ));
+        $r->setValue($testClass, $cache);
+    }
+
+    private function findSutFqcn($test)
+    {
+        if ($this->sutFqcnResolver) {
+            $resolver = $this->sutFqcnResolver;
+
+            return $resolver($test);
+        }
+
+        $class = get_class($test);
+
+        $sutFqcn = str_replace('\\Tests\\', '\\', $class);
+        $sutFqcn = preg_replace('{Test$}', '', $sutFqcn);
+
+        if (!class_exists($sutFqcn)) {
+            return;
+        }
+
+        return $sutFqcn;
+    }
+
+    public function __destruct()
+    {
+        if (!$this->warnings) {
+            return;
+        }
+
+        echo "\n";
+
+        foreach ($this->warnings as $key => $warning) {
+            echo sprintf("%d) %s\n", ++$key, $warning);
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
new file mode 100644
index 0000000000000..216b860a4bc2c
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -0,0 +1,35 @@
+markTestSkipped('This test cannot be run on Windows.');
+        }
+
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('This test cannot be run on HHVM.');
+        }
+
+        $dir = __DIR__.'/../Tests/Fixtures/coverage';
+        $php = PHP_BINARY;
+        $phpunit = $_SERVER['argv'][0];
+
+        exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text", $output);
+        $output = implode("\n", $output);
+        $this->assertContains('Foo', $output);
+
+        exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text", $output);
+        $output = implode("\n", $output);
+        $this->assertNotContains('Foo', $output);
+        $this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
+        $this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
+        $this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
+        $this->assertNotContains("CoversNothingTest::test\nCould not find the tested class.", $output);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-with-listener.xml.dist b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-with-listener.xml.dist
new file mode 100644
index 0000000000000..1984359ebdd78
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-with-listener.xml.dist
@@ -0,0 +1,32 @@
+
+
+
+
+    
+        
+            tests
+        
+    
+
+    
+        
+            src
+        
+    
+
+    
+        
+            
+                
+                true
+            
+        
+    
+
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-without-listener.xml.dist b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-without-listener.xml.dist
new file mode 100644
index 0000000000000..6201535933767
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-without-listener.xml.dist
@@ -0,0 +1,23 @@
+
+
+
+
+    
+        
+            tests
+        
+    
+
+    
+        
+            src
+        
+    
+
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
new file mode 100644
index 0000000000000..b50305a402634
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PhpUnitCoverageTest;
+
+class Bar
+{
+    private $foo;
+
+    public function __construct(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+
+    public function barZ()
+    {
+        $this->foo->fooZ();
+
+        return 'bar';
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
new file mode 100644
index 0000000000000..f811ae70b10a0
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
@@ -0,0 +1,20 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PhpUnitCoverageTest;
+
+class Foo
+{
+    public function fooZ()
+    {
+        return 'foo';
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
new file mode 100644
index 0000000000000..b49fc706a9cfa
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PhpUnitCoverageTest\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class BarTest extends TestCase
+{
+    public function testBar()
+    {
+        if (!class_exists('PhpUnitCoverageTest\Foo')) {
+            $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
+        }
+
+        $foo = new \PhpUnitCoverageTest\Foo();
+        $bar = new \PhpUnitCoverageTest\Bar($foo);
+
+        $this->assertSame('bar', $bar->barZ());
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversDefaultClassTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversDefaultClassTest.php
new file mode 100644
index 0000000000000..d764638d04958
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversDefaultClassTest.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @coversDefaultClass \DateTime
+ */
+class CoversDefaultClassTest extends TestCase
+{
+    public function test()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversNothingTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversNothingTest.php
new file mode 100644
index 0000000000000..e60ea97e57bbd
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversNothingTest.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @coversNothing
+ */
+class CoversNothingTest extends TestCase
+{
+    public function test()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversTest.php
new file mode 100644
index 0000000000000..f6d3406046d86
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversTest.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+
+class CoversTest extends TestCase
+{
+    /**
+     * @covers \DateTime
+     */
+    public function test()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php
new file mode 100644
index 0000000000000..934ee77dc1873
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php
@@ -0,0 +1,20 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+
+class SutNotFoundTest extends TestCase
+{
+    public function test()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
new file mode 100644
index 0000000000000..9647a8658d212
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
@@ -0,0 +1,19 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require __DIR__.'/../src/Bar.php';
+require __DIR__.'/../src/Foo.php';
+
+require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
+if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
+    require __DIR__.'/../../../../Legacy/CoverageListener.php';
+}
+require __DIR__.'/../../../../CoverageListener.php';

From 4adadbeffa03c3f15fb4d9a14e3e105c38aab033 Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Wed, 27 Sep 2017 09:53:29 +0200
Subject: [PATCH 0914/1099] Remove unused http_digest fixtures

---
 .../Fixtures/php/container1_with_digest.php   | 105 ------------------
 .../Fixtures/xml/container1_with_digest.xml   |  82 --------------
 .../Fixtures/yml/container1_with_digest.yml   |  85 --------------
 3 files changed, 272 deletions(-)
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
deleted file mode 100644
index 581407fcc05a5..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-loadFromExtension('security', array(
-    'acl' => array(),
-    'encoders' => array(
-        'JMS\FooBundle\Entity\User1' => 'plaintext',
-        'JMS\FooBundle\Entity\User2' => array(
-            'algorithm' => 'sha1',
-            'encode_as_base64' => false,
-            'iterations' => 5,
-        ),
-        'JMS\FooBundle\Entity\User3' => array(
-            'algorithm' => 'md5',
-        ),
-        'JMS\FooBundle\Entity\User4' => array(
-            'id' => 'security.encoder.foo',
-        ),
-        'JMS\FooBundle\Entity\User5' => array(
-            'algorithm' => 'pbkdf2',
-            'hash_algorithm' => 'sha1',
-            'encode_as_base64' => false,
-            'iterations' => 5,
-            'key_length' => 30,
-        ),
-        'JMS\FooBundle\Entity\User6' => array(
-            'algorithm' => 'bcrypt',
-            'cost' => 15,
-        ),
-    ),
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-        'digest' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER, ROLE_ADMIN'),
-                ),
-            ),
-        ),
-        'basic' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => 'ROLE_SUPER_ADMIN'),
-                    'bar' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => array('ROLE_USER', 'ROLE_ADMIN')),
-                ),
-            ),
-        ),
-        'service' => array(
-            'id' => 'user.manager',
-        ),
-        'chain' => array(
-            'chain' => array(
-                'providers' => array('service', 'basic'),
-            ),
-        ),
-    ),
-
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-        'secure' => array('stateless' => true,
-            'http_basic' => true,
-            'http_digest' => array('secret' => 'TheSecret'),
-            'form_login' => true,
-            'anonymous' => true,
-            'switch_user' => true,
-            'x509' => true,
-            'remote_user' => true,
-            'logout' => true,
-            'remember_me' => array('secret' => 'TheSecret'),
-            'user_checker' => null,
-            'logout_on_user_change' => true,
-        ),
-        'host' => array(
-            'pattern' => '/test',
-            'host' => 'foo\\.example\\.org',
-            'methods' => array('GET', 'POST'),
-            'anonymous' => true,
-            'http_basic' => true,
-            'logout_on_user_change' => true,
-        ),
-        'with_user_checker' => array(
-            'user_checker' => 'app.user_checker',
-            'anonymous' => true,
-            'http_basic' => true,
-            'logout_on_user_change' => true,
-        ),
-    ),
-
-    'access_control' => array(
-        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https', 'methods' => array('get', 'POST')),
-        array('path' => '/blog/.*', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
-        array('path' => '/blog/524', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'allow_if' => "token.getUsername() matches '/^admin/'"),
-    ),
-
-    'role_hierarchy' => array(
-        'ROLE_ADMIN' => 'ROLE_USER',
-        'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
-        'ROLE_REMOTE' => 'ROLE_USER,ROLE_ADMIN',
-    ),
-));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
deleted file mode 100644
index e5049f2033e51..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-    
-        
-
-        
-
-        
-
-        
-
-        
-
-        
-
-        
-
-        
-            
-                
-            
-        
-
-        
-            
-                
-            
-        
-
-        
-            
-                
-                
-            
-        
-
-        
-
-        
-            
-        
-
-        
-
-        
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-        
-
-        
-            
-            
-        
-
-        
-            
-            
-            app.user_checker
-        
-
-        ROLE_USER
-        ROLE_USER,ROLE_ADMIN,ROLE_ALLOWED_TO_SWITCH
-        ROLE_USER,ROLE_ADMIN
-
-        
-        
-        
-    
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
deleted file mode 100644
index a2b57201bfbd2..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-security:
-    acl: ~
-    encoders:
-        JMS\FooBundle\Entity\User1: plaintext
-        JMS\FooBundle\Entity\User2:
-            algorithm: sha1
-            encode_as_base64: false
-            iterations: 5
-        JMS\FooBundle\Entity\User3:
-            algorithm: md5
-        JMS\FooBundle\Entity\User4:
-            id: security.encoder.foo
-        JMS\FooBundle\Entity\User5:
-            algorithm: pbkdf2
-            hash_algorithm: sha1
-            encode_as_base64: false
-            iterations: 5
-            key_length: 30
-        JMS\FooBundle\Entity\User6:
-            algorithm: bcrypt
-            cost: 15
-
-    providers:
-        default:
-            memory:
-                users:
-                    foo: { password: foo, roles: ROLE_USER }
-        digest:
-            memory:
-                users:
-                    foo: { password: foo, roles: 'ROLE_USER, ROLE_ADMIN' }
-        basic:
-            memory:
-                users:
-                    foo: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: ROLE_SUPER_ADMIN }
-                    bar: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: [ROLE_USER, ROLE_ADMIN] }
-        service:
-            id: user.manager
-        chain:
-            chain:
-                providers: [service, basic]
-
-
-    firewalls:
-        simple: { pattern: /login, security: false }
-        secure:
-            stateless: true
-            http_basic: true
-            http_digest:
-                secret: TheSecret
-            form_login: true
-            anonymous: true
-            switch_user: true
-            x509: true
-            remote_user: true
-            logout: true
-            remember_me:
-                secret: TheSecret
-            user_checker: ~
-
-        host:
-            pattern: /test
-            host: foo\.example\.org
-            methods: [GET,POST]
-            anonymous: true
-            http_basic: true
-            logout_on_user_change: true
-
-        with_user_checker:
-            anonymous: ~
-            http_basic: ~
-            user_checker: app.user_checker
-            logout_on_user_change: true
-
-    role_hierarchy:
-        ROLE_ADMIN:       ROLE_USER
-        ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
-        ROLE_REMOTE:      ROLE_USER,ROLE_ADMIN
-
-    access_control:
-        - { path: /blog/524, role: ROLE_USER, requires_channel: https, methods: [get, POST]}
-        -
-            path: /blog/.*
-            role: IS_AUTHENTICATED_ANONYMOUSLY
-        - { path: /blog/524, role: IS_AUTHENTICATED_ANONYMOUSLY, allow_if: "token.getUsername() matches '/^admin/'" }

From a867ca1d0c8f5384ef18761178b17cc8b0d6d331 Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Wed, 27 Sep 2017 09:59:35 +0200
Subject: [PATCH 0915/1099] [SecurityBundle] Remove ACL related code

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |   3 +
 .../SecurityBundle/Command/InitAclCommand.php | 113 ----------
 .../SecurityBundle/Command/SetAclCommand.php  | 202 ------------------
 .../DependencyInjection/MainConfiguration.php |  42 ----
 .../DependencyInjection/SecurityExtension.php |  60 ------
 .../Resources/config/console.xml              |  11 -
 .../CompleteConfigurationTest.php             |  38 ----
 .../Fixtures/php/container1_with_acl.php      | 101 ---------
 .../Fixtures/xml/container1_with_acl.xml      |  80 -------
 .../Fixtures/yml/container1_with_acl.yml      |  81 -------
 .../Tests/Functional/SetAclCommandTest.php    | 177 ---------------
 11 files changed, 3 insertions(+), 905 deletions(-)
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index d5f167f7aeb5e..b5b0f6ec6124e 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -10,6 +10,9 @@ CHANGELOG
  * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` anymore
  * removed support for voters that don't implement the `VoterInterface`
  * removed HTTP digest authentication
+ * removed command `acl:set` along with `SetAclCommand` class
+ * removed command `init:acl` along with `InitAclCommand` class
+ * removed `acl` configuration key and related services, use symfony/acl-bundle instead
 
 3.4.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
deleted file mode 100644
index 42e4f8825d888..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\Command;
-
-@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), E_USER_DEPRECATED);
-
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Security\Acl\Dbal\Schema;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Schema\SchemaException;
-
-/**
- * Installs the tables required by the ACL system.
- *
- * @author Johannes M. Schmitt 
- *
- * @deprecated since version 3.4, to be removed in 4.0. See Symfony\Bundle\AclBundle\Command\SetAclCommand instead.
- */
-class InitAclCommand extends ContainerAwareCommand
-{
-    protected static $defaultName = 'init:acl';
-
-    private $connection;
-    private $schema;
-
-    public function __construct($connection = null, Schema $schema = null)
-    {
-        if (!$connection instanceof Connection) {
-            parent::__construct($connection);
-
-            return;
-        }
-
-        parent::__construct();
-
-        $this->connection = $connection;
-        $this->schema = $schema;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        if (!$this->connection && !$this->getContainer()->has('security.acl.dbal.connection')) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-            ->setDescription('Mounts ACL tables in the database')
-            ->setHelp(<<<'EOF'
-The %command.name% command mounts ACL tables in the database.
-
-  php %command.full_name%
-
-The name of the DBAL connection must be configured in your app/config/security.yml configuration file in the security.acl.connection variable.
-
-  security:
-      acl:
-          connection: default
-EOF
-            )
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        (new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output))->warning('Command "init:acl" is deprecated since version 3.4 and will be removed from SecurityBundle in 4.0. Install symfony/acl-bundle and use "acl:init" instead.');
-
-        if (null === $this->connection) {
-            $this->connection = $this->getContainer()->get('security.acl.dbal.connection');
-            $this->schema = $this->getContainer()->get('security.acl.dbal.schema');
-        }
-
-        try {
-            $this->schema->addToSchema($this->connection->getSchemaManager()->createSchema());
-        } catch (SchemaException $e) {
-            $output->writeln('Aborting: '.$e->getMessage());
-
-            return 1;
-        }
-
-        foreach ($this->schema->toSql($this->connection->getDatabasePlatform()) as $sql) {
-            $this->connection->exec($sql);
-        }
-
-        $output->writeln('ACL tables have been initialized successfully.');
-    }
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
deleted file mode 100644
index c0c51eff4e8c7..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
+++ /dev/null
@@ -1,202 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\Command;
-
-@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), E_USER_DEPRECATED);
-
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
-use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
-use Symfony\Component\Security\Acl\Exception\AclAlreadyExistsException;
-use Symfony\Component\Security\Acl\Permission\MaskBuilder;
-use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface;
-
-/**
- * Sets ACL for objects.
- *
- * @author Kévin Dunglas 
- *
- * @deprecated since version 3.4, to be removed in 4.0. See Symfony\Bundle\AclBundle\Command\SetAclCommand instead.
- */
-class SetAclCommand extends ContainerAwareCommand
-{
-    protected static $defaultName = 'acl:set';
-
-    private $provider;
-
-    /**
-     * @param MutableAclProviderInterface $provider
-     */
-    public function __construct($provider = null)
-    {
-        if (!$provider instanceof MutableAclProviderInterface) {
-            parent::__construct($provider);
-
-            return;
-        }
-
-        parent::__construct();
-
-        $this->provider = $provider;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        if (null !== $this->provider) {
-            return parent::isEnabled();
-        }
-        if (!$this->getContainer()->has('security.acl.provider')) {
-            return false;
-        }
-
-        $provider = $this->getContainer()->get('security.acl.provider');
-        if (!$provider instanceof MutableAclProviderInterface) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-            ->setDescription('Sets ACL for objects')
-            ->setHelp(<<%command.name% command sets ACL.
-The ACL system must have been initialized with the init:acl command.
-
-To set VIEW and EDIT permissions for the user kevin on the instance of
-Acme\MyClass having the identifier 42:
-
-  php %command.full_name% --user=Symfony/Component/Security/Core/User/User:kevin VIEW EDIT Acme/MyClass:42
-
-Note that you can use / instead of \\ for the namespace delimiter to avoid any
-problem.
-
-To set permissions for a role, use the --role option:
-
-  php %command.full_name% --role=ROLE_USER VIEW Acme/MyClass:1936
-
-To set permissions at the class scope, use the --class-scope option:
-
-  php %command.full_name% --class-scope --user=Symfony/Component/Security/Core/User/User:anne OWNER Acme/MyClass:42
-  
-EOF
-            )
-            ->addArgument('arguments', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of permissions and object identities (class name and ID separated by a column)')
-            ->addOption('user', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A list of security identities')
-            ->addOption('role', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A list of roles')
-            ->addOption('class-scope', null, InputOption::VALUE_NONE, 'Use class-scope entries')
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        (new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output))->warning('Command "acl:set" is deprecated since version 3.4 and will be removed from SecurityBundle in 4.0. Install symfony/acl-bundle to use this command.');
-
-        if (null === $this->provider) {
-            $this->provider = $this->getContainer()->get('security.acl.provider');
-        }
-
-        // Parse arguments
-        $objectIdentities = array();
-        $maskBuilder = $this->getMaskBuilder();
-        foreach ($input->getArgument('arguments') as $argument) {
-            $data = explode(':', $argument, 2);
-
-            if (count($data) > 1) {
-                $objectIdentities[] = new ObjectIdentity($data[1], strtr($data[0], '/', '\\'));
-            } else {
-                $maskBuilder->add($data[0]);
-            }
-        }
-
-        // Build permissions mask
-        $mask = $maskBuilder->get();
-
-        $userOption = $input->getOption('user');
-        $roleOption = $input->getOption('role');
-        $classScopeOption = $input->getOption('class-scope');
-
-        if (empty($userOption) && empty($roleOption)) {
-            throw new \InvalidArgumentException('A Role or a User must be specified.');
-        }
-
-        // Create security identities
-        $securityIdentities = array();
-
-        if ($userOption) {
-            foreach ($userOption as $user) {
-                $data = explode(':', $user, 2);
-
-                if (1 === count($data)) {
-                    throw new \InvalidArgumentException('The user must follow the format "Acme/MyUser:username".');
-                }
-
-                $securityIdentities[] = new UserSecurityIdentity($data[1], strtr($data[0], '/', '\\'));
-            }
-        }
-
-        if ($roleOption) {
-            foreach ($roleOption as $role) {
-                $securityIdentities[] = new RoleSecurityIdentity($role);
-            }
-        }
-
-        // Sets ACL
-        foreach ($objectIdentities as $objectIdentity) {
-            // Creates a new ACL if it does not already exist
-            try {
-                $this->provider->createAcl($objectIdentity);
-            } catch (AclAlreadyExistsException $e) {
-            }
-
-            $acl = $this->provider->findAcl($objectIdentity, $securityIdentities);
-
-            foreach ($securityIdentities as $securityIdentity) {
-                if ($classScopeOption) {
-                    $acl->insertClassAce($securityIdentity, $mask);
-                } else {
-                    $acl->insertObjectAce($securityIdentity, $mask);
-                }
-            }
-
-            $this->provider->updateAcl($acl);
-        }
-    }
-
-    /**
-     * Gets the mask builder.
-     *
-     * @return MaskBuilder
-     */
-    protected function getMaskBuilder()
-    {
-        return new MaskBuilder();
-    }
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 533b52cd4b1c6..078817b3be97e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -106,7 +106,6 @@ public function getConfigTreeBuilder()
             ->end()
         ;
 
-        $this->addAclSection($rootNode);
         $this->addEncodersSection($rootNode);
         $this->addProvidersSection($rootNode);
         $this->addFirewallsSection($rootNode, $this->factories);
@@ -116,47 +115,6 @@ public function getConfigTreeBuilder()
         return $tb;
     }
 
-    private function addAclSection(ArrayNodeDefinition $rootNode)
-    {
-        $rootNode
-            ->children()
-                ->arrayNode('acl')
-                    ->setDeprecated('The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.')
-                    ->children()
-                        ->scalarNode('connection')
-                            ->defaultNull()
-                            ->info('any name configured in doctrine.dbal section')
-                        ->end()
-                        ->arrayNode('cache')
-                            ->addDefaultsIfNotSet()
-                            ->children()
-                                ->scalarNode('id')->end()
-                                ->scalarNode('prefix')->defaultValue('sf2_acl_')->end()
-                            ->end()
-                        ->end()
-                        ->scalarNode('provider')->end()
-                        ->arrayNode('tables')
-                            ->addDefaultsIfNotSet()
-                            ->children()
-                                ->scalarNode('class')->defaultValue('acl_classes')->end()
-                                ->scalarNode('entry')->defaultValue('acl_entries')->end()
-                                ->scalarNode('object_identity')->defaultValue('acl_object_identities')->end()
-                                ->scalarNode('object_identity_ancestors')->defaultValue('acl_object_identity_ancestors')->end()
-                                ->scalarNode('security_identity')->defaultValue('acl_security_identities')->end()
-                            ->end()
-                        ->end()
-                        ->arrayNode('voter')
-                            ->addDefaultsIfNotSet()
-                            ->children()
-                                ->booleanNode('allow_if_object_identity_unavailable')->defaultTrue()->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-        ;
-    }
-
     private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 9462575f3453e..b727c699da4b2 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
 
-use Symfony\Bundle\SecurityBundle\Command\InitAclCommand;
-use Symfony\Bundle\SecurityBundle\Command\SetAclCommand;
 use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
@@ -113,68 +111,10 @@ public function load(array $configs, ContainerBuilder $container)
             $container->getDefinition(UserPasswordEncoderCommand::class)->replaceArgument(1, array_keys($config['encoders']));
         }
 
-        // load ACL
-        if (isset($config['acl'])) {
-            $this->aclLoad($config['acl'], $container);
-        } else {
-            $container->removeDefinition(InitAclCommand::class);
-            $container->removeDefinition(SetAclCommand::class);
-        }
-
         $container->registerForAutoconfiguration(VoterInterface::class)
             ->addTag('security.voter');
     }
 
-    private function aclLoad($config, ContainerBuilder $container)
-    {
-        if (!interface_exists('Symfony\Component\Security\Acl\Model\AclInterface')) {
-            throw new \LogicException('You must install symfony/security-acl in order to use the ACL functionality.');
-        }
-
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('security_acl.xml');
-
-        if (isset($config['cache']['id'])) {
-            $container->setAlias('security.acl.cache', $config['cache']['id'])->setPrivate(true);
-        }
-        $container->getDefinition('security.acl.voter.basic_permissions')->addArgument($config['voter']['allow_if_object_identity_unavailable']);
-
-        // custom ACL provider
-        if (isset($config['provider'])) {
-            $container->setAlias('security.acl.provider', $config['provider'])->setPrivate(true);
-
-            return;
-        }
-
-        $this->configureDbalAclProvider($config, $container, $loader);
-    }
-
-    private function configureDbalAclProvider(array $config, ContainerBuilder $container, $loader)
-    {
-        $loader->load('security_acl_dbal.xml');
-
-        if (null !== $config['connection']) {
-            $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']))->setPrivate(true);
-        }
-
-        $container
-            ->getDefinition('security.acl.dbal.schema_listener')
-            ->addTag('doctrine.event_listener', array(
-                'connection' => $config['connection'],
-                'event' => 'postGenerateSchema',
-                'lazy' => true,
-            ))
-        ;
-
-        $container->getDefinition('security.acl.cache.doctrine')->addArgument($config['cache']['prefix']);
-
-        $container->setParameter('security.acl.dbal.class_table_name', $config['tables']['class']);
-        $container->setParameter('security.acl.dbal.entry_table_name', $config['tables']['entry']);
-        $container->setParameter('security.acl.dbal.oid_table_name', $config['tables']['object_identity']);
-        $container->setParameter('security.acl.dbal.oid_ancestors_table_name', $config['tables']['object_identity_ancestors']);
-        $container->setParameter('security.acl.dbal.sid_table_name', $config['tables']['security_identity']);
-    }
-
     /**
      * Loads the web configuration.
      *
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
index b375d95effe5c..34feeeb9e8fd5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
@@ -7,17 +7,6 @@
     
         
 
-        
-            
-            
-            
-        
-
-        
-            
-            
-        
-
         
             
              
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 138c7e9233480..d274d4005e854 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -36,20 +36,6 @@ public function testRolesHierarchy()
         ), $container->getParameter('security.role_hierarchy.roles'));
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
-     */
-    public function testRolesHierarchyWithAcl()
-    {
-        $container = $this->getContainer('container1_with_acl');
-        $this->assertEquals(array(
-            'ROLE_ADMIN' => array('ROLE_USER'),
-            'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
-            'ROLE_REMOTE' => array('ROLE_USER', 'ROLE_ADMIN'),
-        ), $container->getParameter('security.role_hierarchy.roles'));
-    }
-
     public function testUserProviders()
     {
         $container = $this->getContainer('container1');
@@ -324,30 +310,6 @@ public function testEncoders()
         )), $container->getDefinition('security.encoder_factory.generic')->getArguments());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
-     */
-    public function testAcl()
-    {
-        $container = $this->getContainer('container1_with_acl');
-
-        $this->assertTrue($container->hasDefinition('security.acl.dbal.provider'));
-        $this->assertEquals('security.acl.dbal.provider', (string) $container->getAlias('security.acl.provider'));
-    }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
-     */
-    public function testCustomAclProvider()
-    {
-        $container = $this->getContainer('custom_acl_provider');
-
-        $this->assertFalse($container->hasDefinition('security.acl.dbal.provider'));
-        $this->assertEquals('foo', (string) $container->getAlias('security.acl.provider'));
-    }
-
     public function testRememberMeThrowExceptionsDefault()
     {
         $container = $this->getContainer('container1');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
deleted file mode 100644
index 268ced04dbfb4..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
+++ /dev/null
@@ -1,101 +0,0 @@
-loadFromExtension('security', array(
-    'acl' => array(),
-    'encoders' => array(
-        'JMS\FooBundle\Entity\User1' => 'plaintext',
-        'JMS\FooBundle\Entity\User2' => array(
-            'algorithm' => 'sha1',
-            'encode_as_base64' => false,
-            'iterations' => 5,
-        ),
-        'JMS\FooBundle\Entity\User3' => array(
-            'algorithm' => 'md5',
-        ),
-        'JMS\FooBundle\Entity\User4' => array(
-            'id' => 'security.encoder.foo',
-        ),
-        'JMS\FooBundle\Entity\User5' => array(
-            'algorithm' => 'pbkdf2',
-            'hash_algorithm' => 'sha1',
-            'encode_as_base64' => false,
-            'iterations' => 5,
-            'key_length' => 30,
-        ),
-        'JMS\FooBundle\Entity\User6' => array(
-            'algorithm' => 'bcrypt',
-            'cost' => 15,
-        ),
-    ),
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-        'digest' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER, ROLE_ADMIN'),
-                ),
-            ),
-        ),
-        'basic' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => 'ROLE_SUPER_ADMIN'),
-                    'bar' => array('password' => '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33', 'roles' => array('ROLE_USER', 'ROLE_ADMIN')),
-                ),
-            ),
-        ),
-        'service' => array(
-            'id' => 'user.manager',
-        ),
-        'chain' => array(
-            'chain' => array(
-                'providers' => array('service', 'basic'),
-            ),
-        ),
-    ),
-
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-        'secure' => array('stateless' => true,
-            'http_basic' => true,
-            'form_login' => true,
-            'anonymous' => true,
-            'switch_user' => true,
-            'x509' => true,
-            'remote_user' => true,
-            'logout' => true,
-            'remember_me' => array('secret' => 'TheSecret'),
-            'user_checker' => null,
-        ),
-        'host' => array(
-            'pattern' => '/test',
-            'host' => 'foo\\.example\\.org',
-            'methods' => array('GET', 'POST'),
-            'anonymous' => true,
-            'http_basic' => true,
-        ),
-        'with_user_checker' => array(
-            'user_checker' => 'app.user_checker',
-            'anonymous' => true,
-            'http_basic' => true,
-        ),
-    ),
-
-    'access_control' => array(
-        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https', 'methods' => array('get', 'POST')),
-        array('path' => '/blog/.*', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
-        array('path' => '/blog/524', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'allow_if' => "token.getUsername() matches '/^admin/'"),
-    ),
-
-    'role_hierarchy' => array(
-        'ROLE_ADMIN' => 'ROLE_USER',
-        'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
-        'ROLE_REMOTE' => 'ROLE_USER,ROLE_ADMIN',
-    ),
-));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
deleted file mode 100644
index 7797c38287193..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-    
-        
-        
-
-        
-
-        
-
-        
-
-        
-
-        
-
-        
-            
-                
-            
-        
-
-        
-            
-                
-            
-        
-
-        
-            
-                
-                
-            
-        
-
-        
-
-        
-            
-        
-
-        
-
-        
-            
-            
-            
-            
-            
-            
-            
-            
-            
-        
-
-        
-            
-            
-        
-
-        
-            
-            
-            app.user_checker
-        
-
-        ROLE_USER
-        ROLE_USER,ROLE_ADMIN,ROLE_ALLOWED_TO_SWITCH
-        ROLE_USER,ROLE_ADMIN
-
-        
-        
-        
-    
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
deleted file mode 100644
index 40e0f1a81e2f6..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-security:
-    acl: ~
-    encoders:
-        JMS\FooBundle\Entity\User1: plaintext
-        JMS\FooBundle\Entity\User2:
-            algorithm: sha1
-            encode_as_base64: false
-            iterations: 5
-        JMS\FooBundle\Entity\User3:
-            algorithm: md5
-        JMS\FooBundle\Entity\User4:
-            id: security.encoder.foo
-        JMS\FooBundle\Entity\User5:
-            algorithm: pbkdf2
-            hash_algorithm: sha1
-            encode_as_base64: false
-            iterations: 5
-            key_length: 30
-        JMS\FooBundle\Entity\User6:
-            algorithm: bcrypt
-            cost: 15
-
-    providers:
-        default:
-            memory:
-                users:
-                    foo: { password: foo, roles: ROLE_USER }
-        digest:
-            memory:
-                users:
-                    foo: { password: foo, roles: 'ROLE_USER, ROLE_ADMIN' }
-        basic:
-            memory:
-                users:
-                    foo: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: ROLE_SUPER_ADMIN }
-                    bar: { password: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, roles: [ROLE_USER, ROLE_ADMIN] }
-        service:
-            id: user.manager
-        chain:
-            chain:
-                providers: [service, basic]
-
-
-    firewalls:
-        simple: { pattern: /login, security: false }
-        secure:
-            stateless: true
-            http_basic: true
-            form_login: true
-            anonymous: true
-            switch_user: true
-            x509: true
-            remote_user: true
-            logout: true
-            remember_me:
-                secret: TheSecret
-            user_checker: ~
-
-        host:
-            pattern: /test
-            host: foo\.example\.org
-            methods: [GET,POST]
-            anonymous: true
-            http_basic: true
-
-        with_user_checker:
-            anonymous: ~
-            http_basic: ~
-            user_checker: app.user_checker
-
-    role_hierarchy:
-        ROLE_ADMIN:       ROLE_USER
-        ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
-        ROLE_REMOTE:      ROLE_USER,ROLE_ADMIN
-
-    access_control:
-        - { path: /blog/524, role: ROLE_USER, requires_channel: https, methods: [get, POST]}
-        -
-            path: /blog/.*
-            role: IS_AUTHENTICATED_ANONYMOUSLY
-        - { path: /blog/524, role: IS_AUTHENTICATED_ANONYMOUSLY, allow_if: "token.getUsername() matches '/^admin/'" }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
deleted file mode 100644
index a658126fce347..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier 
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\SecurityBundle\Command\SetAclCommand;
-use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
-use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
-use Symfony\Component\Security\Acl\Exception\NoAceFoundException;
-use Symfony\Component\Security\Acl\Permission\BasicPermissionMap;
-
-/**
- * Tests SetAclCommand.
- *
- * @author Kévin Dunglas 
- * @requires extension pdo_sqlite
- * @group legacy
- */
-class SetAclCommandTest extends WebTestCase
-{
-    const OBJECT_CLASS = 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\Entity\Car';
-    const SECURITY_CLASS = 'Symfony\Component\Security\Core\User\User';
-
-    public function testSetAclUser()
-    {
-        $objectId = 1;
-        $securityUsername1 = 'kevin';
-        $securityUsername2 = 'anne';
-        $grantedPermission1 = 'VIEW';
-        $grantedPermission2 = 'EDIT';
-
-        $application = $this->getApplication();
-        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('test.security.acl.provider')));
-
-        $setAclCommand = $application->find('acl:set');
-        $setAclCommandTester = new CommandTester($setAclCommand);
-        $setAclCommandTester->execute(array(
-            'command' => 'acl:set',
-            'arguments' => array($grantedPermission1, $grantedPermission2, sprintf('%s:%s', self::OBJECT_CLASS, $objectId)),
-            '--user' => array(sprintf('%s:%s', self::SECURITY_CLASS, $securityUsername1), sprintf('%s:%s', self::SECURITY_CLASS, $securityUsername2)),
-        ));
-
-        $objectIdentity = new ObjectIdentity($objectId, self::OBJECT_CLASS);
-        $securityIdentity1 = new UserSecurityIdentity($securityUsername1, self::SECURITY_CLASS);
-        $securityIdentity2 = new UserSecurityIdentity($securityUsername2, self::SECURITY_CLASS);
-        $permissionMap = new BasicPermissionMap();
-
-        /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
-        $acl = $aclProvider->findAcl($objectIdentity, array($securityIdentity1));
-
-        $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission1, null), array($securityIdentity1)));
-        $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission1, null), array($securityIdentity2)));
-        $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission2, null), array($securityIdentity2)));
-
-        try {
-            $acl->isGranted($permissionMap->getMasks('OWNER', null), array($securityIdentity1));
-            $this->fail('NoAceFoundException not throwed');
-        } catch (NoAceFoundException $e) {
-        }
-
-        try {
-            $acl->isGranted($permissionMap->getMasks('OPERATOR', null), array($securityIdentity2));
-            $this->fail('NoAceFoundException not throwed');
-        } catch (NoAceFoundException $e) {
-        }
-    }
-
-    public function testSetAclRole()
-    {
-        $objectId = 1;
-        $securityUsername = 'kevin';
-        $grantedPermission = 'VIEW';
-        $role = 'ROLE_ADMIN';
-
-        $application = $this->getApplication();
-        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('test.security.acl.provider')));
-
-        $setAclCommand = $application->find('acl:set');
-        $setAclCommandTester = new CommandTester($setAclCommand);
-        $setAclCommandTester->execute(array(
-            'command' => 'acl:set',
-            'arguments' => array($grantedPermission, sprintf('%s:%s', str_replace('\\', '/', self::OBJECT_CLASS), $objectId)),
-            '--role' => array($role),
-        ));
-
-        $objectIdentity = new ObjectIdentity($objectId, self::OBJECT_CLASS);
-        $userSecurityIdentity = new UserSecurityIdentity($securityUsername, self::SECURITY_CLASS);
-        $roleSecurityIdentity = new RoleSecurityIdentity($role);
-        $permissionMap = new BasicPermissionMap();
-
-        /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
-        $acl = $aclProvider->findAcl($objectIdentity, array($roleSecurityIdentity, $userSecurityIdentity));
-
-        $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
-        $this->assertTrue($acl->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
-
-        try {
-            $acl->isGranted($permissionMap->getMasks('VIEW', null), array($userSecurityIdentity));
-            $this->fail('NoAceFoundException not throwed');
-        } catch (NoAceFoundException $e) {
-        }
-
-        try {
-            $acl->isGranted($permissionMap->getMasks('OPERATOR', null), array($userSecurityIdentity));
-            $this->fail('NoAceFoundException not throwed');
-        } catch (NoAceFoundException $e) {
-        }
-    }
-
-    public function testSetAclClassScope()
-    {
-        $objectId = 1;
-        $grantedPermission = 'VIEW';
-        $role = 'ROLE_USER';
-
-        $application = $this->getApplication();
-        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('test.security.acl.provider')));
-
-        $setAclCommand = $application->find('acl:set');
-        $setAclCommandTester = new CommandTester($setAclCommand);
-        $setAclCommandTester->execute(array(
-            'command' => 'acl:set',
-            'arguments' => array($grantedPermission, sprintf('%s:%s', self::OBJECT_CLASS, $objectId)),
-            '--class-scope' => true,
-            '--role' => array($role),
-        ));
-
-        $objectIdentity1 = new ObjectIdentity($objectId, self::OBJECT_CLASS);
-        $objectIdentity2 = new ObjectIdentity(2, self::OBJECT_CLASS);
-        $roleSecurityIdentity = new RoleSecurityIdentity($role);
-        $permissionMap = new BasicPermissionMap();
-
-        /** @var \Symfony\Component\Security\Acl\Model\AclProviderInterface $aclProvider */
-        $aclProvider = $application->getKernel()->getContainer()->get('test.security.acl.provider');
-
-        $acl1 = $aclProvider->findAcl($objectIdentity1, array($roleSecurityIdentity));
-        $this->assertTrue($acl1->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
-
-        $acl2 = $aclProvider->createAcl($objectIdentity2);
-        $this->assertTrue($acl2->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
-    }
-
-    private function getApplication()
-    {
-        $kernel = $this->createKernel(array('test_case' => 'Acl'));
-        $kernel->boot();
-
-        $application = new Application($kernel);
-
-        $initAclCommand = $application->find('init:acl');
-        $initAclCommandTester = new CommandTester($initAclCommand);
-        $initAclCommandTester->execute(array('command' => 'init:acl'));
-
-        return $application;
-    }
-}

From 37d1a212f998ba5865ec7b5d471868afdcd8deba Mon Sep 17 00:00:00 2001
From: Alexandru Furculita 
Date: Tue, 26 Sep 2017 22:01:24 +0300
Subject: [PATCH 0916/1099] Removed compatibility layer for PHP <5.4 sessions

Signed-off-by: Alexandru Furculita 
---
 .../Bridge/Twig/Tests/AppVariableTest.php     |   8 +-
 .../Tests/Controller/ControllerTraitTest.php  |   2 +-
 .../Component/HttpFoundation/CHANGELOG.md     |   5 +
 .../Handler/NativeFileSessionHandler.php      |   2 +-
 .../Storage/Handler/NativeSessionHandler.php  |  22 ---
 .../Session/Storage/NativeSessionStorage.php  |  75 ++++-------
 .../Session/Storage/Proxy/AbstractProxy.php   | 126 ------------------
 .../Session/Storage/Proxy/NativeProxy.php     |  43 ------
 .../Storage/Proxy/SessionHandlerProxy.php     |  92 -------------
 .../Handler/NativeFileSessionHandlerTest.php  |   1 -
 .../Handler/NativeSessionHandlerTest.php      |  35 -----
 .../Storage/NativeSessionStorageTest.php      |  63 ++++++---
 .../Storage/PhpBridgeSessionStorageTest.php   |   5 +-
 .../Storage/Proxy/AbstractProxyTest.php       | 115 ----------------
 .../Session/Storage/Proxy/NativeProxyTest.php |  38 ------
 .../Storage/Proxy/SessionHandlerProxyTest.php | 125 -----------------
 16 files changed, 88 insertions(+), 669 deletions(-)
 delete mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php

diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index c258ad41a1465..2a97c269031c8 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -47,9 +47,8 @@ public function testEnvironment()
 
     public function testGetSession()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn($session);
+        $request->method('getSession')->willReturn($session = new Session());
 
         $this->setRequestStack($request);
 
@@ -168,9 +167,8 @@ public function testGetFlashesWithNoRequest()
 
     public function testGetFlashesWithNoSessionStarted()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn($session);
+        $request->method('getSession')->willReturn(new Session());
 
         $this->setRequestStack($request);
 
@@ -259,7 +257,7 @@ private function setFlashMessages()
         $flashBag = new FlashBag();
         $flashBag->initialize($flashMessages);
 
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
         $session->method('isStarted')->willReturn(true);
         $session->method('getFlashBag')->willReturn($flashBag);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
index 71e6f581e7389..3feabfd12e273 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -376,7 +376,7 @@ public function testRedirectToRoute()
     public function testAddFlash()
     {
         $flashBag = new FlashBag();
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
         $session->expects($this->once())->method('getFlashBag')->willReturn($flashBag);
 
         $container = new Container();
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index ff69bc0b4fe9a..46d5ac73aea6e 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -17,6 +17,11 @@ CHANGELOG
  * checking for cacheable HTTP methods using the `Request::isMethodSafe()`
    method (by not passing `false` as its argument) is not supported anymore and
    throws a `\BadMethodCallException`
+ * the `NativeSessionHandler` class has been removed
+ * the `AbstractProxy`, `NativeProxy` and `SessionHandlerProxy` classes have been removed
+ * setting session save handlers that do not implement `\SessionHandlerInterface` in 
+   `NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a 
+   `\TypeError`
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 4e9704bd5858f..b052b32dab6cf 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -16,7 +16,7 @@
  *
  * @author Drak 
  */
-class NativeFileSessionHandler extends NativeSessionHandler
+class NativeFileSessionHandler extends \SessionHandler
 {
     /**
      * @param string $savePath Path of directory to save session files
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
deleted file mode 100644
index daa7dbd15b7c8..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-
-@trigger_error('The '.__NAMESPACE__.'\NativeSessionHandler class is deprecated since version 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.', E_USER_DEPRECATED);
-
-/**
- * @deprecated since version 3.4, to be removed in 4.0. Use \SessionHandler instead.
- * @see http://php.net/sessionhandler
- */
-class NativeSessionHandler extends \SessionHandler
-{
-}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 3c22b85af639f..7145bf92c5e23 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
 /**
  * This provides a base class for session attribute storage.
@@ -38,7 +36,7 @@ class NativeSessionStorage implements SessionStorageInterface
     protected $closed = false;
 
     /**
-     * @var AbstractProxy|\SessionHandlerInterface
+     * @var \SessionHandlerInterface
      */
     protected $saveHandler;
 
@@ -87,12 +85,8 @@ class NativeSessionStorage implements SessionStorageInterface
      * sid_bits_per_character, "5"
      * trans_sid_hosts, $_SERVER['HTTP_HOST']
      * trans_sid_tags, "a=href,area=href,frame=src,form="
-     *
-     * @param array                         $options Session configuration options
-     * @param \SessionHandlerInterface|null $handler
-     * @param MetadataBag                   $metaBag MetadataBag
      */
-    public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
+    public function __construct(array $options = array(), \SessionHandlerInterface $handler = null, MetadataBag $metaBag = null)
     {
         session_cache_limiter(''); // disable by default because it's managed by HeaderBag (if used)
         ini_set('session.use_cookies', 1);
@@ -107,7 +101,7 @@ public function __construct(array $options = array(), $handler = null, MetadataB
     /**
      * Gets the save handler instance.
      *
-     * @return AbstractProxy|\SessionHandlerInterface
+     * @return \SessionHandlerInterface
      */
     public function getSaveHandler()
     {
@@ -146,15 +140,21 @@ public function start()
      */
     public function getId()
     {
-        return $this->saveHandler->getId();
+        return session_id();
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \LogicException When the session is active
      */
     public function setId($id)
     {
-        $this->saveHandler->setId($id);
+        if (\PHP_SESSION_ACTIVE === session_status()) {
+            throw new \LogicException('Cannot change the ID of an active session');
+        }
+
+        session_id($id);
     }
 
     /**
@@ -162,15 +162,21 @@ public function setId($id)
      */
     public function getName()
     {
-        return $this->saveHandler->getName();
+        return session_name();
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \LogicException When the session is active
      */
     public function setName($name)
     {
-        $this->saveHandler->setName($name);
+        if (\PHP_SESSION_ACTIVE === session_status()) {
+            throw new \LogicException('Cannot change the name of an active session');
+        }
+
+        session_name($name);
     }
 
     /**
@@ -217,9 +223,6 @@ public function save()
             // The default PHP error message is not very helpful, as it does not give any information on the current save handler.
             // Therefore, we catch this error and trigger a warning with a better error message
             $handler = $this->getSaveHandler();
-            if ($handler instanceof SessionHandlerProxy) {
-                $handler = $handler->getHandler();
-            }
 
             restore_error_handler();
             trigger_error(sprintf('session_write_close(): Failed to write session data with %s handler', get_class($handler)), E_USER_WARNING);
@@ -248,6 +251,8 @@ public function clear()
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \LogicException When the session is already started
      */
     public function registerBag(SessionBagInterface $bag)
     {
@@ -267,7 +272,7 @@ public function getBag($name)
             throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
         }
 
-        if (!$this->started && $this->saveHandler->isActive()) {
+        if (!$this->started && \PHP_SESSION_ACTIVE === session_status()) {
             $this->loadSession();
         } elseif (!$this->started) {
             $this->start();
@@ -357,37 +362,12 @@ public function setOptions(array $options)
      * @see http://php.net/sessionhandlerinterface
      * @see http://php.net/sessionhandler
      * @see http://github.com/drak/NativeSession
-     *
-     * @param \SessionHandlerInterface|null $saveHandler
-     *
-     * @throws \InvalidArgumentException
      */
-    public function setSaveHandler($saveHandler = null)
+    public function setSaveHandler(\SessionHandlerInterface $saveHandler = null)
     {
-        if (!$saveHandler instanceof AbstractProxy &&
-            !$saveHandler instanceof \SessionHandlerInterface &&
-            null !== $saveHandler) {
-            throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');
-        }
+        $this->saveHandler = $saveHandler ?: new \SessionHandler();
 
-        if ($saveHandler instanceof AbstractProxy) {
-            @trigger_error(
-                'Using session save handlers that are instances of AbstractProxy is deprecated since version 3.4 and will be removed in 4.0.',
-                E_USER_DEPRECATED
-            );
-        }
-
-        // Wrap $saveHandler in proxy and prevent double wrapping of proxy
-        if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
-            $saveHandler = new SessionHandlerProxy($saveHandler);
-        } elseif (!$saveHandler instanceof AbstractProxy) {
-            $saveHandler = new SessionHandlerProxy(new \SessionHandler());
-        }
-        $this->saveHandler = $saveHandler;
-
-        if ($this->saveHandler instanceof \SessionHandlerInterface) {
-            session_set_save_handler($this->saveHandler, false);
-        }
+        session_set_save_handler($this->saveHandler, false);
     }
 
     /**
@@ -406,11 +386,12 @@ protected function loadSession(array &$session = null)
             $session = &$_SESSION;
         }
 
-        $bags = array_merge($this->bags, array($this->metadataBag));
+        $bags = $this->bags;
+        $bags[] = $this->metadataBag;
 
         foreach ($bags as $bag) {
             $key = $bag->getStorageKey();
-            $session[$key] = isset($session[$key]) ? $session[$key] : array();
+            $session[$key] = $session[$key] ?? array();
             $bag->initialize($session[$key]);
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
deleted file mode 100644
index c1c8b9b1f7dd2..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
-
-@trigger_error('The '.__NAMESPACE__.'\AbstractProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
-/**
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
- * @author Drak 
- */
-abstract class AbstractProxy
-{
-    /**
-     * Flag if handler wraps an internal PHP session handler (using \SessionHandler).
-     *
-     * @var bool
-     */
-    protected $wrapper = false;
-
-    /**
-     * @var string
-     */
-    protected $saveHandlerName;
-
-    /**
-     * Gets the session.save_handler name.
-     *
-     * @return string
-     */
-    public function getSaveHandlerName()
-    {
-        return $this->saveHandlerName;
-    }
-
-    /**
-     * Is this proxy handler and instance of \SessionHandlerInterface.
-     *
-     * @return bool
-     */
-    public function isSessionHandlerInterface()
-    {
-        return $this instanceof \SessionHandlerInterface;
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool
-     */
-    public function isWrapper()
-    {
-        return $this->wrapper;
-    }
-
-    /**
-     * Has a session started?
-     *
-     * @return bool
-     */
-    public function isActive()
-    {
-        return \PHP_SESSION_ACTIVE === session_status();
-    }
-
-    /**
-     * Gets the session ID.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return session_id();
-    }
-
-    /**
-     * Sets the session ID.
-     *
-     * @param string $id
-     *
-     * @throws \LogicException
-     */
-    public function setId($id)
-    {
-        if ($this->isActive()) {
-            throw new \LogicException('Cannot change the ID of an active session');
-        }
-
-        session_id($id);
-    }
-
-    /**
-     * Gets the session name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return session_name();
-    }
-
-    /**
-     * Sets the session name.
-     *
-     * @param string $name
-     *
-     * @throws \LogicException
-     */
-    public function setName($name)
-    {
-        if ($this->isActive()) {
-            throw new \LogicException('Cannot change the name of an active session');
-        }
-
-        session_name($name);
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
deleted file mode 100644
index e75497d57c3b3..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
-
-@trigger_error('The '.__NAMESPACE__.'\NativeProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
-/**
- * This proxy is built-in session handlers in PHP 5.3.x.
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
- * @author Drak 
- */
-class NativeProxy extends AbstractProxy
-{
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        // this makes an educated guess as to what the handler is since it should already be set.
-        $this->saveHandlerName = ini_get('session.save_handler');
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool False
-     */
-    public function isWrapper()
-    {
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
deleted file mode 100644
index d6adef82dbf65..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
-
-@trigger_error('The '.__NAMESPACE__.'\SessionHandlerProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
-/**
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
- * @author Drak 
- */
-class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
-{
-    /**
-     * @var \SessionHandlerInterface
-     */
-    protected $handler;
-
-    public function __construct(\SessionHandlerInterface $handler)
-    {
-        $this->handler = $handler;
-        $this->wrapper = ($handler instanceof \SessionHandler);
-        $this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
-    }
-
-    /**
-     * @return \SessionHandlerInterface
-     */
-    public function getHandler()
-    {
-        return $this->handler;
-    }
-
-    // \SessionHandlerInterface
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return (bool) $this->handler->open($savePath, $sessionName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return (bool) $this->handler->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return (string) $this->handler->read($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return (bool) $this->handler->write($sessionId, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return (bool) $this->handler->destroy($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        return (bool) $this->handler->gc($maxlifetime);
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
index a6264e51d2a72..95e725f4bc8a6 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -29,7 +29,6 @@ public function testConstruct()
     {
         $storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
 
-        $this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
         $this->assertEquals('user', ini_get('session.save_handler'));
 
         $this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
deleted file mode 100644
index fe4cc72d23b56..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
-
-/**
- * Test class for NativeSessionHandler.
- *
- * @author Drak 
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @group legacy
- */
-class NativeSessionHandlerTest extends TestCase
-{
-    public function testConstruct()
-    {
-        $handler = new NativeSessionHandler();
-
-        $this->assertTrue($handler instanceof \SessionHandler);
-        $this->assertTrue($handler instanceof NativeSessionHandler);
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 818c63a9d2ae2..067fc392e8cd8 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -14,10 +14,8 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
 /**
  * Test class for NativeSessionStorage.
@@ -100,6 +98,7 @@ public function testGetId()
 
         $storage->start();
         $id = $storage->getId();
+        $this->assertEquals(session_id(), $id);
         $this->assertInternalType('string', $id);
         $this->assertNotSame('', $id);
 
@@ -107,6 +106,44 @@ public function testGetId()
         $this->assertSame($id, $storage->getId(), 'ID stays after saving session');
     }
 
+    public function testId()
+    {
+        $storage = $this->getStorage();
+
+        $this->assertEquals(session_id(), $storage->getId());
+        $storage->setId('foo');
+        $this->assertEquals('foo', $storage->getId());
+        $this->assertEquals(session_id(), $storage->getId());
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testIdException()
+    {
+        session_start();
+        $this->getStorage()->setId('foo');
+    }
+
+    public function testName()
+    {
+        $storage = $this->getStorage();
+
+        $this->assertEquals(session_name(), $storage->getName());
+        $storage->setName('foo');
+        $this->assertEquals('foo', $storage->getName());
+        $this->assertEquals(session_name(), $storage->getName());
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testNameException()
+    {
+        session_start();
+        $this->getStorage()->setName('foo');
+    }
+
     public function testRegenerate()
     {
         $storage = $this->getStorage();
@@ -185,9 +222,9 @@ public function testCookieOptions()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \TypeError
      */
-    public function testSetSaveHandlerException()
+    public function testSetSaveHandlerError()
     {
         $storage = $this->getStorage();
         $storage->setSaveHandler(new \stdClass());
@@ -198,17 +235,13 @@ public function testSetSaveHandler()
         $this->iniSet('session.save_handler', 'files');
         $storage = $this->getStorage();
         $storage->setSaveHandler();
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $this->assertInstanceOf(\SessionHandler::class, $storage->getSaveHandler());
         $storage->setSaveHandler(null);
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
-        $storage->setSaveHandler(new SessionHandlerProxy(new NativeSessionHandler()));
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
-        $storage->setSaveHandler(new NativeSessionHandler());
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
-        $storage->setSaveHandler(new SessionHandlerProxy(new NullSessionHandler()));
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $this->assertInstanceOf(\SessionHandler::class, $storage->getSaveHandler());
+        $storage->setSaveHandler(new \SessionHandler());
+        $this->assertInstanceOf(\SessionHandler::class, $storage->getSaveHandler());
         $storage->setSaveHandler(new NullSessionHandler());
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $this->assertInstanceOf(\SessionHandlerInterface::class, $storage->getSaveHandler());
     }
 
     /**
@@ -218,12 +251,12 @@ public function testStarted()
     {
         $storage = $this->getStorage();
 
-        $this->assertFalse($storage->getSaveHandler()->isActive());
+        $this->assertNotSame(\PHP_SESSION_ACTIVE, session_status());
         $this->assertFalse($storage->isStarted());
 
         session_start();
         $this->assertTrue(isset($_SESSION));
-        $this->assertTrue($storage->getSaveHandler()->isActive());
+        $this->assertSame(\PHP_SESSION_ACTIVE, session_status());
 
         // PHP session might have started, but the storage driver has not, so false is correct here
         $this->assertFalse($storage->isStarted());
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index b8b98386c3367..945d4dd0f6ea0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -64,13 +64,12 @@ public function testPhpSession()
     {
         $storage = $this->getStorage();
 
-        $this->assertFalse($storage->getSaveHandler()->isActive());
+        $this->assertNotSame(\PHP_SESSION_ACTIVE, session_status());
         $this->assertFalse($storage->isStarted());
 
         session_start();
         $this->assertTrue(isset($_SESSION));
-        // in PHP 5.4 we can reliably detect a session started
-        $this->assertTrue($storage->getSaveHandler()->isActive());
+        $this->assertSame(\PHP_SESSION_ACTIVE, session_status());
         // PHP session might have started, but the storage driver has not, so false is correct here
         $this->assertFalse($storage->isStarted());
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
deleted file mode 100644
index f2be722c8f522..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Proxy;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
-
-/**
- * Test class for AbstractProxy.
- *
- * @group legacy
- *
- * @author Drak 
- */
-class AbstractProxyTest extends TestCase
-{
-    /**
-     * @var AbstractProxy
-     */
-    protected $proxy;
-
-    protected function setUp()
-    {
-        $this->proxy = $this->getMockForAbstractClass(AbstractProxy::class);
-    }
-
-    protected function tearDown()
-    {
-        $this->proxy = null;
-    }
-
-    public function testGetSaveHandlerName()
-    {
-        $this->assertNull($this->proxy->getSaveHandlerName());
-    }
-
-    public function testIsSessionHandlerInterface()
-    {
-        $this->assertFalse($this->proxy->isSessionHandlerInterface());
-        $sh = new SessionHandlerProxy(new \SessionHandler());
-        $this->assertTrue($sh->isSessionHandlerInterface());
-    }
-
-    public function testIsWrapper()
-    {
-        $this->assertFalse($this->proxy->isWrapper());
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testIsActive()
-    {
-        $this->assertFalse($this->proxy->isActive());
-        session_start();
-        $this->assertTrue($this->proxy->isActive());
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testName()
-    {
-        $this->assertEquals(session_name(), $this->proxy->getName());
-        $this->proxy->setName('foo');
-        $this->assertEquals('foo', $this->proxy->getName());
-        $this->assertEquals(session_name(), $this->proxy->getName());
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     * @expectedException \LogicException
-     */
-    public function testNameException()
-    {
-        session_start();
-        $this->proxy->setName('foo');
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testId()
-    {
-        $this->assertEquals(session_id(), $this->proxy->getId());
-        $this->proxy->setId('foo');
-        $this->assertEquals('foo', $this->proxy->getId());
-        $this->assertEquals(session_id(), $this->proxy->getId());
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     * @expectedException \LogicException
-     */
-    public function testIdException()
-    {
-        session_start();
-        $this->proxy->setId('foo');
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
deleted file mode 100644
index ed4fee6bfec0f..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Proxy;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
-
-/**
- * Test class for NativeProxy.
- *
- * @group legacy
- *
- * @author Drak 
- */
-class NativeProxyTest extends TestCase
-{
-    public function testIsWrapper()
-    {
-        $proxy = new NativeProxy();
-        $this->assertFalse($proxy->isWrapper());
-    }
-
-    public function testGetSaveHandlerName()
-    {
-        $name = ini_get('session.save_handler');
-        $proxy = new NativeProxy();
-        $this->assertEquals($name, $proxy->getSaveHandlerName());
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
deleted file mode 100644
index fdd1dae254198..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Proxy;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
-
-/**
- * Tests for SessionHandlerProxy class.
- *
- * @author Drak 
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @group legacy
- */
-class SessionHandlerProxyTest extends TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_Matcher
-     */
-    private $mock;
-
-    /**
-     * @var SessionHandlerProxy
-     */
-    private $proxy;
-
-    protected function setUp()
-    {
-        $this->mock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
-        $this->proxy = new SessionHandlerProxy($this->mock);
-    }
-
-    protected function tearDown()
-    {
-        $this->mock = null;
-        $this->proxy = null;
-    }
-
-    public function testOpenTrue()
-    {
-        $this->mock->expects($this->once())
-            ->method('open')
-            ->will($this->returnValue(true));
-
-        $this->assertFalse($this->proxy->isActive());
-        $this->proxy->open('name', 'id');
-        $this->assertFalse($this->proxy->isActive());
-    }
-
-    public function testOpenFalse()
-    {
-        $this->mock->expects($this->once())
-            ->method('open')
-            ->will($this->returnValue(false));
-
-        $this->assertFalse($this->proxy->isActive());
-        $this->proxy->open('name', 'id');
-        $this->assertFalse($this->proxy->isActive());
-    }
-
-    public function testClose()
-    {
-        $this->mock->expects($this->once())
-            ->method('close')
-            ->will($this->returnValue(true));
-
-        $this->assertFalse($this->proxy->isActive());
-        $this->proxy->close();
-        $this->assertFalse($this->proxy->isActive());
-    }
-
-    public function testCloseFalse()
-    {
-        $this->mock->expects($this->once())
-            ->method('close')
-            ->will($this->returnValue(false));
-
-        $this->assertFalse($this->proxy->isActive());
-        $this->proxy->close();
-        $this->assertFalse($this->proxy->isActive());
-    }
-
-    public function testRead()
-    {
-        $this->mock->expects($this->once())
-            ->method('read');
-
-        $this->proxy->read('id');
-    }
-
-    public function testWrite()
-    {
-        $this->mock->expects($this->once())
-            ->method('write');
-
-        $this->proxy->write('id', 'data');
-    }
-
-    public function testDestroy()
-    {
-        $this->mock->expects($this->once())
-            ->method('destroy');
-
-        $this->proxy->destroy('id');
-    }
-
-    public function testGc()
-    {
-        $this->mock->expects($this->once())
-            ->method('gc');
-
-        $this->proxy->gc(86400);
-    }
-}

From aa30d0424326bfe395ba1c87bf494bb22ea75f3a Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Wed, 11 Jan 2017 15:09:04 +0100
Subject: [PATCH 0917/1099] [Serializer] throw more specific exceptions

---
 .../Serializer/Encoder/JsonDecode.php         |  6 +++---
 .../Serializer/Encoder/JsonEncode.php         |  4 ++--
 .../Serializer/Encoder/XmlEncoder.php         | 14 +++++++-------
 .../Exception/NotEncodableValueException.php  | 19 +++++++++++++++++++
 .../NotNormalizableValueException.php         | 19 +++++++++++++++++++
 .../Normalizer/AbstractObjectNormalizer.php   |  8 ++++----
 .../Normalizer/ArrayDenormalizer.php          |  6 ++++--
 .../Normalizer/DataUriNormalizer.php          |  9 ++++++---
 .../Normalizer/DateTimeNormalizer.php         |  8 ++++----
 .../Component/Serializer/Serializer.php       | 15 +++++++++------
 10 files changed, 77 insertions(+), 31 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Exception/NotEncodableValueException.php
 create mode 100644 src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php

diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
index e9ca7ce570e59..079f066cf5cb3 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 
 /**
  * Decodes JSON data.
@@ -73,7 +73,7 @@ public function __construct($associative = false, $depth = 512)
      *
      * @return mixed
      *
-     * @throws UnexpectedValueException
+     * @throws NotEncodableValueException
      *
      * @see http://php.net/json_decode json_decode
      */
@@ -88,7 +88,7 @@ public function decode($data, $format, array $context = array())
         $decodedData = json_decode($data, $associative, $recursionDepth, $options);
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(json_last_error_msg());
+            throw new NotEncodableValueException(json_last_error_msg());
         }
 
         return $decodedData;
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
index 14cd2c949a991..5ed9ae7a255b7 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 
 /**
  * Encodes JSON data.
@@ -40,7 +40,7 @@ public function encode($data, $format, array $context = array())
         $encodedJson = json_encode($data, $context['json_encode_options']);
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(json_last_error_msg());
+            throw new NotEncodableValueException(json_last_error_msg());
         }
 
         return $encodedJson;
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index d2ca3ee9bdb7a..9a7aa31596906 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 
 /**
  * Encodes XML data.
@@ -78,7 +78,7 @@ public function encode($data, $format, array $context = array())
     public function decode($data, $format, array $context = array())
     {
         if ('' === trim($data)) {
-            throw new UnexpectedValueException('Invalid XML data, it can not be empty.');
+            throw new NotEncodableValueException('Invalid XML data, it can not be empty.');
         }
 
         $internalErrors = libxml_use_internal_errors(true);
@@ -94,13 +94,13 @@ public function decode($data, $format, array $context = array())
         if ($error = libxml_get_last_error()) {
             libxml_clear_errors();
 
-            throw new UnexpectedValueException($error->message);
+            throw new NotEncodableValueException($error->message);
         }
 
         $rootNode = null;
         foreach ($dom->childNodes as $child) {
             if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
-                throw new UnexpectedValueException('Document types are not allowed.');
+                throw new NotEncodableValueException('Document types are not allowed.');
             }
             if (!$rootNode && XML_PI_NODE !== $child->nodeType) {
                 $rootNode = $child;
@@ -380,7 +380,7 @@ private function parseXmlValue(\DOMNode $node, array $context = array())
      *
      * @return bool
      *
-     * @throws UnexpectedValueException
+     * @throws NotEncodableValueException
      */
     private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
     {
@@ -437,7 +437,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
             return $this->appendNode($parentNode, $data, 'data');
         }
 
-        throw new UnexpectedValueException(sprintf('An unexpected value could not be serialized: %s', var_export($data, true)));
+        throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', var_export($data, true)));
     }
 
     /**
@@ -485,7 +485,7 @@ private function needsCdataWrapping($val)
      *
      * @return bool
      *
-     * @throws UnexpectedValueException
+     * @throws NotEncodableValueException
      */
     private function selectNodeType(\DOMNode $node, $val)
     {
diff --git a/src/Symfony/Component/Serializer/Exception/NotEncodableValueException.php b/src/Symfony/Component/Serializer/Exception/NotEncodableValueException.php
new file mode 100644
index 0000000000000..e1709fb1ef221
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Exception/NotEncodableValueException.php
@@ -0,0 +1,19 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Christian Flothmann 
+ */
+class NotEncodableValueException extends UnexpectedValueException
+{
+}
diff --git a/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php
new file mode 100644
index 0000000000000..58adf72cab147
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php
@@ -0,0 +1,19 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Christian Flothmann 
+ */
+class NotNormalizableValueException extends UnexpectedValueException
+{
+}
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 93e85c6fe67de..93e5f9bc5e126 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Exception\ExtraAttributesException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
@@ -200,7 +200,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
             try {
                 $this->setAttributeValue($object, $attribute, $value, $format, $context);
             } catch (InvalidArgumentException $e) {
-                throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
+                throw new NotNormalizableValueException($e->getMessage(), $e->getCode(), $e);
             }
         }
 
@@ -233,7 +233,7 @@ abstract protected function setAttributeValue($object, $attribute, $value, $form
      *
      * @return mixed
      *
-     * @throws UnexpectedValueException
+     * @throws NotNormalizableValueException
      * @throws LogicException
      */
     private function validateAndDenormalize($currentClass, $attribute, $data, $format, array $context)
@@ -292,7 +292,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
             return $data;
         }
 
-        throw new UnexpectedValueException(sprintf('The type of the "%s" attribute for class "%s" must be one of "%s" ("%s" given).', $attribute, $currentClass, implode('", "', array_keys($expectedTypes)), gettype($data)));
+        throw new NotNormalizableValueException(sprintf('The type of the "%s" attribute for class "%s" must be one of "%s" ("%s" given).', $attribute, $currentClass, implode('", "', array_keys($expectedTypes)), gettype($data)));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index 14b23d01a073f..60ba68be25146 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Serializer\Exception\BadMethodCallException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
@@ -33,6 +33,8 @@ class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterfa
 
     /**
      * {@inheritdoc}
+     *
+     * @throws NotNormalizableValueException
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
@@ -52,7 +54,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $builtinType = isset($context['key_type']) ? $context['key_type']->getBuiltinType() : null;
         foreach ($data as $key => $value) {
             if (null !== $builtinType && !call_user_func('is_'.$builtinType, $key)) {
-                throw new UnexpectedValueException(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, $builtinType, gettype($key)));
+                throw new NotNormalizableValueException(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, $builtinType, gettype($key)));
             }
 
             $data[$key] = $serializer->denormalize($value, $class, $format, $context);
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index 66a9ed6bd8d55..995bdf1441776 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 
 /**
  * Normalizes an {@see \SplFileInfo} object to a data URI.
@@ -85,11 +85,14 @@ public function supportsNormalization($data, $format = null)
      * Regex adapted from Brian Grinstead code.
      *
      * @see https://gist.github.com/bgrins/6194623
+     *
+     * @throws InvalidArgumentException
+     * @throws NotNormalizableValueException
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (!preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
-            throw new UnexpectedValueException('The provided "data:" URI is not valid.');
+            throw new NotNormalizableValueException('The provided "data:" URI is not valid.');
         }
 
         try {
@@ -102,7 +105,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                     return new \SplFileObject($data);
             }
         } catch (\RuntimeException $exception) {
-            throw new UnexpectedValueException($exception->getMessage(), $exception->getCode(), $exception);
+            throw new NotNormalizableValueException($exception->getMessage(), $exception->getCode(), $exception);
         }
 
         throw new InvalidArgumentException(sprintf('The class parameter "%s" is not supported. It must be one of "SplFileInfo", "SplFileObject" or "Symfony\Component\HttpFoundation\File\File".', $class));
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 26fd9c6201afd..fcc593b96a93f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Normalizer;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 
 /**
  * Normalizes an object implementing the {@see \DateTimeInterface} to a date string.
@@ -79,7 +79,7 @@ public function supportsNormalization($data, $format = null)
     /**
      * {@inheritdoc}
      *
-     * @throws UnexpectedValueException
+     * @throws NotNormalizableValueException
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
@@ -100,7 +100,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
 
             $dateTimeErrors = \DateTime::class === $class ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
 
-            throw new UnexpectedValueException(sprintf(
+            throw new NotNormalizableValueException(sprintf(
                 'Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s',
                 $data,
                 $dateTimeFormat,
@@ -112,7 +112,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         try {
             return \DateTime::class === $class ? new \DateTime($data, $timezone) : new \DateTimeImmutable($data, $timezone);
         } catch (\Exception $e) {
-            throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
+            throw new NotNormalizableValueException($e->getMessage(), $e->getCode(), $e);
         }
     }
 
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index 4c5cec1653ced..9bcd44b4330ea 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -15,12 +15,13 @@
 use Symfony\Component\Serializer\Encoder\ChainEncoder;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
  * Serializer serializes and deserializes data.
@@ -108,7 +109,7 @@ public function __construct(array $normalizers = array(), array $encoders = arra
     final public function serialize($data, $format, array $context = array())
     {
         if (!$this->supportsEncoding($format)) {
-            throw new UnexpectedValueException(sprintf('Serialization for the format %s is not supported', $format));
+            throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported', $format));
         }
 
         if ($this->encoder->needsNormalization($format)) {
@@ -124,7 +125,7 @@ final public function serialize($data, $format, array $context = array())
     final public function deserialize($data, $type, $format, array $context = array())
     {
         if (!$this->supportsDecoding($format)) {
-            throw new UnexpectedValueException(sprintf('Deserialization for the format %s is not supported', $format));
+            throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported', $format));
         }
 
         $data = $this->decode($data, $format, $context);
@@ -160,14 +161,16 @@ public function normalize($data, $format = null, array $context = array())
                 throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
             }
 
-            throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', get_class($data)));
+            throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', get_class($data)));
         }
 
-        throw new UnexpectedValueException(sprintf('An unexpected value could not be normalized: %s', var_export($data, true)));
+        throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', var_export($data, true)));
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @throws NotNormalizableValueException
      */
     public function denormalize($data, $type, $format = null, array $context = array())
     {
@@ -179,7 +182,7 @@ public function denormalize($data, $type, $format = null, array $context = array
             return $normalizer->denormalize($data, $type, $format, $context);
         }
 
-        throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $type));
+        throw new NotNormalizableValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $type));
     }
 
     /**

From 7c4aa0bccb468fd1de0743469c4b866208edd452 Mon Sep 17 00:00:00 2001
From: Zan Baldwin 
Date: Tue, 26 Sep 2017 14:54:54 +0100
Subject: [PATCH 0918/1099] Saltless Encoder Interface

A new interface for all encoders that do not require a user-generated salt.
---
 .../Command/UserPasswordEncoderCommand.php    | 10 ++++-----
 .../UserPasswordEncoderCommandTest.php        | 12 +++++-----
 .../Core/Encoder/BCryptPasswordEncoder.php    |  2 +-
 .../Encoder/SelfSaltingEncoderInterface.php   | 22 +++++++++++++++++++
 4 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 src/Symfony/Component/Security/Core/Encoder/SelfSaltingEncoderInterface.php

diff --git a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
index c93cb4987f481..0df89403a82a0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
@@ -19,8 +19,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
+use Symfony\Component\Security\Core\Encoder\SelfSaltingEncoderInterface;
 use Symfony\Component\Security\Core\User\User;
 
 /**
@@ -117,9 +117,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $encoderFactory = $this->encoderFactory ?: $this->getContainer()->get('security.encoder_factory');
         $encoder = $encoderFactory->getEncoder($userClass);
-        $bcryptWithoutEmptySalt = !$emptySalt && $encoder instanceof BCryptPasswordEncoder;
+        $saltlessWithoutEmptySalt = !$emptySalt && $encoder instanceof SelfSaltingEncoderInterface;
 
-        if ($bcryptWithoutEmptySalt) {
+        if ($saltlessWithoutEmptySalt) {
             $emptySalt = true;
         }
 
@@ -161,8 +161,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (!$emptySalt) {
             $errorIo->note(sprintf('Make sure that your salt storage field fits the salt length: %s chars', strlen($salt)));
-        } elseif ($bcryptWithoutEmptySalt) {
-            $errorIo->note('Bcrypt encoder used: the encoder generated its own built-in salt.');
+        } elseif ($saltlessWithoutEmptySalt) {
+            $errorIo->note('Self-salting encoder used: the encoder generated its own built-in salt.');
         }
 
         $errorIo->success('Password encoding succeeded');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
index 0710f94b5b094..afd3da09ce0d2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -120,13 +120,11 @@ public function testEncodePasswordEmptySaltOutput()
 
     public function testEncodePasswordBcryptOutput()
     {
-        $this->passwordEncoderCommandTester->execute(
-            array(
-                'command' => 'security:encode-password',
-                'password' => 'p@ssw0rd',
-                'user-class' => 'Custom\Class\Bcrypt\User',
-            )
-        );
+        $this->passwordEncoderCommandTester->execute(array(
+            'command' => 'security:encode-password',
+            'password' => 'p@ssw0rd',
+            'user-class' => 'Custom\Class\Bcrypt\User',
+        ), array('interactive' => false));
 
         $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
     }
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
index 8278ef34fa625..8c09660a35315 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -17,7 +17,7 @@
  * @author Elnur Abdurrakhimov 
  * @author Terje Bråten 
  */
-class BCryptPasswordEncoder extends BasePasswordEncoder
+class BCryptPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEncoderInterface
 {
     const MAX_PASSWORD_LENGTH = 72;
 
diff --git a/src/Symfony/Component/Security/Core/Encoder/SelfSaltingEncoderInterface.php b/src/Symfony/Component/Security/Core/Encoder/SelfSaltingEncoderInterface.php
new file mode 100644
index 0000000000000..37855b60cff83
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Encoder/SelfSaltingEncoderInterface.php
@@ -0,0 +1,22 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Encoder;
+
+/**
+ * SelfSaltingEncoderInterface is a marker interface for encoders that do not
+ * require a user-generated salt.
+ *
+ * @author Zan Baldwin 
+ */
+interface SelfSaltingEncoderInterface
+{
+}

From d173494e487ac07bb2dcbdc70eeb0ce288461ef9 Mon Sep 17 00:00:00 2001
From: Oliver Hoff 
Date: Tue, 19 Sep 2017 11:55:20 +0200
Subject: [PATCH 0919/1099] CsvEncoder handling variable structures and custom
 header order

---
 src/Symfony/Component/Serializer/CHANGELOG.md |  2 +
 .../Serializer/Encoder/CsvEncoder.php         | 72 +++++++++++++++----
 .../Tests/Encoder/CsvEncoderTest.php          | 40 +++++++++--
 3 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index ef59f22499264..9a6e20d52f96d 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -7,6 +7,8 @@ CHANGELOG
  * added `AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT` context option
    to disable throwing an `UnexpectedValueException` on a type mismatch
  * added support for serializing `DateInterval` objects
+ * improved `CsvEncoder` to handle variable nested structures
+ * CSV headers can be passed to the `CsvEncoder` via the `csv_headers` serialization context variable 
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index cdbe0eb44e659..b4e501d7efab7 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -17,6 +17,7 @@
  * Encodes CSV data.
  *
  * @author Kévin Dunglas 
+ * @author Oliver Hoff 
  */
 class CsvEncoder implements EncoderInterface, DecoderInterface
 {
@@ -25,6 +26,7 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
     const ENCLOSURE_KEY = 'csv_enclosure';
     const ESCAPE_CHAR_KEY = 'csv_escape_char';
     const KEY_SEPARATOR_KEY = 'csv_key_separator';
+    const HEADERS_KEY = 'csv_headers';
 
     private $delimiter;
     private $enclosure;
@@ -69,21 +71,22 @@ public function encode($data, $format, array $context = array())
             }
         }
 
-        list($delimiter, $enclosure, $escapeChar, $keySeparator) = $this->getCsvOptions($context);
+        list($delimiter, $enclosure, $escapeChar, $keySeparator, $headers) = $this->getCsvOptions($context);
 
-        $headers = null;
-        foreach ($data as $value) {
-            $result = array();
-            $this->flatten($value, $result, $keySeparator);
+        foreach ($data as &$value) {
+            $flattened = array();
+            $this->flatten($value, $flattened, $keySeparator);
+            $value = $flattened;
+        }
+        unset($value);
 
-            if (null === $headers) {
-                $headers = array_keys($result);
-                fputcsv($handle, $headers, $delimiter, $enclosure, $escapeChar);
-            } elseif (array_keys($result) !== $headers) {
-                throw new InvalidArgumentException('To use the CSV encoder, each line in the data array must have the same structure. You may want to use a custom normalizer class to normalize the data format before passing it to the CSV encoder.');
-            }
+        $headers = array_merge(array_values($headers), array_diff($this->extractHeaders($data), $headers));
+
+        fputcsv($handle, $headers, $delimiter, $enclosure, $escapeChar);
 
-            fputcsv($handle, $result, $delimiter, $enclosure, $escapeChar);
+        $headers = array_fill_keys($headers, '');
+        foreach ($data as $row) {
+            fputcsv($handle, array_replace($headers, $row), $delimiter, $enclosure, $escapeChar);
         }
 
         rewind($handle);
@@ -194,7 +197,50 @@ private function getCsvOptions(array $context)
         $enclosure = isset($context[self::ENCLOSURE_KEY]) ? $context[self::ENCLOSURE_KEY] : $this->enclosure;
         $escapeChar = isset($context[self::ESCAPE_CHAR_KEY]) ? $context[self::ESCAPE_CHAR_KEY] : $this->escapeChar;
         $keySeparator = isset($context[self::KEY_SEPARATOR_KEY]) ? $context[self::KEY_SEPARATOR_KEY] : $this->keySeparator;
+        $headers = isset($context[self::HEADERS_KEY]) ? $context[self::HEADERS_KEY] : array();
+
+        if (!is_array($headers)) {
+            throw new InvalidArgumentException(sprintf('The "%s" context variable must be an array or null, given "%s".', self::HEADERS_KEY, gettype($headers)));
+        }
+
+        return array($delimiter, $enclosure, $escapeChar, $keySeparator, $headers);
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return string[]
+     */
+    private function extractHeaders(array $data)
+    {
+        $headers = array();
+        $flippedHeaders = array();
+
+        foreach ($data as $row) {
+            $previousHeader = null;
+
+            foreach ($row as $header => $_) {
+                if (isset($flippedHeaders[$header])) {
+                    $previousHeader = $header;
+                    continue;
+                }
+
+                if (null === $previousHeader) {
+                    $n = count($headers);
+                } else {
+                    $n = $flippedHeaders[$previousHeader] + 1;
+
+                    for ($j = count($headers); $j > $n; --$j) {
+                        ++$flippedHeaders[$headers[$j] = $headers[$j - 1]];
+                    }
+                }
+
+                $headers[$n] = $header;
+                $flippedHeaders[$header] = $n;
+                $previousHeader = $header;
+            }
+        }
 
-        return array($delimiter, $enclosure, $escapeChar, $keySeparator);
+        return $headers;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
index 61cbc03ee6d26..a5e5c256f34ad 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -135,12 +135,42 @@ public function testEncodeEmptyArray()
         $this->assertEquals("\n\n", $this->encoder->encode(array(array()), 'csv'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
-     */
-    public function testEncodeNonFlattenableStructure()
+    public function testEncodeVariableStructure()
+    {
+        $value = array(
+            array('a' => array('foo', 'bar')),
+            array('a' => array(), 'b' => 'baz'),
+            array('a' => array('bar', 'foo'), 'c' => 'pong'),
+        );
+        $csv = <<assertEquals($csv, $this->encoder->encode($value, 'csv'));
+    }
+
+    public function testEncodeCustomHeaders()
     {
-        $this->encoder->encode(array(array('a' => array('foo', 'bar')), array('a' => array())), 'csv');
+        $context = array(
+            CsvEncoder::HEADERS_KEY => array(
+                'b',
+                'c',
+            ),
+        );
+        $value = array(
+            array('a' => 'foo', 'b' => 'bar'),
+        );
+        $csv = <<assertEquals($csv, $this->encoder->encode($value, 'csv', $context));
     }
 
     public function testSupportsDecoding()

From 860575a88240a1eca46fc9a660212816827d32df Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sat, 16 Sep 2017 21:37:07 +0200
Subject: [PATCH 0920/1099] [WebProfilerBundle] Render file links for twig
 templates

---
 .../Twig/DataCollector/TwigDataCollector.php  | 21 ++++++++++++++++++-
 .../TwigBundle/Resources/config/twig.xml      |  1 +
 .../Resources/views/Collector/twig.html.twig  |  4 +++-
 .../Resources/views/Profiler/open.css.twig    |  4 ++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index f28c92422ae48..d5efaa805362c 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;
 use Twig\Markup;
 use Twig\Profiler\Dumper\HtmlDumper;
 use Twig\Profiler\Profile;
@@ -27,11 +28,13 @@
 class TwigDataCollector extends DataCollector implements LateDataCollectorInterface
 {
     private $profile;
+    private $twig;
     private $computed;
 
-    public function __construct(Profile $profile)
+    public function __construct(Profile $profile, Environment $twig)
     {
         $this->profile = $profile;
+        $this->twig = $twig;
     }
 
     /**
@@ -47,6 +50,17 @@ public function collect(Request $request, Response $response, \Exception $except
     public function lateCollect()
     {
         $this->data['profile'] = serialize($this->profile);
+        $this->data['template_paths'] = array();
+
+        $templateFinder = function (Profile $profile) use (&$templateFinder) {
+            if ($profile->isTemplate() && $template = $this->twig->load($profile->getName())->getSourceContext()->getPath()) {
+                $this->data['template_paths'][$profile->getName()] = $template;
+            }
+            foreach ($profile as $p) {
+                $templateFinder($p);
+            }
+        };
+        $templateFinder($this->profile);
     }
 
     public function getTime()
@@ -59,6 +73,11 @@ public function getTemplateCount()
         return $this->getComputedData('template_count');
     }
 
+    public function getTemplatePaths()
+    {
+        return $this->data['template_paths'];
+    }
+
     public function getTemplates()
     {
         return $this->getComputedData('templates');
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 8c6a944603333..ff564b412148a 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -68,6 +68,7 @@
         
             
             
+            
         
 
         
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
index c3c8a5d5f6764..dbf3825ee60f6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -85,7 +85,9 @@
             
             {% for template, count in collector.templates %}
                 
-                    {{ template }}
+                    {%- set file = collector.templatePaths[template]|default(false) -%}
+                    {%- set link = file ? file|file_link(1) : false -%}
+                    {% if link %}{{ template }}{% else %}{{ template }}{% endif %}
                     {{ count }}
                 
             {% endfor %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
index 7a0941c955a6d..d0f5cda02dccc 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
@@ -58,6 +58,10 @@ a.doc:hover {
     margin-top: 41px;
 }
 
+.source li code {
+    color: #555;
+}
+
 .source li.selected {
     background: rgba(255, 255, 153, 0.5);
 }

From b4b00c9c6f7fb10e02eaa6faf34291261c5e5e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= 
Date: Sun, 29 Jan 2017 20:47:50 +0100
Subject: [PATCH 0921/1099] [Lock] Include lock component in framework bundle

---
 .../DependencyInjection/Configuration.php     |  46 +++++++
 .../FrameworkExtension.php                    |  88 ++++++++++++
 .../FrameworkBundle/Resources/config/lock.xml |  38 ++++++
 .../Resources/config/schema/symfony-1.0.xsd   |  16 +++
 .../DependencyInjection/ConfigurationTest.php |   9 ++
 .../DependencyInjection/Fixtures/xml/lock.xml |  11 ++
 .../Fixtures/xml/lock_named.xml               |  22 +++
 .../DependencyInjection/Fixtures/yml/lock.yml |   2 +
 .../Fixtures/yml/lock_named.yml               |   9 ++
 .../Bundle/FrameworkBundle/composer.json      |   1 +
 .../Console/Command/LockableTrait.php         |   2 +-
 .../Tests/Command/LockableTraitTest.php       |   2 +-
 .../Component/Lock/Store/FlockStore.php       |   7 +-
 .../Component/Lock/Store/MemcachedStore.php   | 128 ++++++++++++++++++
 .../Component/Lock/Store/RedisStore.php       |  90 ++++++++++++
 .../Component/Lock/Store/StoreFactory.php     |  54 ++++++++
 .../Lock/Tests/Store/FlockStoreTest.php       |   2 +-
 .../Lock/Tests/Store/MemcachedStoreTest.php   |  96 +++++++++++++
 18 files changed, 618 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
 create mode 100644 src/Symfony/Component/Lock/Store/StoreFactory.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index fab5ac344600e..bc7026bd61275 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -18,6 +18,8 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Form\Form;
+use Symfony\Component\Lock\Lock;
+use Symfony\Component\Lock\Store\SemaphoreStore;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\Validation;
@@ -129,6 +131,7 @@ public function getConfigTreeBuilder()
         $this->addCacheSection($rootNode);
         $this->addPhpErrorsSection($rootNode);
         $this->addWebLinkSection($rootNode);
+        $this->addLockSection($rootNode);
 
         return $treeBuilder;
     }
@@ -875,6 +878,49 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
+    private function addLockSection(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('lock')
+                    ->info('Lock configuration')
+                    ->{!class_exists(FullStack::class) && class_exists(Lock::class) ? 'canBeDisabled' : 'canBeEnabled'}()
+                    ->beforeNormalization()
+                        ->ifString()->then(function ($v) { return array('enabled' => true, 'resources' => $v); })
+                    ->end()
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) { return is_array($v) && !isset($v['resources']); })
+                        ->then(function ($v) {
+                            $e = $v['enabled'];
+                            unset($v['enabled']);
+
+                            return array('enabled' => $e, 'resources' => $v);
+                        })
+                    ->end()
+                    ->addDefaultsIfNotSet()
+                    ->fixXmlConfig('resource')
+                    ->children()
+                        ->arrayNode('resources')
+                            ->requiresAtLeastOneElement()
+                            ->defaultValue(array('default' => array(class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock')))
+                            ->beforeNormalization()
+                                ->ifString()->then(function ($v) { return array('default' => $v); })
+                            ->end()
+                            ->beforeNormalization()
+                                ->ifTrue(function ($v) { return is_array($v) && array_keys($v) === range(0, count($v) - 1); })
+                                ->then(function ($v) { return array('default' => $v); })
+                            ->end()
+                            ->prototype('array')
+                                ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                                ->prototype('scalar')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addWebLinkSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index ebb594fac1590..4c7b4dfe67716 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -38,6 +38,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -54,6 +55,11 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Lock\Factory;
+use Symfony\Component\Lock\Lock;
+use Symfony\Component\Lock\LockInterface;
+use Symfony\Component\Lock\Store\StoreFactory;
+use Symfony\Component\Lock\StoreInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
@@ -298,6 +304,10 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerPropertyInfoConfiguration($config['property_info'], $container, $loader);
         }
 
+        if ($this->isConfigEnabled($container, $config['lock'])) {
+            $this->registerLockConfiguration($config['lock'], $container, $loader);
+        }
+
         if ($this->isConfigEnabled($container, $config['web_link'])) {
             if (!class_exists(HttpHeaderSerializer::class)) {
                 throw new LogicException('WebLink support cannot be enabled as the WebLink component is not installed.');
@@ -1672,6 +1682,84 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
         }
     }
 
+    private function registerLockConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    {
+        $loader->load('lock.xml');
+
+        foreach ($config['resources'] as $resourceName => $resourceStores) {
+            if (0 === count($resourceStores)) {
+                continue;
+            }
+
+            // Generate stores
+            $storeDefinitions = array();
+            foreach ($resourceStores as $storeDsn) {
+                $storeDsn = $container->resolveEnvPlaceholders($storeDsn, null, $usedEnvs);
+                switch (true) {
+                    case 'flock' === $storeDsn:
+                        $storeDefinition = new Reference('lock.store.flock');
+                        break;
+                    case 'semaphore' === $storeDsn:
+                        $storeDefinition = new Reference('lock.store.semaphore');
+                        break;
+                    case $usedEnvs || preg_match('#^[a-z]++://#', $storeDsn):
+                        if (!$container->hasDefinition($connectionDefinitionId = $container->hash($storeDsn))) {
+                            $connectionDefinition = new Definition(\stdClass::class);
+                            $connectionDefinition->setPublic(false);
+                            $connectionDefinition->setFactory(array(StoreFactory::class, 'createConnection'));
+                            $connectionDefinition->setArguments(array($storeDsn));
+                            $container->setDefinition($connectionDefinitionId, $connectionDefinition);
+                        }
+
+                        $storeDefinition = new Definition(StoreInterface::class);
+                        $storeDefinition->setPublic(false);
+                        $storeDefinition->setFactory(array(StoreFactory::class, 'createStore'));
+                        $storeDefinition->setArguments(array(new Reference($connectionDefinitionId)));
+
+                        $container->setDefinition($storeDefinitionId = 'lock.'.$resourceName.'.store.'.$container->hash($storeDsn), $storeDefinition);
+
+                        $storeDefinition = new Reference($storeDefinitionId);
+                        break;
+                    default:
+                        throw new InvalidArgumentException(sprintf('Lock store DSN "%s" is not valid in resource "%s"', $storeDsn, $resourceName));
+                }
+
+                $storeDefinitions[] = $storeDefinition;
+            }
+
+            // Wrap array of stores with CombinedStore
+            if (count($storeDefinitions) > 1) {
+                $combinedDefinition = new ChildDefinition('lock.store.combined.abstract');
+                $combinedDefinition->replaceArgument(0, $storeDefinitions);
+                $container->setDefinition('lock.'.$resourceName.'.store', $combinedDefinition);
+            } else {
+                $container->setAlias('lock.'.$resourceName.'.store', new Alias((string) $storeDefinitions[0], false));
+            }
+
+            // Generate factories for each resource
+            $factoryDefinition = new ChildDefinition('lock.factory.abstract');
+            $factoryDefinition->replaceArgument(0, new Reference('lock.'.$resourceName.'.store'));
+            $container->setDefinition('lock.'.$resourceName.'.factory', $factoryDefinition);
+
+            // Generate services for lock instances
+            $lockDefinition = new Definition(Lock::class);
+            $lockDefinition->setPublic(false);
+            $lockDefinition->setFactory(array(new Reference('lock.'.$resourceName.'.factory'), 'createLock'));
+            $lockDefinition->setArguments(array($resourceName));
+            $container->setDefinition('lock.'.$resourceName, $lockDefinition);
+
+            // provide alias for default resource
+            if ('default' === $resourceName) {
+                $container->setAlias('lock.store', new Alias('lock.'.$resourceName.'.store', false));
+                $container->setAlias('lock.factory', new Alias('lock.'.$resourceName.'.factory', false));
+                $container->setAlias('lock', new Alias('lock.'.$resourceName, false));
+                $container->setAlias(StoreInterface::class, new Alias('lock.store', false));
+                $container->setAlias(Factory::class, new Alias('lock.factory', false));
+                $container->setAlias(LockInterface::class, new Alias('lock', false));
+            }
+        }
+    }
+
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)
     {
         $version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
new file mode 100644
index 0000000000000..e4c2231c1c155
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
@@ -0,0 +1,38 @@
+
+
+
+
+    
+        
+
+        
+
+        
+
+        
+             
+        
+
+        
+             
+        
+
+        
+             
+             
+        
+
+        
+
+        
+            
+             
+            
+                
+            
+        
+
+    
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index f63f93723029d..181dd9334a80b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -29,6 +29,7 @@
             
             
             
+            
         
 
         
@@ -296,4 +297,19 @@
             
         
     
+
+    
+        
+            
+        
+        
+    
+
+    
+        
+            
+                
+            
+        
+    
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index e4e6f0f2a7bea..e6e83d40b538d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -16,6 +16,7 @@
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Lock\Store\SemaphoreStore;
 
 class ConfigurationTest extends TestCase
 {
@@ -343,6 +344,14 @@ protected static function getBundleDefaultConfig()
             'web_link' => array(
                 'enabled' => !class_exists(FullStack::class),
             ),
+            'lock' => array(
+                'enabled' => !class_exists(FullStack::class),
+                'resources' => array(
+                    'default' => array(
+                        class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock',
+                    ),
+                ),
+            ),
         );
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
new file mode 100644
index 0000000000000..fc2bf0657a615
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
@@ -0,0 +1,11 @@
+
+
+
+    
+        
+    
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
new file mode 100644
index 0000000000000..d36c482de62ea
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
@@ -0,0 +1,22 @@
+
+
+
+
+    
+        redis://paas.com
+    
+
+    
+        
+            semaphore
+            flock
+            semaphore
+            flock
+            %env(REDIS_URL)%
+        
+    
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
new file mode 100644
index 0000000000000..70f578a143a56
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
@@ -0,0 +1,2 @@
+framework:
+    lock: ~
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
new file mode 100644
index 0000000000000..6d0cb5ca638bd
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
@@ -0,0 +1,9 @@
+parameters:
+    env(REDIS_DSN): redis://paas.com
+
+framework:
+    lock:
+        foo: semaphore
+        bar: flock
+        baz: [semaphore, flock]
+        qux: "%env(REDIS_DSN)%"
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 9b16b9417950c..18065e6782306 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -54,6 +54,7 @@
         "symfony/workflow": "~3.3|~4.0",
         "symfony/yaml": "~3.2|~4.0",
         "symfony/property-info": "~3.3|~4.0",
+        "symfony/lock": "~3.4|~4.0",
         "symfony/web-link": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
diff --git a/src/Symfony/Component/Console/Command/LockableTrait.php b/src/Symfony/Component/Console/Command/LockableTrait.php
index b521f3b7708b9..308ebf28c045a 100644
--- a/src/Symfony/Component/Console/Command/LockableTrait.php
+++ b/src/Symfony/Component/Console/Command/LockableTrait.php
@@ -46,7 +46,7 @@ private function lock($name = null, $blocking = false)
         if (SemaphoreStore::isSupported($blocking)) {
             $store = new SemaphoreStore();
         } else {
-            $store = new FlockStore(sys_get_temp_dir());
+            $store = new FlockStore();
         }
 
         $this->lock = (new Factory($store))->createLock($name ?: $this->getName());
diff --git a/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php b/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
index 401ff823a7761..a622d1b4895f5 100644
--- a/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
@@ -44,7 +44,7 @@ public function testLockReturnsFalseIfAlreadyLockedByAnotherCommand()
         if (SemaphoreStore::isSupported(false)) {
             $store = new SemaphoreStore();
         } else {
-            $store = new FlockStore(sys_get_temp_dir());
+            $store = new FlockStore();
         }
 
         $lock = (new Factory($store))->createLock($command->getName());
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
index cd0a276de4a38..5babc7f610bce 100644
--- a/src/Symfony/Component/Lock/Store/FlockStore.php
+++ b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -32,12 +32,15 @@ class FlockStore implements StoreInterface
     private $lockPath;
 
     /**
-     * @param string $lockPath the directory to store the lock
+     * @param string|null $lockPath the directory to store the lock, defaults to the system's temporary directory
      *
      * @throws LockStorageException If the lock directory could not be created or is not writable
      */
-    public function __construct($lockPath)
+    public function __construct($lockPath = null)
     {
+        if (null === $lockPath) {
+            $lockPath = sys_get_temp_dir();
+        }
         if (!is_dir($lockPath) || !is_writable($lockPath)) {
             throw new InvalidArgumentException(sprintf('The directory "%s" is not writable.', $lockPath));
         }
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index 8e9db10cd036f..4a2ffa3e02042 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -24,6 +24,12 @@
  */
 class MemcachedStore implements StoreInterface
 {
+    private static $defaultClientOptions = array(
+        'persistent_id' => null,
+        'username' => null,
+        'password' => null,
+    );
+
     private $memcached;
     private $initialTtl;
     /** @var bool */
@@ -52,6 +58,128 @@ public function __construct(\Memcached $memcached, $initialTtl = 300)
         $this->initialTtl = $initialTtl;
     }
 
+    /**
+     * Creates a Memcached instance.
+     *
+     * By default, the binary protocol, block, and libketama compatible options are enabled.
+     *
+     * Example DSN:
+     * - 'memcached://user:pass@localhost?weight=33'
+     * - array(array('localhost', 11211, 33))
+     *
+     * @param string $dsn     A server or A DSN
+     * @param array  $options An array of options
+     *
+     * @return \Memcached
+     *
+     * @throws \ErrorEception When invalid options or server are provided
+     */
+    public static function createConnection($server, array $options = array())
+    {
+        if (!static::isSupported()) {
+            throw new InvalidArgumentException('Memcached extension is required');
+        }
+        set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
+        try {
+            $options += static::$defaultClientOptions;
+            $client = new \Memcached($options['persistent_id']);
+            $username = $options['username'];
+            $password = $options['password'];
+
+            // parse any DSN in $server
+            if (is_string($server)) {
+                if (0 !== strpos($server, 'memcached://')) {
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $server));
+                }
+                $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
+                    if (!empty($m[1])) {
+                        list($username, $password) = explode(':', $m[1], 2) + array(1 => null);
+                    }
+
+                    return 'file://';
+                }, $server);
+                if (false === $params = parse_url($params)) {
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $server));
+                }
+                if (!isset($params['host']) && !isset($params['path'])) {
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $server));
+                }
+                if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
+                    $params['weight'] = $m[1];
+                    $params['path'] = substr($params['path'], 0, -strlen($m[0]));
+                }
+                $params += array(
+                    'host' => isset($params['host']) ? $params['host'] : $params['path'],
+                    'port' => isset($params['host']) ? 11211 : null,
+                    'weight' => 0,
+                );
+                if (isset($params['query'])) {
+                    parse_str($params['query'], $query);
+                    $params += $query;
+                    $options = $query + $options;
+                }
+
+                $server = array($params['host'], $params['port'], $params['weight']);
+            }
+
+            // set client's options
+            unset($options['persistent_id'], $options['username'], $options['password'], $options['weight']);
+            $options = array_change_key_case($options, CASE_UPPER);
+            $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
+            $client->setOption(\Memcached::OPT_NO_BLOCK, false);
+            if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
+                $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
+            }
+            foreach ($options as $name => $value) {
+                if (is_int($name)) {
+                    continue;
+                }
+                if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) {
+                    $value = constant('Memcached::'.$name.'_'.strtoupper($value));
+                }
+                $opt = constant('Memcached::OPT_'.$name);
+
+                unset($options[$name]);
+                $options[$opt] = $value;
+            }
+            $client->setOptions($options);
+
+            // set client's servers, taking care of persistent connections
+            if (!$client->isPristine()) {
+                $oldServers = array();
+                foreach ($client->getServerList() as $server) {
+                    $oldServers[] = array($server['host'], $server['port']);
+                }
+
+                $newServers = array();
+                if (1 < count($server)) {
+                    $server = array_values($server);
+                    unset($server[2]);
+                    $server[1] = (int) $server[1];
+                }
+                $newServers[] = $server;
+
+                if ($oldServers !== $newServers) {
+                    // before resetting, ensure $servers is valid
+                    $client->addServers(array($server));
+                    $client->resetServerList();
+                }
+            }
+            $client->addServers(array($server));
+
+            if (null !== $username || null !== $password) {
+                if (!method_exists($client, 'setSaslAuthData')) {
+                    trigger_error('Missing SASL support: the memcached extension must be compiled with --enable-memcached-sasl.');
+                }
+                $client->setSaslAuthData($username, $password);
+            }
+
+            return $client;
+        } finally {
+            restore_error_handler();
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
index 88b15938997c9..66a067dfb0f9d 100644
--- a/src/Symfony/Component/Lock/Store/RedisStore.php
+++ b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -24,6 +24,14 @@
  */
 class RedisStore implements StoreInterface
 {
+    private static $defaultConnectionOptions = array(
+        'class' => null,
+        'persistent' => 0,
+        'persistent_id' => null,
+        'timeout' => 30,
+        'read_timeout' => 0,
+        'retry_interval' => 0,
+    );
     private $redis;
     private $initialTtl;
 
@@ -45,6 +53,88 @@ public function __construct($redisClient, $initialTtl = 300.0)
         $this->initialTtl = $initialTtl;
     }
 
+    /**
+     * Creates a Redis connection using a DSN configuration.
+     *
+     * Example DSN:
+     *   - redis://localhost
+     *   - redis://example.com:1234
+     *   - redis://secret@example.com/13
+     *   - redis:///var/run/redis.sock
+     *   - redis://secret@/var/run/redis.sock/13
+     *
+     * @param string $dsn
+     * @param array  $options See self::$defaultConnectionOptions
+     *
+     * @throws InvalidArgumentException When the DSN is invalid
+     *
+     * @return \Redis|\Predis\Client According to the "class" option
+     */
+    public static function createConnection($dsn, array $options = array())
+    {
+        if (0 !== strpos($dsn, 'redis://')) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
+        }
+        $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
+            if (isset($m[1])) {
+                $auth = $m[1];
+            }
+
+            return 'file://';
+        }, $dsn);
+        if (false === $params = parse_url($params)) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
+        }
+        if (!isset($params['host']) && !isset($params['path'])) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
+        }
+        if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
+            $params['dbindex'] = $m[1];
+            $params['path'] = substr($params['path'], 0, -strlen($m[0]));
+        }
+        $params += array(
+            'host' => isset($params['host']) ? $params['host'] : $params['path'],
+            'port' => isset($params['host']) ? 6379 : null,
+            'dbindex' => 0,
+        );
+        if (isset($params['query'])) {
+            parse_str($params['query'], $query);
+            $params += $query;
+        }
+        $params += $options + self::$defaultConnectionOptions;
+        $class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
+
+        if (is_a($class, \Redis::class, true)) {
+            $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
+            $redis = new $class();
+            @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+
+            if (@!$redis->isConnected()) {
+                $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
+                throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));
+            }
+
+            if ((null !== $auth && !$redis->auth($auth))
+                || ($params['dbindex'] && !$redis->select($params['dbindex']))
+                || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
+            ) {
+                $e = preg_replace('/^ERR /', '', $redis->getLastError());
+                throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn));
+            }
+        } elseif (is_a($class, \Predis\Client::class, true)) {
+            $params['scheme'] = isset($params['host']) ? 'tcp' : 'unix';
+            $params['database'] = $params['dbindex'] ?: null;
+            $params['password'] = $auth;
+            $redis = new $class((new Factory())->create($params));
+        } elseif (class_exists($class, false)) {
+            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class));
+        } else {
+            throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
+        }
+
+        return $redis;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
new file mode 100644
index 0000000000000..9a23cf6472dea
--- /dev/null
+++ b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -0,0 +1,54 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Lock\Store;
+
+use Symfony\Component\Lock\Exception\InvalidArgumentException;
+
+/**
+ * StoreFactory create stores and connections.
+ *
+ * @author Jérémy Derussé 
+ */
+class StoreFactory
+{
+    public static function createConnection($dsn, array $options = array())
+    {
+        if (!is_string($dsn)) {
+            throw new InvalidArgumentException(sprintf('The %s() method expects argument #1 to be string, %s given.', __METHOD__, gettype($dsn)));
+        }
+        if (0 === strpos($dsn, 'redis://')) {
+            return RedisStore::createConnection($dsn, $options);
+        }
+        if (0 === strpos($dsn, 'memcached://')) {
+            return MemcachedStore::createConnection($dsn, $options);
+        }
+
+        throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn));
+    }
+
+    /**
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client|\Memcached $connection
+     *
+     * @return RedisStore|MemcachedStore
+     */
+    public static function createStore($connection)
+    {
+        if ($connection instanceof \Redis || $connection instanceof \RedisArray || $connection instanceof \RedisCluster || $connection instanceof \Predis\Client) {
+            return new RedisStore($connection);
+        }
+        if ($connection instanceof \Memcached) {
+            return new MemcachedStore($connection);
+        }
+
+        throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', get_class($connection)));
+    }
+}
diff --git a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
index 53d2ae78dc78a..ef3650c3124b5 100644
--- a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
@@ -26,7 +26,7 @@ class FlockStoreTest extends AbstractStoreTest
      */
     protected function getStore()
     {
-        return new FlockStore(sys_get_temp_dir());
+        return new FlockStore();
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
index eb030fba0f9de..cfe03b25e2c34 100644
--- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
@@ -54,4 +54,100 @@ public function testAbortAfterExpiration()
     {
         $this->markTestSkipped('Memcached expects a TTL greater than 1 sec. Simulating a slow network is too hard');
     }
+
+    public function testDefaultOptions()
+    {
+        $this->assertTrue(MemcachedStore::isSupported());
+
+        $client = MemcachedStore::createConnection('memcached://127.0.0.1');
+
+        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
+    }
+
+    /**
+     * @dataProvider provideServersSetting
+     */
+    public function testServersSetting($dsn, $host, $port)
+    {
+        $client1 = MemcachedStore::createConnection($dsn);
+        $client3 = MemcachedStore::createConnection(array($host, $port));
+        $expect = array(
+            'host' => $host,
+            'port' => $port,
+        );
+
+        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
+        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
+        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
+    }
+
+    public function provideServersSetting()
+    {
+        yield array(
+            'memcached://127.0.0.1/50',
+            '127.0.0.1',
+            11211,
+        );
+        yield array(
+            'memcached://localhost:11222?weight=25',
+            'localhost',
+            11222,
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
+                'memcached://user:password@127.0.0.1?weight=50',
+                '127.0.0.1',
+                11211,
+            );
+        }
+        yield array(
+            'memcached:///var/run/memcached.sock?weight=25',
+            '/var/run/memcached.sock',
+            0,
+        );
+        yield array(
+            'memcached:///var/local/run/memcached.socket?weight=25',
+            '/var/local/run/memcached.socket',
+            0,
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
+                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
+                '/var/local/run/memcached.socket',
+                0,
+            );
+        }
+    }
+
+    /**
+     * @dataProvider provideDsnWithOptions
+     */
+    public function testDsnWithOptions($dsn, array $options, array $expectedOptions)
+    {
+        $client = MemcachedStore::createConnection($dsn, $options);
+
+        foreach ($expectedOptions as $option => $expect) {
+            $this->assertSame($expect, $client->getOption($option));
+        }
+    }
+
+    public function provideDsnWithOptions()
+    {
+        if (!class_exists('\Memcached')) {
+            self::markTestSkipped('Extension memcached required.');
+        }
+
+        yield array(
+            'memcached://localhost:11222?retry_timeout=10',
+            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
+            array(\Memcached::OPT_RETRY_TIMEOUT => 10),
+        );
+        yield array(
+            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
+            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
+            array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
+        );
+    }
 }

From 5ab50103ae4edc0db2c6bb2f8aaf6833ba9b7984 Mon Sep 17 00:00:00 2001
From: Pierre du Plessis 
Date: Fri, 10 Mar 2017 14:08:44 +0200
Subject: [PATCH 0922/1099] Remove Validator\TypeTestCase and add validator
 logic to base TypeTestCase

---
 .../Test/Traits/ValidatorExtensionTrait.php   | 40 +++++++++++++++++
 .../Component/Form/Test/TypeTestCase.php      | 19 ++++++++
 .../Type/BaseValidatorExtensionTest.php       |  1 +
 .../Type/FormTypeValidatorExtensionTest.php   |  3 ++
 .../Type/SubmitTypeValidatorExtensionTest.php |  4 ++
 .../Extension/Validator/Type/TypeTestCase.php | 44 -------------------
 .../Type/UploadValidatorExtensionTest.php     |  1 +
 7 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
 delete mode 100644 src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php

diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
new file mode 100644
index 0000000000000..0724f697ba77a
--- /dev/null
+++ b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
@@ -0,0 +1,40 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Test\Traits;
+
+use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+use Symfony\Component\Form\Test\TypeTestCase;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+trait ValidatorExtensionTrait
+{
+    protected $validator;
+
+    protected function getValidatorExtension()
+    {
+        if (!interface_exists(ValidatorInterface::class)) {
+            throw new \Exception('In order to use the "ValidatorExtensionTrait", the symfony/validator component must be installed');
+        }
+
+        if (!$this instanceof TypeTestCase) {
+            throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends %s', TypeTestCase::class));
+        }
+
+        $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
+        $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
+        $this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));
+        $this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));
+
+        return new ValidatorExtension($this->validator);
+    }
+}
diff --git a/src/Symfony/Component/Form/Test/TypeTestCase.php b/src/Symfony/Component/Form/Test/TypeTestCase.php
index ff3f78292f5f0..346dc61648896 100644
--- a/src/Symfony/Component/Form/Test/TypeTestCase.php
+++ b/src/Symfony/Component/Form/Test/TypeTestCase.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 abstract class TypeTestCase extends FormIntegrationTestCase
 {
@@ -34,6 +35,24 @@ protected function setUp()
         $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
     }
 
+    protected function tearDown()
+    {
+        if (in_array(ValidatorExtensionTrait::class, class_uses($this))) {
+            $this->validator = null;
+        }
+    }
+
+    protected function getExtensions()
+    {
+        $extensions = array();
+
+        if (in_array(ValidatorExtensionTrait::class, class_uses($this))) {
+            $extensions[] = $this->getValidatorExtension();
+        }
+
+        return $extensions;
+    }
+
     public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
     {
         self::assertEquals($expected->format('c'), $actual->format('c'));
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
index f12b915b9a378..e83aaaa3491dc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
 use Symfony\Component\Form\Test\FormInterface;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 
 /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
index 2bf10bb36bce2..0dca9c476b56d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -12,11 +12,14 @@
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
 use Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension;
+use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\ConstraintViolationList;
 
 class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
+    use ValidatorExtensionTrait;
+
     public function testSubmitValidatesData()
     {
         $builder = $this->factory->createBuilder(
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
index 48fc8de51d9c8..015b9582b5764 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
@@ -11,8 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
+use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
+
 class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
+    use ValidatorExtensionTrait;
+
     protected function createForm(array $options = array())
     {
         return $this->factory->create('Symfony\Component\Form\Extension\Core\Type\SubmitType', null, $options);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
deleted file mode 100644
index cb6000aa8fb81..0000000000000
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
-
-use Symfony\Component\Form\Test\TypeTestCase as BaseTypeTestCase;
-use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
-
-abstract class TypeTestCase extends BaseTypeTestCase
-{
-    protected $validator;
-
-    protected function setUp()
-    {
-        $this->validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
-        $metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
-        $this->validator->expects($this->once())->method('getMetadataFor')->will($this->returnValue($metadata));
-        $this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));
-
-        parent::setUp();
-    }
-
-    protected function tearDown()
-    {
-        $this->validator = null;
-
-        parent::tearDown();
-    }
-
-    protected function getExtensions()
-    {
-        return array_merge(parent::getExtensions(), array(
-            new ValidatorExtension($this->validator),
-        ));
-    }
-}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
index 8c0984f7e4e13..17792b67454f2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
 use Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\Options;
 

From ec9242d1ee906ed288e0cd31c1ac1557647519cb Mon Sep 17 00:00:00 2001
From: Christopher Davis 
Date: Wed, 22 Feb 2017 10:41:23 -0500
Subject: [PATCH 0923/1099] [Serializer] Add Support for  in CustomNormalizer

---
 .../Normalizer/AbstractNormalizer.php         |  9 ++--
 .../Normalizer/CustomNormalizer.php           |  7 +--
 .../Normalizer/ObjectToPopulateTrait.php      | 41 ++++++++++++++++
 .../Tests/Normalizer/CustomNormalizerTest.php | 12 +++++
 .../Normalizer/ObjectToPopulateTraitTest.php  | 47 +++++++++++++++++++
 5 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 726654cbf6b87..7a79949185740 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -27,6 +27,8 @@
  */
 abstract class AbstractNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
+    use ObjectToPopulateTrait;
+
     const CIRCULAR_REFERENCE_LIMIT = 'circular_reference_limit';
     const OBJECT_TO_POPULATE = 'object_to_populate';
     const GROUPS = 'groups';
@@ -317,12 +319,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
             $format = null;
         }
 
-        if (
-            isset($context[static::OBJECT_TO_POPULATE]) &&
-            is_object($context[static::OBJECT_TO_POPULATE]) &&
-            $context[static::OBJECT_TO_POPULATE] instanceof $class
-        ) {
-            $object = $context[static::OBJECT_TO_POPULATE];
+        if (null !== $object = $this->extractObjectToPopulate($class, $context, static::OBJECT_TO_POPULATE)) {
             unset($context[static::OBJECT_TO_POPULATE]);
 
             return $object;
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index fd8bbca274211..b56b10f2dcf70 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -19,10 +19,11 @@
  */
 class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
-    private $cache = array();
-
+    use ObjectToPopulateTrait;
     use SerializerAwareTrait;
 
+    private $cache = array();
+
     /**
      * {@inheritdoc}
      */
@@ -36,7 +37,7 @@ public function normalize($object, $format = null, array $context = array())
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
-        $object = new $class();
+        $object = $this->extractObjectToPopulate($class, $context) ?: new $class();
         $object->denormalize($this->serializer, $data, $format, $context);
 
         return $object;
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
new file mode 100644
index 0000000000000..f21100f014c6a
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
@@ -0,0 +1,41 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+trait ObjectToPopulateTrait
+{
+    /**
+     * Extract the `object_to_populate` field from the context if it exists
+     * and is an instance of the provided $class.
+     *
+     * @param string $class The class the object should be
+     * @param $context The denormalization context
+     * @param string $key They in which to look for the object to populate.
+     *                    Keeps backwards compatibility with `AbstractNormalizer`.
+     *
+     * @return object|null an object if things check out, null otherwise
+     */
+    protected function extractObjectToPopulate($class, array $context, $key = null)
+    {
+        $key = $key ?: 'object_to_populate';
+
+        if (
+            isset($context[$key]) &&
+            is_object($context[$key]) &&
+            $context[$key] instanceof $class
+        ) {
+            return $context[$key];
+        }
+
+        return null;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
index a3c3c1a0e62ec..e5d0d445707eb 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
@@ -56,6 +56,18 @@ public function testDeserialize()
         $this->assertNull($obj->xmlFoo);
     }
 
+    public function testDenormalizeWithObjectToPopulateUsesProvidedObject()
+    {
+        $expected = new ScalarDummy();
+        $obj = $this->normalizer->denormalize('foo', ScalarDummy::class, 'json', array(
+            'object_to_populate' => $expected,
+        ));
+
+        $this->assertSame($expected, $obj);
+        $this->assertEquals('foo', $obj->foo);
+        $this->assertNull($obj->xmlFoo);
+    }
+
     public function testSupportsNormalization()
     {
         $this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy()));
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
new file mode 100644
index 0000000000000..def71e5def5d7
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
@@ -0,0 +1,47 @@
+extractObjectToPopulate(ProxyDummy::class, array());
+
+        $this->assertNull($object);
+    }
+
+    public function testExtractObjectToPopulateReturnsNullWhenNonObjectIsProvided()
+    {
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+            'object_to_populate' => 'not an object',
+        ));
+
+        $this->assertNull($object);
+    }
+
+    public function testExtractObjectToPopulateReturnsNullWhenTheClassIsNotAnInstanceOfTheProvidedClass()
+    {
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+            'object_to_populate' => new \stdClass(),
+        ));
+
+        $this->assertNull($object);
+    }
+
+    public function testExtractObjectToPopulateReturnsObjectWhenEverythingChecksOut()
+    {
+        $expected = new ProxyDummy();
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+            'object_to_populate' => $expected,
+        ));
+
+        $this->assertSame($expected, $object);
+    }
+}

From f7eb7972ff7eb9e844b771c061e0f9fe8cc56fa4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 27 Sep 2017 10:32:40 -0700
Subject: [PATCH 0924/1099] fixed CS

---
 .../Serializer/Normalizer/ObjectToPopulateTrait.php         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
index f21100f014c6a..ac647889168bd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
@@ -28,11 +28,7 @@ protected function extractObjectToPopulate($class, array $context, $key = null)
     {
         $key = $key ?: 'object_to_populate';
 
-        if (
-            isset($context[$key]) &&
-            is_object($context[$key]) &&
-            $context[$key] instanceof $class
-        ) {
+        if (isset($context[$key]) && is_object($context[$key]) && $context[$key] instanceof $class) {
             return $context[$key];
         }
 

From d43c1f7b6040732d6cd66b62b3bee9e70c43b088 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Wed, 27 Sep 2017 21:54:46 +0200
Subject: [PATCH 0925/1099] [SecurityBundle] Add missing AclSchemaListener
 deprecation

---
 .../Bundle/SecurityBundle/EventListener/AclSchemaListener.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
index 8faa9ac366fd6..33d37fe2edb64 100644
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\SecurityBundle\EventListener;
 
+@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\EventListener\SetAclCommand instead.', AclSchemaListener::class), E_USER_DEPRECATED);
+
 use Symfony\Component\Security\Acl\Dbal\Schema;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 
@@ -18,6 +20,8 @@
  * Merges ACL schema into the given schema.
  *
  * @author Johannes M. Schmitt 
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class AclSchemaListener
 {

From c8c3d42c7c5b52880a0ab7ad8df6b6f8aaa0396c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Wed, 27 Sep 2017 21:45:22 +0200
Subject: [PATCH 0926/1099] [SecurityBundle] Remove remaining ACL stuff from
 SecurityBundle

---
 .../DependencyInjection/MainConfiguration.php | 10 +---
 .../EventListener/AclSchemaListener.php       | 36 --------------
 .../Resources/config/security_acl.xml         | 35 -------------
 .../Resources/config/security_acl_dbal.xml    | 49 -------------------
 .../Fixtures/php/custom_acl_provider.php      |  9 ----
 .../Fixtures/xml/custom_acl_provider.xml      | 16 ------
 .../Fixtures/yml/custom_acl_provider.yml      |  6 ---
 .../Functional/Bundle/AclBundle/AclBundle.php | 21 --------
 .../Bundle/AclBundle/Entity/Car.php           | 22 ---------
 .../Tests/Functional/app/Acl/bundles.php      | 17 -------
 .../Tests/Functional/app/Acl/config.yml       | 28 -----------
 .../Tests/Functional/app/Acl/doctrine.yml     |  5 --
 .../Tests/Functional/app/AppKernel.php        |  6 ---
 .../Bundle/SecurityBundle/composer.json       |  4 --
 14 files changed, 1 insertion(+), 263 deletions(-)
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
 delete mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 078817b3be97e..5288de97b1bdb 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -19,15 +19,7 @@
 use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
 
 /**
- * This class contains the configuration information.
- *
- * This information is for the following tags:
- *
- *   * security.config
- *   * security.acl
- *
- * This information is solely responsible for how the different configuration
- * sections are normalized, and merged.
+ * SecurityExtension configuration structure.
  *
  * @author Johannes M. Schmitt 
  */
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
deleted file mode 100644
index 8faa9ac366fd6..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\EventListener;
-
-use Symfony\Component\Security\Acl\Dbal\Schema;
-use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-
-/**
- * Merges ACL schema into the given schema.
- *
- * @author Johannes M. Schmitt 
- */
-class AclSchemaListener
-{
-    private $schema;
-
-    public function __construct(Schema $schema)
-    {
-        $this->schema = $schema;
-    }
-
-    public function postGenerateSchema(GenerateSchemaEventArgs $args)
-    {
-        $schema = $args->getSchema();
-        $this->schema->addToSchema($schema);
-    }
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
deleted file mode 100644
index 68418dadff1c9..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-        
-
-        
-
-        
-            
-            
-        
-
-        
-            
-                
-            
-        
-
-        
-
-        
-            
-            
-            
-            
-            
-            
-            
-        
-    
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
deleted file mode 100644
index c1ed332654fe0..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-    
-        
-
-        
-
-        
-            
-            
-            
-                %security.acl.dbal.class_table_name%
-                %security.acl.dbal.entry_table_name%
-                %security.acl.dbal.oid_table_name%
-                %security.acl.dbal.oid_ancestors_table_name%
-                %security.acl.dbal.sid_table_name%
-            
-            
-        
-
-        
-            
-                %security.acl.dbal.class_table_name%
-                %security.acl.dbal.entry_table_name%
-                %security.acl.dbal.oid_table_name%
-                %security.acl.dbal.oid_ancestors_table_name%
-                %security.acl.dbal.sid_table_name%
-            
-            
-        
-        
-            
-        
-
-        
-        
-
-        
-            
-            
-        
-
-        
-    
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php
deleted file mode 100644
index 351dc6c09e1a6..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php
+++ /dev/null
@@ -1,9 +0,0 @@
-load('container1.php', $container);
-
-$container->loadFromExtension('security', array(
-    'acl' => array(
-        'provider' => 'foo',
-    ),
-));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml
deleted file mode 100644
index 6addc81668253..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-    
-        
-    
-
-    
-        
-    
-
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml
deleted file mode 100644
index 633eed00e3418..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-imports:
-    - { resource: container1.yml }
-
-security:
-    acl:
-        provider: foo
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php
deleted file mode 100644
index 1208003bcc2c4..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-/**
- * @author Kévin Dunglas 
- */
-class AclBundle extends Bundle
-{
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php
deleted file mode 100644
index c85a589578ec5..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\Entity;
-
-/**
- * Car.
- *
- * @author Kévin Dunglas 
- */
-class Car
-{
-    public $id;
-}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php
deleted file mode 100644
index 51337913d5370..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-return array(
-    new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-    new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-    new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\AclBundle(),
-);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
deleted file mode 100644
index 45f8e24d4f81e..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-imports:
-    - { resource: ./../config/framework.yml }
-
-services:
-    _defaults: { public: true }
-    test.security.acl.provider: '@security.acl.provider'
-
-doctrine:
-    dbal:
-        driver:   pdo_sqlite
-        memory:   true
-        charset:  UTF8
-
-security:
-    firewalls:
-        test:
-            pattern:  ^/
-            security: false
-    acl:
-        connection: default
-    encoders:
-        Symfony\Component\Security\Core\User\User: plaintext
-    providers:
-        in_memory:
-            memory:
-                users:
-                    kevin: { password: test, roles: [ROLE_USER] }
-                    anne:  { password: test, roles: [ROLE_ADMIN]}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml
deleted file mode 100644
index 7a12388398f76..0000000000000
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
-services:
-    Doctrine\Bundle\DoctrineBundle\Command\:
-        resource: "@DoctrineBundle/Command/*"
-        tags: [console.command]
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
index 82c8ad4aa6c60..1aab514f45450 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\app;
 
-use Doctrine\ORM\Version;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
@@ -83,11 +82,6 @@ public function getLogDir()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load($this->rootConfig);
-
-        // to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
-        if ('Acl' === $this->testCase && class_exists(Version::class)) {
-            $loader->load(__DIR__.'/Acl/doctrine.yml');
-        }
     }
 
     public function serialize()
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index c5d6f7f103f53..d31285e66a0ee 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -32,7 +32,6 @@
         "symfony/form": "~3.4|~4.0",
         "symfony/framework-bundle": "~3.4|~4.0",
         "symfony/http-foundation": "~3.4|~4.0",
-        "symfony/security-acl": "~2.8|~3.0",
         "symfony/translation": "~3.4|~4.0",
         "symfony/twig-bundle": "~3.4|~4.0",
         "symfony/twig-bridge": "~3.4|~4.0",
@@ -50,9 +49,6 @@
         "symfony/framework-bundle": "<3.4",
         "symfony/console": "<3.4"
     },
-    "suggest": {
-        "symfony/security-acl": "For using the ACL functionality of this bundle"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
         "exclude-from-classmap": [

From 5b4308e9e1d870d0e2a7d4b931299b1e20669b7d Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Wed, 27 Sep 2017 23:22:30 +0200
Subject: [PATCH 0927/1099] [Routing] Enhance Route(Collection) docblocks

---
 src/Symfony/Component/Routing/Route.php       | 28 +++++++++----------
 .../Component/Routing/RouteCollection.php     |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index fee2002c9d9bb..d6f3906a0f939 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -30,12 +30,12 @@ class Route implements \Serializable
     private $host = '';
 
     /**
-     * @var array
+     * @var string[]
      */
     private $schemes = array();
 
     /**
-     * @var array
+     * @var string[]
      */
     private $methods = array();
 
@@ -71,14 +71,14 @@ class Route implements \Serializable
      *
      *  * compiler_class: A class name able to compile this route instance (RouteCompiler by default)
      *
-     * @param string       $path         The path pattern to match
-     * @param array        $defaults     An array of default parameter values
-     * @param array        $requirements An array of requirements for parameters (regexes)
-     * @param array        $options      An array of options
-     * @param string       $host         The host pattern to match
-     * @param string|array $schemes      A required URI scheme or an array of restricted schemes
-     * @param string|array $methods      A required HTTP method or an array of restricted methods
-     * @param string       $condition    A condition that should evaluate to true for the route to match
+     * @param string          $path         The path pattern to match
+     * @param array           $defaults     An array of default parameter values
+     * @param array           $requirements An array of requirements for parameters (regexes)
+     * @param array           $options      An array of options
+     * @param string          $host         The host pattern to match
+     * @param string|string[] $schemes      A required URI scheme or an array of restricted schemes
+     * @param string|string[] $methods      A required HTTP method or an array of restricted methods
+     * @param string          $condition    A condition that should evaluate to true for the route to match
      */
     public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = '')
     {
@@ -230,7 +230,7 @@ public function setHost($pattern)
      * Returns the lowercased schemes this route is restricted to.
      * So an empty array means that any scheme is allowed.
      *
-     * @return array The schemes
+     * @return string[] The schemes
      */
     public function getSchemes()
     {
@@ -243,7 +243,7 @@ public function getSchemes()
      *
      * This method implements a fluent interface.
      *
-     * @param string|array $schemes The scheme or an array of schemes
+     * @param string|string[] $schemes The scheme or an array of schemes
      *
      * @return $this
      */
@@ -279,7 +279,7 @@ public function hasScheme($scheme)
      * Returns the uppercased HTTP methods this route is restricted to.
      * So an empty array means that any method is allowed.
      *
-     * @return array The methods
+     * @return string[] The methods
      */
     public function getMethods()
     {
@@ -292,7 +292,7 @@ public function getMethods()
      *
      * This method implements a fluent interface.
      *
-     * @param string|array $methods The method or an array of methods
+     * @param string|string[] $methods The method or an array of methods
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index 2ccb90f3b0966..f8b18084be126 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -104,7 +104,7 @@ public function get($name)
     /**
      * Removes a route or an array of routes by name from the collection.
      *
-     * @param string|array $name The route name or an array of route names
+     * @param string|string[] $name The route name or an array of route names
      */
     public function remove($name)
     {
@@ -234,7 +234,7 @@ public function addOptions(array $options)
     /**
      * Sets the schemes (e.g. 'https') all child routes are restricted to.
      *
-     * @param string|array $schemes The scheme or an array of schemes
+     * @param string|string[] $schemes The scheme or an array of schemes
      */
     public function setSchemes($schemes)
     {
@@ -246,7 +246,7 @@ public function setSchemes($schemes)
     /**
      * Sets the HTTP methods (e.g. 'POST') all child routes are restricted to.
      *
-     * @param string|array $methods The method or an array of methods
+     * @param string|string[] $methods The method or an array of methods
      */
     public function setMethods($methods)
     {

From eebe39e600c68971ec78255b16b65995d2bb49dc Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Wed, 27 Sep 2017 23:42:53 +0200
Subject: [PATCH 0928/1099] Fix AclSchemaListener deprecation

---
 .../Bundle/SecurityBundle/EventListener/AclSchemaListener.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
index 33d37fe2edb64..6441fbba6275e 100644
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\EventListener;
 
-@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\EventListener\SetAclCommand instead.', AclSchemaListener::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('Class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\EventListener\AclSchemaListener instead.', AclSchemaListener::class), E_USER_DEPRECATED);
 
 use Symfony\Component\Security\Acl\Dbal\Schema;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;

From 7d749bfb7743991ddc35b93cce1876bfe441ada5 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Wed, 27 Sep 2017 19:08:26 +0200
Subject: [PATCH 0929/1099] [Routing] Enhance PHP DSL traits docblocks

---
 .../Routing/Loader/Configurator/Traits/AddTrait.php         | 2 +-
 .../Routing/Loader/Configurator/Traits/RouteTrait.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
index abaf868c9c698..7171fd241f6d0 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
@@ -28,7 +28,7 @@ trait AddTrait
      * Adds a route.
      *
      * @param string $name
-     * @param string $value
+     * @param string $path
      *
      * @return RouteConfigurator
      */
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
index 8eb3276500d89..a40cd16a5b2e5 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
@@ -95,7 +95,7 @@ final public function host($pattern)
      * Sets the schemes (e.g. 'https') this route is restricted to.
      * So an empty array means that any scheme is allowed.
      *
-     * @param array $schemes
+     * @param string[] $schemes
      *
      * @return $this
      */
@@ -110,7 +110,7 @@ final public function schemes(array $schemes)
      * Sets the HTTP methods (e.g. 'POST') this route is restricted to.
      * So an empty array means that any method is allowed.
      *
-     * @param array $methods
+     * @param string[] $methods
      *
      * @return $this
      */
@@ -124,7 +124,7 @@ final public function methods(array $methods)
     /**
      * Adds the "_controller" entry to defaults.
      *
-     * @param callable $controller a callable or parseable pseudo-callable
+     * @param callable|string $controller a callable or parseable pseudo-callable
      *
      * @return $this
      */

From fbe71480005c34d7f7768baca9b6fe7cd8597752 Mon Sep 17 00:00:00 2001
From: darnel 
Date: Thu, 28 Sep 2017 08:55:08 +0200
Subject: [PATCH 0930/1099] Fix translation for "This field was not expected"

Update validators.cs.xlf - Fix czech translation for "This field was not expected"
---
 .../Validator/Resources/translations/validators.cs.xlf          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
index ba6853be90dfe..67957d845d2f6 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
@@ -36,7 +36,7 @@
             
             
                 This field was not expected.
-                Toto pole nebyla očekávána.
+                Toto pole nebylo očekáváno.
             
             
                 This field is missing.

From 0a7e5b0d0962fce41797ec536abfe4b73acfdfe3 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Wed, 27 Sep 2017 19:31:27 +0200
Subject: [PATCH 0931/1099] [DI] Fix missing use + minor tweaks

---
 .../Configurator/AbstractConfigurator.php     | 31 +++++--------------
 .../AbstractServiceConfigurator.php           |  5 ++-
 .../Configurator/ReferenceConfigurator.php    |  9 ++++--
 .../Configurator/Traits/AbstractTrait.php     |  2 --
 .../Traits/AutoconfigureTrait.php             |  1 +
 .../Configurator/Traits/DeprecateTrait.php    |  1 -
 .../Loader/Configurator/Traits/TagTrait.php   |  1 -
 .../services_autoconfigure_with_parent.php    |  9 ++++++
 .../Tests/Loader/PhpFileLoaderTest.php        | 13 ++++++++
 9 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_autoconfigure_with_parent.php

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
index 2c4538e20144a..73ca320e31247 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
@@ -22,6 +22,9 @@ abstract class AbstractConfigurator
 {
     const FACTORY = 'unknown';
 
+    /** @internal */
+    protected $definition;
+
     public function __call($method, $args)
     {
         if (method_exists($this, 'set'.$method)) {
@@ -37,7 +40,7 @@ public function __call($method, $args)
      * @param mixed $value
      * @param bool  $allowServices whether Definition and Reference are allowed; by default, only scalars and arrays are
      *
-     * @return mixed the value, optionaly cast to a Definition/Reference
+     * @return mixed the value, optionally cast to a Definition/Reference
      */
     public static function processValue($value, $allowServices = false)
     {
@@ -50,32 +53,14 @@ public static function processValue($value, $allowServices = false)
         }
 
         if ($value instanceof ReferenceConfigurator) {
-            static $refCast;
-
-            if (!$refCast) {
-                $refCast = \Closure::bind(function ($value) {
-                    return new Reference($value->id, $value->invalidBehavior);
-                }, null, $value);
-            }
-
-            // cast ReferenceConfigurator to Reference
-            return $refCast($value);
+            return new Reference($value->id, $value->invalidBehavior);
         }
 
         if ($value instanceof InlineServiceConfigurator) {
-            static $defCast;
-
-            if (!$defCast) {
-                $defCast = \Closure::bind(function ($value) {
-                    $def = $value->definition;
-                    $value->definition = null;
-
-                    return $def;
-                }, null, $value);
-            }
+            $def = $value->definition;
+            $value->definition = null;
 
-            // cast InlineServiceConfigurator to Definition
-            return $defCast($value);
+            return $def;
         }
 
         if ($value instanceof self) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
index 72ca7320b9f69..40b6c2f389723 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
@@ -17,9 +17,8 @@
 abstract class AbstractServiceConfigurator extends AbstractConfigurator
 {
     protected $parent;
-    protected $definition;
     protected $id;
-    protected $defaultTags = array();
+    private $defaultTags = array();
 
     public function __construct(ServicesConfigurator $parent, Definition $definition, $id = null, array $defaultTags = array())
     {
@@ -59,7 +58,7 @@ final public function set($id, $class = null)
      * Creates an alias.
      *
      * @param string $id
-     * @param string $ref
+     * @param string $referencedId
      *
      * @return AliasConfigurator
      */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
index 93fdf3960e0dd..1585c0872a694 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ReferenceConfigurator.php
@@ -16,10 +16,13 @@
 /**
  * @author Nicolas Grekas 
  */
-class ReferenceConfigurator
+class ReferenceConfigurator extends AbstractConfigurator
 {
-    private $id;
-    private $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
+    /** @internal */
+    protected $id;
+
+    /** @internal */
+    protected $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
 
     public function __construct($id)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
index 47e0dee287e0e..f69a7a5be109d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
 
-use Symfony\Component\DependencyInjection\Definition;
-
 /**
  * @method $this abstract(bool $abstract = true)
  */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
index e3dccc9656951..42a692353e9dc 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
 
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 trait AutoconfigureTrait
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
index 331be473e216c..b14a6557eee96 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
 
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 trait DeprecateTrait
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
index 4094acdbfce91..aeb8b047d428e 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
 
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 trait TagTrait
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_autoconfigure_with_parent.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_autoconfigure_with_parent.php
new file mode 100644
index 0000000000000..f8ffb1dee992c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_autoconfigure_with_parent.php
@@ -0,0 +1,9 @@
+services()
+        ->set('parent_service', \stdClass::class)
+        ->set('child_service')->parent('parent_service')->autoconfigure(true);
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index 02f84311e689c..a8f10d9ef0461 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -76,4 +76,17 @@ public function provideConfig()
             yield array('php7');
         }
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The service "child_service" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.
+     */
+    public function testAutoConfigureAndChildDefinitionNotAllowed()
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $container = new ContainerBuilder();
+        $loader = new PhpFileLoader($container, new FileLocator());
+        $loader->load($fixtures.'/config/services_autoconfigure_with_parent.php');
+        $container->compile();
+    }
 }

From f618e43234f3ce483db04479fde9f7cbd88dafb0 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Thu, 28 Sep 2017 12:45:51 +0200
Subject: [PATCH 0932/1099] include file and line no in deprecation message

---
 src/Symfony/Component/Yaml/Inline.php         | 43 +++++++++++++------
 src/Symfony/Component/Yaml/Parser.php         | 27 +++++++++---
 .../Component/Yaml/Tests/ParserTest.php       | 14 +++---
 3 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index b1653137fc135..9f868f2744a44 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -348,7 +348,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
             }
 
             if ($output && '%' === $output[0]) {
-                @trigger_error(sprintf('Not quoting the scalar "%s" starting with the "%%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', $output), E_USER_DEPRECATED);
+                @trigger_error(self::getDeprecationMessage(sprintf('Not quoting the scalar "%s" starting with the "%%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', $output)), E_USER_DEPRECATED);
             }
 
             if ($evaluate) {
@@ -500,19 +500,19 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
             }
 
             if (':' === $key) {
-                @trigger_error('Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
+                @trigger_error(self::getDeprecationMessage('Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0.'), E_USER_DEPRECATED);
             }
 
             if (!$isKeyQuoted) {
                 $evaluatedKey = self::evaluateScalar($key, $flags, $references);
 
                 if ('' !== $key && $evaluatedKey !== $key && !is_string($evaluatedKey) && !is_int($evaluatedKey)) {
-                    @trigger_error('Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.', E_USER_DEPRECATED);
+                    @trigger_error(self::getDeprecationMessage('Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.'), E_USER_DEPRECATED);
                 }
             }
 
             if (':' !== $key && !$isKeyQuoted && (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true))) {
-                @trigger_error('Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
+                @trigger_error(self::getDeprecationMessage('Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0.'), E_USER_DEPRECATED);
             }
 
             while ($i < $len) {
@@ -532,7 +532,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         break;
@@ -543,7 +543,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         break;
@@ -553,7 +553,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         --$i;
@@ -622,18 +622,18 @@ private static function evaluateScalar($scalar, $flags, $references = array())
             case '!' === $scalar[0]:
                 switch (true) {
                     case 0 === strpos($scalar, '!str'):
-                        @trigger_error('Support for the !str tag is deprecated since version 3.4. Use the !!str tag instead.', E_USER_DEPRECATED);
+                        @trigger_error(self::getDeprecationMessage('Support for the !str tag is deprecated since version 3.4. Use the !!str tag instead.'), E_USER_DEPRECATED);
 
                         return (string) substr($scalar, 5);
                     case 0 === strpos($scalar, '!!str '):
                         return (string) substr($scalar, 6);
                     case 0 === strpos($scalar, '! '):
-                        @trigger_error('Using the non-specific tag "!" is deprecated since version 3.4 as its behavior will change in 4.0. It will force non-evaluating your values in 4.0. Use plain integers or !!float instead.', E_USER_DEPRECATED);
+                        @trigger_error(self::getDeprecationMessage('Using the non-specific tag "!" is deprecated since version 3.4 as its behavior will change in 4.0. It will force non-evaluating your values in 4.0. Use plain integers or !!float instead.'), E_USER_DEPRECATED);
 
                         return (int) self::parseScalar(substr($scalar, 2), $flags);
                     case 0 === strpos($scalar, '!php/object:'):
                         if (self::$objectSupport) {
-                            @trigger_error('The !php/object: tag to indicate dumped PHP objects is deprecated since version 3.4 and will be removed in 4.0. Use the !php/object (without the colon) tag instead.', E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage('The !php/object: tag to indicate dumped PHP objects is deprecated since version 3.4 and will be removed in 4.0. Use the !php/object (without the colon) tag instead.'), E_USER_DEPRECATED);
 
                             return unserialize(substr($scalar, 12));
                         }
@@ -645,7 +645,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         return;
                     case 0 === strpos($scalar, '!!php/object:'):
                         if (self::$objectSupport) {
-                            @trigger_error('The !!php/object: tag to indicate dumped PHP objects is deprecated since version 3.1 and will be removed in 4.0. Use the !php/object (without the colon) tag instead.', E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage('The !!php/object: tag to indicate dumped PHP objects is deprecated since version 3.1 and will be removed in 4.0. Use the !php/object (without the colon) tag instead.'), E_USER_DEPRECATED);
 
                             return unserialize(substr($scalar, 13));
                         }
@@ -667,7 +667,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         return;
                     case 0 === strpos($scalar, '!php/const:'):
                         if (self::$constantSupport) {
-                            @trigger_error('The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.', E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage('The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.'), E_USER_DEPRECATED);
 
                             if (defined($const = substr($scalar, 11))) {
                                 return constant($const);
@@ -698,7 +698,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case 0 === strpos($scalar, '!!binary '):
                         return self::evaluateBinaryScalar(substr($scalar, 9));
                     default:
-                        @trigger_error(sprintf('Using the unquoted scalar value "%s" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.', $scalar), E_USER_DEPRECATED);
+                        @trigger_error(self::getDeprecationMessage(sprintf('Using the unquoted scalar value "%s" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.', $scalar)), E_USER_DEPRECATED);
                 }
 
             // Optimize for returning strings.
@@ -732,7 +732,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9,]*(\.[0-9_]+)?$/', $scalar):
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9_]*(\.[0-9_]+)?$/', $scalar):
                         if (false !== strpos($scalar, ',')) {
-                            @trigger_error('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0.', E_USER_DEPRECATED);
+                            @trigger_error(self::getDeprecationMessage('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0.'), E_USER_DEPRECATED);
                         }
 
                         return (float) str_replace(array(',', '_'), '', $scalar);
@@ -854,4 +854,19 @@ private static function getHexRegex()
     {
         return '~^0x[0-9a-f_]++$~i';
     }
+
+    private static function getDeprecationMessage($message)
+    {
+        $message = rtrim($message, '.');
+
+        if (null !== self::$parsedFilename) {
+            $message .= ' in '.self::$parsedFilename;
+        }
+
+        if (-1 !== self::$parsedLineNumber) {
+            $message .= ' on line '.self::$parsedLineNumber;
+        }
+
+        return $message.'.';
+    }
 }
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index be1c13cddbf98..af4cb3fbe4280 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -214,7 +214,7 @@ private function doParse($value, $flags)
                 }
 
                 if (isset($values['value'][1]) && '?' === $values['value'][0] && ' ' === $values['value'][1]) {
-                    @trigger_error('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', E_USER_DEPRECATED);
+                    @trigger_error($this->getDeprecationMessage('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.'), E_USER_DEPRECATED);
                 }
 
                 // array
@@ -272,7 +272,7 @@ private function doParse($value, $flags)
 
                 if (!is_string($key) && !is_int($key)) {
                     $keyType = is_numeric($key) ? 'numeric key' : 'non-string key';
-                    @trigger_error(sprintf('Implicit casting of %s to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.', $keyType), E_USER_DEPRECATED);
+                    @trigger_error($this->getDeprecationMessage(sprintf('Implicit casting of %s to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.', $keyType)), E_USER_DEPRECATED);
                 }
 
                 // Convert float keys to strings, to avoid being converted to integers by PHP
@@ -346,7 +346,7 @@ private function doParse($value, $flags)
                                 $data[$key] = null;
                             }
                         } else {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error($this->getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                         }
                     } else {
                         // remember the parsed line number here in case we need it to provide some contexts in error messages below
@@ -361,7 +361,7 @@ private function doParse($value, $flags)
                                 $data[$key] = $value;
                             }
                         } else {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error($this->getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                         }
                     }
                 } else {
@@ -371,7 +371,7 @@ private function doParse($value, $flags)
                     if ($allowOverwrite || !isset($data[$key])) {
                         $data[$key] = $value;
                     } else {
-                        @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                        @trigger_error($this->getDeprecationMessage(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key)), E_USER_DEPRECATED);
                     }
                 }
                 if ($isRef) {
@@ -384,7 +384,7 @@ private function doParse($value, $flags)
                 }
 
                 if (isset($this->currentLine[1]) && '?' === $this->currentLine[0] && ' ' === $this->currentLine[1]) {
-                    @trigger_error('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', E_USER_DEPRECATED);
+                    @trigger_error($this->getDeprecationMessage('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.'), E_USER_DEPRECATED);
                 }
 
                 // 1-liner optionally followed by newline(s)
@@ -699,7 +699,7 @@ private function parseValue($value, $flags, $context)
                 if ('!!binary' === $matches['tag']) {
                     return Inline::evaluateBinaryScalar($data);
                 } elseif ('!' !== $matches['tag']) {
-                    @trigger_error(sprintf('Using the custom tag "%s" for the value "%s" is deprecated since version 3.3. It will be replaced by an instance of %s in 4.0.', $matches['tag'], $data, TaggedValue::class), E_USER_DEPRECATED);
+                    @trigger_error($this->getDeprecationMessage(sprintf('Using the custom tag "%s" for the value "%s" is deprecated since version 3.3. It will be replaced by an instance of %s in 4.0.', $matches['tag'], $data, TaggedValue::class)), E_USER_DEPRECATED);
                 }
             }
 
@@ -1083,4 +1083,17 @@ private function getLineTag($value, $flags, $nextLineCheck = true)
 
         throw new ParseException(sprintf('Tags support is not enabled. You must use the flag `Yaml::PARSE_CUSTOM_TAGS` to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
     }
+
+    private function getDeprecationMessage($message)
+    {
+        $message = rtrim($message, '.');
+
+        if (null !== $this->filename) {
+            $message .= ' in '.$this->filename;
+        }
+
+        $message .= ' on line '.($this->getRealCurrentLineNb() + 1);
+
+        return $message.'.';
+    }
 }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 553b762384c29..8dd8f43a23761 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1096,7 +1096,7 @@ public function testYamlDirective()
 
     /**
      * @group legacy
-     * @expectedDeprecation Implicit casting of numeric key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.
+     * @expectedDeprecation Implicit casting of numeric key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 2.
      */
     public function testFloatKeys()
     {
@@ -1118,7 +1118,7 @@ public function testFloatKeys()
 
     /**
      * @group legacy
-     * @expectedDeprecation Implicit casting of non-string key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.
+     * @expectedDeprecation Implicit casting of non-string key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
      */
     public function testBooleanKeys()
     {
@@ -1707,7 +1707,7 @@ public function testExceptionWhenUsingUnsuportedBuiltInTags()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
      */
     public function testComplexMappingThrowsParseException()
     {
@@ -1722,7 +1722,7 @@ public function testComplexMappingThrowsParseException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 2.
      */
     public function testComplexMappingNestedInMappingThrowsParseException()
     {
@@ -1738,7 +1738,7 @@ public function testComplexMappingNestedInMappingThrowsParseException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
      */
     public function testComplexMappingNestedInSequenceThrowsParseException()
     {
@@ -1771,7 +1771,7 @@ private function loadTestsFromFixtureFiles($testsFile)
         $parser = new Parser();
 
         $tests = array();
-        $files = $parser->parse(file_get_contents(__DIR__.'/Fixtures/'.$testsFile));
+        $files = $parser->parseFile(__DIR__.'/Fixtures/'.$testsFile);
         foreach ($files as $file) {
             $yamls = file_get_contents(__DIR__.'/Fixtures/'.$file.'.yml');
 
@@ -1852,7 +1852,7 @@ public function testPhpConstantTagMappingKey()
 
     /**
      * @group legacy
-     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 1.
      * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.
      * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead.
      */

From f0876e59272bfc0e11e20218b80be7b7560ea7d7 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Thu, 28 Sep 2017 13:24:51 +0200
Subject: [PATCH 0933/1099] register an identity translator as fallback

The Form component can be used without the Translation component.
However, to be able to use the default form themes provided by the
TwigBridge you need to have the `trans` filter to be available.

This change ensure that there will always be a `trans` filter which as
a fallback will just return the message key if no translator is present.
---
 .../Bridge/Twig/Extension/TranslationExtension.php     | 10 +++++++++-
 .../DependencyInjection/Compiler/ExtensionPass.php     |  7 -------
 .../Bundle/TwigBundle/Resources/config/twig.xml        |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
index 5155169a8173d..a748e1ed72e7b 100644
--- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -32,7 +32,7 @@ class TranslationExtension extends AbstractExtension
     private $translator;
     private $translationNodeVisitor;
 
-    public function __construct(TranslatorInterface $translator, NodeVisitorInterface $translationNodeVisitor = null)
+    public function __construct(TranslatorInterface $translator = null, NodeVisitorInterface $translationNodeVisitor = null)
     {
         if (!$translationNodeVisitor) {
             $translationNodeVisitor = new TranslationNodeVisitor();
@@ -94,11 +94,19 @@ public function getTranslationNodeVisitor()
 
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
+        if (null === $this->translator) {
+            return $message;
+        }
+
         return $this->translator->trans($message, $arguments, $domain, $locale);
     }
 
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
+        if (null === $this->translator) {
+            return $message;
+        }
+
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
     }
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 31d1b758eff56..667acfc350fbc 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -35,9 +35,6 @@ public function process(ContainerBuilder $container)
         if (!interface_exists('Symfony\Component\Routing\Generator\UrlGeneratorInterface')) {
             $container->removeDefinition('twig.extension.routing');
         }
-        if (!interface_exists('Symfony\Component\Translation\TranslatorInterface')) {
-            $container->removeDefinition('twig.extension.trans');
-        }
 
         if (!class_exists('Symfony\Component\Yaml\Yaml')) {
             $container->removeDefinition('twig.extension.yaml');
@@ -49,10 +46,6 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
         }
 
-        if ($container->has('translator')) {
-            $container->getDefinition('twig.extension.trans')->addTag('twig.extension');
-        }
-
         if ($container->has('router')) {
             $container->getDefinition('twig.extension.routing')->addTag('twig.extension');
         }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index ff564b412148a..50e439b39ec64 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -72,7 +72,8 @@
         
 
         
-            
+            
+            
         
 
         

From 4dd0e5317100848d6867170f6c41b186dc99f21c Mon Sep 17 00:00:00 2001
From: Matthias Pigulla 
Date: Sun, 17 Sep 2017 21:33:12 +0200
Subject: [PATCH 0934/1099] HttpCache does not consider ESI resources in HEAD
 requests

---
 .../HttpKernel/HttpCache/HttpCache.php        |  14 +-
 .../Tests/HttpCache/HttpCacheTest.php         | 123 +++++++++++++++++-
 2 files changed, 124 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 941d4c6fa033d..d0f2155143b7f 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -633,14 +633,6 @@ protected function store(Request $request, Response $response)
      */
     private function restoreResponseBody(Request $request, Response $response)
     {
-        if ($request->isMethod('HEAD') || 304 === $response->getStatusCode()) {
-            $response->setContent(null);
-            $response->headers->remove('X-Body-Eval');
-            $response->headers->remove('X-Body-File');
-
-            return;
-        }
-
         if ($response->headers->has('X-Body-Eval')) {
             ob_start();
 
@@ -656,7 +648,11 @@ private function restoreResponseBody(Request $request, Response $response)
                 $response->headers->set('Content-Length', strlen($response->getContent()));
             }
         } elseif ($response->headers->has('X-Body-File')) {
-            $response->setContent(file_get_contents($response->headers->get('X-Body-File')));
+            // Response does not include possibly dynamic content (ESI, SSI), so we need
+            // not handle the content for HEAD requests
+            if (!$request->isMethod('HEAD')) {
+                $response->setContent(file_get_contents($response->headers->get('X-Body-File')));
+            }
         } else {
             return;
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
index d75bd00efb6fc..32977cf387c24 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1133,7 +1133,7 @@ public function testEsiCacheSendsTheLowestTtl()
             array(
                 'status' => 200,
                 'body' => 'Hello World!',
-                'headers' => array('Cache-Control' => 's-maxage=300'),
+                'headers' => array('Cache-Control' => 's-maxage=200'),
             ),
             array(
                 'status' => 200,
@@ -1147,8 +1147,33 @@ public function testEsiCacheSendsTheLowestTtl()
         $this->request('GET', '/', array(), array(), true);
         $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
 
-        // check for 100 or 99 as the test can be executed after a second change
-        $this->assertTrue(in_array($this->response->getTtl(), array(99, 100)));
+        $this->assertEquals(100, $this->response->getTtl());
+    }
+
+    public function testEsiCacheSendsTheLowestTtlForHeadRequests()
+    {
+        $responses = array(
+            array(
+                'status' => 200,
+                'body' => 'I am a long-lived master response, but I embed a short-lived resource: ',
+                'headers' => array(
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ),
+            ),
+            array(
+                'status' => 200,
+                'body' => 'I am a short-lived resource',
+                'headers' => array('Cache-Control' => 's-maxage=100'),
+            ),
+        );
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', array(), array(), true);
+
+        $this->assertEmpty($this->response->getContent());
+        $this->assertEquals(100, $this->response->getTtl());
     }
 
     public function testEsiCacheForceValidation()
@@ -1184,6 +1209,37 @@ public function testEsiCacheForceValidation()
         $this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
     }
 
+    public function testEsiCacheForceValidationForHeadRequests()
+    {
+        $responses = array(
+            array(
+                'status' => 200,
+                'body' => 'I am the master response and use expiration caching, but I embed another resource: ',
+                'headers' => array(
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ),
+            ),
+            array(
+                'status' => 200,
+                'body' => 'I am the embedded resource and use validation caching',
+                'headers' => array('ETag' => 'foobar'),
+            ),
+        );
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', array(), array(), true);
+
+        // The response has been assembled from expiration and validation based resources
+        // This can neither be cached nor revalidated, so it should be private/no cache
+        $this->assertEmpty($this->response->getContent());
+        $this->assertNull($this->response->getTtl());
+        $this->assertTrue($this->response->mustRevalidate());
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
+    }
+
     public function testEsiRecalculateContentLengthHeader()
     {
         $responses = array(
@@ -1192,7 +1248,6 @@ public function testEsiRecalculateContentLengthHeader()
                 'body' => '',
                 'headers' => array(
                     'Content-Length' => 26,
-                    'Cache-Control' => 's-maxage=300',
                     'Surrogate-Control' => 'content="ESI/1.0"',
                 ),
             ),
@@ -1210,6 +1265,37 @@ public function testEsiRecalculateContentLengthHeader()
         $this->assertEquals(12, $this->response->headers->get('Content-Length'));
     }
 
+    public function testEsiRecalculateContentLengthHeaderForHeadRequest()
+    {
+        $responses = array(
+            array(
+                'status' => 200,
+                'body' => '',
+                'headers' => array(
+                    'Content-Length' => 26,
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ),
+            ),
+            array(
+                'status' => 200,
+                'body' => 'Hello World!',
+                'headers' => array(),
+            ),
+        );
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', array(), array(), true);
+
+        // https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13
+        // "The Content-Length entity-header field indicates the size of the entity-body,
+        // in decimal number of OCTETs, sent to the recipient or, in the case of the HEAD
+        // method, the size of the entity-body that would have been sent had the request
+        // been a GET."
+        $this->assertEmpty($this->response->getContent());
+        $this->assertEquals(12, $this->response->headers->get('Content-Length'));
+    }
+
     public function testClientIpIsAlwaysLocalhostForForwardedRequests()
     {
         $this->setNextResponse();
@@ -1301,6 +1387,35 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
         $this->assertNull($this->response->getLastModified());
     }
 
+    public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponsesAndHeadRequest()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $responses = array(
+            array(
+                'status' => 200,
+                'body' => '',
+                'headers' => array(
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                    'ETag' => 'hey',
+                    'Last-Modified' => $time->format(DATE_RFC2822),
+                ),
+            ),
+            array(
+                'status' => 200,
+                'body' => 'Hey!',
+                'headers' => array(),
+            ),
+        );
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', array(), array(), true);
+        $this->assertEmpty($this->response->getContent());
+        $this->assertNull($this->response->getETag());
+        $this->assertNull($this->response->getLastModified());
+    }
+
     public function testDoesNotCacheOptionsRequest()
     {
         $this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=60'), 'get');

From 534eaed7aeaf52fbdcbcb8f666243de2c5aa352b Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Wed, 13 Sep 2017 19:40:55 +0200
Subject: [PATCH 0935/1099] parse merge keys with PARSE_OBJECT_FOR_MAP flag

---
 src/Symfony/Component/Yaml/Parser.php         | 18 +++++++--
 .../Component/Yaml/Tests/ParserTest.php       | 37 +++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 81b5e0f7f69f9..54a5704daf339 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -249,7 +249,7 @@ private function doParse($value, $flags)
                 if ('<<' === $key) {
                     $mergeNode = true;
                     $allowOverwrite = true;
-                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
+                    if (isset($values['value'][0]) && '*' === $values['value'][0]) {
                         $refName = substr(rtrim($values['value']), 1);
                         if (!array_key_exists($refName, $this->refs)) {
                             throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
@@ -257,6 +257,10 @@ private function doParse($value, $flags)
 
                         $refValue = $this->refs[$refName];
 
+                        if (Yaml::PARSE_OBJECT_FOR_MAP & $flags && $refValue instanceof \stdClass) {
+                            $refValue = (array) $refValue;
+                        }
+
                         if (!is_array($refValue)) {
                             throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
@@ -270,6 +274,10 @@ private function doParse($value, $flags)
                         }
                         $parsed = $this->parseBlock($this->getRealCurrentLineNb() + 1, $value, $flags);
 
+                        if (Yaml::PARSE_OBJECT_FOR_MAP & $flags && $parsed instanceof \stdClass) {
+                            $parsed = (array) $parsed;
+                        }
+
                         if (!is_array($parsed)) {
                             throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
@@ -279,6 +287,10 @@ private function doParse($value, $flags)
                             // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
                             // in the sequence override keys specified in later mapping nodes.
                             foreach ($parsed as $parsedItem) {
+                                if (Yaml::PARSE_OBJECT_FOR_MAP & $flags && $parsedItem instanceof \stdClass) {
+                                    $parsedItem = (array) $parsedItem;
+                                }
+
                                 if (!is_array($parsedItem)) {
                                     throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
                                 }
@@ -902,7 +914,7 @@ private function cleanup($value)
 
         // remove leading comments
         $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-        if (1 == $count) {
+        if (1 === $count) {
             // items have been removed, update the offset
             $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
             $value = $trimmedValue;
@@ -910,7 +922,7 @@ private function cleanup($value)
 
         // remove start of the document marker (---)
         $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-        if (1 == $count) {
+        if (1 === $count) {
             // items have been removed, update the offset
             $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
             $value = $trimmedValue;
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 620eff32d967c..ddf3213054802 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1865,6 +1865,43 @@ public function testPhpConstantTagMappingKeyWithKeysCastToStrings()
 
         $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT | Yaml::PARSE_KEYS_AS_STRINGS));
     }
+
+    public function testMergeKeysWhenMappingsAreParsedAsObjects()
+    {
+        $yaml = << (object) array(
+                'bar' => 1,
+            ),
+            'bar' => (object) array(
+                'baz' => 2,
+                'bar' => 1,
+            ),
+            'baz' => (object) array(
+                'baz_foo' => 3,
+                'baz_bar' => 4,
+            ),
+            'foobar' => (object) array(
+                'bar' => null,
+                'baz' => 2,
+            ),
+        );
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
 }
 
 class B

From 979e58f37051ffa0f1d22915c90e52c9d8d7bfe5 Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Tue, 28 Mar 2017 12:05:21 +0200
Subject: [PATCH 0936/1099] [DI] Reference tagged services in config

---
 .../Argument/TaggedIteratorArgument.php       | 37 +++++++++++++++++
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/PassConfig.php                   |  1 +
 .../ResolveTaggedIteratorArgumentPass.php     | 38 ++++++++++++++++++
 .../DependencyInjection/Dumper/XmlDumper.php  |  4 ++
 .../DependencyInjection/Dumper/YamlDumper.php |  4 ++
 .../Configurator/ContainerConfigurator.php    | 13 ++++++
 .../Loader/XmlFileLoader.php                  |  7 ++++
 .../Loader/YamlFileLoader.php                 |  8 ++++
 .../schema/dic/services/services-1.0.xsd      |  3 ++
 .../ResolveTaggedIteratorArgumentPassTest.php | 40 +++++++++++++++++++
 .../Tests/Fixtures/config/basic.php           |  2 -
 .../Tests/Fixtures/config/child.php           |  2 -
 .../Tests/Fixtures/config/defaults.php        |  2 -
 .../Tests/Fixtures/config/instanceof.php      |  2 -
 .../Tests/Fixtures/config/php7.php            |  2 -
 .../Tests/Fixtures/config/prototype.php       |  2 -
 .../Tests/Fixtures/config/services9.php       |  8 +++-
 .../Tests/Fixtures/containers/container9.php  | 11 +++++
 .../Tests/Fixtures/graphviz/services9.dot     |  2 +
 .../Tests/Fixtures/php/services9.php          | 25 ++++++++++++
 .../Tests/Fixtures/php/services9_as_files.txt | 24 +++++++++++
 .../Tests/Fixtures/php/services9_compiled.php | 26 ++++++++++++
 .../Tests/Fixtures/xml/services9.xml          |  6 +++
 .../Tests/Fixtures/yaml/services9.yml         | 10 +++++
 src/Symfony/Component/Yaml/Inline.php         |  4 +-
 src/Symfony/Component/Yaml/Parser.php         |  2 +
 27 files changed, 271 insertions(+), 15 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php

diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
new file mode 100644
index 0000000000000..19e0d2b97152c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -0,0 +1,37 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Argument;
+
+/**
+ * Represents a collection of services found by tag name to lazily iterate over.
+ *
+ * @author Roland Franssen 
+ */
+class TaggedIteratorArgument extends IteratorArgument
+{
+    private $tag;
+
+    /**
+     * @param string $tag
+     */
+    public function __construct($tag)
+    {
+        parent::__construct(array());
+
+        $this->tag = (string) $tag;
+    }
+
+    public function getTag()
+    {
+        return $this->tag;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index cea65b20b7504..013da9ad4ec3f 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * deprecated support for top-level anonymous services in XML
  * deprecated case insensitivity of parameter names
  * deprecated the `ResolveDefinitionTemplatesPass` class in favor of `ResolveChildDefinitionsPass`
+ * added `TaggedIteratorArgument` with YAML (`!tagged foo`) and XML (``) support
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 2cb261dfbc565..6c0448ecb4e81 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -61,6 +61,7 @@ public function __construct()
             new AutowireRequiredMethodsPass(),
             new ResolveBindingsPass(),
             new AutowirePass(false),
+            new ResolveTaggedIteratorArgumentPass(),
             new ResolveServiceSubscribersPass(),
             new ResolveReferencesToAliasesPass(),
             new ResolveInvalidReferencesPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
new file mode 100644
index 0000000000000..009cee9bf5c1d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
@@ -0,0 +1,38 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+
+/**
+ * Resolves all TaggedIteratorArgument arguments.
+ *
+ * @author Roland Franssen 
+ */
+class ResolveTaggedIteratorArgumentPass extends AbstractRecursivePass
+{
+    use PriorityTaggedServiceTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function processValue($value, $isRoot = false)
+    {
+        if (!$value instanceof TaggedIteratorArgument) {
+            return parent::processValue($value, $isRoot);
+        }
+
+        $value->setValues($this->findAndSortTaggedServices($value->getTag(), $this->container));
+
+        return $value;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index fb307a76e8ca7..cfd7c38413c84 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
@@ -298,6 +299,9 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
             if (is_array($value)) {
                 $element->setAttribute('type', 'collection');
                 $this->convertParameters($value, $type, $element, 'key');
+            } elseif ($value instanceof TaggedIteratorArgument) {
+                $element->setAttribute('type', 'tagged');
+                $element->setAttribute('tag', $value->getTag());
             } elseif ($value instanceof IteratorArgument) {
                 $element->setAttribute('type', 'iterator');
                 $this->convertParameters($value->getValues(), $type, $element, 'key');
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 916a2317b3893..dc44cba17e9b7 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Parameter;
@@ -263,6 +264,9 @@ private function dumpValue($value)
             $value = $value->getValues()[0];
         }
         if ($value instanceof ArgumentInterface) {
+            if ($value instanceof TaggedIteratorArgument) {
+                return new TaggedValue('tagged', $value->getTag());
+            }
             if ($value instanceof IteratorArgument) {
                 $tag = 'iterator';
             } else {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
index 132529087ab1d..b44f1e43105a5 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -115,6 +116,18 @@ function iterator(array $values)
     return new IteratorArgument(AbstractConfigurator::processValue($values, true));
 }
 
+/**
+ * Creates a lazy iterator by tag name.
+ *
+ * @param string $tag
+ *
+ * @return TaggedIteratorArgument
+ */
+function tagged($tag)
+{
+    return new TaggedIteratorArgument($tag);
+}
+
 /**
  * Creates an expression.
  *
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index f152d462676e2..e5a43e391d20d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader;
 
 use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
@@ -518,6 +519,12 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
                         throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="iterator" only accepts collections of type="service" references in "%s".', $name, $file));
                     }
                     break;
+                case 'tagged':
+                    if (!$arg->getAttribute('tag')) {
+                        throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="tagged" has no or empty "tag" attribute in "%s".', $name, $file));
+                    }
+                    $arguments[$key] = new TaggedIteratorArgument($arg->getAttribute('tag'));
+                    break;
                 case 'string':
                     $arguments[$key] = $arg->nodeValue;
                     break;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index d9fd24c3d71a6..4088a3152931b 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -726,6 +727,13 @@ private function resolveServices($value, $file, $isParameter = false)
                     throw new InvalidArgumentException(sprintf('"!iterator" tag only accepts arrays of "@service" references in "%s".', $file));
                 }
             }
+            if ('tagged' === $value->getTag()) {
+                if (!is_string($argument) || !$argument) {
+                    throw new InvalidArgumentException(sprintf('"!tagged" tag only accepts non empty string in "%s".', $file));
+                }
+
+                return new TaggedIteratorArgument($argument);
+            }
             if ('service' === $value->getTag()) {
                 if ($isParameter) {
                     throw new InvalidArgumentException(sprintf('Using an anonymous service in a parameter is not allowed in "%s".', $file));
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 0be8658e3d547..3a55a7df676c7 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -208,6 +208,7 @@
     
     
     
+    
   
 
   
@@ -233,6 +234,7 @@
     
     
     
+    
   
 
   
@@ -258,6 +260,7 @@
       
       
       
+      
     
   
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
new file mode 100644
index 0000000000000..a219f860078b7
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
@@ -0,0 +1,40 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveTaggedIteratorArgumentPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Roland Franssen 
+ */
+class ResolveTaggedIteratorArgumentPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a', 'stdClass')->addTag('foo');
+        $container->register('b', 'stdClass')->addTag('foo', array('priority' => 20));
+        $container->register('c', 'stdClass')->addTag('foo', array('priority' => 10));
+        $container->register('d', 'stdClass')->setProperty('foos', new TaggedIteratorArgument('foo'));
+
+        (new ResolveTaggedIteratorArgumentPass())->process($container);
+
+        $properties = $container->getDefinition('d')->getProperties();
+        $expected = new TaggedIteratorArgument('foo');
+        $expected->setValues(array(new Reference('b'), new Reference('c'), new Reference('a')));
+        $this->assertEquals($expected, $properties['foos']);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
index bab4e1ec83f04..b98e894c37253 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
@@ -5,9 +5,7 @@
 use App\BarService;
 
 return function (ContainerConfigurator $c) {
-
     $s = $c->services();
     $s->set(BarService::class)
         ->args(array(inline('FooClass')));
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
index 30178217b6924..6fd84485e7a3a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
@@ -5,7 +5,6 @@
 use App\BarService;
 
 return function (ContainerConfigurator $c) {
-
     $c->services()
         ->set('bar', 'Class1')
         ->set(BarService::class)
@@ -20,5 +19,4 @@
             ->parent('bar')
             ->parent(BarService::class)
     ;
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
index 7fa93d2a91d73..de3b99d745a56 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
@@ -5,7 +5,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
 
 return function (ContainerConfigurator $c) {
-
     $c->import('basic.php');
 
     $s = $c->services()->defaults()
@@ -19,5 +18,4 @@
 
     $s->set(Foo::class)->args(array(ref('bar')))->public();
     $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
index 13d0213bf11e5..062e8c00ab250 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
@@ -6,7 +6,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
 
 return function (ContainerConfigurator $c) {
-
     $s = $c->services();
     $s->instanceof(Prototype\Foo::class)
         ->property('p', 0)
@@ -20,5 +19,4 @@
     $s->load(Prototype::class.'\\', '../Prototype')->exclude('../Prototype/*/*');
 
     $s->set('foo', FooService::class);
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
index 22a98c2c571d5..7711624e6f0f6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/php7.php
@@ -5,7 +5,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
 
 return function (ContainerConfigurator $c) {
-
     $c->parameters()
         ('foo', 'Foo')
         ('bar', 'Bar')
@@ -17,5 +16,4 @@
         ('bar', Foo::class)
             ->call('setFoo')
     ;
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
index 77bc132dcb78a..21cab6c6af753 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
@@ -5,7 +5,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
 
 return function (ContainerConfigurator $c) {
-
     $di = $c->services()->defaults()
         ->tag('baz');
     $di->load(Prototype::class.'\\', '../Prototype')
@@ -20,5 +19,4 @@
         ->parent('foo');
     $di->set('foo')->lazy()->abstract();
     $di->get(Prototype\Foo::class)->lazy(false);
-
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
index 85543b6ebbcc7..3f4d5f15ea71a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
@@ -9,7 +9,6 @@
 require_once __DIR__.'/../includes/foo.php';
 
 return function (ContainerConfigurator $c) {
-
     $p = $c->parameters();
     $p->set('baz_class', 'BazClass');
     $p->set('foo_class', FooClass::class)
@@ -119,4 +118,11 @@
     $s->set('lazy_context_ignore_invalid_ref', 'LazyContext')
         ->args(array(iterator(array(ref('foo.baz'), ref('invalid')->ignoreOnInvalid())), iterator(array())));
 
+    $s->set('tagged_iterator_foo', 'Bar')
+        ->private()
+        ->tag('foo');
+
+    $s->set('tagged_iterator', 'Bar')
+        ->public()
+        ->args(array(tagged('foo')));
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 91a9af43d9a1f..452dab6d806b6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -4,6 +4,7 @@
 require_once __DIR__.'/../includes/foo.php';
 
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -161,5 +162,15 @@
     ->setArguments(array(new IteratorArgument(array(new Reference('foo.baz'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE))), new IteratorArgument(array())))
     ->setPublic(true)
 ;
+$container
+    ->register('tagged_iterator_foo', 'Bar')
+    ->addTag('foo')
+    ->setPublic(false)
+;
+$container
+    ->register('tagged_iterator', 'Bar')
+    ->addArgument(new TaggedIteratorArgument('foo'))
+    ->setPublic(true)
+;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
index df9a1cae7ce73..6a34c5735c777 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
@@ -29,6 +29,8 @@ digraph sc {
   node_factory_service_simple [label="factory_service_simple\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_lazy_context [label="lazy_context\nLazyContext\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_lazy_context_ignore_invalid_ref [label="lazy_context_ignore_invalid_ref\nLazyContext\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_tagged_iterator_foo [label="tagged_iterator_foo\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_tagged_iterator [label="tagged_iterator\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
   node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
   node_foobaz [label="foobaz\n\n", shape=record, fillcolor="#ff9999", style="filled"];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
index ec7c57a8dfb41..3075285dcf3a2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -56,6 +56,8 @@ public function __construct()
             'new_factory' => 'getNewFactoryService',
             'new_factory_service' => 'getNewFactoryServiceService',
             'service_from_static_method' => 'getServiceFromStaticMethodService',
+            'tagged_iterator' => 'getTaggedIteratorService',
+            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
         );
         $this->privates = array(
             'configurator_service' => true,
@@ -63,6 +65,7 @@ public function __construct()
             'factory_simple' => true,
             'inlined' => true,
             'new_factory' => true,
+            'tagged_iterator_foo' => true,
         );
         $this->aliases = array(
             'Psr\\Container\\ContainerInterface' => 'service_container',
@@ -337,6 +340,18 @@ protected function getServiceFromStaticMethodService()
         return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
+    /**
+     * Gets the public 'tagged_iterator' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorService()
+    {
+        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
     /**
      * Gets the private 'configurator_service' shared service.
      *
@@ -404,6 +419,16 @@ protected function getNewFactoryService()
         return $instance;
     }
 
+    /**
+     * Gets the private 'tagged_iterator_foo' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorFooService()
+    {
+        return $this->services['tagged_iterator_foo'] = new \Bar();
+    }
+
     /**
      * Gets the default parameters.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 059f0912815ca..d6c0fc11eddff 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -235,6 +235,27 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 
 return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
 
+    [Container%s/getTaggedIteratorService.php] => services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+    yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load(__DIR__.'/getFooService.php')) && false ?: '_'};
+    yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+}, 2));
+
+    [Container%s/getTaggedIteratorFooService.php] => services['tagged_iterator_foo'] = new \Bar();
+
     [Container%s/Container.php] =>  __DIR__.'/getMethodCall1Service.php',
             'new_factory_service' => __DIR__.'/getNewFactoryServiceService.php',
             'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php',
+            'tagged_iterator' => __DIR__.'/getTaggedIteratorService.php',
+            'tagged_iterator_foo' => __DIR__.'/getTaggedIteratorFooService.php',
         );
         $this->privates = array(
             'factory_simple' => true,
+            'tagged_iterator_foo' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 103bb0de34d88..46e76a4d7f375 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -49,9 +49,12 @@ public function __construct()
             'method_call1' => 'getMethodCall1Service',
             'new_factory_service' => 'getNewFactoryServiceService',
             'service_from_static_method' => 'getServiceFromStaticMethodService',
+            'tagged_iterator' => 'getTaggedIteratorService',
+            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
         );
         $this->privates = array(
             'factory_simple' => true,
+            'tagged_iterator_foo' => true,
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -339,6 +342,19 @@ protected function getServiceFromStaticMethodService()
         return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
+    /**
+     * Gets the public 'tagged_iterator' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorService()
+    {
+        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+            yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
+            yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+        }, 2));
+    }
+
     /**
      * Gets the private 'factory_simple' shared service.
      *
@@ -353,6 +369,16 @@ protected function getFactorySimpleService()
         return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
     }
 
+    /**
+     * Gets the private 'tagged_iterator_foo' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorFooService()
+    {
+        return $this->services['tagged_iterator_foo'] = new \Bar();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index 06f314f5eff73..d12c00319aca1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -133,6 +133,12 @@
       
       
     
+    
+      
+    
+    
+      
+    
     
     
     
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index b6b76da513106..cf713d189e57e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -145,6 +145,16 @@ services:
     alias_for_alias:
         alias: 'foo'
         public: true
+    tagged_iterator_foo:
+        class: Bar
+        tags:
+            - { name: foo }
+        public: false
+    tagged_iterator:
+        class: Bar
+        arguments:
+            - !tagged foo
+        public: true
     Psr\Container\ContainerInterface:
         alias: service_container
         public: false
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index b1653137fc135..7b355eca77bd1 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -774,8 +774,8 @@ private static function parseTag($value, &$i, $flags)
         $nextOffset += strspn($value, ' ', $nextOffset);
 
         // Is followed by a scalar
-        if (!isset($value[$nextOffset]) || !in_array($value[$nextOffset], array('[', '{'), true)) {
-            // Manage scalars in {@link self::evaluateScalar()}
+        if ((!isset($value[$nextOffset]) || !in_array($value[$nextOffset], array('[', '{'), true)) && 'tagged' !== $tag) {
+            // Manage non-whitelisted scalars in {@link self::evaluateScalar()}
             return;
         }
 
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index be1c13cddbf98..3789a83151705 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -698,6 +698,8 @@ private function parseValue($value, $flags, $context)
             if ('' !== $matches['tag']) {
                 if ('!!binary' === $matches['tag']) {
                     return Inline::evaluateBinaryScalar($data);
+                } elseif ('tagged' === $matches['tag']) {
+                    return new TaggedValue(substr($matches['tag'], 1), $data);
                 } elseif ('!' !== $matches['tag']) {
                     @trigger_error(sprintf('Using the custom tag "%s" for the value "%s" is deprecated since version 3.3. It will be replaced by an instance of %s in 4.0.', $matches['tag'], $data, TaggedValue::class), E_USER_DEPRECATED);
                 }

From 1c8b65000ec75ef6504f20f961a620250aa4c475 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 28 Sep 2017 16:19:20 +0200
Subject: [PATCH 0937/1099] fix merge

---
 src/Symfony/Component/Yaml/Inline.php | 15 ---------------
 src/Symfony/Component/Yaml/Parser.php | 13 -------------
 2 files changed, 28 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 91b4ff206a7d6..128f2c97c5359 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -746,19 +746,4 @@ private static function getHexRegex(): string
     {
         return '~^0x[0-9a-f_]++$~i';
     }
-
-    private static function getDeprecationMessage($message)
-    {
-        $message = rtrim($message, '.');
-
-        if (null !== self::$parsedFilename) {
-            $message .= ' in '.self::$parsedFilename;
-        }
-
-        if (-1 !== self::$parsedLineNumber) {
-            $message .= ' on line '.self::$parsedLineNumber;
-        }
-
-        return $message.'.';
-    }
 }
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index f579d8e58abb4..2e26e59abe890 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -1031,17 +1031,4 @@ private function getLineTag(string $value, int $flags, bool $nextLineCheck = tru
 
         throw new ParseException(sprintf('Tags support is not enabled. You must use the flag `Yaml::PARSE_CUSTOM_TAGS` to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
     }
-
-    private function getDeprecationMessage($message)
-    {
-        $message = rtrim($message, '.');
-
-        if (null !== $this->filename) {
-            $message .= ' in '.$this->filename;
-        }
-
-        $message .= ' on line '.($this->getRealCurrentLineNb() + 1);
-
-        return $message.'.';
-    }
 }

From cf0355203376ed9fe4a0e41446a003602dc02e66 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Wed, 13 Sep 2017 20:06:14 +0200
Subject: [PATCH 0938/1099] include file and line number in deprecation

---
 .../Loader/YamlFileLoader.php                 |  8 ++++++++
 .../Routing/Loader/YamlFileLoader.php         |  8 ++++++++
 .../Mapping/Loader/YamlFileLoader.php         | 12 ++++++++++-
 .../Translation/Loader/YamlFileLoader.php     |  8 ++++++++
 .../Mapping/Loader/YamlFileLoader.php         |  8 ++++++++
 src/Symfony/Component/Yaml/Inline.php         | 20 +++++++++----------
 src/Symfony/Component/Yaml/Parser.php         | 14 ++++++-------
 .../Component/Yaml/Tests/InlineTest.php       |  8 ++++----
 .../Component/Yaml/Tests/ParserTest.php       | 16 +++++++--------
 9 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 8e751be1027c2..4d14075dfea0e 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -605,10 +605,18 @@ protected function loadFile($file)
             $this->yamlParser = new YamlParser();
         }
 
+        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($file, &$prevErrorHandler) {
+            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$file.'"$0', $message) : $message;
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
+        });
+
         try {
             $configuration = $this->yamlParser->parse(file_get_contents($file), Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS | Yaml::PARSE_KEYS_AS_STRINGS);
         } catch (ParseException $e) {
             throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
+        } finally {
+            restore_error_handler();
         }
 
         return $this->validate($configuration, $file);
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index 7ae5e84d109aa..72935fa5589f4 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -58,10 +58,18 @@ public function load($file, $type = null)
             $this->yamlParser = new YamlParser();
         }
 
+        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($file, &$prevErrorHandler) {
+            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$file.'"$0', $message) : $message;
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
+        });
+
         try {
             $parsedConfig = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_KEYS_AS_STRINGS);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+        } finally {
+            restore_error_handler();
         }
 
         $collection = new RouteCollection();
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
index 20a1d48aade65..0f833a5dedace 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -114,7 +114,17 @@ private function getClassesFromYaml()
             $this->yamlParser = new Parser();
         }
 
-        $classes = $this->yamlParser->parse(file_get_contents($this->file), Yaml::PARSE_KEYS_AS_STRINGS);
+        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use (&$prevErrorHandler) {
+            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$this->file.'"$0', $message) : $message;
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
+        });
+
+        try {
+            $classes = $this->yamlParser->parse(file_get_contents($this->file), Yaml::PARSE_KEYS_AS_STRINGS);
+        } finally {
+            restore_error_handler();
+        }
 
         if (empty($classes)) {
             return array();
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
index 5897767b6bf03..da6ceca2862b1 100644
--- a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -39,10 +39,18 @@ protected function loadResource($resource)
             $this->yamlParser = new YamlParser();
         }
 
+        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($resource, &$prevErrorHandler) {
+            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$resource.'"$0', $message) : $message;
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
+        });
+
         try {
             $messages = $this->yamlParser->parse(file_get_contents($resource), Yaml::PARSE_KEYS_AS_STRINGS);
         } catch (ParseException $e) {
             throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
+        } finally {
+            restore_error_handler();
         }
 
         return $messages;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index f2e664750a485..632fb4f78070e 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -115,10 +115,18 @@ protected function parseNodes(array $nodes)
      */
     private function parseFile($path)
     {
+        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($path, &$prevErrorHandler) {
+            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$path.'"$0', $message) : $message;
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
+        });
+
         try {
             $classes = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_KEYS_AS_STRINGS);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+        } finally {
+            restore_error_handler();
         }
 
         // empty file
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index c5e7f97a588aa..d747960fddacc 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -335,7 +335,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
             }
 
             if ($output && '%' === $output[0]) {
-                @trigger_error(sprintf('Not quoting the scalar "%s" starting with the "%%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', $output), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not quoting the scalar "%s" starting with the "%%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0 on line %d.', $output, self::$parsedLineNumber + 1), E_USER_DEPRECATED);
             }
 
             if ($evaluate) {
@@ -487,19 +487,19 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
             }
 
             if (':' === $key) {
-                @trigger_error('Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
+                @trigger_error(sprintf('Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0 on line %d.', self::$parsedLineNumber + 1), E_USER_DEPRECATED);
             }
 
             if (!(Yaml::PARSE_KEYS_AS_STRINGS & $flags)) {
                 $evaluatedKey = self::evaluateScalar($key, $flags, $references);
 
                 if ('' !== $key && $evaluatedKey !== $key && !is_string($evaluatedKey) && !is_int($evaluatedKey)) {
-                    @trigger_error('Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.', E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line %d.', self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                 }
             }
 
             if (':' !== $key && !$isKeyQuoted && (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true))) {
-                @trigger_error('Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
+                @trigger_error(sprintf('Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0 on line %d.', self::$parsedLineNumber + 1), E_USER_DEPRECATED);
             }
 
             while ($i < $len) {
@@ -519,7 +519,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         break;
@@ -530,7 +530,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         break;
@@ -540,7 +540,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
                         if (isset($output[$key])) {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                             $duplicate = true;
                         }
                         --$i;
@@ -624,7 +624,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         return;
                     case 0 === strpos($scalar, '!!php/object:'):
                         if (self::$objectSupport) {
-                            @trigger_error('The !!php/object tag to indicate dumped PHP objects is deprecated since version 3.1 and will be removed in 4.0. Use the !php/object tag instead.', E_USER_DEPRECATED);
+                            @trigger_error(sprintf('The !!php/object tag to indicate dumped PHP objects is deprecated since version 3.1 and will be removed in 4.0. Use the !php/object tag instead on line %d.', self::$parsedLineNumber + 1), E_USER_DEPRECATED);
 
                             return unserialize(substr($scalar, 13));
                         }
@@ -652,7 +652,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case 0 === strpos($scalar, '!!binary '):
                         return self::evaluateBinaryScalar(substr($scalar, 9));
                     default:
-                        @trigger_error(sprintf('Using the unquoted scalar value "%s" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.', $scalar), E_USER_DEPRECATED);
+                        @trigger_error(sprintf('Using the unquoted scalar value "%s" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it on line %d.', $scalar, self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                 }
 
             // Optimize for returning strings.
@@ -686,7 +686,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9,]*(\.[0-9_]+)?$/', $scalar):
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9_]*(\.[0-9_]+)?$/', $scalar):
                         if (false !== strpos($scalar, ',')) {
-                            @trigger_error('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0.', E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0 on line %d.', self::$parsedLineNumber + 1), E_USER_DEPRECATED);
                         }
 
                         return (float) str_replace(array(',', '_'), '', $scalar);
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 81b5e0f7f69f9..3215850341693 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -178,7 +178,7 @@ private function doParse($value, $flags)
                 }
 
                 if (isset($values['value'][1]) && '?' === $values['value'][0] && ' ' === $values['value'][1]) {
-                    @trigger_error('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                 }
 
                 // array
@@ -238,7 +238,7 @@ private function doParse($value, $flags)
 
                 if (!(Yaml::PARSE_KEYS_AS_STRINGS & $flags) && !is_string($key) && !is_int($key)) {
                     $keyType = is_numeric($key) ? 'numeric key' : 'non-string key';
-                    @trigger_error(sprintf('Implicit casting of %s to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.', $keyType), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Implicit casting of %s to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line %d.', $keyType, $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                 }
 
                 // Convert float keys to strings, to avoid being converted to integers by PHP
@@ -312,7 +312,7 @@ private function doParse($value, $flags)
                                 $data[$key] = null;
                             }
                         } else {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                         }
                     } else {
                         // remember the parsed line number here in case we need it to provide some contexts in error messages below
@@ -327,7 +327,7 @@ private function doParse($value, $flags)
                                 $data[$key] = $value;
                             }
                         } else {
-                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, $realCurrentLineNbKey + 1), E_USER_DEPRECATED);
                         }
                     }
                 } else {
@@ -337,7 +337,7 @@ private function doParse($value, $flags)
                     if ($allowOverwrite || !isset($data[$key])) {
                         $data[$key] = $value;
                     } else {
-                        @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', $key), E_USER_DEPRECATED);
+                        @trigger_error(sprintf('Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated since version 3.2 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $key, $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                     }
                 }
                 if ($isRef) {
@@ -350,7 +350,7 @@ private function doParse($value, $flags)
                 }
 
                 if (isset($this->currentLine[1]) && '?' === $this->currentLine[0] && ' ' === $this->currentLine[1]) {
-                    @trigger_error('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.', E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.', $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                 }
 
                 // 1-liner optionally followed by newline(s)
@@ -663,7 +663,7 @@ private function parseValue($value, $flags, $context)
                 if ('!!binary' === $matches['tag']) {
                     return Inline::evaluateBinaryScalar($data);
                 } elseif ('!' !== $matches['tag']) {
-                    @trigger_error(sprintf('Using the custom tag "%s" for the value "%s" is deprecated since version 3.3. It will be replaced by an instance of %s in 4.0.', $matches['tag'], $data, TaggedValue::class), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Using the custom tag "%s" for the value "%s" is deprecated since version 3.3. It will be replaced by an instance of %s in 4.0 on line %d.', $matches['tag'], $data, TaggedValue::class, $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
                 }
             }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 665c2ecc29f33..a23bd6dc4c115 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -168,7 +168,7 @@ public function testParseInvalidMappingKeyShouldThrowException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0.
+     * @expectedDeprecation Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since version 3.2 and will throw a ParseException in 4.0 on line 1.
      * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
      */
     public function testParseMappingKeyWithColonNotFollowedBySpace()
@@ -304,7 +304,7 @@ public function getScalarIndicators()
 
     /**
      * @group legacy
-     * @expectedDeprecation Not quoting the scalar "%bar " starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.
+     * @expectedDeprecation Not quoting the scalar "%bar " starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0 on line 1.
      * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
      */
     public function testParseUnquotedScalarStartingWithPercentCharacter()
@@ -700,7 +700,7 @@ public function testVeryLongQuotedStrings()
 
     /**
      * @group legacy
-     * @expectedDeprecation Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0.
+     * @expectedDeprecation Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0 on line 1.
      */
     public function testOmittedMappingKeyIsParsedAsColon()
     {
@@ -730,7 +730,7 @@ public function testTheEmptyStringIsAValidMappingKey()
 
     /**
      * @group legacy
-     * @expectedDeprecation Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.
+     * @expectedDeprecation Implicit casting of incompatible mapping keys to strings is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
      * @dataProvider getNotPhpCompatibleMappingKeyData
      */
     public function testImplicitStringCastingOfMappingKeysIsDeprecated($yaml, $expected)
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 620eff32d967c..92f00664eb07e 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -61,7 +61,7 @@ public function testSpecifications($expected, $yaml, $comment, $deprecated)
             restore_error_handler();
 
             $this->assertCount(1, $deprecations);
-            $this->assertContains('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0.', $deprecations[0]);
+            $this->assertContains('Using the comma as a group separator for floats is deprecated since version 3.2 and will be removed in 4.0 on line 1.', $deprecations[0]);
         }
     }
 
@@ -853,7 +853,7 @@ public function testMappingDuplicateKeyFlow()
     /**
      * @group legacy
      * @dataProvider getParseExceptionOnDuplicateData
-     * @expectedDeprecation Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated %s.
+     * @expectedDeprecation Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated %s and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.
      * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
      */
     public function testParseExceptionOnDuplicate($input, $duplicateKey, $lineNumber)
@@ -1081,7 +1081,7 @@ public function testYamlDirective()
 
     /**
      * @group legacy
-     * @expectedDeprecation Implicit casting of numeric key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.
+     * @expectedDeprecation Implicit casting of numeric key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 2.
      */
     public function testFloatKeys()
     {
@@ -1103,7 +1103,7 @@ public function testFloatKeys()
 
     /**
      * @group legacy
-     * @expectedDeprecation Implicit casting of non-string key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.
+     * @expectedDeprecation Implicit casting of non-string key to string is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
      */
     public function testBooleanKeys()
     {
@@ -1682,7 +1682,7 @@ public function testCustomTagsDisabled()
 
     /**
      * @group legacy
-     * @expectedDeprecation Using the unquoted scalar value "!iterator foo" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.
+     * @expectedDeprecation Using the unquoted scalar value "!iterator foo" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it on line 1.
      */
     public function testUnsupportedTagWithScalar()
     {
@@ -1700,7 +1700,7 @@ public function testExceptionWhenUsingUnsuportedBuiltInTags()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
      */
     public function testComplexMappingThrowsParseException()
     {
@@ -1715,7 +1715,7 @@ public function testComplexMappingThrowsParseException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 2.
      */
     public function testComplexMappingNestedInMappingThrowsParseException()
     {
@@ -1731,7 +1731,7 @@ public function testComplexMappingNestedInMappingThrowsParseException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0.
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since version 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
      */
     public function testComplexMappingNestedInSequenceThrowsParseException()
     {

From 0851189daaaba5d2e8267ef5534daf721a16974e Mon Sep 17 00:00:00 2001
From: Ryan Weaver 
Date: Tue, 26 Sep 2017 15:22:45 -0400
Subject: [PATCH 0939/1099] Adding a shortcuts for the main security
 functionality

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |  2 +
 .../Resources/config/security.xml             | 13 +++
 .../Tests/Functional/SecurityTest.php         | 34 +++++++
 .../Functional/app/SecurityHelper/bundles.php | 20 ++++
 .../Functional/app/SecurityHelper/config.yml  | 18 ++++
 src/Symfony/Component/Security/CHANGELOG.md   |  1 +
 .../Component/Security/Core/Security.php      | 54 ++++++++++-
 .../Security/Core/Tests/SecurityTest.php      | 97 +++++++++++++++++++
 .../Component/Security/Core/composer.json     |  2 +
 src/Symfony/Component/Security/composer.json  |  2 +
 10 files changed, 240 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityTest.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml
 create mode 100644 src/Symfony/Component/Security/Core/Tests/SecurityTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index b759b693cd273..269eefd43e910 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.4.0
 -----
 
+ * Added new `security.helper` service that is an instance of `Symfony\Component\Security\Core\Security`
+   and provides shortcuts for common security tasks.
  * Tagging voters with the `security.voter` tag without implementing the
    `VoterInterface` on the class is now deprecated and will be removed in 4.0.
  * [BC BREAK] `FirewallContext::getListeners()` now returns `\Traversable|array`
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 049d67f5a05b1..0225df0ee47ae 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -26,6 +26,19 @@
         
         
 
+        
+            
+                
+                    
+                    
+                        
+                        
+                    
+                
+            
+        
+        
+
         
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityTest.php
new file mode 100644
index 0000000000000..bcf8a0d620c93
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityTest.php
@@ -0,0 +1,34 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
+
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\User\User;
+
+class SecurityTest extends WebTestCase
+{
+    public function testServiceIsFunctional()
+    {
+        $kernel = self::createKernel(array('test_case' => 'SecurityHelper', 'root_config' => 'config.yml'));
+        $kernel->boot();
+        $container = $kernel->getContainer();
+
+        // put a token into the storage so the final calls can function
+        $user = new User('foo', 'pass');
+        $token = new UsernamePasswordToken($user, '', 'provider', array('ROLE_USER'));
+        $container->get('security.token_storage')->setToken($token);
+
+        $security = $container->get('functional_test.security.helper');
+        $this->assertTrue($security->isGranted('ROLE_USER'));
+        $this->assertSame($token, $security->getToken());
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
new file mode 100644
index 0000000000000..2a8e7a2ff88d2
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
@@ -0,0 +1,20 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return array(
+    new FrameworkBundle(),
+    new SecurityBundle(),
+    new TwigBundle(),
+);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml
new file mode 100644
index 0000000000000..d7b8ac97d9775
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml
@@ -0,0 +1,18 @@
+imports:
+    - { resource: ./../config/default.yml }
+
+services:
+    # alias the service so we can access it in the tests
+    functional_test.security.helper:
+        alias: security.helper
+        public: true
+
+security:
+    providers:
+        in_memory:
+            memory:
+                users: []
+
+    firewalls:
+        default:
+            anonymous: ~
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 5ac97ca8b20bb..e0ac7afe2f50c 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Added `getUser`, `getToken` and `isGranted` methods to `Security`.
  * added a `setToken()` method to the `SwitchUserEvent` class to allow to replace the created token while switching users
    when custom token generation is required by application. 
  * Using voters that do not implement the `VoterInterface`is now deprecated in
diff --git a/src/Symfony/Component/Security/Core/Security.php b/src/Symfony/Component/Security/Core/Security.php
index 84cc77dcf7f32..5f25b41ccade5 100644
--- a/src/Symfony/Component/Security/Core/Security.php
+++ b/src/Symfony/Component/Security/Core/Security.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Security\Core;
 
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
 /**
- * This class holds security information.
- *
- * @author Johannes M. Schmitt 
+ * Helper class for commonly-needed security tasks.
  */
 final class Security
 {
@@ -22,4 +24,50 @@ final class Security
     const AUTHENTICATION_ERROR = '_security.last_error';
     const LAST_USERNAME = '_security.last_username';
     const MAX_USERNAME_LENGTH = 4096;
+
+    private $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * @return UserInterface|null
+     */
+    public function getUser()
+    {
+        if (!$token = $this->getToken()) {
+            return null;
+        }
+
+        $user = $token->getUser();
+        if (!is_object($user)) {
+            return null;
+        }
+
+        return $user;
+    }
+
+    /**
+     * Checks if the attributes are granted against the current authentication token and optionally supplied subject.
+     *
+     * @param mixed $attributes
+     * @param mixed $subject
+     *
+     * @return bool
+     */
+    public function isGranted($attributes, $subject = null)
+    {
+        return $this->container->get('security.authorization_checker')
+            ->isGranted($attributes, $subject);
+    }
+
+    /**
+     * @return TokenInterface|null
+     */
+    public function getToken()
+    {
+        return $this->container->get('security.token_storage')->getToken();
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/SecurityTest.php b/src/Symfony/Component/Security/Core/Tests/SecurityTest.php
new file mode 100644
index 0000000000000..b2ba5d0d5fa1d
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Tests/SecurityTest.php
@@ -0,0 +1,97 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\User\User;
+
+class SecurityTest extends TestCase
+{
+    public function testGetToken()
+    {
+        $token = new UsernamePasswordToken('foo', 'bar', 'provider');
+        $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
+
+        $tokenStorage->expects($this->once())
+            ->method('getToken')
+            ->will($this->returnValue($token));
+
+        $container = $this->createContainer('security.token_storage', $tokenStorage);
+
+        $security = new Security($container);
+        $this->assertSame($token, $security->getToken());
+    }
+
+    /**
+     * @dataProvider getUserTests
+     */
+    public function testGetUser($userInToken, $expectedUser)
+    {
+        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $token->expects($this->any())
+            ->method('getUser')
+            ->will($this->returnValue($userInToken));
+        $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
+
+        $tokenStorage->expects($this->once())
+            ->method('getToken')
+            ->will($this->returnValue($token));
+
+        $container = $this->createContainer('security.token_storage', $tokenStorage);
+
+        $security = new Security($container);
+        $this->assertSame($expectedUser, $security->getUser());
+    }
+
+    public function getUserTests()
+    {
+        yield array(null, null);
+
+        yield array('string_username', null);
+
+        $user = new User('nice_user', 'foo');
+        yield array($user, $user);
+    }
+
+    public function testIsGranted()
+    {
+        $authorizationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
+
+        $authorizationChecker->expects($this->once())
+            ->method('isGranted')
+            ->with('SOME_ATTRIBUTE', 'SOME_SUBJECT')
+            ->will($this->returnValue(true));
+
+        $container = $this->createContainer('security.authorization_checker', $authorizationChecker);
+
+        $security = new Security($container);
+        $this->assertTrue($security->isGranted('SOME_ATTRIBUTE', 'SOME_SUBJECT'));
+    }
+
+    private function createContainer($serviceId, $serviceObject)
+    {
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+
+        $container->expects($this->atLeastOnce())
+            ->method('get')
+            ->with($serviceId)
+            ->will($this->returnValue($serviceObject));
+
+        return $container;
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 2bba025ae4b53..b70ef54004ff6 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -20,6 +20,7 @@
         "symfony/polyfill-php56": "~1.0"
     },
     "require-dev": {
+        "psr/container": "^1.0",
         "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
@@ -28,6 +29,7 @@
         "psr/log": "~1.0"
     },
     "suggest": {
+        "psr/container": "To instantiate the Security class",
         "symfony/event-dispatcher": "",
         "symfony/http-foundation": "",
         "symfony/validator": "For using the user password constraint",
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index e53bf6d53783f..bc72e8469bf0e 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -32,6 +32,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
+        "psr/container": "^1.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.8|~3.0|~4.0",
@@ -41,6 +42,7 @@
         "psr/log": "~1.0"
     },
     "suggest": {
+        "psr/container": "To instantiate the Security class",
         "symfony/form": "",
         "symfony/validator": "For using the user password constraint",
         "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs",

From 08deb372f1a2fe2355445ba8e01f0b6aa98d7d9d Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Thu, 28 Sep 2017 19:06:05 +0200
Subject: [PATCH 0940/1099] [DependencyInjection] fix tests

---
 .../Tests/Fixtures/php/services9_as_files.txt     |  7 +++----
 .../Tests/Fixtures/php/services9_compiled.php     | 15 ++-------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 75562d178a286..22135fa6a91c9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -274,8 +274,8 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 // Returns the public 'tagged_iterator' shared service.
 
 return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-    yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load(__DIR__.'/getFooService.php')) && false ?: '_'};
-    yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+    yield 0 => ($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php'));
+    yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
 }, 2));
 
     [Container%s/getTaggedIteratorFooService.php] => services['tagged_iterator_foo'] = new \Bar();
+return $this->privates['tagged_iterator_foo'] = new \Bar();
 
     [Container%s/Container.php] =>  __DIR__.'/getNewFactoryServiceService.php',
             'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php',
             'tagged_iterator' => __DIR__.'/getTaggedIteratorService.php',
-            'tagged_iterator_foo' => __DIR__.'/getTaggedIteratorFooService.php',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index fce5f72271916..ed8861e137a04 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -53,7 +53,6 @@ public function __construct()
             'new_factory_service' => 'getNewFactoryServiceService',
             'service_from_static_method' => 'getServiceFromStaticMethodService',
             'tagged_iterator' => 'getTaggedIteratorService',
-            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -382,8 +381,8 @@ protected function getServiceFromStaticMethodService()
     protected function getTaggedIteratorService()
     {
         return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-            yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
-            yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+            yield 0 => ($this->services['foo'] ?? $this->getFooService());
+            yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
         }, 2));
     }
 
@@ -401,16 +400,6 @@ protected function getFactorySimpleService()
         return $this->privates['factory_simple'] = new \SimpleFactoryClass('foo');
     }
 
-    /**
-     * Gets the private 'tagged_iterator_foo' shared service.
-     *
-     * @return \Bar
-     */
-    protected function getTaggedIteratorFooService()
-    {
-        return $this->services['tagged_iterator_foo'] = new \Bar();
-    }
-
     /**
      * {@inheritdoc}
      */

From 95358ac98f9a871d7e81a9498c462d30cbdc086d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= 
Date: Thu, 28 Sep 2017 19:35:07 +0200
Subject: [PATCH 0941/1099] Share connection factories between cache and lock

---
 .../FrameworkExtension.php                    |   3 +-
 .../Component/Lock/Store/MemcachedStore.php   | 122 ------------------
 .../Component/Lock/Store/RedisStore.php       |  82 ------------
 .../Component/Lock/Store/StoreFactory.php     |  15 ---
 .../Lock/Tests/Store/MemcachedStoreTest.php   |  96 --------------
 5 files changed, 2 insertions(+), 316 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 4c7b4dfe67716..dafecf9d581d6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -23,6 +23,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\ResettableInterface;
@@ -1706,7 +1707,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
                         if (!$container->hasDefinition($connectionDefinitionId = $container->hash($storeDsn))) {
                             $connectionDefinition = new Definition(\stdClass::class);
                             $connectionDefinition->setPublic(false);
-                            $connectionDefinition->setFactory(array(StoreFactory::class, 'createConnection'));
+                            $connectionDefinition->setFactory(array(AbstractAdapter::class, 'createConnection'));
                             $connectionDefinition->setArguments(array($storeDsn));
                             $container->setDefinition($connectionDefinitionId, $connectionDefinition);
                         }
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index 4a2ffa3e02042..beaad69962084 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -58,128 +58,6 @@ public function __construct(\Memcached $memcached, $initialTtl = 300)
         $this->initialTtl = $initialTtl;
     }
 
-    /**
-     * Creates a Memcached instance.
-     *
-     * By default, the binary protocol, block, and libketama compatible options are enabled.
-     *
-     * Example DSN:
-     * - 'memcached://user:pass@localhost?weight=33'
-     * - array(array('localhost', 11211, 33))
-     *
-     * @param string $dsn     A server or A DSN
-     * @param array  $options An array of options
-     *
-     * @return \Memcached
-     *
-     * @throws \ErrorEception When invalid options or server are provided
-     */
-    public static function createConnection($server, array $options = array())
-    {
-        if (!static::isSupported()) {
-            throw new InvalidArgumentException('Memcached extension is required');
-        }
-        set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
-        try {
-            $options += static::$defaultClientOptions;
-            $client = new \Memcached($options['persistent_id']);
-            $username = $options['username'];
-            $password = $options['password'];
-
-            // parse any DSN in $server
-            if (is_string($server)) {
-                if (0 !== strpos($server, 'memcached://')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $server));
-                }
-                $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
-                    if (!empty($m[1])) {
-                        list($username, $password) = explode(':', $m[1], 2) + array(1 => null);
-                    }
-
-                    return 'file://';
-                }, $server);
-                if (false === $params = parse_url($params)) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $server));
-                }
-                if (!isset($params['host']) && !isset($params['path'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $server));
-                }
-                if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
-                    $params['weight'] = $m[1];
-                    $params['path'] = substr($params['path'], 0, -strlen($m[0]));
-                }
-                $params += array(
-                    'host' => isset($params['host']) ? $params['host'] : $params['path'],
-                    'port' => isset($params['host']) ? 11211 : null,
-                    'weight' => 0,
-                );
-                if (isset($params['query'])) {
-                    parse_str($params['query'], $query);
-                    $params += $query;
-                    $options = $query + $options;
-                }
-
-                $server = array($params['host'], $params['port'], $params['weight']);
-            }
-
-            // set client's options
-            unset($options['persistent_id'], $options['username'], $options['password'], $options['weight']);
-            $options = array_change_key_case($options, CASE_UPPER);
-            $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
-            $client->setOption(\Memcached::OPT_NO_BLOCK, false);
-            if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
-                $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
-            }
-            foreach ($options as $name => $value) {
-                if (is_int($name)) {
-                    continue;
-                }
-                if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) {
-                    $value = constant('Memcached::'.$name.'_'.strtoupper($value));
-                }
-                $opt = constant('Memcached::OPT_'.$name);
-
-                unset($options[$name]);
-                $options[$opt] = $value;
-            }
-            $client->setOptions($options);
-
-            // set client's servers, taking care of persistent connections
-            if (!$client->isPristine()) {
-                $oldServers = array();
-                foreach ($client->getServerList() as $server) {
-                    $oldServers[] = array($server['host'], $server['port']);
-                }
-
-                $newServers = array();
-                if (1 < count($server)) {
-                    $server = array_values($server);
-                    unset($server[2]);
-                    $server[1] = (int) $server[1];
-                }
-                $newServers[] = $server;
-
-                if ($oldServers !== $newServers) {
-                    // before resetting, ensure $servers is valid
-                    $client->addServers(array($server));
-                    $client->resetServerList();
-                }
-            }
-            $client->addServers(array($server));
-
-            if (null !== $username || null !== $password) {
-                if (!method_exists($client, 'setSaslAuthData')) {
-                    trigger_error('Missing SASL support: the memcached extension must be compiled with --enable-memcached-sasl.');
-                }
-                $client->setSaslAuthData($username, $password);
-            }
-
-            return $client;
-        } finally {
-            restore_error_handler();
-        }
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
index 66a067dfb0f9d..9f17e49b78668 100644
--- a/src/Symfony/Component/Lock/Store/RedisStore.php
+++ b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -53,88 +53,6 @@ public function __construct($redisClient, $initialTtl = 300.0)
         $this->initialTtl = $initialTtl;
     }
 
-    /**
-     * Creates a Redis connection using a DSN configuration.
-     *
-     * Example DSN:
-     *   - redis://localhost
-     *   - redis://example.com:1234
-     *   - redis://secret@example.com/13
-     *   - redis:///var/run/redis.sock
-     *   - redis://secret@/var/run/redis.sock/13
-     *
-     * @param string $dsn
-     * @param array  $options See self::$defaultConnectionOptions
-     *
-     * @throws InvalidArgumentException When the DSN is invalid
-     *
-     * @return \Redis|\Predis\Client According to the "class" option
-     */
-    public static function createConnection($dsn, array $options = array())
-    {
-        if (0 !== strpos($dsn, 'redis://')) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
-        }
-        $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
-            if (isset($m[1])) {
-                $auth = $m[1];
-            }
-
-            return 'file://';
-        }, $dsn);
-        if (false === $params = parse_url($params)) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
-        }
-        if (!isset($params['host']) && !isset($params['path'])) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
-        }
-        if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
-            $params['dbindex'] = $m[1];
-            $params['path'] = substr($params['path'], 0, -strlen($m[0]));
-        }
-        $params += array(
-            'host' => isset($params['host']) ? $params['host'] : $params['path'],
-            'port' => isset($params['host']) ? 6379 : null,
-            'dbindex' => 0,
-        );
-        if (isset($params['query'])) {
-            parse_str($params['query'], $query);
-            $params += $query;
-        }
-        $params += $options + self::$defaultConnectionOptions;
-        $class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
-
-        if (is_a($class, \Redis::class, true)) {
-            $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
-            $redis = new $class();
-            @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
-
-            if (@!$redis->isConnected()) {
-                $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
-                throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));
-            }
-
-            if ((null !== $auth && !$redis->auth($auth))
-                || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
-            ) {
-                $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn));
-            }
-        } elseif (is_a($class, \Predis\Client::class, true)) {
-            $params['scheme'] = isset($params['host']) ? 'tcp' : 'unix';
-            $params['database'] = $params['dbindex'] ?: null;
-            $params['password'] = $auth;
-            $redis = new $class((new Factory())->create($params));
-        } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class));
-        } else {
-            throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
-        }
-
-        return $redis;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
index 9a23cf6472dea..eccaeaf97473c 100644
--- a/src/Symfony/Component/Lock/Store/StoreFactory.php
+++ b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -20,21 +20,6 @@
  */
 class StoreFactory
 {
-    public static function createConnection($dsn, array $options = array())
-    {
-        if (!is_string($dsn)) {
-            throw new InvalidArgumentException(sprintf('The %s() method expects argument #1 to be string, %s given.', __METHOD__, gettype($dsn)));
-        }
-        if (0 === strpos($dsn, 'redis://')) {
-            return RedisStore::createConnection($dsn, $options);
-        }
-        if (0 === strpos($dsn, 'memcached://')) {
-            return MemcachedStore::createConnection($dsn, $options);
-        }
-
-        throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn));
-    }
-
     /**
      * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client|\Memcached $connection
      *
diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
index cfe03b25e2c34..eb030fba0f9de 100644
--- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
@@ -54,100 +54,4 @@ public function testAbortAfterExpiration()
     {
         $this->markTestSkipped('Memcached expects a TTL greater than 1 sec. Simulating a slow network is too hard');
     }
-
-    public function testDefaultOptions()
-    {
-        $this->assertTrue(MemcachedStore::isSupported());
-
-        $client = MemcachedStore::createConnection('memcached://127.0.0.1');
-
-        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
-    }
-
-    /**
-     * @dataProvider provideServersSetting
-     */
-    public function testServersSetting($dsn, $host, $port)
-    {
-        $client1 = MemcachedStore::createConnection($dsn);
-        $client3 = MemcachedStore::createConnection(array($host, $port));
-        $expect = array(
-            'host' => $host,
-            'port' => $port,
-        );
-
-        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
-        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
-    }
-
-    public function provideServersSetting()
-    {
-        yield array(
-            'memcached://127.0.0.1/50',
-            '127.0.0.1',
-            11211,
-        );
-        yield array(
-            'memcached://localhost:11222?weight=25',
-            'localhost',
-            11222,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
-                'memcached://user:password@127.0.0.1?weight=50',
-                '127.0.0.1',
-                11211,
-            );
-        }
-        yield array(
-            'memcached:///var/run/memcached.sock?weight=25',
-            '/var/run/memcached.sock',
-            0,
-        );
-        yield array(
-            'memcached:///var/local/run/memcached.socket?weight=25',
-            '/var/local/run/memcached.socket',
-            0,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
-                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
-                '/var/local/run/memcached.socket',
-                0,
-            );
-        }
-    }
-
-    /**
-     * @dataProvider provideDsnWithOptions
-     */
-    public function testDsnWithOptions($dsn, array $options, array $expectedOptions)
-    {
-        $client = MemcachedStore::createConnection($dsn, $options);
-
-        foreach ($expectedOptions as $option => $expect) {
-            $this->assertSame($expect, $client->getOption($option));
-        }
-    }
-
-    public function provideDsnWithOptions()
-    {
-        if (!class_exists('\Memcached')) {
-            self::markTestSkipped('Extension memcached required.');
-        }
-
-        yield array(
-            'memcached://localhost:11222?retry_timeout=10',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_RETRY_TIMEOUT => 10),
-        );
-        yield array(
-            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
-        );
-    }
 }

From 0f0a6e85e36432b8c5d6745e785ddee34f3ad343 Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 28 Sep 2017 20:22:10 +0200
Subject: [PATCH 0942/1099] PdoSessionHandler: fix advisory lock for pgsql when
 session.sid_bits_per_character > 4

---
 .../Storage/Handler/PdoSessionHandler.php     | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 8909a5f401fdc..483e73a119a04 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -580,11 +580,11 @@ private function doAdvisoryLock($sessionId)
                 return $releaseStmt;
             case 'pgsql':
                 // Obtaining an exclusive session level advisory lock requires an integer key.
-                // So we convert the HEX representation of the session id to an integer.
-                // Since integers are signed, we have to skip one hex char to fit in the range.
-                if (4 === PHP_INT_SIZE) {
-                    $sessionInt1 = hexdec(substr($sessionId, 0, 7));
-                    $sessionInt2 = hexdec(substr($sessionId, 7, 7));
+                // When session.sid_bits_per_character > 4, the session id can contain non-hex-characters.
+                // So we cannot just use hexdec().
+                if (4 === \PHP_INT_SIZE) {
+                    $sessionInt1 = $this->convertStringToInt($sessionId);
+                    $sessionInt2 = $this->convertStringToInt(substr($sessionId, 4, 4));
 
                     $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key1, :key2)');
                     $stmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
@@ -595,7 +595,7 @@ private function doAdvisoryLock($sessionId)
                     $releaseStmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
                     $releaseStmt->bindValue(':key2', $sessionInt2, \PDO::PARAM_INT);
                 } else {
-                    $sessionBigInt = hexdec(substr($sessionId, 0, 15));
+                    $sessionBigInt = $this->convertStringToInt($sessionId);
 
                     $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key)');
                     $stmt->bindValue(':key', $sessionBigInt, \PDO::PARAM_INT);
@@ -613,6 +613,27 @@ private function doAdvisoryLock($sessionId)
         }
     }
 
+    /**
+     * Encodes the first 4 (when PHP_INT_SIZE == 4) or 8 characters of the string as an integer.
+     *
+     * Keep in mind, PHP integers are signed.
+     *
+     * @param string $string
+     *
+     * @return int
+     */
+    private function convertStringToInt($string)
+    {
+        if (4 === \PHP_INT_SIZE) {
+            return (ord($string[3]) << 24) + (ord($string[2]) << 16) + (ord($string[1]) << 8) + ord($string[0]);
+        }
+
+        $int1 = (ord($string[7]) << 24) + (ord($string[6]) << 16) + (ord($string[5]) << 8) + ord($string[4]);
+        $int2 = (ord($string[3]) << 24) + (ord($string[2]) << 16) + (ord($string[1]) << 8) + ord($string[0]);
+
+        return $int2 + ($int1 << 32);
+    }
+
     /**
      * Return a locking or nonlocking SQL query to read session information.
      *

From 0a658c6eef6b74e64193b6d89bd6cde7a90f78fe Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Tue, 19 Sep 2017 13:13:19 -0400
Subject: [PATCH 0943/1099] Add exclusive Twig namespace for bundles path

---
 src/Symfony/Bundle/TwigBundle/CHANGELOG.md                 | 1 +
 .../TwigBundle/DependencyInjection/TwigExtension.php       | 7 +++++++
 .../Tests/DependencyInjection/TwigExtensionTest.php        | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
index 8ba6647306e04..bdf357181f060 100644
--- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added exclusive Twig namespace only for root bundles
  * deprecated `Symfony\Bundle\TwigBundle\Command\DebugCommand`, use `Symfony\Bridge\Twig\Command\DebugCommand` instead
  * deprecated relying on the `ContainerAwareInterface` implementation for `Symfony\Bundle\TwigBundle\Command\LintCommand`
  * added option to configure default path templates (via `default_path`)
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index d4450f531c322..4123ad7c66378 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -130,6 +130,13 @@ public function load(array $configs, ContainerBuilder $container)
             foreach ($bundle['paths'] as $path) {
                 $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
             }
+
+            // add exclusive namespace for root bundles only
+            // to override a bundle template that also extends itself
+            if (count($bundle['paths']) > 0 && 0 === count($bundle['parents'])) {
+                // the last path must be the bundle views directory
+                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '!'.$namespace));
+            }
         }
 
         if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 9d47948d67b77..2faaaa38fcb13 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -198,6 +198,7 @@ public function testTwigLoaderPaths($format)
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
+            array(realpath(__DIR__.'/../..').'/Resources/views', '!Twig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildTwig'),

From fa62e5068e81c65cd2676675da4caeec438a33cc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 28 Sep 2017 16:57:16 +0200
Subject: [PATCH 0944/1099] [HttpKernel] Deprecate some compiler passes in
 favor of tagged iterator args

---
 UPGRADE-3.4.md                                | 14 +++-
 UPGRADE-4.0.md                                | 14 +++-
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  6 +-
 .../Compiler/AddCacheClearerPass.php          | 26 ++++++-
 .../Compiler/AddCacheWarmerPass.php           | 29 ++++++-
 .../Compiler/ConfigCachePass.php              |  4 +-
 .../FrameworkBundle/FrameworkBundle.php       |  6 --
 .../Resources/config/services.xml             |  6 +-
 .../DependencyInjection/ConfigCachePass.php   |  4 +
 .../ConfigCachePassTest.php                   |  3 +
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  4 +
 .../CacheClearer/ChainCacheClearer.php        |  8 +-
 .../CacheWarmer/CacheWarmerAggregate.php      | 17 +++-
 .../AddCacheClearerPass.php                   | 50 ------------
 .../AddCacheWarmerPass.php                    | 53 -------------
 .../CacheClearer/ChainCacheClearerTest.php    |  3 +
 .../CacheWarmer/CacheWarmerAggregateTest.php  |  6 ++
 .../AddCacheClearerPassTest.php               | 53 -------------
 .../AddCacheWarmerPassTest.php                | 77 -------------------
 19 files changed, 119 insertions(+), 264 deletions(-)
 delete mode 100644 src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheClearerPass.php
 delete mode 100644 src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheWarmerPass.php
 delete mode 100644 src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheClearerPassTest.php
 delete mode 100644 src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheWarmerPassTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index f6d137842b400..ffc6458fecd5d 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -136,12 +136,10 @@ FrameworkBundle
    instead (e.g. `--prefix=""`)
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheClearerPass`
-   class has been deprecated and will be removed in 4.0. Use the
-   `Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass` class instead.
+   class has been deprecated and will be removed in 4.0. Use tagged iterator arguments instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheWarmerPass`
-   class has been deprecated and will be removed in 4.0. Use the
-   `Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass` class instead.
+   class has been deprecated and will be removed in 4.0. Use tagged iterator arguments instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass`
    class has been deprecated and will be removed in 4.0. Use the
@@ -260,6 +258,14 @@ HttpKernel
 
  * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been deprecated and will be removed in 4.0.
 
+ * The `ChainCacheClearer::add()` method has been deprecated and will be removed in 4.0,
+   inject the list of clearers as a constructor argument instead.
+
+ * The `CacheWarmerAggregate::add()` and `setWarmers()` methods have been deprecated and will be removed in 4.0,
+   inject the list of clearers as a constructor argument instead.
+
+ * The `CacheWarmerAggregate` and `ChainCacheClearer` classes have been made final.
+
 Process
 -------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 8174f1a4d266d..1f122c002dccf 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -384,7 +384,7 @@ FrameworkBundle
    class instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass` class has been removed.
-   Use `Symfony\Component\Config\DependencyInjection\ConfigCachePass` class instead.
+   Use tagged iterator arguments instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass` class has been
    removed. Use the `Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass`
@@ -439,10 +439,10 @@ FrameworkBundle
    been removed.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheClearerPass` class has been removed.
-   Use the `Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass` class instead.
+   Use tagged iterator arguments instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheWarmerPass` class has been removed.
-   Use the `Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass` class instead.
+   Use tagged iterator arguments instead.
 
  * The `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass`
    class has been removed. Use the
@@ -603,6 +603,14 @@ HttpKernel
 
  * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been removed.
 
+ * The `ChainCacheClearer::add()` method has been removed,
+   inject the list of clearers as a constructor argument instead.
+
+ * The `CacheWarmerAggregate::add()` and `setWarmers()` methods have been removed,
+   inject the list of clearers as a constructor argument instead.
+
+ * The `CacheWarmerAggregate` and `ChainCacheClearer` classes have been made final.
+
 Ldap
 ----
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 0c7581e7c0b7d..4ff27e13a43a5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -12,8 +12,8 @@ CHANGELOG
    require symfony/stopwatch` in your `dev` environment.
  * Deprecated using the `KERNEL_DIR` environment variable with `KernelTestCase::getKernelClass()`.
  * Deprecated the `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` methods.
- * Deprecated `AddCacheClearerPass`, use `Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass` instead.
- * Deprecated `AddCacheWarmerPass`, use `Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass` instead.
+ * Deprecated `AddCacheClearerPass`, use tagged iterator arguments instead.
+ * Deprecated `AddCacheWarmerPass`, use tagged iterator arguments instead.
  * Deprecated `TranslationDumperPass`, use 
    `Symfony\Component\Translation\DependencyInjection\TranslationDumperPass` instead
  * Deprecated `TranslationExtractorPass`, use 
@@ -82,7 +82,7 @@ CHANGELOG
  * Deprecated `SessionListener`
  * Deprecated `TestSessionListener`
  * Deprecated `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass`.
-   Use `Symfony\Component\Console\DependencyInjection\ConfigCachePass` instead.
+   Use tagged iterator arguments instead.
  * Deprecated `PropertyInfoPass`, use `Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass` instead
  * Deprecated `ControllerArgumentValueResolverPass`. Use
    `Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass` instead
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php
index c58fd6843d3eb..f650826be04c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php
@@ -11,17 +11,35 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
-@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass instead.', AddCacheClearerPass::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use tagged iterator arguments instead.', AddCacheClearerPass::class), E_USER_DEPRECATED);
 
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass as BaseAddCacheClearerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Registers the cache clearers.
  *
- * @deprecated since version 3.4, to be removed in 4.0. Use {@link BaseAddCacheClearerPass instead}.
+ * @deprecated since version 3.4, to be removed in 4.0. Use tagged iterator arguments.
  *
  * @author Dustin Dobervich 
  */
-class AddCacheClearerPass extends BaseAddCacheClearerPass
+class AddCacheClearerPass implements CompilerPassInterface
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('cache_clearer')) {
+            return;
+        }
+
+        $clearers = array();
+        foreach ($container->findTaggedServiceIds('kernel.cache_clearer', true) as $id => $attributes) {
+            $clearers[] = new Reference($id);
+        }
+
+        $container->getDefinition('cache_clearer')->replaceArgument(0, $clearers);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheWarmerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheWarmerPass.php
index 4b427684a9ed3..7a1b2e98bba19 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheWarmerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheWarmerPass.php
@@ -11,17 +11,38 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
-@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass instead.', AddCacheWarmerPass::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use tagged iterator arguments instead.', AddCacheWarmerPass::class), E_USER_DEPRECATED);
 
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass as BaseAddCacheWarmerPass;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
  * Registers the cache warmers.
  *
- * @deprecated since version 3.4, to be removed in 4.0. Use {@link BaseAddCacheWarmerPass instead}.
+ * @deprecated since version 3.4, to be removed in 4.0. Use tagged iterator arguments instead.
  *
  * @author Fabien Potencier 
  */
-class AddCacheWarmerPass extends BaseAddCacheWarmerPass
+class AddCacheWarmerPass implements CompilerPassInterface
 {
+    use PriorityTaggedServiceTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('cache_warmer')) {
+            return;
+        }
+
+        $warmers = $this->findAndSortTaggedServices('kernel.cache_warmer', $container);
+
+        if (empty($warmers)) {
+            return;
+        }
+
+        $container->getDefinition('cache_warmer')->replaceArgument(0, $warmers);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigCachePass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigCachePass.php
index 7fcea3b0e555d..eae4311a345ad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigCachePass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigCachePass.php
@@ -13,12 +13,12 @@
 
 use Symfony\Component\Config\DependencyInjection\ConfigCachePass as BaseConfigCachePass;
 
-@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use Symfony\Component\Config\DependencyInjection\ConfigCachePass instead.', ConfigCachePass::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use tagged iterator arguments instead.', ConfigCachePass::class), E_USER_DEPRECATED);
 
 /**
  * Adds services tagged config_cache.resource_checker to the config_cache_factory service, ordering them by priority.
  *
- * @deprecated since version 3.3, to be removed in 4.0. Use {@link BaseConfigCachePass} instead.
+ * @deprecated since version 3.3, to be removed in 4.0. Use tagged iterator arguments instead.
  *
  * @author Matthias Pigulla 
  * @author Benjamin Klotz 
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index c6936d35be83d..62df8c5ed9bbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -25,11 +25,8 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
-use Symfony\Component\Config\DependencyInjection\ConfigCachePass;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass;
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
@@ -102,8 +99,6 @@ public function build(ContainerBuilder $container)
             $container->addCompilerPass(new TranslatorPass('translator.default', 'translation.loader'));
         }
         $container->addCompilerPass(new LoggingTranslatorPass());
-        $container->addCompilerPass(new AddCacheWarmerPass());
-        $container->addCompilerPass(new AddCacheClearerPass());
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
         $this->addCompilerPassIfExists($container, TranslationExtractorPass::class);
         $this->addCompilerPassIfExists($container, TranslationDumperPass::class);
@@ -124,7 +119,6 @@ public function build(ContainerBuilder $container)
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
             $container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);
-            $this->addCompilerPassIfExists($container, ConfigCachePass::class);
             $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 0bae93663bf5c..31ca2075e4a98 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -24,7 +24,7 @@
         
 
         
-            
+            
         
 
         
@@ -40,7 +40,7 @@
         
 
         
-            
+            
         
 
         
@@ -63,7 +63,7 @@
         
 
         
-             
+            
         
 
         
diff --git a/src/Symfony/Component/Config/DependencyInjection/ConfigCachePass.php b/src/Symfony/Component/Config/DependencyInjection/ConfigCachePass.php
index 02cae0d2b2b65..665cd39e8dd09 100644
--- a/src/Symfony/Component/Config/DependencyInjection/ConfigCachePass.php
+++ b/src/Symfony/Component/Config/DependencyInjection/ConfigCachePass.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Config\DependencyInjection;
 
+@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use tagged iterator arguments instead.', ConfigCachePass::class), E_USER_DEPRECATED);
+
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
@@ -21,6 +23,8 @@
  *
  * @author Matthias Pigulla 
  * @author Benjamin Klotz 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Use tagged iterator arguments instead.
  */
 class ConfigCachePass implements CompilerPassInterface
 {
diff --git a/src/Symfony/Component/Config/Tests/DependencyInjection/ConfigCachePassTest.php b/src/Symfony/Component/Config/Tests/DependencyInjection/ConfigCachePassTest.php
index 7452755f50884..4f9c12f8c4ff0 100644
--- a/src/Symfony/Component/Config/Tests/DependencyInjection/ConfigCachePassTest.php
+++ b/src/Symfony/Component/Config/Tests/DependencyInjection/ConfigCachePassTest.php
@@ -17,6 +17,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Config\DependencyInjection\ConfigCachePass;
 
+/**
+ * @group legacy
+ */
 class ConfigCachePassTest extends TestCase
 {
     public function testThatCheckersAreProcessedInPriorityOrder()
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 66e3b38e25ce6..0c4ee8fa016ea 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -12,6 +12,10 @@ CHANGELOG
  * added `AddCacheWarmerPass`
  * deprecated `EnvParametersResource`
  * added `Symfony\Component\HttpKernel\Client::catchExceptions()`
+ * deprecated the `ChainCacheClearer::add()` method
+ * deprecated the `CacheaWarmerAggregate::add()` and `setWarmers()` methods
+ * made `CacheWarmerAggregate` and `ChainCacheClearer` classes final
+
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
index c749c7c0a4e47..f85d6d14356d3 100644
--- a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
+++ b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
@@ -15,6 +15,8 @@
  * ChainCacheClearer.
  *
  * @author Dustin Dobervich 
+ *
+ * @final since version 3.4
  */
 class ChainCacheClearer implements CacheClearerInterface
 {
@@ -28,7 +30,7 @@ class ChainCacheClearer implements CacheClearerInterface
      *
      * @param array $clearers The initial clearers
      */
-    public function __construct(array $clearers = array())
+    public function __construct($clearers = array())
     {
         $this->clearers = $clearers;
     }
@@ -47,9 +49,13 @@ public function clear($cacheDir)
      * Adds a cache clearer to the aggregate.
      *
      * @param CacheClearerInterface $clearer
+     *
+     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
      */
     public function add(CacheClearerInterface $clearer)
     {
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
+
         $this->clearers[] = $clearer;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
index e5f4e4fa4a231..c53b4e4bf0ab1 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -15,17 +15,21 @@
  * Aggregates several cache warmers into a single one.
  *
  * @author Fabien Potencier 
+ *
+ * @final since version 3.4
  */
 class CacheWarmerAggregate implements CacheWarmerInterface
 {
     protected $warmers = array();
     protected $optionalsEnabled = false;
+    private $triggerDeprecation = false;
 
-    public function __construct(array $warmers = array())
+    public function __construct($warmers = array())
     {
         foreach ($warmers as $warmer) {
             $this->add($warmer);
         }
+        $this->triggerDeprecation = true;
     }
 
     public function enableOptionalWarmers()
@@ -53,6 +57,8 @@ public function warmUp($cacheDir)
      * Checks whether this warmer is optional or not.
      *
      * @return bool always false
+     *
+     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
      */
     public function isOptional()
     {
@@ -61,14 +67,23 @@ public function isOptional()
 
     public function setWarmers(array $warmers)
     {
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
+
         $this->warmers = array();
         foreach ($warmers as $warmer) {
             $this->add($warmer);
         }
     }
 
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
+     */
     public function add(CacheWarmerInterface $warmer)
     {
+        if ($this->triggerDeprecation) {
+            @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         $this->warmers[] = $warmer;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheClearerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheClearerPass.php
deleted file mode 100644
index 2689440bd7253..0000000000000
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheClearerPass.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Registers the cache clearers.
- *
- * @author Dustin Dobervich 
- */
-class AddCacheClearerPass implements CompilerPassInterface
-{
-    private $cacheClearerId;
-    private $cacheClearerTag;
-
-    public function __construct($cacheClearerId = 'cache_clearer', $cacheClearerTag = 'kernel.cache_clearer')
-    {
-        $this->cacheClearerId = $cacheClearerId;
-        $this->cacheClearerTag = $cacheClearerTag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->cacheClearerId)) {
-            return;
-        }
-
-        $clearers = array();
-        foreach ($container->findTaggedServiceIds($this->cacheClearerTag, true) as $id => $attributes) {
-            $clearers[] = new Reference($id);
-        }
-
-        $container->getDefinition($this->cacheClearerId)->replaceArgument(0, $clearers);
-    }
-}
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheWarmerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheWarmerPass.php
deleted file mode 100644
index 6d13e1cbcb536..0000000000000
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddCacheWarmerPass.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Registers the cache warmers.
- *
- * @author Fabien Potencier 
- */
-class AddCacheWarmerPass implements CompilerPassInterface
-{
-    use PriorityTaggedServiceTrait;
-
-    private $cacheWarmerId;
-    private $cacheWarmerTag;
-
-    public function __construct($cacheWarmerId = 'cache_warmer', $cacheWarmerTag = 'kernel.cache_warmer')
-    {
-        $this->cacheWarmerId = $cacheWarmerId;
-        $this->cacheWarmerTag = $cacheWarmerTag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->cacheWarmerId)) {
-            return;
-        }
-
-        $warmers = $this->findAndSortTaggedServices($this->cacheWarmerTag, $container);
-
-        if (empty($warmers)) {
-            return;
-        }
-
-        $container->getDefinition($this->cacheWarmerId)->replaceArgument(0, $warmers);
-    }
-}
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
index 1bc853349f230..ec2ecff948c81 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -39,6 +39,9 @@ public function testInjectClearersInConstructor()
         $chainClearer->clear(self::$cacheDir);
     }
 
+    /**
+     * @group legacy
+     */
     public function testInjectClearerUsingAdd()
     {
         $clearer = $this->getMockClearer();
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
index d07ade303f107..ba159124c93e9 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -38,6 +38,9 @@ public function testInjectWarmersUsingConstructor()
         $aggregate->warmUp(self::$cacheDir);
     }
 
+    /**
+     * @group legacy
+     */
     public function testInjectWarmersUsingAdd()
     {
         $warmer = $this->getCacheWarmerMock();
@@ -49,6 +52,9 @@ public function testInjectWarmersUsingAdd()
         $aggregate->warmUp(self::$cacheDir);
     }
 
+    /**
+     * @group legacy
+     */
     public function testInjectWarmersUsingSetWarmers()
     {
         $warmer = $this->getCacheWarmerMock();
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheClearerPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheClearerPassTest.php
deleted file mode 100644
index 3bdb84ad10667..0000000000000
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheClearerPassTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass;
-
-class AddCacheClearerPassTest extends TestCase
-{
-    public function testThatCacheClearer()
-    {
-        $container = new ContainerBuilder();
-
-        $definition = $container->register('cache_clearer')->addArgument(null);
-        $container->register('my_cache_clearer_service1')->addTag('kernel.cache_clearer');
-
-        $addCacheWarmerPass = new AddCacheClearerPass();
-        $addCacheWarmerPass->process($container);
-
-        $expected = array(
-            new Reference('my_cache_clearer_service1'),
-        );
-        $this->assertEquals($expected, $definition->getArgument(0));
-    }
-
-    public function testThatCompilerPassIsIgnoredIfThereIsNoCacheClearerDefinition()
-    {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->never())->method('findTaggedServiceIds');
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('cache_clearer')
-            ->will($this->returnValue(false));
-        $definition->expects($this->never())->method('replaceArgument');
-
-        $addCacheWarmerPass = new AddCacheClearerPass();
-        $addCacheWarmerPass->process($container);
-    }
-}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheWarmerPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheWarmerPassTest.php
deleted file mode 100644
index 3f7bc6e65ebef..0000000000000
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddCacheWarmerPassTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass;
-
-class AddCacheWarmerPassTest extends TestCase
-{
-    public function testThatCacheWarmersAreProcessedInPriorityOrder()
-    {
-        $container = new ContainerBuilder();
-
-        $definition = $container->register('cache_warmer')->addArgument(null);
-        $container->register('my_cache_warmer_service1')->addTag('kernel.cache_warmer', array('priority' => 100));
-        $container->register('my_cache_warmer_service2')->addTag('kernel.cache_warmer', array('priority' => 200));
-        $container->register('my_cache_warmer_service3')->addTag('kernel.cache_warmer');
-
-        $addCacheWarmerPass = new AddCacheWarmerPass();
-        $addCacheWarmerPass->process($container);
-
-        $expected = array(
-            new Reference('my_cache_warmer_service2'),
-            new Reference('my_cache_warmer_service1'),
-            new Reference('my_cache_warmer_service3'),
-        );
-        $this->assertEquals($expected, $definition->getArgument(0));
-    }
-
-    public function testThatCompilerPassIsIgnoredIfThereIsNoCacheWarmerDefinition()
-    {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->never())->method('findTaggedServiceIds');
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('cache_warmer')
-            ->will($this->returnValue(false));
-        $definition->expects($this->never())->method('replaceArgument');
-
-        $addCacheWarmerPass = new AddCacheWarmerPass();
-        $addCacheWarmerPass->process($container);
-    }
-
-    public function testThatCacheWarmersMightBeNotDefined()
-    {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->atLeastOnce())
-            ->method('findTaggedServiceIds')
-            ->will($this->returnValue(array()));
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('cache_warmer')
-            ->will($this->returnValue(true));
-
-        $definition->expects($this->never())->method('replaceArgument');
-
-        $addCacheWarmerPass = new AddCacheWarmerPass();
-        $addCacheWarmerPass->process($container);
-    }
-}

From 9137d57ecd43f1d42e6e09b06ed090614e5f6c8c Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sat, 24 Dec 2016 11:15:47 +0000
Subject: [PATCH 0945/1099] [Asset] Provide default context

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md   |  2 ++
 .../FrameworkBundle/Resources/config/assets.xml   |  7 +++++++
 src/Symfony/Component/Asset/CHANGELOG.md          |  6 ++++++
 .../Asset/Context/RequestStackContext.php         | 15 ++++++++++++---
 .../Tests/Context/RequestStackContextTest.php     |  9 +++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index dafd4c46bb0fc..8bcbe06ae6664 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -53,6 +53,8 @@ CHANGELOG
    `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`,
    `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
     and `YamlLintCommand` classes have been marked as final
+ * Added `asset.request_context.base_path` and `asset.request_context.secure` parameters
+   to provide a default request context in case the stack is empty (similar to `router.request_context.*` parameters)
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
index e714e2834c5fc..cb0f11c926f82 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
@@ -4,6 +4,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
+    
+        
+        false
+    
+
     
         
 
@@ -19,6 +24,8 @@
 
         
             
+            %asset.request_context.base_path%
+            %asset.request_context.secure%
         
 
         
diff --git a/src/Symfony/Component/Asset/CHANGELOG.md b/src/Symfony/Component/Asset/CHANGELOG.md
index 72030a9d65b16..bb4c02f333187 100644
--- a/src/Symfony/Component/Asset/CHANGELOG.md
+++ b/src/Symfony/Component/Asset/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * added optional arguments `$basePath` and `$secure` in `RequestStackContext::__construct()`
+   to provide a default request context in case the stack is empty
+
 3.3.0
 -----
  * Added `JsonManifestVersionStrategy` as a way to read final,
diff --git a/src/Symfony/Component/Asset/Context/RequestStackContext.php b/src/Symfony/Component/Asset/Context/RequestStackContext.php
index ba7113851d863..c18f833264832 100644
--- a/src/Symfony/Component/Asset/Context/RequestStackContext.php
+++ b/src/Symfony/Component/Asset/Context/RequestStackContext.php
@@ -21,10 +21,19 @@
 class RequestStackContext implements ContextInterface
 {
     private $requestStack;
+    private $basePath;
+    private $secure;
 
-    public function __construct(RequestStack $requestStack)
+    /**
+     * @param RequestStack $requestStack
+     * @param string       $basePath
+     * @param bool         $secure
+     */
+    public function __construct(RequestStack $requestStack, $basePath = '', $secure = false)
     {
         $this->requestStack = $requestStack;
+        $this->basePath = $basePath;
+        $this->secure = $secure;
     }
 
     /**
@@ -33,7 +42,7 @@ public function __construct(RequestStack $requestStack)
     public function getBasePath()
     {
         if (!$request = $this->requestStack->getMasterRequest()) {
-            return '';
+            return $this->basePath;
         }
 
         return $request->getBasePath();
@@ -45,7 +54,7 @@ public function getBasePath()
     public function isSecure()
     {
         if (!$request = $this->requestStack->getMasterRequest()) {
-            return false;
+            return $this->secure;
         }
 
         return $request->isSecure();
diff --git a/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php b/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
index 7269d0e6bc983..7f24534eba202 100644
--- a/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
+++ b/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
@@ -61,4 +61,13 @@ public function testIsSecureTrue()
 
         $this->assertTrue($requestStackContext->isSecure());
     }
+
+    public function testDefaultContext()
+    {
+        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
+        $requestStackContext = new RequestStackContext($requestStack, 'default-path', true);
+
+        $this->assertSame('default-path', $requestStackContext->getBasePath());
+        $this->assertTrue($requestStackContext->isSecure());
+    }
 }

From eca2f8e58773582a238441a318373c93f90d76ca Mon Sep 17 00:00:00 2001
From: Tobias Nyholm 
Date: Thu, 14 Sep 2017 09:57:19 +0200
Subject: [PATCH 0946/1099] Moved PhpExtractor and PhpStringTokenParser to
 Translation component

---
 UPGRADE-3.4.md                                |  14 +-
 UPGRADE-4.0.md                                |  14 +-
 .../Bundle/FrameworkBundle/CHANGELOG.md       |   4 +
 .../Tests/Translation/PhpExtractorTest.php    |   3 +
 .../Translation/PhpExtractor.php              | 247 +----------------
 .../Translation/PhpStringTokenParser.php      | 131 +--------
 .../Component/Translation/CHANGELOG.md        |   2 +
 .../Translation/Extractor/PhpExtractor.php    | 258 ++++++++++++++++++
 .../Extractor/PhpStringTokenParser.php        | 142 ++++++++++
 .../Tests/Extractor/PhpExtractorTest.php      |  95 +++++++
 .../fixtures/extractor/resource.format.engine |   0
 .../this.is.a.template.format.engine          |   0
 .../fixtures/extractor/translation.html.php   |  49 ++++
 13 files changed, 585 insertions(+), 374 deletions(-)
 create mode 100644 src/Symfony/Component/Translation/Extractor/PhpExtractor.php
 create mode 100644 src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
 create mode 100644 src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
 create mode 100644 src/Symfony/Component/Translation/Tests/fixtures/extractor/resource.format.engine
 create mode 100644 src/Symfony/Component/Translation/Tests/fixtures/extractor/this.is.a.template.format.engine
 create mode 100644 src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index ffc6458fecd5d..6561c15a0b46f 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -204,6 +204,14 @@ FrameworkBundle
    `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
     and `YamlLintCommand` classes have been marked as final
 
+ * The `Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor`
+   class has been deprecated and will be removed in 4.0. Use the
+   `Symfony\Component\Translation\Extractor\PhpExtractor` class instead.
+
+ * The `Symfony\Bundle\FrameworkBundle\Translation\PhpStringTokenParser`
+   class has been deprecated and will be removed in 4.0. Use the
+   `Symfony\Component\Translation\Extractor\PhpStringTokenParser` class instead.
+
 HttpFoundation
 --------------
 
@@ -280,8 +288,8 @@ Profiler
 Security
 --------
 
- * Deprecated the HTTP digest authentication: `NonceExpiredException`, 
-   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` will be 
+ * Deprecated the HTTP digest authentication: `NonceExpiredException`,
+   `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` will be
    removed in 4.0. Use another authentication system like `http_basic` instead.
 
 SecurityBundle
@@ -305,7 +313,7 @@ SecurityBundle
  * Added `logout_on_user_change` to the firewall options. This config item will
    trigger a logout when the user has changed. Should be set to true to avoid
    deprecations in the configuration.
-   
+
  * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
    Use another authentication system like `http_basic` instead.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 1f122c002dccf..688a309466b5d 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -494,6 +494,14 @@ FrameworkBundle
    `Symfony\Component\Translation\TranslatorInterface` as
     first argument.
 
+ * The `Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor`
+   class has been deprecated and will be removed in 4.0. Use the
+   `Symfony\Component\Translation\Extractor\PhpExtractor` class instead.
+
+ * The `Symfony\Bundle\FrameworkBundle\Translation\PhpStringTokenParser`
+   class has been deprecated and will be removed in 4.0. Use the
+   `Symfony\Component\Translation\Extractor\PhpStringTokenParser` class instead.
+
 HttpFoundation
 --------------
 
@@ -525,9 +533,9 @@ HttpFoundation
  * The ability to check only for cacheable HTTP methods using `Request::isMethodSafe()` is
    not supported anymore, use `Request::isMethodCacheable()` instead.
 
- * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`, 
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`,
    `Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy`,
-   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` and 
+   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` and
    `Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy` classes have been removed.
 
  * `NativeSessionStorage::setSaveHandler()` now requires an instance of `\SessionHandlerInterface` as argument.
@@ -682,7 +690,7 @@ SecurityBundle
 
  * The firewall option `logout_on_user_change` is now always true, which will
    trigger a logout if the user changes between requests.
-   
+
  * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
    has been removed. Use another authentication system like `http_basic` instead.
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 2af300950c43b..1e87a15660466 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -105,6 +105,10 @@ CHANGELOG
    `Symfony\Component\Workflow\DependencyInjection\ValidateWorkflowsPass` instead
  * Deprecated `ConstraintValidatorFactory`, use
    `Symfony\Component\Validator\ContainerConstraintValidatorFactory` instead.
+ * Deprecated `PhpStringTokenParser`, use
+   `Symfony\Component\Translation\Extractor\PhpStringTokenParser` instead.
+ * Deprecated `PhpExtractor`, use
+   `Symfony\Component\Translation\Extractor\PhpExtractor` instead.
 
 3.2.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
index e8c56ee4d5e52..ca45f43329a2f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
@@ -15,6 +15,9 @@
 use Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor;
 use Symfony\Component\Translation\MessageCatalogue;
 
+/**
+ * @group legacy
+ */
 class PhpExtractorTest extends TestCase
 {
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
index 70658f67232d3..f8530875ae199 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
@@ -11,250 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Translation;
 
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Translation\Extractor\AbstractFileExtractor;
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Extractor\ExtractorInterface;
+use Symfony\Component\Translation\Extractor\PhpExtractor as NewPhpExtractor;
+
+@trigger_error(sprintf('The class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use "%s" instead. ', PhpExtractor::class, NewPhpExtractor::class), E_USER_DEPRECATED);
 
 /**
- * PhpExtractor extracts translation messages from a PHP template.
- *
- * @author Michel Salib 
+ * @deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\Translation\Extractor\PhpExtractor instead
  */
-class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
+class PhpExtractor extends NewPhpExtractor
 {
-    const MESSAGE_TOKEN = 300;
-    const METHOD_ARGUMENTS_TOKEN = 1000;
-    const DOMAIN_TOKEN = 1001;
-
-    /**
-     * Prefix for new found message.
-     *
-     * @var string
-     */
-    private $prefix = '';
-
-    /**
-     * The sequence that captures translation messages.
-     *
-     * @var array
-     */
-    protected $sequences = array(
-        array(
-            '->',
-            'trans',
-            '(',
-            self::MESSAGE_TOKEN,
-            ',',
-            self::METHOD_ARGUMENTS_TOKEN,
-            ',',
-            self::DOMAIN_TOKEN,
-        ),
-        array(
-            '->',
-            'transChoice',
-            '(',
-            self::MESSAGE_TOKEN,
-            ',',
-            self::METHOD_ARGUMENTS_TOKEN,
-            ',',
-            self::METHOD_ARGUMENTS_TOKEN,
-            ',',
-            self::DOMAIN_TOKEN,
-        ),
-        array(
-            '->',
-            'trans',
-            '(',
-            self::MESSAGE_TOKEN,
-        ),
-        array(
-            '->',
-            'transChoice',
-            '(',
-            self::MESSAGE_TOKEN,
-        ),
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function extract($resource, MessageCatalogue $catalog)
-    {
-        $files = $this->extractFiles($resource);
-        foreach ($files as $file) {
-            $this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
-
-            if (\PHP_VERSION_ID >= 70000) {
-                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
-                gc_mem_caches();
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Normalizes a token.
-     *
-     * @param mixed $token
-     *
-     * @return string
-     */
-    protected function normalizeToken($token)
-    {
-        if (isset($token[1]) && 'b"' !== $token) {
-            return $token[1];
-        }
-
-        return $token;
-    }
-
-    /**
-     * Seeks to a non-whitespace token.
-     */
-    private function seekToNextRelevantToken(\Iterator $tokenIterator)
-    {
-        for (; $tokenIterator->valid(); $tokenIterator->next()) {
-            $t = $tokenIterator->current();
-            if (T_WHITESPACE !== $t[0]) {
-                break;
-            }
-        }
-    }
-
-    private function skipMethodArgument(\Iterator $tokenIterator)
-    {
-        $openBraces = 0;
-
-        for (; $tokenIterator->valid(); $tokenIterator->next()) {
-            $t = $tokenIterator->current();
-
-            if ('[' === $t[0] || '(' === $t[0]) {
-                ++$openBraces;
-            }
-
-            if (']' === $t[0] || ')' === $t[0]) {
-                --$openBraces;
-            }
-
-            if ((0 === $openBraces && ',' === $t[0]) || (-1 === $openBraces && ')' === $t[0])) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Extracts the message from the iterator while the tokens
-     * match allowed message tokens.
-     */
-    private function getValue(\Iterator $tokenIterator)
-    {
-        $message = '';
-        $docToken = '';
-
-        for (; $tokenIterator->valid(); $tokenIterator->next()) {
-            $t = $tokenIterator->current();
-            if (!isset($t[1])) {
-                break;
-            }
-
-            switch ($t[0]) {
-                case T_START_HEREDOC:
-                    $docToken = $t[1];
-                    break;
-                case T_ENCAPSED_AND_WHITESPACE:
-                case T_CONSTANT_ENCAPSED_STRING:
-                    $message .= $t[1];
-                    break;
-                case T_END_HEREDOC:
-                    return PhpStringTokenParser::parseDocString($docToken, $message);
-                default:
-                    break 2;
-            }
-        }
-
-        if ($message) {
-            $message = PhpStringTokenParser::parse($message);
-        }
-
-        return $message;
-    }
-
-    /**
-     * Extracts trans message from PHP tokens.
-     *
-     * @param array            $tokens
-     * @param MessageCatalogue $catalog
-     */
-    protected function parseTokens($tokens, MessageCatalogue $catalog)
-    {
-        $tokenIterator = new \ArrayIterator($tokens);
-
-        for ($key = 0; $key < $tokenIterator->count(); ++$key) {
-            foreach ($this->sequences as $sequence) {
-                $message = '';
-                $domain = 'messages';
-                $tokenIterator->seek($key);
-
-                foreach ($sequence as $sequenceKey => $item) {
-                    $this->seekToNextRelevantToken($tokenIterator);
-
-                    if ($this->normalizeToken($tokenIterator->current()) === $item) {
-                        $tokenIterator->next();
-                        continue;
-                    } elseif (self::MESSAGE_TOKEN === $item) {
-                        $message = $this->getValue($tokenIterator);
-
-                        if (count($sequence) === ($sequenceKey + 1)) {
-                            break;
-                        }
-                    } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
-                        $this->skipMethodArgument($tokenIterator);
-                    } elseif (self::DOMAIN_TOKEN === $item) {
-                        $domain = $this->getValue($tokenIterator);
-
-                        break;
-                    } else {
-                        break;
-                    }
-                }
-
-                if ($message) {
-                    $catalog->set($message, $this->prefix.$message, $domain);
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $file
-     *
-     * @return bool
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected function canBeExtracted($file)
-    {
-        return $this->isFile($file) && 'php' === pathinfo($file, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * @param string|array $directory
-     *
-     * @return array
-     */
-    protected function extractFromDirectory($directory)
-    {
-        $finder = new Finder();
-
-        return $finder->files()->name('*.php')->in($directory);
-    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php
index e950ac478f84c..7b472cb4350ed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php
@@ -11,132 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Translation;
 
-/*
- * The following is derived from code at http://github.com/nikic/PHP-Parser
- *
- * Copyright (c) 2011 by Nikita Popov
- *
- * Some rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *
- *     * The names of the contributors may not be used to endorse or
- *       promote products derived from this software without specific
- *       prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+@trigger_error(sprintf('The class "%s" is deprecated since version 3.4 and will be removed in 4.0. Use "%s" instead. ', PhpStringTokenParser::class, \Symfony\Component\Translation\Extractor\PhpStringTokenParser::class), E_USER_DEPRECATED);
 
-class PhpStringTokenParser
+/**
+ * @deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\Translation\Extractor\PhpStringTokenParser instead
+ */
+class PhpStringTokenParser extends \Symfony\Component\Translation\Extractor\PhpStringTokenParser
 {
-    protected static $replacements = array(
-        '\\' => '\\',
-        '$' => '$',
-        'n' => "\n",
-        'r' => "\r",
-        't' => "\t",
-        'f' => "\f",
-        'v' => "\v",
-        'e' => "\x1B",
-    );
-
-    /**
-     * Parses a string token.
-     *
-     * @param string $str String token content
-     *
-     * @return string The parsed string
-     */
-    public static function parse($str)
-    {
-        $bLength = 0;
-        if ('b' === $str[0]) {
-            $bLength = 1;
-        }
-
-        if ('\'' === $str[$bLength]) {
-            return str_replace(
-                array('\\\\', '\\\''),
-                array('\\', '\''),
-                substr($str, $bLength + 1, -1)
-            );
-        } else {
-            return self::parseEscapeSequences(substr($str, $bLength + 1, -1), '"');
-        }
-    }
-
-    /**
-     * Parses escape sequences in strings (all string types apart from single quoted).
-     *
-     * @param string      $str   String without quotes
-     * @param null|string $quote Quote type
-     *
-     * @return string String with escape sequences parsed
-     */
-    public static function parseEscapeSequences($str, $quote)
-    {
-        if (null !== $quote) {
-            $str = str_replace('\\'.$quote, $quote, $str);
-        }
-
-        return preg_replace_callback(
-            '~\\\\([\\\\$nrtfve]|[xX][0-9a-fA-F]{1,2}|[0-7]{1,3})~',
-            array(__CLASS__, 'parseCallback'),
-            $str
-        );
-    }
-
-    private static function parseCallback($matches)
-    {
-        $str = $matches[1];
-
-        if (isset(self::$replacements[$str])) {
-            return self::$replacements[$str];
-        } elseif ('x' === $str[0] || 'X' === $str[0]) {
-            return chr(hexdec($str));
-        } else {
-            return chr(octdec($str));
-        }
-    }
-
-    /**
-     * Parses a constant doc string.
-     *
-     * @param string $startToken Doc string start token content (<<
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Extractor;
+
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Translation\MessageCatalogue;
+
+/**
+ * PhpExtractor extracts translation messages from a PHP template.
+ *
+ * @author Michel Salib 
+ */
+class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
+{
+    const MESSAGE_TOKEN = 300;
+    const METHOD_ARGUMENTS_TOKEN = 1000;
+    const DOMAIN_TOKEN = 1001;
+
+    /**
+     * Prefix for new found message.
+     *
+     * @var string
+     */
+    private $prefix = '';
+
+    /**
+     * The sequence that captures translation messages.
+     *
+     * @var array
+     */
+    protected $sequences = array(
+        array(
+            '->',
+            'trans',
+            '(',
+            self::MESSAGE_TOKEN,
+            ',',
+            self::METHOD_ARGUMENTS_TOKEN,
+            ',',
+            self::DOMAIN_TOKEN,
+        ),
+        array(
+            '->',
+            'transChoice',
+            '(',
+            self::MESSAGE_TOKEN,
+            ',',
+            self::METHOD_ARGUMENTS_TOKEN,
+            ',',
+            self::METHOD_ARGUMENTS_TOKEN,
+            ',',
+            self::DOMAIN_TOKEN,
+        ),
+        array(
+            '->',
+            'trans',
+            '(',
+            self::MESSAGE_TOKEN,
+        ),
+        array(
+            '->',
+            'transChoice',
+            '(',
+            self::MESSAGE_TOKEN,
+        ),
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function extract($resource, MessageCatalogue $catalog)
+    {
+        $files = $this->extractFiles($resource);
+        foreach ($files as $file) {
+            $this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
+
+            if (\PHP_VERSION_ID >= 70000) {
+                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
+                gc_mem_caches();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Normalizes a token.
+     *
+     * @param mixed $token
+     *
+     * @return string
+     */
+    protected function normalizeToken($token)
+    {
+        if (isset($token[1]) && 'b"' !== $token) {
+            return $token[1];
+        }
+
+        return $token;
+    }
+
+    /**
+     * Seeks to a non-whitespace token.
+     */
+    private function seekToNextRelevantToken(\Iterator $tokenIterator)
+    {
+        for (; $tokenIterator->valid(); $tokenIterator->next()) {
+            $t = $tokenIterator->current();
+            if (T_WHITESPACE !== $t[0]) {
+                break;
+            }
+        }
+    }
+
+    private function skipMethodArgument(\Iterator $tokenIterator)
+    {
+        $openBraces = 0;
+
+        for (; $tokenIterator->valid(); $tokenIterator->next()) {
+            $t = $tokenIterator->current();
+
+            if ('[' === $t[0] || '(' === $t[0]) {
+                ++$openBraces;
+            }
+
+            if (']' === $t[0] || ')' === $t[0]) {
+                --$openBraces;
+            }
+
+            if ((0 === $openBraces && ',' === $t[0]) || (-1 === $openBraces && ')' === $t[0])) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Extracts the message from the iterator while the tokens
+     * match allowed message tokens.
+     */
+    private function getValue(\Iterator $tokenIterator)
+    {
+        $message = '';
+        $docToken = '';
+
+        for (; $tokenIterator->valid(); $tokenIterator->next()) {
+            $t = $tokenIterator->current();
+            if (!isset($t[1])) {
+                break;
+            }
+
+            switch ($t[0]) {
+                case T_START_HEREDOC:
+                    $docToken = $t[1];
+                    break;
+                case T_ENCAPSED_AND_WHITESPACE:
+                case T_CONSTANT_ENCAPSED_STRING:
+                    $message .= $t[1];
+                    break;
+                case T_END_HEREDOC:
+                    return PhpStringTokenParser::parseDocString($docToken, $message);
+                default:
+                    break 2;
+            }
+        }
+
+        if ($message) {
+            $message = PhpStringTokenParser::parse($message);
+        }
+
+        return $message;
+    }
+
+    /**
+     * Extracts trans message from PHP tokens.
+     *
+     * @param array            $tokens
+     * @param MessageCatalogue $catalog
+     */
+    protected function parseTokens($tokens, MessageCatalogue $catalog)
+    {
+        $tokenIterator = new \ArrayIterator($tokens);
+
+        for ($key = 0; $key < $tokenIterator->count(); ++$key) {
+            foreach ($this->sequences as $sequence) {
+                $message = '';
+                $domain = 'messages';
+                $tokenIterator->seek($key);
+
+                foreach ($sequence as $sequenceKey => $item) {
+                    $this->seekToNextRelevantToken($tokenIterator);
+
+                    if ($this->normalizeToken($tokenIterator->current()) === $item) {
+                        $tokenIterator->next();
+                        continue;
+                    } elseif (self::MESSAGE_TOKEN === $item) {
+                        $message = $this->getValue($tokenIterator);
+
+                        if (count($sequence) === ($sequenceKey + 1)) {
+                            break;
+                        }
+                    } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
+                        $this->skipMethodArgument($tokenIterator);
+                    } elseif (self::DOMAIN_TOKEN === $item) {
+                        $domain = $this->getValue($tokenIterator);
+
+                        break;
+                    } else {
+                        break;
+                    }
+                }
+
+                if ($message) {
+                    $catalog->set($message, $this->prefix.$message, $domain);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $file
+     *
+     * @return bool
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function canBeExtracted($file)
+    {
+        return $this->isFile($file) && 'php' === pathinfo($file, PATHINFO_EXTENSION);
+    }
+
+    /**
+     * @param string|array $directory
+     *
+     * @return array
+     */
+    protected function extractFromDirectory($directory)
+    {
+        $finder = new Finder();
+
+        return $finder->files()->name('*.php')->in($directory);
+    }
+}
diff --git a/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
new file mode 100644
index 0000000000000..bab4ce0c97e26
--- /dev/null
+++ b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
@@ -0,0 +1,142 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Extractor;
+
+/*
+ * The following is derived from code at http://github.com/nikic/PHP-Parser
+ *
+ * Copyright (c) 2011 by Nikita Popov
+ *
+ * Some rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *
+ *     * The names of the contributors may not be used to endorse or
+ *       promote products derived from this software without specific
+ *       prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class PhpStringTokenParser
+{
+    protected static $replacements = array(
+        '\\' => '\\',
+        '$' => '$',
+        'n' => "\n",
+        'r' => "\r",
+        't' => "\t",
+        'f' => "\f",
+        'v' => "\v",
+        'e' => "\x1B",
+    );
+
+    /**
+     * Parses a string token.
+     *
+     * @param string $str String token content
+     *
+     * @return string The parsed string
+     */
+    public static function parse($str)
+    {
+        $bLength = 0;
+        if ('b' === $str[0]) {
+            $bLength = 1;
+        }
+
+        if ('\'' === $str[$bLength]) {
+            return str_replace(
+                array('\\\\', '\\\''),
+                array('\\', '\''),
+                substr($str, $bLength + 1, -1)
+            );
+        } else {
+            return self::parseEscapeSequences(substr($str, $bLength + 1, -1), '"');
+        }
+    }
+
+    /**
+     * Parses escape sequences in strings (all string types apart from single quoted).
+     *
+     * @param string      $str   String without quotes
+     * @param null|string $quote Quote type
+     *
+     * @return string String with escape sequences parsed
+     */
+    public static function parseEscapeSequences($str, $quote)
+    {
+        if (null !== $quote) {
+            $str = str_replace('\\'.$quote, $quote, $str);
+        }
+
+        return preg_replace_callback(
+            '~\\\\([\\\\$nrtfve]|[xX][0-9a-fA-F]{1,2}|[0-7]{1,3})~',
+            array(__CLASS__, 'parseCallback'),
+            $str
+        );
+    }
+
+    private static function parseCallback($matches)
+    {
+        $str = $matches[1];
+
+        if (isset(self::$replacements[$str])) {
+            return self::$replacements[$str];
+        } elseif ('x' === $str[0] || 'X' === $str[0]) {
+            return chr(hexdec($str));
+        } else {
+            return chr(octdec($str));
+        }
+    }
+
+    /**
+     * Parses a constant doc string.
+     *
+     * @param string $startToken Doc string start token content (<<
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Tests\Extractor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Extractor\PhpExtractor;
+use Symfony\Component\Translation\MessageCatalogue;
+
+class PhpExtractorTest extends TestCase
+{
+    /**
+     * @dataProvider resourcesProvider
+     *
+     * @param array|string $resource
+     */
+    public function testExtraction($resource)
+    {
+        // Arrange
+        $extractor = new PhpExtractor();
+        $extractor->setPrefix('prefix');
+        $catalogue = new MessageCatalogue('en');
+
+        // Act
+        $extractor->extract($resource, $catalogue);
+
+        $expectedHeredoc = << array(
+                'single-quoted key' => 'prefixsingle-quoted key',
+                'double-quoted key' => 'prefixdouble-quoted key',
+                'heredoc key' => 'prefixheredoc key',
+                'nowdoc key' => 'prefixnowdoc key',
+                "double-quoted key with whitespace and escaped \$\n\" sequences" => "prefixdouble-quoted key with whitespace and escaped \$\n\" sequences",
+                'single-quoted key with whitespace and nonescaped \$\n\' sequences' => 'prefixsingle-quoted key with whitespace and nonescaped \$\n\' sequences',
+                'single-quoted key with "quote mark at the end"' => 'prefixsingle-quoted key with "quote mark at the end"',
+                $expectedHeredoc => 'prefix'.$expectedHeredoc,
+                $expectedNowdoc => 'prefix'.$expectedNowdoc,
+                '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
+            ),
+            'not_messages' => array(
+                'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array',
+                'other-domain-test-no-params-long-array' => 'prefixother-domain-test-no-params-long-array',
+                'other-domain-test-params-short-array' => 'prefixother-domain-test-params-short-array',
+                'other-domain-test-params-long-array' => 'prefixother-domain-test-params-long-array',
+                'other-domain-test-trans-choice-short-array-%count%' => 'prefixother-domain-test-trans-choice-short-array-%count%',
+                'other-domain-test-trans-choice-long-array-%count%' => 'prefixother-domain-test-trans-choice-long-array-%count%',
+                'typecast' => 'prefixtypecast',
+                'msg1' => 'prefixmsg1',
+                'msg2' => 'prefixmsg2',
+            ),
+        );
+        $actualCatalogue = $catalogue->all();
+
+        $this->assertEquals($expectedCatalogue, $actualCatalogue);
+    }
+
+    public function resourcesProvider()
+    {
+        $directory = __DIR__.'/../fixtures/extractor/';
+        $splFiles = array();
+        foreach (new \DirectoryIterator($directory) as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            if ('translation.html.php' === $fileInfo->getBasename()) {
+                $phpFile = $fileInfo->getPathname();
+            }
+            $splFiles[] = $fileInfo->getFileInfo();
+        }
+
+        return array(
+            array($directory),
+            array($phpFile),
+            array(glob($directory.'*')),
+            array($splFiles),
+            array(new \ArrayObject(glob($directory.'*'))),
+            array(new \ArrayObject($splFiles)),
+        );
+    }
+}
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/resource.format.engine b/src/Symfony/Component/Translation/Tests/fixtures/extractor/resource.format.engine
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/this.is.a.template.format.engine b/src/Symfony/Component/Translation/Tests/fixtures/extractor/this.is.a.template.format.engine
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php
new file mode 100644
index 0000000000000..1ce8ea94fd339
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php
@@ -0,0 +1,49 @@
+This template is used for translation message extraction tests
+trans('single-quoted key'); ?>
+trans('double-quoted key'); ?>
+trans(<<<'EOF'
+heredoc key
+EOF
+); ?>
+trans(<<<'EOF'
+nowdoc key
+EOF
+); ?>
+trans(
+    "double-quoted key with whitespace and escaped \$\n\" sequences"
+); ?>
+trans(
+    'single-quoted key with whitespace and nonescaped \$\n\' sequences'
+); ?>
+trans(<<
+trans(<<<'EOF'
+nowdoc key with whitespace and nonescaped \$\n sequences
+EOF
+); ?>
+
+trans('single-quoted key with "quote mark at the end"'); ?>
+
+transChoice(
+    '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
+    10,
+    array('%count%' => 10)
+); ?>
+
+trans('other-domain-test-no-params-short-array', array(), 'not_messages'); ?>
+
+trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
+
+trans('other-domain-test-params-short-array', array('foo' => 'bar'), 'not_messages'); ?>
+
+trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
+
+transChoice('other-domain-test-trans-choice-short-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+
+transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+
+trans('typecast', array('a' => (int) '123'), 'not_messages'); ?>
+transChoice('msg1', 10 + 1, array(), 'not_messages'); ?>
+transChoice('msg2', ceil(4.5), array(), 'not_messages'); ?>

From 9fac290b411e33c78ee88680d39db9d1515e6de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Fri, 29 Sep 2017 11:11:46 +0200
Subject: [PATCH 0947/1099] [PhpUnitBridge] Make CoverageListenerTest more
 robust when xdebug is not available

---
 src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
index 216b860a4bc2c..0d548aa91204e 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -8,7 +8,7 @@ class CoverageListenerTest extends TestCase
 {
     public function test()
     {
-        if ("\n" !== PHP_EOL) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test cannot be run on Windows.');
         }
 
@@ -16,6 +16,11 @@ public function test()
             $this->markTestSkipped('This test cannot be run on HHVM.');
         }
 
+        exec('php --ri xdebug -d zend_extension=xdebug.so 2> /dev/null', $output, $returnCode);
+        if (0 !== $returnCode) {
+            $this->markTestSkipped('Xdebug is required to run this test.');
+        }
+
         $dir = __DIR__.'/../Tests/Fixtures/coverage';
         $php = PHP_BINARY;
         $phpunit = $_SERVER['argv'][0];

From f18a47bef7d3306b6668b4e66e0cec3dcb3decd9 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 29 Sep 2017 11:41:38 +0200
Subject: [PATCH 0948/1099] doc fixes

---
 src/Symfony/Component/Config/CHANGELOG.md                    | 1 +
 src/Symfony/Component/HttpKernel/CHANGELOG.md                | 2 --
 .../HttpKernel/CacheWarmer/CacheWarmerAggregate.php          | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md
index f8a2028e558db..7813ac53ede47 100644
--- a/src/Symfony/Component/Config/CHANGELOG.md
+++ b/src/Symfony/Component/Config/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * added `setDeprecated()` method to indicate a deprecated node
  * added `XmlUtils::parse()` method to parse an XML string
+ * deprecated `ConfigCachePass`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 0c4ee8fa016ea..d646f7f6aea77 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -8,8 +8,6 @@ CHANGELOG
  * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
  * deprecated commands auto registration
- * added `AddCacheClearerPass`
- * added `AddCacheWarmerPass`
  * deprecated `EnvParametersResource`
  * added `Symfony\Component\HttpKernel\Client::catchExceptions()`
  * deprecated the `ChainCacheClearer::add()` method
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
index c53b4e4bf0ab1..7b7b96bcc8f58 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -57,14 +57,15 @@ public function warmUp($cacheDir)
      * Checks whether this warmer is optional or not.
      *
      * @return bool always false
-     *
-     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
      */
     public function isOptional()
     {
         return false;
     }
 
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
+     */
     public function setWarmers(array $warmers)
     {
         @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);

From 1c0701ab8572c216817666b52ccbe28d9747b731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20M=C3=B6nch?= 
Date: Fri, 29 Sep 2017 12:03:48 +0200
Subject: [PATCH 0949/1099] [DI] Fix typehint

---
 .../Loader/Configurator/ParametersConfigurator.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
index 0d81869e8bb50..9585b1a4b5c34 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
@@ -31,7 +31,7 @@ public function __construct(ContainerBuilder $container)
      * Creates a parameter.
      *
      * @param string $name
-     * @param string $value
+     * @param mixed  $value
      *
      * @return $this
      */
@@ -46,7 +46,7 @@ final public function set($name, $value)
      * Creates a parameter.
      *
      * @param string $name
-     * @param string $value
+     * @param mixed  $value
      *
      * @return $this
      */

From 73eda66b99a668f891781ebf49a88ad23e237a36 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 29 Sep 2017 12:22:06 +0200
Subject: [PATCH 0950/1099] [DowCrawler] Default to UTF-8 when possible

---
 src/Symfony/Component/DomCrawler/Crawler.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index 1ad80e933ee84..5d201dff1eef6 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -127,8 +127,8 @@ public function add($node)
     /**
      * Adds HTML/XML content.
      *
-     * If the charset is not set via the content type, it is assumed
-     * to be ISO-8859-1, which is the default charset defined by the
+     * If the charset is not set via the content type, it is assumed to be UTF-8,
+     * or ISO-8859-1 as a fallback, which is the default charset defined by the
      * HTTP 1.1 specification.
      *
      * @param string      $content A string to parse as HTML/XML
@@ -161,7 +161,7 @@ public function addContent($content, $type = null)
         }
 
         if (null === $charset) {
-            $charset = 'ISO-8859-1';
+            $charset = preg_match('//u', $content) ? 'UTF-8' : 'ISO-8859-1';
         }
 
         if ('x' === $xmlMatches[1]) {

From 3392f9f32d8c16348cf4a501e54859d84e4e3a07 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 29 Sep 2017 12:59:58 +0200
Subject: [PATCH 0951/1099] Fix conflicts between Bridge/PhpUnit and Debug
 fixtures

---
 src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php   | 4 ++--
 .../Tests/Fixtures/coverage/src/{Bar.php => BarCov.php}     | 4 ++--
 .../Tests/Fixtures/coverage/src/{Foo.php => FooCov.php}     | 2 +-
 .../PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php       | 6 +++---
 .../PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/{Bar.php => BarCov.php} (87%)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/{Foo.php => FooCov.php} (96%)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
index 0d548aa91204e..64984ee0b962c 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -27,11 +27,11 @@ public function test()
 
         exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text", $output);
         $output = implode("\n", $output);
-        $this->assertContains('Foo', $output);
+        $this->assertContains('FooCov', $output);
 
         exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text", $output);
         $output = implode("\n", $output);
-        $this->assertNotContains('Foo', $output);
+        $this->assertNotContains('FooCov', $output);
         $this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
         $this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
         $this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
similarity index 87%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
index b50305a402634..c399e8def2b70 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
@@ -11,11 +11,11 @@
 
 namespace PhpUnitCoverageTest;
 
-class Bar
+class BarCov
 {
     private $foo;
 
-    public function __construct(Foo $foo)
+    public function __construct(FooCov $foo)
     {
         $this->foo = $foo;
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
similarity index 96%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
index f811ae70b10a0..7a7b1163452b8 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
@@ -11,7 +11,7 @@
 
 namespace PhpUnitCoverageTest;
 
-class Foo
+class FooCov
 {
     public function fooZ()
     {
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
index b49fc706a9cfa..def55c5e975b5 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
@@ -17,12 +17,12 @@ class BarTest extends TestCase
 {
     public function testBar()
     {
-        if (!class_exists('PhpUnitCoverageTest\Foo')) {
+        if (!class_exists('PhpUnitCoverageTest\FooCov')) {
             $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
         }
 
-        $foo = new \PhpUnitCoverageTest\Foo();
-        $bar = new \PhpUnitCoverageTest\Bar($foo);
+        $foo = new \PhpUnitCoverageTest\FooCov();
+        $bar = new \PhpUnitCoverageTest\BarCov($foo);
 
         $this->assertSame('bar', $bar->barZ());
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
index 9647a8658d212..925f4831ac89d 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/../src/Bar.php';
-require __DIR__.'/../src/Foo.php';
+require __DIR__.'/../src/BarCov.php';
+require __DIR__.'/../src/FooCov.php';
 
 require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {

From 15a2e5b091112e7d6601bd2bf045859355aaff66 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 29 Sep 2017 13:12:40 +0200
Subject: [PATCH 0952/1099] fix test

---
 .../Fixtures/coverage/tests/{BarTest.php => BarCovTest.php}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/{BarTest.php => BarCovTest.php} (91%)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarCovTest.php
similarity index 91%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarCovTest.php
index def55c5e975b5..dc7f2cefd01c3 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarCovTest.php
@@ -13,9 +13,9 @@
 
 use PHPUnit\Framework\TestCase;
 
-class BarTest extends TestCase
+class BarCovTest extends TestCase
 {
-    public function testBar()
+    public function testBarCov()
     {
         if (!class_exists('PhpUnitCoverageTest\FooCov')) {
             $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');

From 3d19fd98378d4f12e7dcd478faaeb49a89c23193 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 29 Sep 2017 13:28:23 +0200
Subject: [PATCH 0953/1099] [FrameworkBundle] Use PhpExtractor from Translation

---
 .../Bundle/FrameworkBundle/Resources/config/translation.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index b1f478ac90bac..fddd2abf759eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -121,7 +121,7 @@
             
         
 
-        
+        
             
         
 

From 260d2f02d8c40d6ce2c37e5f28ba5bd31740e8a0 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Fri, 29 Sep 2017 13:52:17 +0200
Subject: [PATCH 0954/1099] [DI] EnvVarProcessorInterface: fix missing use

---
 .../Component/DependencyInjection/EnvVarProcessorInterface.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
index fce9f5cd7a998..654fe55e982fc 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection;
 
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
 /**
  * The EnvVarProcessorInterface is implemented by objects that manage environment-like variables.
  *

From be093dd79a2de4d67360ca0d0d576773e6cf91ac Mon Sep 17 00:00:00 2001
From: Zan Baldwin 
Date: Tue, 26 Sep 2017 13:56:45 +0100
Subject: [PATCH 0955/1099] Argon2i Password Encoder

Add the Argon2i hashing algorithm provided by libsodium as a core encoder in the Security component, and enable it in the SecurityBundle.
Credit to @chalasr for help with unit tests.
---
 .../Bundle/SecurityBundle/CHANGELOG.md        |   1 +
 .../DependencyInjection/SecurityExtension.php |  13 +++
 .../CompleteConfigurationTest.php             |  13 +++
 .../Fixtures/php/argon2i_encoder.php          |  19 ++++
 .../Fixtures/xml/argon2i_encoder.xml          |  18 +++
 .../Fixtures/yml/argon2i_encoder.yml          |  13 +++
 .../UserPasswordEncoderCommandTest.php        |  51 +++++++++
 .../Functional/app/PasswordEncode/argon2i.yml |   7 ++
 src/Symfony/Component/Security/CHANGELOG.md   |   1 +
 .../Core/Encoder/Argon2iPasswordEncoder.php   | 104 ++++++++++++++++++
 .../Security/Core/Encoder/EncoderFactory.php  |   6 +
 .../Encoder/Argon2iPasswordEncoderTest.php    |  62 +++++++++++
 12 files changed, 308 insertions(+)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml
 create mode 100644 src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
 create mode 100644 src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index b759b693cd273..dd27ace596055 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * deprecated HTTP digest authentication
  * deprecated command `acl:set` along with `SetAclCommand` class
  * deprecated command `init:acl` along with `InitAclCommand` class
+ * Added support for the new Argon2i password encoder
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index b19f6b1b8d58c..45ab00ac47871 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -29,6 +29,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 
 /**
  * SecurityExtension.
@@ -607,6 +608,18 @@ private function createEncoder($config, ContainerBuilder $container)
             );
         }
 
+        // Argon2i encoder
+        if ('argon2i' === $config['algorithm']) {
+            if (!Argon2iPasswordEncoder::isSupported()) {
+                throw new InvalidConfigurationException('Argon2i algorithm is not supported. Please install the libsodium extension or upgrade to PHP 7.2+.');
+            }
+
+            return array(
+                'class' => 'Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder',
+                'arguments' => array(),
+            );
+        }
+
         // run-time configured encoder
         return $config;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 5a2c731b2ac7d..cb581048448fd 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -19,6 +19,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
+use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 
 abstract class CompleteConfigurationTest extends TestCase
 {
@@ -451,6 +452,18 @@ public function testEncoders()
         )), $container->getDefinition('security.encoder_factory.generic')->getArguments());
     }
 
+    public function testArgon2iEncoder()
+    {
+        if (!Argon2iPasswordEncoder::isSupported()) {
+            $this->markTestSkipped('Argon2i algorithm is not supported.');
+        }
+
+        $this->assertSame(array(array('JMS\FooBundle\Entity\User7' => array(
+            'class' => 'Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder',
+            'arguments' => array(),
+        ))), $this->getContainer('argon2i_encoder')->getDefinition('security.encoder_factory.generic')->getArguments());
+    }
+
     /**
      * @group legacy
      * @expectedDeprecation The "security.acl" configuration key is deprecated since version 3.4 and will be removed in 4.0. Install symfony/acl-bundle and use the "acl" key instead.
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php
new file mode 100644
index 0000000000000..23ff1799c8300
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php
@@ -0,0 +1,19 @@
+loadFromExtension('security', array(
+    'encoders' => array(
+        'JMS\FooBundle\Entity\User7' => array(
+            'algorithm' => 'argon2i',
+        ),
+    ),
+    'providers' => array(
+        'default' => array('id' => 'foo'),
+    ),
+    'firewalls' => array(
+        'main' => array(
+            'form_login' => false,
+            'http_basic' => null,
+            'logout_on_user_change' => true,
+        ),
+    ),
+));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
new file mode 100644
index 0000000000000..dda4d8ec888c8
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
@@ -0,0 +1,18 @@
+
+
+
+
+    
+        
+
+        
+
+        
+            
+        
+    
+
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml
new file mode 100644
index 0000000000000..a51e766005456
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml
@@ -0,0 +1,13 @@
+security:
+    encoders:
+        JMS\FooBundle\Entity\User6:
+            algorithm: argon2i
+
+    providers:
+        default: { id: foo }
+
+    firewalls:
+        main:
+            form_login: false
+            http_basic: ~
+            logout_on_user_change: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
index afd3da09ce0d2..ab9275aeed24d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder;
@@ -69,6 +70,27 @@ public function testEncodePasswordBcrypt()
         $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
     }
 
+    public function testEncodePasswordArgon2i()
+    {
+        if (!Argon2iPasswordEncoder::isSupported()) {
+            $this->markTestSkipped('Argon2i algorithm not available.');
+        }
+        $this->setupArgon2i();
+        $this->passwordEncoderCommandTester->execute(array(
+            'command' => 'security:encode-password',
+            'password' => 'password',
+            'user-class' => 'Custom\Class\Argon2i\User',
+        ), array('interactive' => false));
+
+        $output = $this->passwordEncoderCommandTester->getDisplay();
+        $this->assertContains('Password encoding succeeded', $output);
+
+        $encoder = new Argon2iPasswordEncoder();
+        preg_match('#  Encoded password\s+(\$argon2i\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
+        $hash = $matches[1];
+        $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
+    }
+
     public function testEncodePasswordPbkdf2()
     {
         $this->passwordEncoderCommandTester->execute(array(
@@ -129,6 +151,22 @@ public function testEncodePasswordBcryptOutput()
         $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
     }
 
+    public function testEncodePasswordArgon2iOutput()
+    {
+        if (!Argon2iPasswordEncoder::isSupported()) {
+            $this->markTestSkipped('Argon2i algorithm not available.');
+        }
+
+        $this->setupArgon2i();
+        $this->passwordEncoderCommandTester->execute(array(
+            'command' => 'security:encode-password',
+            'password' => 'p@ssw0rd',
+            'user-class' => 'Custom\Class\Argon2i\User',
+        ), array('interactive' => false));
+
+        $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
+    }
+
     public function testEncodePasswordNoConfigForGivenUserClass()
     {
         if (method_exists($this, 'expectException')) {
@@ -230,4 +268,17 @@ protected function tearDown()
     {
         $this->passwordEncoderCommandTester = null;
     }
+
+    private function setupArgon2i()
+    {
+        putenv('COLUMNS='.(119 + strlen(PHP_EOL)));
+        $kernel = $this->createKernel(array('test_case' => 'PasswordEncode', 'root_config' => 'argon2i'));
+        $kernel->boot();
+
+        $application = new Application($kernel);
+
+        $passwordEncoderCommand = $application->get('security:encode-password');
+
+        $this->passwordEncoderCommandTester = new CommandTester($passwordEncoderCommand);
+    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml
new file mode 100644
index 0000000000000..2ca4f3461a6e9
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: config.yml }
+
+security:
+    encoders:
+        Custom\Class\Argon2i\User:
+            algorithm: argon2i
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 5ac97ca8b20bb..176393c173ec6 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
    the user will always be logged out when the user has changed between
    requests.
  * deprecated HTTP digest authentication
+ * Added a new password encoder for the Argon2i hashing algorithm
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
new file mode 100644
index 0000000000000..c88bce0081941
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
@@ -0,0 +1,104 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Encoder;
+
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+
+/**
+ * Argon2iPasswordEncoder uses the Argon2i hashing algorithm.
+ *
+ * @author Zan Baldwin 
+ */
+class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEncoderInterface
+{
+    public static function isSupported()
+    {
+        return (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I'))
+            || \function_exists('sodium_crypto_pwhash_str')
+            || \extension_loaded('libsodium');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function encodePassword($raw, $salt)
+    {
+        if ($this->isPasswordTooLong($raw)) {
+            throw new BadCredentialsException('Invalid password.');
+        }
+
+        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {
+            return $this->encodePasswordNative($raw);
+        }
+        if (\function_exists('sodium_crypto_pwhash_str')) {
+            return $this->encodePasswordSodiumFunction($raw);
+        }
+        if (\extension_loaded('libsodium')) {
+            return $this->encodePasswordSodiumExtension($raw);
+        }
+
+        throw new \LogicException('Argon2i algorithm is not supported. Please install the libsodium extension or upgrade to PHP 7.2+.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isPasswordValid($encoded, $raw, $salt)
+    {
+        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {
+            return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);
+        }
+        if (\function_exists('sodium_crypto_pwhash_str_verify')) {
+            $valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);
+            \sodium_memzero($raw);
+
+            return $valid;
+        }
+        if (\extension_loaded('libsodium')) {
+            $valid = !$this->isPasswordTooLong($raw) && \Sodium\crypto_pwhash_str_verify($encoded, $raw);
+            \Sodium\memzero($raw);
+
+            return $valid;
+        }
+
+        throw new \LogicException('Argon2i algorithm is not supported. Please install the libsodium extension or upgrade to PHP 7.2+.');
+    }
+
+    private function encodePasswordNative($raw)
+    {
+        return password_hash($raw, \PASSWORD_ARGON2I);
+    }
+
+    private function encodePasswordSodiumFunction($raw)
+    {
+        $hash = \sodium_crypto_pwhash_str(
+            $raw,
+            \SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
+            \SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
+        );
+        \sodium_memzero($raw);
+
+        return $hash;
+    }
+
+    private function encodePasswordSodiumExtension($raw)
+    {
+        $hash = \Sodium\crypto_pwhash_str(
+            $raw,
+            \Sodium\CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
+            \Sodium\CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
+        );
+        \Sodium\memzero($raw);
+
+        return $hash;
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
index 7794b2f4dbcc1..8e1dbc852e746 100644
--- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
+++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
@@ -109,6 +109,12 @@ private function getEncoderConfigFromAlgorithm($config)
                     'class' => BCryptPasswordEncoder::class,
                     'arguments' => array($config['cost']),
                 );
+
+            case 'argon2i':
+                return array(
+                    'class' => Argon2iPasswordEncoder::class,
+                    'arguments' => array(),
+                );
         }
 
         return array(
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
new file mode 100644
index 0000000000000..70f2142ec39df
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
@@ -0,0 +1,62 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Tests\Encoder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
+
+/**
+ * @author Zan Baldwin 
+ */
+class Argon2iPasswordEncoderTest extends TestCase
+{
+    const PASSWORD = 'password';
+
+    protected function setUp()
+    {
+        if (!Argon2iPasswordEncoder::isSupported()) {
+            $this->markTestSkipped('Argon2i algorithm is not supported.');
+        }
+    }
+
+    public function testValidation()
+    {
+        $encoder = new Argon2iPasswordEncoder();
+        $result = $encoder->encodePassword(self::PASSWORD, null);
+        $this->assertTrue($encoder->isPasswordValid($result, self::PASSWORD, null));
+        $this->assertFalse($encoder->isPasswordValid($result, 'anotherPassword', null));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
+     */
+    public function testEncodePasswordLength()
+    {
+        $encoder = new Argon2iPasswordEncoder();
+        $encoder->encodePassword(str_repeat('a', 4097), 'salt');
+    }
+
+    public function testCheckPasswordLength()
+    {
+        $encoder = new Argon2iPasswordEncoder();
+        $result = $encoder->encodePassword(str_repeat('a', 4096), null);
+        $this->assertFalse($encoder->isPasswordValid($result, str_repeat('a', 4097), null));
+        $this->assertTrue($encoder->isPasswordValid($result, str_repeat('a', 4096), null));
+    }
+
+    public function testUserProvidedSaltIsNotUsed()
+    {
+        $encoder = new Argon2iPasswordEncoder();
+        $result = $encoder->encodePassword(self::PASSWORD, 'salt');
+        $this->assertTrue($encoder->isPasswordValid($result, self::PASSWORD, 'anotherSalt'));
+    }
+}

From 9a06513ec741e6d7975b09300904e79b477bf9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= 
Date: Sat, 23 Sep 2017 14:20:05 +0100
Subject: [PATCH 0956/1099] [HttpKernel][FrameworkBundle] Add a minimalist
 default PSR-3 logger

---
 composer.json                                 |   1 +
 .../Bundle/FrameworkBundle/CHANGELOG.md       |   1 +
 .../FrameworkBundle/FrameworkBundle.php       |   2 +
 .../Console/Logger/ConsoleLogger.php          |   2 +
 src/Symfony/Component/HttpKernel/CHANGELOG.md |   1 +
 .../DependencyInjection/LoggerPass.php        |  45 ++++
 .../Component/HttpKernel/Log/Logger.php       |  98 ++++++++
 .../DependencyInjection/LoggerPassTest.php    |  68 ++++++
 .../HttpKernel/Tests/Log/LoggerTest.php       | 212 ++++++++++++++++++
 .../Component/HttpKernel/composer.json        |   3 +
 10 files changed, 433 insertions(+)
 create mode 100644 src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
 create mode 100644 src/Symfony/Component/HttpKernel/Log/Logger.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php

diff --git a/composer.json b/composer.json
index 00039be77db9b..7b55e30efd330 100644
--- a/composer.json
+++ b/composer.json
@@ -109,6 +109,7 @@
     "provide": {
         "psr/cache-implementation": "1.0",
         "psr/container-implementation": "1.0",
+        "psr/log-implementation": "1.0",
         "psr/simple-cache-implementation": "1.0"
     },
     "autoload": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 0c7581e7c0b7d..b76987b6c1291 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Always register a minimalist logger that writes in `stderr`
  * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
  * Removed `doctrine/cache` from the list of required dependencies in `composer.json`
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index c6936d35be83d..85569070f3c1e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -31,6 +31,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
+use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
@@ -85,6 +86,7 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
+        $container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
         $container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new RoutingResolverPass());
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index 27c9b6b278e17..d7bcdfad003f5 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -101,6 +101,8 @@ public function log($level, $message, array $context = array())
 
     /**
      * Returns true when any messages have been logged at error levels.
+     *
+     * @return bool
      */
     public function hasErrored()
     {
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 66e3b38e25ce6..76a2f39735fd5 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added a minimalist PSR-3 `Logger` class that writes in `stderr`
  * made kernels implementing `CompilerPassInterface` able to process the container
  * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
new file mode 100644
index 0000000000000..2cffb99b321ec
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
@@ -0,0 +1,45 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\DependencyInjection;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\HttpKernel\Log\Logger;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Registers the default logger if necessary.
+ *
+ * @author Kévin Dunglas 
+ */
+class LoggerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $alias = $container->setAlias(LoggerInterface::class, 'logger');
+        $alias->setPublic(false);
+
+        if ($container->has('logger')) {
+            return;
+        }
+
+        $loggerDefinition = $container->register('logger', Logger::class);
+        $loggerDefinition->setPublic(false);
+        if ($container->getParameter('kernel.debug')) {
+            $loggerDefinition->addArgument(LogLevel::DEBUG);
+        }
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
new file mode 100644
index 0000000000000..cf20ca258a322
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -0,0 +1,98 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Log;
+
+use Psr\Log\AbstractLogger;
+use Psr\Log\InvalidArgumentException;
+use Psr\Log\LogLevel;
+
+/**
+ * Minimalist PSR-3 logger designed to write in stderr or any other stream.
+ *
+ * @author Kévin Dunglas 
+ */
+class Logger extends AbstractLogger
+{
+    private static $levels = array(
+        LogLevel::DEBUG => 0,
+        LogLevel::INFO => 1,
+        LogLevel::NOTICE => 2,
+        LogLevel::WARNING => 3,
+        LogLevel::ERROR => 4,
+        LogLevel::CRITICAL => 5,
+        LogLevel::ALERT => 6,
+        LogLevel::EMERGENCY => 7,
+    );
+
+    private $minLevelIndex;
+    private $formatter;
+    private $handle;
+
+    public function __construct($minLevel = LogLevel::WARNING, $output = 'php://stderr', callable $formatter = null)
+    {
+        if (!isset(self::$levels[$minLevel])) {
+            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $minLevel));
+        }
+
+        $this->minLevelIndex = self::$levels[$minLevel];
+        $this->formatter = $formatter ?: array($this, 'format');
+        if (false === $this->handle = @fopen($output, 'a')) {
+            throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function log($level, $message, array $context = array())
+    {
+        if (!isset(self::$levels[$level])) {
+            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
+        }
+
+        if (self::$levels[$level] < $this->minLevelIndex) {
+            return;
+        }
+
+        $formatter = $this->formatter;
+        fwrite($this->handle, $formatter($level, $message, $context));
+    }
+
+    /**
+     * @param string $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return string
+     */
+    private function format($level, $message, array $context)
+    {
+        if (false !== strpos($message, '{')) {
+            $replacements = array();
+            foreach ($context as $key => $val) {
+                if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
+                    $replacements["{{$key}}"] = $val;
+                } elseif ($val instanceof \DateTimeInterface) {
+                    $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);
+                } elseif (\is_object($val)) {
+                    $replacements["{{$key}}"] = '[object '.\get_class($val).']';
+                } else {
+                    $replacements["{{$key}}"] = '['.\gettype($val).']';
+                }
+            }
+
+            $message = strtr($message, $replacements);
+        }
+
+        return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).\PHP_EOL;
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
new file mode 100644
index 0000000000000..d018929b2a830
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
@@ -0,0 +1,68 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
+use Symfony\Component\HttpKernel\Log\Logger;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Kévin Dunglas 
+ */
+class LoggerPassTest extends TestCase
+{
+    public function testAlwaysSetAutowiringAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->register('logger', 'Foo');
+
+        (new LoggerPass())->process($container);
+
+        $this->assertFalse($container->getAlias(LoggerInterface::class)->isPublic());
+    }
+
+    public function testDoNotOverrideExistingLogger()
+    {
+        $container = new ContainerBuilder();
+        $container->register('logger', 'Foo');
+
+        (new LoggerPass())->process($container);
+
+        $this->assertSame('Foo', $container->getDefinition('logger')->getClass());
+    }
+
+    public function testRegisterLogger()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
+        (new LoggerPass())->process($container);
+
+        $definition = $container->getDefinition('logger');
+        $this->assertSame(Logger::class, $definition->getClass());
+        $this->assertFalse($definition->isPublic());
+    }
+
+    public function testSetMinLevelWhenDebugging()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', true);
+
+        (new LoggerPass())->process($container);
+
+        $definition = $container->getDefinition('logger');
+        $this->assertSame(LogLevel::DEBUG, $definition->getArgument(0));
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
new file mode 100644
index 0000000000000..ecf67af78c115
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
@@ -0,0 +1,212 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Log;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\HttpKernel\Log\Logger;
+
+/**
+ * @author Kévin Dunglas 
+ * @author Jordi Boggiano 
+ */
+class LoggerTest extends TestCase
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var string
+     */
+    private $tmpFile;
+
+    protected function setUp()
+    {
+        $this->tmpFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.'log';
+        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile);
+    }
+
+    protected function tearDown()
+    {
+        if (!@unlink($this->tmpFile)) {
+            file_put_contents($this->tmpFile, '');
+        }
+    }
+
+    public static function assertLogsMatch(array $expected, array $given)
+    {
+        foreach ($given as $k => $line) {
+            self::assertThat(1 === preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}[\+-][0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line), self::isTrue(), "\"$line\" do not match expected pattern \"$expected[$k]\"");
+        }
+    }
+
+    /**
+     * Return the log messages in order.
+     *
+     * @return string[]
+     */
+    public function getLogs()
+    {
+        return file($this->tmpFile, FILE_IGNORE_NEW_LINES);
+    }
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf(LoggerInterface::class, $this->logger);
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $this->logger->{$level}($message, array('user' => 'Bob'));
+        $this->logger->log($level, $message, array('user' => 'Bob'));
+
+        $expected = array(
+            "[$level] message of level $level with context: Bob",
+            "[$level] message of level $level with context: Bob",
+        );
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function provideLevelsAndMessages()
+    {
+        return array(
+            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
+            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
+            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
+            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
+            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
+            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
+            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
+            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
+        );
+    }
+
+    public function testLogLevelDisabled()
+    {
+        $this->logger = new Logger(LogLevel::INFO, $this->tmpFile);
+
+        $this->logger->debug('test', array('user' => 'Bob'));
+        $this->logger->log(LogLevel::DEBUG, 'test', array('user' => 'Bob'));
+
+        // Will always be true, but asserts than an exception isn't thrown
+        $this->assertSame(array(), $this->getLogs());
+    }
+
+    /**
+     * @expectedException \Psr\Log\InvalidArgumentException
+     */
+    public function testThrowsOnInvalidLevel()
+    {
+        $this->logger->log('invalid level', 'Foo');
+    }
+
+    /**
+     * @expectedException \Psr\Log\InvalidArgumentException
+     */
+    public function testThrowsOnInvalidMinLevel()
+    {
+        new Logger('invalid');
+    }
+
+    /**
+     * @expectedException \Psr\Log\InvalidArgumentException
+     */
+    public function testInvalidOutput()
+    {
+        new Logger(LogLevel::DEBUG, '/');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->logger;
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+        $expected = array('[info] {Message {nothing} Bob Bar a}');
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        if (method_exists($this, 'createPartialMock')) {
+            $dummy = $this->createPartialMock(DummyTest::class, array('__toString'));
+        } else {
+            $dummy = $this->getMock(DummyTest::class, array('__toString'));
+        }
+        $dummy->expects($this->atLeastOnce())
+            ->method('__toString')
+            ->will($this->returnValue('DUMMY'));
+
+        $this->logger->warning($dummy);
+
+        $expected = array('[warning] DUMMY');
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = array(
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => array('with object' => new DummyTest()),
+            'object' => new \DateTime(),
+            'resource' => fopen('php://memory', 'r'),
+        );
+
+        $this->logger->warning('Crazy context data', $context);
+
+        $expected = array('[warning] Crazy context data');
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $logger = $this->logger;
+        $logger->warning('Random message', array('exception' => 'oops'));
+        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+
+        $expected = array(
+            '[warning] Random message',
+            '[critical] Uncaught Exception!',
+        );
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testFormatter()
+    {
+        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
+            return json_encode(array('level' => $level, 'message' => $message, 'context' => $context)).\PHP_EOL;
+        });
+
+        $this->logger->error('An error', array('foo' => 'bar'));
+        $this->logger->warning('A warning', array('baz' => 'bar'));
+        $this->assertSame(array(
+            '{"level":"error","message":"An error","context":{"foo":"bar"}}',
+            '{"level":"warning","message":"A warning","context":{"baz":"bar"}}',
+        ), $this->getLogs());
+    }
+}
+
+class DummyTest
+{
+    public function __toString()
+    {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 3c051bb5f7b33..a372edb588601 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -40,6 +40,9 @@
         "symfony/var-dumper": "~3.3|~4.0",
         "psr/cache": "~1.0"
     },
+    "provide": {
+        "psr/log-implementation": "1.0"
+    },
     "conflict": {
         "symfony/config": "<2.8",
         "symfony/dependency-injection": "<3.4",

From 722872f4c48e9c76de9fe7156c886fcabd9a3b68 Mon Sep 17 00:00:00 2001
From: Amrouche Hamza 
Date: Fri, 29 Sep 2017 20:45:30 +0200
Subject: [PATCH 0957/1099] [PHPUnitBridge] don't remove when set to  empty
 string

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index a2747f3be2a09..ae4c818aa327f 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -60,7 +60,8 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $zip->extractTo(getcwd());
     $zip->close();
     chdir("phpunit-$PHPUNIT_VERSION");
-    passthru("$COMPOSER remove --no-update ".(getenv('SYMFONY_PHPUNIT_REMOVE') ?: 'phpspec/prophecy symfony/yaml'));
+    $SYMFONY_PHPUNIT_REMOVE = getenv('SYMFONY_PHPUNIT_REMOVE');
+    passthru("$COMPOSER remove --no-update ".('' === $SYMFONY_PHPUNIT_REMOVE ?: 'phpspec/prophecy symfony/yaml'));
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }

From ec2aaace236dddcf568a3313ecc3b035443959d3 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Fri, 29 Sep 2017 12:25:35 -0700
Subject: [PATCH 0958/1099] improved error message

---
 .../WebProfilerBundle/Resources/views/Collector/time.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 28e3a3c8385af..4f20078e6a139 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -91,7 +91,7 @@
 
     {% if collector.events is empty %}
         
-            No timing events have been recorded. Are you sure that debugging is enabled in the kernel?
+            No timing events have been recorded. Check that symfony/stopwatch is installed and debugging enabled in the kernel.
         
     {% else %}
         {{ block('panelContent') }}

From c6c09e4f2844d4aaa37a1530e9ccba3daf748b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= 
Date: Fri, 29 Sep 2017 22:09:03 +0200
Subject: [PATCH 0959/1099] [Form] Fix FormInterface::submit() annotation

---
 src/Symfony/Component/Form/FormInterface.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index 780c00f40af48..e28d1a102d81f 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -269,10 +269,9 @@ public function handleRequest($request = null);
     /**
      * Submits data to the form, transforms and validates it.
      *
-     * @param null|string|array $submittedData The submitted data
-     * @param bool              $clearMissing  whether to set fields to NULL
-     *                                         when they are missing in the
-     *                                         submitted data
+     * @param mixed $submittedData The submitted data
+     * @param bool  $clearMissing  whether to set fields to NULL when they
+     *                             are missing in the submitted data
      *
      * @return $this
      *

From e7a5803e2ed6ade6d39d83f0b768aa2d67783eea Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Thu, 28 Sep 2017 13:56:55 +0200
Subject: [PATCH 0960/1099] [Security] Add user impersonation support for
 stateless authentication

---
 UPGRADE-3.4.md                                |  3 +++
 UPGRADE-4.0.md                                |  2 ++
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 .../DependencyInjection/MainConfiguration.php |  1 +
 .../DependencyInjection/SecurityExtension.php | 10 +++++--
 .../Resources/config/security_listeners.xml   |  1 +
 .../CompleteConfigurationTest.php             |  2 ++
 .../Fixtures/php/container1.php               |  2 +-
 .../Fixtures/php/container1_with_acl.php      |  2 +-
 .../Fixtures/php/container1_with_digest.php   |  2 +-
 .../Fixtures/php/no_custom_user_checker.php   |  2 +-
 .../Fixtures/xml/container1.xml               |  2 +-
 .../Fixtures/xml/container1_with_acl.xml      |  2 +-
 .../Fixtures/xml/container1_with_digest.xml   |  2 +-
 .../Fixtures/xml/no_custom_user_checker.xml   |  2 +-
 .../Fixtures/yml/container1.yml               |  3 ++-
 .../Fixtures/yml/container1_with_acl.yml      |  3 ++-
 .../Fixtures/yml/container1_with_digest.yml   |  3 ++-
 .../Fixtures/yml/no_custom_user_checker.yml   |  3 ++-
 .../SecurityExtensionTest.php                 | 26 +++++++++++++++++++
 .../Tests/Functional/SwitchUserTest.php       | 13 ++++++++++
 .../app/JsonLogin/switchuser_stateless.yml    | 13 ++++++++++
 .../Http/Firewall/SwitchUserListener.php      | 15 ++++++-----
 .../Tests/Firewall/SwitchUserListenerTest.php | 25 ++++++++++++++++++
 24 files changed, 120 insertions(+), 20 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 6561c15a0b46f..09e0a8a002027 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -316,6 +316,9 @@ SecurityBundle
 
  * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
    Use another authentication system like `http_basic` instead.
+   
+ * Deprecated setting the `switch_user.stateless` option to false when the firewall is `stateless`.
+   Setting it to false will have no effect in 4.0.
 
 Translation
 -----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 688a309466b5d..9631609958628 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -693,6 +693,8 @@ SecurityBundle
 
  * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
    has been removed. Use another authentication system like `http_basic` instead.
+   
+ * The `switch_user.stateless` option is now always true if the firewall is stateless.
 
 Serializer
 ----------
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 4d5a1b8f86eab..12c8fa8a0c504 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
  * deprecated command `acl:set` along with `SetAclCommand` class
  * deprecated command `init:acl` along with `InitAclCommand` class
  * Added support for the new Argon2i password encoder
+ * added `stateless` option to the `switch_user` listener
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 533b52cd4b1c6..e3c3fcef12141 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -304,6 +304,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->scalarNode('provider')->end()
                     ->scalarNode('parameter')->defaultValue('_switch_user')->end()
                     ->scalarNode('role')->defaultValue('ROLE_ALLOWED_TO_SWITCH')->end()
+                    ->booleanNode('stateless')->defaultValue(false)->end()
                 ->end()
             ->end()
         ;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 45ab00ac47871..f0e9abf0a7a15 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -456,7 +456,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         // Switch user listener
         if (isset($firewall['switch_user'])) {
             $listenerKeys[] = 'switch_user';
-            $listeners[] = new Reference($this->createSwitchUserListener($container, $id, $firewall['switch_user'], $defaultProvider));
+            $listeners[] = new Reference($this->createSwitchUserListener($container, $id, $firewall['switch_user'], $defaultProvider, $firewall['stateless']));
         }
 
         // Access listener
@@ -699,10 +699,15 @@ private function createExceptionListener($container, $config, $id, $defaultEntry
         return $exceptionListenerId;
     }
 
-    private function createSwitchUserListener($container, $id, $config, $defaultProvider)
+    private function createSwitchUserListener($container, $id, $config, $defaultProvider, $stateless)
     {
         $userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
 
+        // in 4.0, ignore the `switch_user.stateless` key if $stateless is `true`
+        if ($stateless && false === $config['stateless']) {
+            @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), E_USER_DEPRECATED);
+        }
+
         $switchUserListenerId = 'security.authentication.switchuser_listener.'.$id;
         $listener = $container->setDefinition($switchUserListenerId, new ChildDefinition('security.authentication.switchuser_listener'));
         $listener->replaceArgument(1, new Reference($userProvider));
@@ -710,6 +715,7 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv
         $listener->replaceArgument(3, $id);
         $listener->replaceArgument(6, $config['parameter']);
         $listener->replaceArgument(7, $config['role']);
+        $listener->replaceArgument(9, $config['stateless']);
 
         return $switchUserListenerId;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index ab9a587ad7d18..73c3eed722083 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -241,6 +241,7 @@
             _switch_user
             ROLE_ALLOWED_TO_SWITCH
             
+            false 
         
 
         
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index cb581048448fd..ad87bcb112904 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -130,6 +130,7 @@ public function testFirewalls()
                 array(
                     'parameter' => '_switch_user',
                     'role' => 'ROLE_ALLOWED_TO_SWITCH',
+                    'stateless' => true,
                 ),
             ),
             array(
@@ -256,6 +257,7 @@ public function testFirewallsWithDigest()
                 array(
                     'parameter' => '_switch_user',
                     'role' => 'ROLE_ALLOWED_TO_SWITCH',
+                    'stateless' => true,
                 ),
             ),
             array(
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index a80f880f80850..1395aa5db4920 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -65,7 +65,7 @@
             'http_basic' => true,
             'form_login' => true,
             'anonymous' => true,
-            'switch_user' => true,
+            'switch_user' => array('stateless' => true),
             'x509' => true,
             'remote_user' => true,
             'logout' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
index fc9b07c4f18b2..f6c156101454b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
@@ -67,7 +67,7 @@
             'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
-            'switch_user' => true,
+            'switch_user' => array('stateless' => true),
             'x509' => true,
             'remote_user' => true,
             'logout' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
index 581407fcc05a5..d35a5743b69e2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
@@ -67,7 +67,7 @@
             'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
             'anonymous' => true,
-            'switch_user' => true,
+            'switch_user' => array('stateless' => true),
             'x509' => true,
             'remote_user' => true,
             'logout' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
index 3889752f8f928..2724be3e28040 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/no_custom_user_checker.php
@@ -17,7 +17,7 @@
             'http_basic' => true,
             'form_login' => true,
             'anonymous' => true,
-            'switch_user' => true,
+            'switch_user' => array('stateless' => true),
             'x509' => true,
             'remote_user' => true,
             'logout' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index 01a5940d8c699..ac85132ffe00b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -49,7 +49,7 @@
             
             
             
-            
+            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
index 6d43fcdc4ff80..30b24f8d8ef19 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
@@ -51,7 +51,7 @@
             
             
             
-            
+            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
index e5049f2033e51..b0af7529ca70a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
@@ -52,7 +52,7 @@
             
             
             
-            
+            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
index b97d39adb5a78..996c8a7de20b5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -17,7 +17,7 @@
             
             
             
-            
+            
             
             
             
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index d9489abca1358..48a572ba7166b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -47,7 +47,8 @@ security:
             http_basic: true
             form_login: true
             anonymous: true
-            switch_user: true
+            switch_user:
+                stateless: true
             x509: true
             remote_user: true
             logout: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
index e8ed61ef031b9..9a3d902bb5268 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
@@ -50,7 +50,8 @@ security:
                 secret: TheSecret
             form_login: true
             anonymous: true
-            switch_user: true
+            switch_user:
+                stateless: true
             x509: true
             remote_user: true
             logout: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
index a2b57201bfbd2..77a4f9b0a353d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
@@ -50,7 +50,8 @@ security:
                 secret: TheSecret
             form_login: true
             anonymous: true
-            switch_user: true
+            switch_user:
+                stateless: true
             x509: true
             remote_user: true
             logout: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
index 6a196597c51e7..05ee906237db8 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/no_custom_user_checker.yml
@@ -12,7 +12,8 @@ security:
             http_basic: true
             form_login: true
             anonymous: true
-            switch_user: true
+            switch_user:
+                stateless: true
             x509: true
             remote_user: true
             logout: true
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 1055e4afd40f6..9ad7bfb3f8b04 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -148,6 +148,32 @@ public function testDeprecationForUserLogout()
         $container->compile();
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Firewall "some_firewall" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall's "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.
+     */
+    public function testSwitchUserNotStatelessOnStatelessFirewall()
+    {
+        $container = $this->getRawContainer();
+
+        $container->loadFromExtension('security', array(
+            'providers' => array(
+                'default' => array('id' => 'foo'),
+            ),
+
+            'firewalls' => array(
+                'some_firewall' => array(
+                    'stateless' => true,
+                    'http_basic' => null,
+                    'switch_user' => array('stateless' => false),
+                    'logout_on_user_change' => true,
+                ),
+            ),
+        ));
+
+        $container->compile();
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
index 697829b1cb75a..d89c24f1233fb 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
 
 class SwitchUserTest extends WebTestCase
@@ -50,6 +51,18 @@ public function testSwitchedUserExit()
         $this->assertEquals('user_can_switch', $client->getProfile()->getCollector('security')->getUser());
     }
 
+    public function testSwitchUserStateless()
+    {
+        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'switchuser_stateless.yml'));
+        $client->request('POST', '/chk', array('_switch_user' => 'dunglas'), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "user_can_switch", "password": "test"}}');
+        $response = $client->getResponse();
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(array('message' => 'Welcome @dunglas!'), json_decode($response->getContent(), true));
+        $this->assertSame('dunglas', $client->getProfile()->getCollector('security')->getUser());
+    }
+
     public function getTestParameters()
     {
         return array(
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml
new file mode 100644
index 0000000000000..29789a4caa25f
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml
@@ -0,0 +1,13 @@
+imports:
+    - { resource: ./config.yml }
+
+security:
+    providers:
+        in_memory:
+            memory:
+                users:
+                    user_can_switch: { password: test, roles: [ROLE_USER, ROLE_ALLOWED_TO_SWITCH] }
+    firewalls:
+        main:
+            switch_user:
+                stateless: true
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 2fc06140cfd37..d659ffc258db4 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -49,8 +49,9 @@ class SwitchUserListener implements ListenerInterface
     private $role;
     private $logger;
     private $dispatcher;
+    private $stateless;
 
-    public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, UserCheckerInterface $userChecker, $providerKey, AccessDecisionManagerInterface $accessDecisionManager, LoggerInterface $logger = null, $usernameParameter = '_switch_user', $role = 'ROLE_ALLOWED_TO_SWITCH', EventDispatcherInterface $dispatcher = null)
+    public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, UserCheckerInterface $userChecker, $providerKey, AccessDecisionManagerInterface $accessDecisionManager, LoggerInterface $logger = null, $usernameParameter = '_switch_user', $role = 'ROLE_ALLOWED_TO_SWITCH', EventDispatcherInterface $dispatcher = null, $stateless = false)
     {
         if (empty($providerKey)) {
             throw new \InvalidArgumentException('$providerKey must not be empty.');
@@ -65,6 +66,7 @@ public function __construct(TokenStorageInterface $tokenStorage, UserProviderInt
         $this->role = $role;
         $this->logger = $logger;
         $this->dispatcher = $dispatcher;
+        $this->stateless = $stateless;
     }
 
     /**
@@ -92,12 +94,13 @@ public function handle(GetResponseEvent $event)
             }
         }
 
-        $request->query->remove($this->usernameParameter);
-        $request->server->set('QUERY_STRING', http_build_query($request->query->all()));
+        if (!$this->stateless) {
+            $request->query->remove($this->usernameParameter);
+            $request->server->set('QUERY_STRING', http_build_query($request->query->all()));
+            $response = new RedirectResponse($request->getUri(), 302);
 
-        $response = new RedirectResponse($request->getUri(), 302);
-
-        $event->setResponse($response);
+            $event->setResponse($response);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index c97eda759330b..0e61ee208ee2c 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -266,4 +266,29 @@ public function testSwitchUserWithReplacedToken()
 
         $this->assertSame($replacedToken, $this->tokenStorage->getToken());
     }
+
+    public function testSwitchUserStateless()
+    {
+        $token = new UsernamePasswordToken('username', '', 'key', array('ROLE_FOO'));
+        $user = new User('username', 'password', array());
+
+        $this->tokenStorage->setToken($token);
+        $this->request->query->set('_switch_user', 'kuba');
+
+        $this->accessDecisionManager->expects($this->once())
+            ->method('decide')->with($token, array('ROLE_ALLOWED_TO_SWITCH'))
+            ->will($this->returnValue(true));
+
+        $this->userProvider->expects($this->once())
+            ->method('loadUserByUsername')->with('kuba')
+            ->will($this->returnValue($user));
+        $this->userChecker->expects($this->once())
+            ->method('checkPostAuth')->with($user);
+
+        $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', null, true);
+        $listener->handle($this->event);
+
+        $this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $this->tokenStorage->getToken());
+        $this->assertFalse($this->event->hasResponse());
+    }
 }

From 2d1e3347a64b249f75b2b9820f87f60f87200b2c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Fri, 29 Sep 2017 20:40:54 +0200
Subject: [PATCH 0961/1099] [SecurityBundle] Deprecate auto picking the first
 provider

when no provider is explicitly configured on a firewall
---
 UPGRADE-3.4.md                                |  4 +++
 UPGRADE-4.0.md                                |  4 +++
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 .../DependencyInjection/SecurityExtension.php |  4 +++
 .../Fixtures/php/container1.php               |  5 +++-
 .../Fixtures/php/container1_with_acl.php      |  5 +++-
 .../Fixtures/php/container1_with_digest.php   |  5 +++-
 .../Fixtures/xml/container1.xml               |  8 +++---
 .../Fixtures/xml/container1_with_acl.xml      |  8 +++---
 .../Fixtures/xml/container1_with_digest.xml   |  8 +++---
 .../Fixtures/yml/container1.yml               |  3 +++
 .../Fixtures/yml/container1_with_acl.yml      |  3 +++
 .../Fixtures/yml/container1_with_digest.yml   |  3 +++
 .../SecurityExtensionTest.php                 | 25 +++++++++++++++++++
 14 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 6561c15a0b46f..3bfbde4b32d5c 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -316,6 +316,10 @@ SecurityBundle
 
  * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
    Use another authentication system like `http_basic` instead.
+   
+ * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider. 
+   Using the first configured provider is deprecated since 3.4 and will throw an exception on 4.0.
+   Explicitly configure the provider to use on your firewalls.
 
 Translation
 -----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 688a309466b5d..c3ba0ed84c9d4 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -693,6 +693,10 @@ SecurityBundle
 
  * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
    has been removed. Use another authentication system like `http_basic` instead.
+   
+ * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider. 
+   The first configured provider is not used anymore and an exception is thrown instead.
+   Explicitly configure the provider to use on your firewalls.
 
 Serializer
 ----------
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 4d5a1b8f86eab..9b02ebac34eee 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
  * deprecated command `acl:set` along with `SetAclCommand` class
  * deprecated command `init:acl` along with `InitAclCommand` class
  * Added support for the new Argon2i password encoder
+ * deprecated auto picking the first registered provider when no configured provider on a firewall and ambiguous
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 45ab00ac47871..231d5dae7223d 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -359,6 +359,10 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             $defaultProvider = $providerIds[$normalizedName];
         } else {
             $defaultProvider = reset($providerIds);
+
+            if (count($providerIds) > 1) {
+                @trigger_error(sprintf('Firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $id, key($providerIds)), E_USER_DEPRECATED);
+            }
         }
 
         $config->replaceArgument(5, $defaultProvider);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
index a80f880f80850..433c9ed2ecb22 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -60,8 +60,9 @@
     ),
 
     'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
+        'simple' => array('provider' => 'default', 'pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
+            'provider' => 'default',
             'http_basic' => true,
             'form_login' => true,
             'anonymous' => true,
@@ -74,6 +75,7 @@
             'logout_on_user_change' => true,
         ),
         'host' => array(
+            'provider' => 'default',
             'pattern' => '/test',
             'host' => 'foo\\.example\\.org',
             'methods' => array('GET', 'POST'),
@@ -82,6 +84,7 @@
             'logout_on_user_change' => true,
         ),
         'with_user_checker' => array(
+            'provider' => 'default',
             'user_checker' => 'app.user_checker',
             'anonymous' => true,
             'http_basic' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
index fc9b07c4f18b2..4dd85111cfb22 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_acl.php
@@ -61,8 +61,9 @@
     ),
 
     'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
+        'simple' => array('provider' => 'default', 'pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
+            'provider' => 'default',
             'http_basic' => true,
             'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
@@ -75,6 +76,7 @@
             'user_checker' => null,
         ),
         'host' => array(
+            'provider' => 'default',
             'pattern' => '/test',
             'host' => 'foo\\.example\\.org',
             'methods' => array('GET', 'POST'),
@@ -82,6 +84,7 @@
             'http_basic' => true,
         ),
         'with_user_checker' => array(
+            'provider' => 'default',
             'user_checker' => 'app.user_checker',
             'anonymous' => true,
             'http_basic' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
index 581407fcc05a5..df57aee64bac7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1_with_digest.php
@@ -61,8 +61,9 @@
     ),
 
     'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
+        'simple' => array('provider' => 'default', 'pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
+            'provider' => 'default',
             'http_basic' => true,
             'http_digest' => array('secret' => 'TheSecret'),
             'form_login' => true,
@@ -76,6 +77,7 @@
             'logout_on_user_change' => true,
         ),
         'host' => array(
+            'provider' => 'default',
             'pattern' => '/test',
             'host' => 'foo\\.example\\.org',
             'methods' => array('GET', 'POST'),
@@ -84,6 +86,7 @@
             'logout_on_user_change' => true,
         ),
         'with_user_checker' => array(
+            'provider' => 'default',
             'user_checker' => 'app.user_checker',
             'anonymous' => true,
             'http_basic' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index 01a5940d8c699..56052deb4a1a1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -43,9 +43,9 @@
             
         
 
-        
+        
 
-        
+        
             
             
             
@@ -57,12 +57,12 @@
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
             app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
index 6d43fcdc4ff80..fbe21f0bb1742 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_acl.xml
@@ -44,9 +44,9 @@
             
         
 
-        
+        
 
-        
+        
             
             
             
@@ -59,12 +59,12 @@
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
             app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
index e5049f2033e51..790a90714a4e1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1_with_digest.xml
@@ -45,9 +45,9 @@
             
         
 
-        
+        
 
-        
+        
             
             
             
@@ -60,12 +60,12 @@
             
         
 
-        
+        
             
             
         
 
-        
+        
             
             
             app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
index d9489abca1358..292154660b6dc 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -43,6 +43,7 @@ security:
     firewalls:
         simple: { pattern: /login, security: false }
         secure:
+            provider: default
             stateless: true
             http_basic: true
             form_login: true
@@ -56,6 +57,7 @@ security:
             user_checker: ~
 
         host:
+            provider: default
             pattern: /test
             host: foo\.example\.org
             methods: [GET,POST]
@@ -64,6 +66,7 @@ security:
             logout_on_user_change: true
 
         with_user_checker:
+            provider: default
             anonymous: ~
             http_basic: ~
             user_checker: app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
index e8ed61ef031b9..176494e8ba93f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_acl.yml
@@ -44,6 +44,7 @@ security:
     firewalls:
         simple: { pattern: /login, security: false }
         secure:
+            provider: default
             stateless: true
             http_basic: true
             http_digest:
@@ -59,6 +60,7 @@ security:
             user_checker: ~
 
         host:
+            provider: default
             pattern: /test
             host: foo\.example\.org
             methods: [GET,POST]
@@ -66,6 +68,7 @@ security:
             http_basic: true
 
         with_user_checker:
+            provider: default
             anonymous: ~
             http_basic: ~
             user_checker: app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
index a2b57201bfbd2..1e984256f33d1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1_with_digest.yml
@@ -44,6 +44,7 @@ security:
     firewalls:
         simple: { pattern: /login, security: false }
         secure:
+            provider: default
             stateless: true
             http_basic: true
             http_digest:
@@ -59,6 +60,7 @@ security:
             user_checker: ~
 
         host:
+            provider: default
             pattern: /test
             host: foo\.example\.org
             methods: [GET,POST]
@@ -67,6 +69,7 @@ security:
             logout_on_user_change: true
 
         with_user_checker:
+            provider: default
             anonymous: ~
             http_basic: ~
             user_checker: app.user_checker
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 1055e4afd40f6..3dd1f817ae618 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -148,6 +148,31 @@ public function testDeprecationForUserLogout()
         $container->compile();
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Firewall "default" has no "provider" set but multiple providers exist. Using the first configured provider (first) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.
+     */
+    public function testDeprecationForAmbiguousProvider()
+    {
+        $container = $this->getRawContainer();
+
+        $container->loadFromExtension('security', array(
+            'providers' => array(
+                'first' => array('id' => 'foo'),
+                'second' => array('id' => 'bar'),
+            ),
+
+            'firewalls' => array(
+                'default' => array(
+                    'http_basic' => null,
+                    'logout_on_user_change' => true,
+                ),
+            ),
+        ));
+
+        $container->compile();
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();

From c109dcd5ae0a9c2979bf5ad2957b029f79960b51 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Sat, 30 Sep 2017 14:58:47 +0200
Subject: [PATCH 0962/1099] [FrameworkBundle] Register a NullLogger from test
 kernels

---
 .../Command/CacheClearCommand/Fixture/TestAppKernel.php    | 7 +++++++
 .../FrameworkBundle/Tests/Functional/app/AppKernel.php     | 7 +++++++
 .../FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php   | 2 ++
 3 files changed, 16 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
index 8a61d96d36c6e..18ea12ee30e2a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
 
+use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class TestAppKernel extends Kernel
@@ -33,4 +35,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.DIRECTORY_SEPARATOR.'config.yml');
     }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
index 58fb963855e2f..e239bb5331696 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\app;
 
+use Psr\Log\NullLogger;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -72,6 +74,11 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load($this->rootConfig);
     }
 
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
+
     public function serialize()
     {
         return serialize(array($this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
index f476945f3da0c..1994778095d13 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
 
+use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -77,6 +78,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
 
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
+        $c->register('logger', NullLogger::class);
         $c->loadFromExtension('framework', array(
             'secret' => '$ecret',
         ));

From 2080582a75769db4b9e32b241ec0da90c05af6a6 Mon Sep 17 00:00:00 2001
From: Antoine Bellion 
Date: Fri, 29 Sep 2017 13:45:44 +0200
Subject: [PATCH 0963/1099] [HttpFoundation] Return instance in
 StreamedResponse

---
 .../HttpFoundation/StreamedResponse.php          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index 928531309ad0a..cd86be1363cd4 100644
--- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -66,16 +66,22 @@ public static function create($callback = null, $status = 200, $headers = array(
      * Sets the PHP callback associated with this Response.
      *
      * @param callable $callback A valid PHP callback
+     *
+     * @return $this
      */
     public function setCallback(callable $callback)
     {
         $this->callback = $callback;
+
+        return $this;
     }
 
     /**
      * {@inheritdoc}
      *
      * This method only sends the headers once.
+     *
+     * @return $this
      */
     public function sendHeaders()
     {
@@ -85,13 +91,15 @@ public function sendHeaders()
 
         $this->headersSent = true;
 
-        parent::sendHeaders();
+        return parent::sendHeaders();
     }
 
     /**
      * {@inheritdoc}
      *
      * This method only sends the content once.
+     *
+     * @return $this
      */
     public function sendContent()
     {
@@ -106,18 +114,24 @@ public function sendContent()
         }
 
         call_user_func($this->callback);
+
+        return $this;
     }
 
     /**
      * {@inheritdoc}
      *
      * @throws \LogicException when the content is not null
+     *
+     * @return $this
      */
     public function setContent($content)
     {
         if (null !== $content) {
             throw new \LogicException('The content cannot be set on a StreamedResponse instance.');
         }
+
+        return $this;
     }
 
     /**

From 5ee9043d8b81dfaf84beb5e9b79fc5bc0a001b2b Mon Sep 17 00:00:00 2001
From: Oskar Stark 
Date: Thu, 28 Sep 2017 08:42:58 +0200
Subject: [PATCH 0964/1099] removed useless PHPDoc

---
 .../Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php      | 2 --
 .../Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php | 2 --
 .../CompilerPass/RegisterMappingsPass.php                 | 2 --
 .../Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php | 2 --
 src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php         | 4 ----
 src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php     | 2 --
 .../ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php      | 2 --
 .../Swiftmailer/DataCollector/MessageDataCollector.php    | 4 ----
 src/Symfony/Bridge/Twig/Extension/CodeExtension.php       | 2 --
 src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php | 2 --
 .../NodeVisitor/TranslationDefaultDomainNodeVisitor.php   | 5 -----
 .../FrameworkBundle/CacheWarmer/RouterCacheWarmer.php     | 2 --
 .../Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php | 2 --
 .../CacheWarmer/TemplatePathsCacheWarmer.php              | 2 --
 .../Bundle/FrameworkBundle/Console/Application.php        | 4 ----
 .../FrameworkBundle/Console/Helper/DescriptorHelper.php   | 3 ---
 .../FrameworkBundle/Controller/ControllerNameParser.php   | 4 +---
 .../FrameworkBundle/Controller/ControllerResolver.php     | 4 ----
 .../Bundle/FrameworkBundle/HttpCache/HttpCache.php        | 2 --
 .../Bundle/FrameworkBundle/Routing/DelegatingLoader.php   | 2 --
 src/Symfony/Bundle/FrameworkBundle/Routing/Router.php     | 2 --
 .../FrameworkBundle/Templating/Asset/PathPackage.php      | 2 --
 .../Bundle/FrameworkBundle/Templating/Debugger.php        | 2 --
 .../FrameworkBundle/Templating/DelegatingEngine.php       | 2 --
 .../FrameworkBundle/Templating/Helper/ActionsHelper.php   | 2 --
 .../FrameworkBundle/Templating/Helper/CodeHelper.php      | 4 ----
 .../FrameworkBundle/Templating/Helper/RequestHelper.php   | 2 --
 .../FrameworkBundle/Templating/Helper/RouterHelper.php    | 2 --
 .../FrameworkBundle/Templating/Helper/SessionHelper.php   | 2 --
 .../Templating/Helper/TranslatorHelper.php                | 4 ----
 .../Templating/Loader/FilesystemLoader.php                | 2 --
 .../FrameworkBundle/Templating/Loader/TemplateLocator.php | 2 --
 .../Bundle/FrameworkBundle/Templating/PhpEngine.php       | 2 --
 .../FrameworkBundle/Templating/TemplateNameParser.php     | 2 --
 .../Bundle/FrameworkBundle/Templating/TimedPhpEngine.php  | 2 --
 .../Bundle/FrameworkBundle/Translation/Translator.php     | 2 --
 .../Validator/ConstraintValidatorFactory.php              | 2 --
 .../DataCollector/SecurityDataCollector.php               | 4 ----
 .../DependencyInjection/MainConfiguration.php             | 2 --
 .../SecurityBundle/Templating/Helper/LogoutUrlHelper.php  | 2 --
 .../TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php   | 2 --
 src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php | 2 --
 .../WebProfilerBundle/Controller/ProfilerController.php   | 4 ----
 src/Symfony/Component/BrowserKit/Client.php               | 2 --
 src/Symfony/Component/BrowserKit/Request.php              | 4 ----
 src/Symfony/Component/BrowserKit/Response.php             | 4 ----
 src/Symfony/Component/ClassLoader/ApcClassLoader.php      | 2 --
 .../Component/ClassLoader/ApcUniversalClassLoader.php     | 2 --
 src/Symfony/Component/ClassLoader/DebugClassLoader.php    | 2 --
 src/Symfony/Component/ClassLoader/MapClassLoader.php      | 2 --
 src/Symfony/Component/ClassLoader/WinCacheClassLoader.php | 2 --
 src/Symfony/Component/ClassLoader/XcacheClassLoader.php   | 2 --
 src/Symfony/Component/Config/Definition/BaseNode.php      | 2 --
 .../Component/Config/Definition/Builder/ExprBuilder.php   | 2 --
 .../Component/Config/Definition/Builder/MergeBuilder.php  | 2 --
 .../Component/Config/Definition/Builder/NodeBuilder.php   | 3 ---
 .../Config/Definition/Builder/NodeDefinition.php          | 2 --
 .../Config/Definition/Builder/NormalizationBuilder.php    | 2 --
 .../Config/Definition/Builder/ValidationBuilder.php       | 2 --
 src/Symfony/Component/Config/FileLocator.php              | 2 --
 src/Symfony/Component/Config/Loader/DelegatingLoader.php  | 2 --
 src/Symfony/Component/Config/Loader/FileLoader.php        | 2 --
 src/Symfony/Component/Config/Loader/LoaderResolver.php    | 2 --
 .../Component/Config/Resource/DirectoryResource.php       | 2 --
 src/Symfony/Component/Config/Resource/FileResource.php    | 2 --
 src/Symfony/Component/Console/Application.php             | 2 --
 src/Symfony/Component/Console/Command/Command.php         | 2 --
 .../Console/Descriptor/ApplicationDescription.php         | 2 --
 .../Console/Formatter/OutputFormatterStyleStack.php       | 2 --
 src/Symfony/Component/Console/Helper/DescriptorHelper.php | 3 ---
 src/Symfony/Component/Console/Helper/HelperSet.php        | 2 --
 src/Symfony/Component/Console/Helper/ProgressBar.php      | 2 --
 src/Symfony/Component/Console/Input/ArgvInput.php         | 2 --
 src/Symfony/Component/Console/Input/ArrayInput.php        | 2 --
 src/Symfony/Component/Console/Input/Input.php             | 2 --
 src/Symfony/Component/Console/Input/InputArgument.php     | 2 --
 src/Symfony/Component/Console/Input/InputDefinition.php   | 2 --
 src/Symfony/Component/Console/Input/InputOption.php       | 2 --
 src/Symfony/Component/Console/Input/StringInput.php       | 2 --
 src/Symfony/Component/Console/Output/ConsoleOutput.php    | 2 --
 src/Symfony/Component/Console/Output/Output.php           | 2 --
 src/Symfony/Component/Console/Output/StreamOutput.php     | 2 --
 src/Symfony/Component/Console/Question/ChoiceQuestion.php | 2 --
 .../Component/Console/Question/ConfirmationQuestion.php   | 2 --
 src/Symfony/Component/Console/Question/Question.php       | 2 --
 src/Symfony/Component/Console/Shell.php                   | 2 --
 .../Component/Console/Tester/ApplicationTester.php        | 2 --
 src/Symfony/Component/Console/Tester/CommandTester.php    | 2 --
 src/Symfony/Component/CssSelector/Node/Specificity.php    | 2 --
 src/Symfony/Component/CssSelector/Parser/Parser.php       | 2 --
 .../Component/CssSelector/Parser/Tokenizer/Tokenizer.php  | 3 ---
 .../CssSelector/Parser/Tokenizer/TokenizerPatterns.php    | 3 ---
 .../CssSelector/XPath/Extension/HtmlExtension.php         | 2 --
 .../CssSelector/XPath/Extension/NodeExtension.php         | 2 --
 src/Symfony/Component/Debug/DebugClassLoader.php          | 2 --
 .../Component/DependencyInjection/Dumper/PhpDumper.php    | 8 --------
 .../Tests/Fixtures/php/services1-1.php                    | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services1.php  | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services10.php | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services12.php | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services13.php | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services19.php | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services20.php | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services8.php  | 5 -----
 .../DependencyInjection/Tests/Fixtures/php/services9.php  | 5 -----
 .../Tests/Fixtures/php/services9_compiled.php             | 5 -----
 src/Symfony/Component/DomCrawler/Crawler.php              | 2 --
 src/Symfony/Component/DomCrawler/Field/FormField.php      | 2 --
 src/Symfony/Component/DomCrawler/Form.php                 | 2 --
 src/Symfony/Component/DomCrawler/Link.php                 | 2 --
 .../EventDispatcher/ContainerAwareEventDispatcher.php     | 2 --
 .../EventDispatcher/Debug/TraceableEventDispatcher.php    | 2 --
 .../DependencyInjection/RegisterListenersPass.php         | 2 --
 src/Symfony/Component/ExpressionLanguage/Expression.php   | 2 --
 .../Component/ExpressionLanguage/ExpressionFunction.php   | 2 --
 src/Symfony/Component/ExpressionLanguage/Node/Node.php    | 2 --
 .../Component/ExpressionLanguage/ParsedExpression.php     | 2 --
 .../ExpressionLanguage/SerializedParsedExpression.php     | 2 --
 src/Symfony/Component/ExpressionLanguage/Token.php        | 2 --
 src/Symfony/Component/ExpressionLanguage/TokenStream.php  | 2 --
 .../Component/Finder/Adapter/AbstractFindAdapter.php      | 3 ---
 .../Component/Finder/Comparator/DateComparator.php        | 2 --
 .../Component/Finder/Comparator/NumberComparator.php      | 2 --
 src/Symfony/Component/Finder/Finder.php                   | 3 ---
 .../Component/Finder/Iterator/CustomFilterIterator.php    | 2 --
 .../Component/Finder/Iterator/DateRangeFilterIterator.php | 2 --
 .../Finder/Iterator/DepthRangeFilterIterator.php          | 2 --
 .../Finder/Iterator/ExcludeDirectoryFilterIterator.php    | 2 --
 .../Component/Finder/Iterator/FileTypeFilterIterator.php  | 2 --
 .../Finder/Iterator/MultiplePcreFilterIterator.php        | 2 --
 .../Finder/Iterator/RecursiveDirectoryIterator.php        | 2 --
 .../Component/Finder/Iterator/SizeRangeFilterIterator.php | 2 --
 .../Component/Finder/Iterator/SortableIterator.php        | 2 --
 src/Symfony/Component/Finder/Shell/Command.php            | 2 --
 src/Symfony/Component/Finder/SplFileInfo.php              | 2 --
 src/Symfony/Component/Form/CallbackTransformer.php        | 2 --
 .../Core/DataTransformer/BaseDateTimeTransformer.php      | 2 --
 .../DataTransformer/ChoiceToBooleanArrayTransformer.php   | 2 --
 .../Core/DataTransformer/ChoiceToValueTransformer.php     | 2 --
 .../Core/DataTransformer/ChoicesToValuesTransformer.php   | 2 --
 .../Core/DataTransformer/DateTimeToArrayTransformer.php   | 2 --
 .../DateTimeToLocalizedStringTransformer.php              | 2 --
 .../PercentToLocalizedStringTransformer.php               | 2 --
 .../Core/EventListener/FixCheckboxInputListener.php       | 2 --
 .../Core/EventListener/FixRadioInputListener.php          | 2 --
 .../Core/EventListener/FixUrlProtocolListener.php         | 2 --
 .../Component/Form/Extension/Csrf/CsrfExtension.php       | 2 --
 src/Symfony/Component/Form/FormError.php                  | 2 --
 src/Symfony/Component/Form/FormRegistry.php               | 2 --
 src/Symfony/Component/Form/FormRenderer.php               | 2 --
 src/Symfony/Component/Form/FormTypeGuesserChain.php       | 2 --
 src/Symfony/Component/Form/Guess/Guess.php                | 2 --
 src/Symfony/Component/Form/Guess/TypeGuess.php            | 2 --
 src/Symfony/Component/Form/Guess/ValueGuess.php           | 2 --
 src/Symfony/Component/HttpFoundation/AcceptHeader.php     | 2 --
 src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php | 2 --
 .../Component/HttpFoundation/BinaryFileResponse.php       | 2 --
 src/Symfony/Component/HttpFoundation/Cookie.php           | 2 --
 .../File/Exception/AccessDeniedException.php              | 2 --
 .../File/Exception/FileNotFoundException.php              | 2 --
 .../File/MimeType/FileBinaryMimeTypeGuesser.php           | 2 --
 .../File/MimeType/FileinfoMimeTypeGuesser.php             | 2 --
 src/Symfony/Component/HttpFoundation/FileBag.php          | 2 --
 src/Symfony/Component/HttpFoundation/HeaderBag.php        | 2 --
 src/Symfony/Component/HttpFoundation/JsonResponse.php     | 2 --
 src/Symfony/Component/HttpFoundation/ParameterBag.php     | 2 --
 src/Symfony/Component/HttpFoundation/Request.php          | 2 --
 src/Symfony/Component/HttpFoundation/Response.php         | 2 --
 .../Component/HttpFoundation/ResponseHeaderBag.php        | 2 --
 .../HttpFoundation/Session/Attribute/AttributeBag.php     | 2 --
 .../Session/Attribute/NamespacedAttributeBag.php          | 2 --
 .../HttpFoundation/Session/Flash/AutoExpireFlashBag.php   | 2 --
 .../Component/HttpFoundation/Session/Flash/FlashBag.php   | 2 --
 src/Symfony/Component/HttpFoundation/Session/Session.php  | 4 ----
 .../Session/Storage/Handler/LegacyPdoSessionHandler.php   | 2 --
 .../Session/Storage/Handler/MemcacheSessionHandler.php    | 4 ----
 .../Session/Storage/Handler/MemcachedSessionHandler.php   | 4 ----
 .../Session/Storage/Handler/MongoDbSessionHandler.php     | 4 ----
 .../Session/Storage/Handler/NativeFileSessionHandler.php  | 4 ----
 .../Session/Storage/Handler/PdoSessionHandler.php         | 2 --
 .../HttpFoundation/Session/Storage/MetadataBag.php        | 2 --
 .../Session/Storage/MockArraySessionStorage.php           | 2 --
 .../Session/Storage/MockFileSessionStorage.php            | 2 --
 .../Session/Storage/NativeSessionStorage.php              | 2 --
 .../Session/Storage/PhpBridgeSessionStorage.php           | 2 --
 .../HttpFoundation/Session/Storage/Proxy/NativeProxy.php  | 5 -----
 .../Session/Storage/Proxy/SessionHandlerProxy.php         | 4 ----
 src/Symfony/Component/HttpFoundation/StreamedResponse.php | 2 --
 src/Symfony/Component/HttpKernel/Client.php               | 2 --
 .../Component/HttpKernel/Config/EnvParametersResource.php | 2 --
 src/Symfony/Component/HttpKernel/Config/FileLocator.php   | 2 --
 .../HttpKernel/Controller/ControllerReference.php         | 2 --
 .../HttpKernel/Controller/ControllerResolver.php          | 4 ----
 .../HttpKernel/Controller/TraceableControllerResolver.php | 4 ----
 .../HttpKernel/DataCollector/ConfigDataCollector.php      | 4 ----
 .../DependencyInjection/ContainerAwareHttpKernel.php      | 2 --
 .../HttpKernel/EventListener/FragmentListener.php         | 2 --
 .../HttpKernel/EventListener/ProfilerListener.php         | 2 --
 .../Component/HttpKernel/EventListener/RouterListener.php | 2 --
 .../HttpKernel/EventListener/SurrogateListener.php        | 2 --
 .../HttpKernel/Exception/AccessDeniedHttpException.php    | 4 ----
 .../HttpKernel/Exception/BadRequestHttpException.php      | 4 ----
 .../HttpKernel/Exception/ConflictHttpException.php        | 4 ----
 .../Component/HttpKernel/Exception/GoneHttpException.php  | 4 ----
 .../HttpKernel/Exception/LengthRequiredHttpException.php  | 4 ----
 .../Exception/MethodNotAllowedHttpException.php           | 4 ----
 .../HttpKernel/Exception/NotAcceptableHttpException.php   | 4 ----
 .../HttpKernel/Exception/NotFoundHttpException.php        | 4 ----
 .../Exception/PreconditionFailedHttpException.php         | 4 ----
 .../Exception/PreconditionRequiredHttpException.php       | 4 ----
 .../Exception/ServiceUnavailableHttpException.php         | 4 ----
 .../HttpKernel/Exception/TooManyRequestsHttpException.php | 4 ----
 .../HttpKernel/Exception/UnauthorizedHttpException.php    | 4 ----
 .../Exception/UnprocessableEntityHttpException.php        | 4 ----
 .../Exception/UnsupportedMediaTypeHttpException.php       | 4 ----
 .../Fragment/AbstractSurrogateFragmentRenderer.php        | 2 --
 .../Component/HttpKernel/Fragment/FragmentHandler.php     | 2 --
 .../HttpKernel/Fragment/HIncludeFragmentRenderer.php      | 2 --
 .../HttpKernel/Fragment/InlineFragmentRenderer.php        | 2 --
 src/Symfony/Component/HttpKernel/HttpCache/Esi.php        | 2 --
 src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php  | 2 --
 src/Symfony/Component/HttpKernel/HttpCache/Ssi.php        | 2 --
 src/Symfony/Component/HttpKernel/HttpCache/Store.php      | 2 --
 src/Symfony/Component/HttpKernel/HttpKernel.php           | 2 --
 src/Symfony/Component/HttpKernel/Kernel.php               | 2 --
 .../HttpKernel/Profiler/BaseMemcacheProfilerStorage.php   | 2 --
 .../HttpKernel/Profiler/MongoDbProfilerStorage.php        | 2 --
 .../Component/HttpKernel/Profiler/PdoProfilerStorage.php  | 2 --
 src/Symfony/Component/HttpKernel/Profiler/Profile.php     | 2 --
 src/Symfony/Component/HttpKernel/Profiler/Profiler.php    | 2 --
 .../HttpKernel/Profiler/RedisProfilerStorage.php          | 2 --
 src/Symfony/Component/HttpKernel/UriSigner.php            | 2 --
 src/Symfony/Component/Intl/Collator/Collator.php          | 2 --
 .../Intl/DateFormatter/DateFormat/FullTransformer.php     | 2 --
 .../Intl/DateFormatter/DateFormat/MonthTransformer.php    | 3 ---
 .../Component/Intl/DateFormatter/IntlDateFormatter.php    | 2 --
 .../Exception/MethodArgumentNotImplementedException.php   | 2 --
 .../MethodArgumentValueNotImplementedException.php        | 2 --
 .../Intl/Exception/MethodNotImplementedException.php      | 2 --
 .../Component/Intl/Exception/NotImplementedException.php  | 2 --
 .../Component/Intl/NumberFormatter/NumberFormatter.php    | 2 --
 src/Symfony/Component/Process/PhpProcess.php              | 2 --
 src/Symfony/Component/Process/Process.php                 | 2 --
 src/Symfony/Component/Process/ProcessBuilder.php          | 4 ----
 .../Component/PropertyAccess/PropertyPathIterator.php     | 2 --
 src/Symfony/Component/Routing/Annotation/Route.php        | 2 --
 src/Symfony/Component/Routing/CompiledRoute.php           | 2 --
 .../Routing/Generator/Dumper/GeneratorDumper.php          | 2 --
 .../Routing/Generator/Dumper/PhpGeneratorDumper.php       | 5 -----
 src/Symfony/Component/Routing/Generator/UrlGenerator.php  | 2 --
 .../Component/Routing/Loader/AnnotationClassLoader.php    | 2 --
 .../Component/Routing/Loader/AnnotationFileLoader.php     | 2 --
 .../Component/Routing/Matcher/Dumper/DumperRoute.php      | 2 --
 .../Component/Routing/Matcher/Dumper/MatcherDumper.php    | 2 --
 .../Component/Routing/Matcher/Dumper/PhpMatcherDumper.php | 5 -----
 src/Symfony/Component/Routing/Matcher/UrlMatcher.php      | 2 --
 src/Symfony/Component/Routing/RequestContext.php          | 2 --
 src/Symfony/Component/Routing/Route.php                   | 2 --
 src/Symfony/Component/Routing/Router.php                  | 2 --
 .../Routing/Tests/Fixtures/dumper/url_matcher1.php        | 5 -----
 .../Routing/Tests/Fixtures/dumper/url_matcher2.php        | 5 -----
 .../Routing/Tests/Fixtures/dumper/url_matcher3.php        | 5 -----
 src/Symfony/Component/Security/Acl/Dbal/AclProvider.php   | 2 --
 src/Symfony/Component/Security/Acl/Dbal/Schema.php        | 2 --
 src/Symfony/Component/Security/Acl/Domain/Acl.php         | 2 --
 .../Component/Security/Acl/Domain/AclCollectionCache.php  | 2 --
 .../Component/Security/Acl/Domain/DoctrineAclCache.php    | 2 --
 src/Symfony/Component/Security/Acl/Domain/Entry.php       | 2 --
 src/Symfony/Component/Security/Acl/Domain/FieldEntry.php  | 2 --
 .../Component/Security/Acl/Domain/ObjectIdentity.php      | 2 --
 .../Security/Acl/Domain/RoleSecurityIdentity.php          | 2 --
 .../Acl/Domain/SecurityIdentityRetrievalStrategy.php      | 2 --
 .../Security/Acl/Domain/UserSecurityIdentity.php          | 2 --
 .../Security/Acl/Permission/AbstractMaskBuilder.php       | 2 --
 .../Core/Authentication/AuthenticationProviderManager.php | 2 --
 .../Core/Authentication/AuthenticationTrustResolver.php   | 2 --
 .../Provider/AnonymousAuthenticationProvider.php          | 2 --
 .../Authentication/Provider/DaoAuthenticationProvider.php | 2 --
 .../Provider/PreAuthenticatedAuthenticationProvider.php   | 2 --
 .../Provider/RememberMeAuthenticationProvider.php         | 2 --
 .../Provider/UserAuthenticationProvider.php               | 2 --
 .../Core/Authentication/RememberMe/PersistentToken.php    | 2 --
 .../Security/Core/Authentication/Token/AbstractToken.php  | 2 --
 .../Security/Core/Authentication/Token/AnonymousToken.php | 2 --
 .../Core/Authentication/Token/PreAuthenticatedToken.php   | 2 --
 .../Core/Authentication/Token/RememberMeToken.php         | 2 --
 .../Core/Authentication/Token/UsernamePasswordToken.php   | 2 --
 .../Security/Core/Authorization/AccessDecisionManager.php | 2 --
 .../Security/Core/Authorization/AuthorizationChecker.php  | 2 --
 .../Core/Authorization/Voter/AuthenticatedVoter.php       | 2 --
 .../Security/Core/Authorization/Voter/ExpressionVoter.php | 2 --
 .../Security/Core/Authorization/Voter/RoleVoter.php       | 2 --
 .../Security/Core/Encoder/BCryptPasswordEncoder.php       | 2 --
 .../Core/Encoder/MessageDigestPasswordEncoder.php         | 2 --
 .../Security/Core/Encoder/Pbkdf2PasswordEncoder.php       | 2 --
 .../Security/Core/Encoder/PlaintextPasswordEncoder.php    | 2 --
 src/Symfony/Component/Security/Core/Role/Role.php         | 2 --
 .../Component/Security/Core/Role/RoleHierarchy.php        | 2 --
 .../Component/Security/Core/Role/SwitchUserRole.php       | 2 --
 .../Component/Security/Core/User/InMemoryUserProvider.php | 2 --
 src/Symfony/Component/Security/Csrf/CsrfToken.php         | 2 --
 src/Symfony/Component/Security/Http/AccessMap.php         | 2 --
 .../Authentication/CustomAuthenticationFailureHandler.php | 2 --
 .../Authentication/CustomAuthenticationSuccessHandler.php | 2 --
 .../DefaultAuthenticationFailureHandler.php               | 2 --
 .../DefaultAuthenticationSuccessHandler.php               | 2 --
 .../Http/Authentication/SimpleAuthenticationHandler.php   | 2 --
 .../Http/EntryPoint/FormAuthenticationEntryPoint.php      | 2 --
 .../Security/Http/Event/InteractiveLoginEvent.php         | 4 ----
 src/Symfony/Component/Security/Http/Firewall.php          | 2 --
 .../Http/Firewall/AbstractAuthenticationListener.php      | 2 --
 .../Component/Security/Http/Firewall/LogoutListener.php   | 2 --
 .../Security/Http/Firewall/RememberMeListener.php         | 2 --
 .../Http/Firewall/SimpleFormAuthenticationListener.php    | 2 --
 .../Http/Firewall/SimplePreAuthenticationListener.php     | 2 --
 src/Symfony/Component/Security/Http/HttpUtils.php         | 2 --
 .../Security/Http/Logout/CookieClearingLogoutHandler.php  | 2 --
 .../Http/RememberMe/AbstractRememberMeServices.php        | 2 --
 .../RememberMe/PersistentTokenBasedRememberMeServices.php | 2 --
 .../Component/Serializer/Mapping/Loader/FileLoader.php    | 2 --
 src/Symfony/Component/Stopwatch/Section.php               | 2 --
 src/Symfony/Component/Stopwatch/StopwatchEvent.php        | 2 --
 src/Symfony/Component/Stopwatch/StopwatchPeriod.php       | 2 --
 src/Symfony/Component/Templating/Asset/Package.php        | 2 --
 src/Symfony/Component/Templating/Asset/PathPackage.php    | 2 --
 src/Symfony/Component/Templating/Asset/UrlPackage.php     | 2 --
 src/Symfony/Component/Templating/DelegatingEngine.php     | 2 --
 src/Symfony/Component/Templating/Helper/AssetsHelper.php  | 2 --
 .../Component/Templating/Helper/CoreAssetsHelper.php      | 2 --
 src/Symfony/Component/Templating/Loader/CacheLoader.php   | 2 --
 src/Symfony/Component/Templating/Loader/ChainLoader.php   | 2 --
 .../Component/Templating/Loader/FilesystemLoader.php      | 2 --
 src/Symfony/Component/Templating/PhpEngine.php            | 2 --
 src/Symfony/Component/Templating/Storage/Storage.php      | 2 --
 src/Symfony/Component/Translation/IdentityTranslator.php  | 2 --
 src/Symfony/Component/Translation/MessageCatalogue.php    | 4 ----
 src/Symfony/Component/Translation/Translator.php          | 4 ----
 .../Component/Validator/Mapping/GetterMetadata.php        | 2 --
 .../Component/Validator/Mapping/MemberMetadata.php        | 2 --
 .../Component/Validator/Mapping/PropertyMetadata.php      | 2 --
 src/Symfony/Component/Yaml/Exception/ParseException.php   | 2 --
 src/Symfony/Component/Yaml/Parser.php                     | 2 --
 342 files changed, 1 insertion(+), 826 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
index b1e4f6a9d93b1..9725fdcc088f9 100644
--- a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
+++ b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -27,8 +27,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface
     private $registry;
 
     /**
-     * Constructor.
-     *
      * @param ManagerRegistry $registry A ManagerRegistry instance
      */
     public function __construct(ManagerRegistry $registry)
diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
index 0b1052719f559..93cd2c11f9a4d 100644
--- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
+++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
@@ -31,8 +31,6 @@ class ContainerAwareLoader extends Loader
     private $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container A ContainerInterface instance
      */
     public function __construct(ContainerInterface $container)
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
index e37e4f66c29aa..d6ab657d515b3 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -97,8 +97,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
     private $aliasMap;
 
     /**
-     * Constructor.
-     *
      * The $managerParameters is an ordered list of container parameters that could provide the
      * name of the manager to register these namespaces and alias on. The first non-empty name
      * is used, the others skipped.
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
index d819ff0a6c51e..6ae9c469bb166 100644
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
+++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -54,8 +54,6 @@ class DbalSessionHandler implements \SessionHandlerInterface
     private $timeCol = 'sess_time';
 
     /**
-     * Constructor.
-     *
      * @param Connection $con       A connection
      * @param string     $tableName Table name
      */
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
index acd8cc0fcd510..9fab65a12c039 100644
--- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -16,8 +16,6 @@
 use Doctrine\DBAL\Logging\SQLLogger;
 
 /**
- * DbalLogger.
- *
  * @author Fabien Potencier 
  */
 class DbalLogger implements SQLLogger
@@ -29,8 +27,6 @@ class DbalLogger implements SQLLogger
     protected $stopwatch;
 
     /**
-     * Constructor.
-     *
      * @param LoggerInterface $logger    A LoggerInterface instance
      * @param Stopwatch       $stopwatch A Stopwatch instance
      */
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
index 0b9ada21b2c50..2b3bafa8b7794 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -56,8 +56,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
     );
 
     /**
-     * Constructor.
-     *
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
      *                                                until the output is set, e.g. by using console events)
      * @param bool                 $bubble            Whether the messages that are handled can bubble up the stack
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
index 40791358500a0..45509058c051e 100644
--- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
+++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -41,8 +41,6 @@ class ProxyDumper implements DumperInterface
     private $classGenerator;
 
     /**
-     * Constructor.
-     *
      * @param string $salt
      */
     public function __construct($salt = '')
diff --git a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
index a7d7f541baa3d..aaf114311cab7 100644
--- a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
+++ b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
@@ -19,8 +19,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * MessageDataCollector.
- *
  * @author Fabien Potencier 
  * @author Clément JOBEILI 
  *
@@ -33,8 +31,6 @@ class MessageDataCollector extends DataCollector
     private $isSpool;
 
     /**
-     * Constructor.
-     *
      * We don't inject the message logger and mailer here
      * to avoid the creation of these objects when no emails are sent.
      *
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
index eca1e52d77a70..84e150e3ef1c9 100644
--- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -26,8 +26,6 @@ class CodeExtension extends AbstractExtension
     private $charset;
 
     /**
-     * Constructor.
-     *
      * @param string $fileLinkFormat The format for links to source files
      * @param string $rootDir        The project root directory
      * @param string $charset        The charset
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
index 07e913059754c..bbf6fea639815 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -26,8 +26,6 @@ class HttpKernelExtension extends AbstractExtension
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param FragmentHandler $handler A FragmentHandler instance
      */
     public function __construct(FragmentHandler $handler)
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
index b3c89d18eb2bd..c04ce13a1881b 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -26,8 +26,6 @@
 use Twig\NodeVisitor\AbstractNodeVisitor;
 
 /**
- * TranslationDefaultDomainNodeVisitor.
- *
  * @author Fabien Potencier 
  */
 class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
@@ -37,9 +35,6 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
      */
     private $scope;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->scope = new Scope();
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
index 256bebebe80b7..3515cfc7f3225 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
@@ -25,8 +25,6 @@ class RouterCacheWarmer implements CacheWarmerInterface
     protected $router;
 
     /**
-     * Constructor.
-     *
      * @param RouterInterface $router A Router instance
      */
     public function __construct(RouterInterface $router)
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
index 2b756a2997abc..d68fa7ce77674 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -29,8 +29,6 @@ class TemplateFinder implements TemplateFinderInterface
     private $templates;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface             $kernel  A KernelInterface instance
      * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
      * @param string                      $rootDir The directory where global templates can be stored
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
index 829218bb2c828..2cb19d9df20b0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
@@ -25,8 +25,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer
     protected $locator;
 
     /**
-     * Constructor.
-     *
      * @param TemplateFinderInterface $finder  A template finder
      * @param TemplateLocator         $locator The template locator
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index 3ccb97fe39231..54cce9a45954c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -22,8 +22,6 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Application.
- *
  * @author Fabien Potencier 
  */
 class Application extends BaseApplication
@@ -32,8 +30,6 @@ class Application extends BaseApplication
     private $commandsRegistered = false;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php
index 2599f0090e5d3..475c22ca31e80 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php
@@ -24,9 +24,6 @@
  */
 class DescriptorHelper extends BaseDescriptorHelper
 {
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index 989dc8cd23d7c..8d6203a06fb68 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -25,8 +25,6 @@ class ControllerNameParser
     protected $kernel;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
@@ -141,7 +139,7 @@ private function findAlternative($nonExistentBundleName)
             }
 
             $lev = levenshtein($nonExistentBundleName, $bundleName);
-            if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
+            if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
                 $alternative = $bundleName;
                 $shortest = $lev;
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
index 31593b9b80506..00f4f1ed148c3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -17,8 +17,6 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 /**
- * ControllerResolver.
- *
  * @author Fabien Potencier 
  */
 class ControllerResolver extends BaseControllerResolver
@@ -27,8 +25,6 @@ class ControllerResolver extends BaseControllerResolver
     protected $parser;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface   $container A ContainerInterface instance
      * @param ControllerNameParser $parser    A ControllerNameParser instance
      * @param LoggerInterface      $logger    A LoggerInterface instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index 05dbfb3bd0cfb..d50598bb1db00 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -29,8 +29,6 @@ abstract class HttpCache extends BaseHttpCache
     protected $kernel;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $kernel   An HttpKernelInterface instance
      * @param string              $cacheDir The cache directory (default used if null)
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
index 29f3072a897cd..b54ac4e8373b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -32,8 +32,6 @@ class DelegatingLoader extends BaseDelegatingLoader
     private $loading = false;
 
     /**
-     * Constructor.
-     *
      * @param ControllerNameParser    $parser   A ControllerNameParser instance
      * @param LoggerInterface         $logger   A LoggerInterface instance
      * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
index 4ef5f0a4bd1c4..ec37ca3067cbf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -29,8 +29,6 @@ class Router extends BaseRouter implements WarmableInterface
     private $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container A ContainerInterface instance
      * @param mixed              $resource  The main resource to load
      * @param array              $options   An array of options
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
index 1eb801c4546c8..27f6af8d6634e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
@@ -26,8 +26,6 @@
 class PathPackage extends BasePathPackage
 {
     /**
-     * Constructor.
-     *
      * @param Request $request The current request
      * @param string  $version The version
      * @param string  $format  The version format
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
index 55471027449b9..7dcdec2b4bc79 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
@@ -29,8 +29,6 @@ class Debugger implements DebuggerInterface
     protected $logger;
 
     /**
-     * Constructor.
-     *
      * @param LoggerInterface $logger A LoggerInterface instance
      */
     public function __construct(LoggerInterface $logger = null)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
index c204ffa2f03b2..a6a0b508fbda2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
@@ -25,8 +25,6 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container The DI container
      * @param array              $engineIds An array of engine Ids
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
index 8f0d54eada32c..8e1e242f01ac4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
@@ -25,8 +25,6 @@ class ActionsHelper extends Helper
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param FragmentHandler $handler A FragmentHandler instance
      */
     public function __construct(FragmentHandler $handler)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
index 06071e51b276c..aac7ec85cc2f7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -14,8 +14,6 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * CodeHelper.
- *
  * @author Fabien Potencier 
  */
 class CodeHelper extends Helper
@@ -25,8 +23,6 @@ class CodeHelper extends Helper
     protected $charset;
 
     /**
-     * Constructor.
-     *
      * @param string $fileLinkFormat The format for links to source files
      * @param string $rootDir        The project root directory
      * @param string $charset        The charset
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
index ec28f12ba63f6..1d0a32243cd5c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
@@ -26,8 +26,6 @@ class RequestHelper extends Helper
     protected $requestStack;
 
     /**
-     * Constructor.
-     *
      * @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
      *
      * @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
index d54caaf395509..e9d5d03c71859 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
@@ -24,8 +24,6 @@ class RouterHelper extends Helper
     protected $generator;
 
     /**
-     * Constructor.
-     *
      * @param UrlGeneratorInterface $router A Router instance
      */
     public function __construct(UrlGeneratorInterface $router)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
index 5d15fa3464b07..1149943b4ee0d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
@@ -26,8 +26,6 @@ class SessionHelper extends Helper
     protected $requestStack;
 
     /**
-     * Constructor.
-     *
      * @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
      *
      * @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
index 2c2641a885b13..9893c5e35c9c5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
@@ -15,8 +15,6 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * TranslatorHelper.
- *
  * @author Fabien Potencier 
  */
 class TranslatorHelper extends Helper
@@ -24,8 +22,6 @@ class TranslatorHelper extends Helper
     protected $translator;
 
     /**
-     * Constructor.
-     *
      * @param TranslatorInterface $translator A TranslatorInterface instance
      */
     public function __construct(TranslatorInterface $translator)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
index 4f6cffc103b8c..402778bd76857 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
@@ -26,8 +26,6 @@ class FilesystemLoader implements LoaderInterface
     protected $locator;
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface $locator A FileLocatorInterface instance
      */
     public function __construct(FileLocatorInterface $locator)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
index 369e95a1f08aa..c74322d6814fd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -27,8 +27,6 @@ class TemplateLocator implements FileLocatorInterface
     private $cacheHits = array();
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface $locator  A FileLocatorInterface instance
      * @param string               $cacheDir The cache path
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
index 41382f769c65f..0725e010e979c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
@@ -27,8 +27,6 @@ class PhpEngine extends BasePhpEngine implements EngineInterface
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
      * @param ContainerInterface          $container The DI container
      * @param LoaderInterface             $loader    A loader instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
index c50541fa27ee3..3ae8fccd202c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
@@ -28,8 +28,6 @@ class TemplateNameParser extends BaseTemplateNameParser
     protected $cache = array();
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
index 3295cc73a726f..ccfbcf7408f4f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
@@ -26,8 +26,6 @@ class TimedPhpEngine extends PhpEngine
     protected $stopwatch;
 
     /**
-     * Constructor.
-     *
      * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
      * @param ContainerInterface          $container A ContainerInterface instance
      * @param LoaderInterface             $loader    A LoaderInterface instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index 9fdfb645d372a..3b68fda38cb93 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -46,8 +46,6 @@ class Translator extends BaseTranslator implements WarmableInterface
     private $resources = array();
 
     /**
-     * Constructor.
-     *
      * Available options:
      *
      *   * cache_dir: The cache directory (or null to disable caching)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
index 4e36678212baa..ce4efcbb1bea7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
@@ -44,8 +44,6 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
     protected $validators;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container  The service container
      * @param array              $validators An array of validators
      */
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
index c9f2599526a70..285d5993a27c5 100644
--- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
+++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -19,8 +19,6 @@
 use Symfony\Component\Security\Core\Role\RoleInterface;
 
 /**
- * SecurityDataCollector.
- *
  * @author Fabien Potencier 
  */
 class SecurityDataCollector extends DataCollector
@@ -29,8 +27,6 @@ class SecurityDataCollector extends DataCollector
     private $roleHierarchy;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface|null  $tokenStorage
      * @param RoleHierarchyInterface|null $roleHierarchy
      */
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index df6380224cd20..8b6d2e7d2970b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -37,8 +37,6 @@ class MainConfiguration implements ConfigurationInterface
     private $userProviderFactories;
 
     /**
-     * Constructor.
-     *
      * @param array $factories
      * @param array $userProviderFactories
      */
diff --git a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
index 6819c37609875..b998d4d80a056 100644
--- a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
+++ b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
@@ -27,8 +27,6 @@ class LogoutUrlHelper extends Helper
     private $generator;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface|LogoutUrlGenerator $generator    A ContainerInterface or LogoutUrlGenerator instance
      * @param UrlGeneratorInterface|null            $router       The router service
      * @param TokenStorageInterface|null            $tokenStorage The token storage service
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
index e5be1d5234d53..328c7318f5ef7 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
@@ -30,8 +30,6 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface
     protected $finder;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface           $container The dependency injection container
      * @param TemplateFinderInterface|null $finder    The template paths cache warmer
      */
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
index b92764d371bf4..a1e5bbc609233 100644
--- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -29,8 +29,6 @@ class FilesystemLoader extends BaseFilesystemLoader
     protected $parser;
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface        $locator A FileLocatorInterface instance
      * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
      */
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 355edde5c866b..ef6624195e17a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -22,8 +22,6 @@
 use Twig\Environment;
 
 /**
- * ProfilerController.
- *
  * @author Fabien Potencier 
  */
 class ProfilerController
@@ -36,8 +34,6 @@ class ProfilerController
     private $toolbarPosition;
 
     /**
-     * Constructor.
-     *
      * @param UrlGeneratorInterface $generator       The URL Generator
      * @param Profiler              $profiler        The profiler
      * @param Environment           $twig            The twig environment
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index b5b2dab50d4cc..ecd6d65ee688b 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -45,8 +45,6 @@ abstract class Client
     private $isMainRequest = true;
 
     /**
-     * Constructor.
-     *
      * @param array     $server    The server parameters (equivalent of $_SERVER)
      * @param History   $history   A History instance to store the browser history
      * @param CookieJar $cookieJar A CookieJar instance to store the cookies
diff --git a/src/Symfony/Component/BrowserKit/Request.php b/src/Symfony/Component/BrowserKit/Request.php
index 2e2819b4ca465..d78868e539022 100644
--- a/src/Symfony/Component/BrowserKit/Request.php
+++ b/src/Symfony/Component/BrowserKit/Request.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\BrowserKit;
 
 /**
- * Request object.
- *
  * @author Fabien Potencier 
  */
 class Request
@@ -27,8 +25,6 @@ class Request
     protected $content;
 
     /**
-     * Constructor.
-     *
      * @param string $uri        The request URI
      * @param string $method     The HTTP method request
      * @param array  $parameters The request parameters
diff --git a/src/Symfony/Component/BrowserKit/Response.php b/src/Symfony/Component/BrowserKit/Response.php
index 984442fbe3691..ba4e416bf8048 100644
--- a/src/Symfony/Component/BrowserKit/Response.php
+++ b/src/Symfony/Component/BrowserKit/Response.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\BrowserKit;
 
 /**
- * Response object.
- *
  * @author Fabien Potencier 
  */
 class Response
@@ -23,8 +21,6 @@ class Response
     protected $headers;
 
     /**
-     * Constructor.
-     *
      * The headers array is a set of key/value pairs. If a header is present multiple times
      * then the value is an array of all the values.
      *
diff --git a/src/Symfony/Component/ClassLoader/ApcClassLoader.php b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
index 46ee4a8566b1f..3a1c4ee45c554 100644
--- a/src/Symfony/Component/ClassLoader/ApcClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
@@ -57,8 +57,6 @@ class ApcClassLoader
     protected $decorated;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix    The APC namespace prefix to use
      * @param object $decorated A class loader object that implements the findFile() method
      *
diff --git a/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
index 0ab45678f9af1..fa897b004cc5b 100644
--- a/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -68,8 +68,6 @@ class ApcUniversalClassLoader extends UniversalClassLoader
     private $prefix;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix A prefix to create a namespace in APC
      *
      * @throws \RuntimeException
diff --git a/src/Symfony/Component/ClassLoader/DebugClassLoader.php b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
index 783cf676f7060..ec046927364f2 100644
--- a/src/Symfony/Component/ClassLoader/DebugClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -31,8 +31,6 @@ class DebugClassLoader
     private $classFinder;
 
     /**
-     * Constructor.
-     *
      * @param object $classFinder
      */
     public function __construct($classFinder)
diff --git a/src/Symfony/Component/ClassLoader/MapClassLoader.php b/src/Symfony/Component/ClassLoader/MapClassLoader.php
index 1d8bcc2a026b2..289f7efb53456 100644
--- a/src/Symfony/Component/ClassLoader/MapClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/MapClassLoader.php
@@ -21,8 +21,6 @@ class MapClassLoader
     private $map = array();
 
     /**
-     * Constructor.
-     *
      * @param array $map A map where keys are classes and values the absolute file path
      */
     public function __construct(array $map)
diff --git a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
index 3e077450f1ebc..d5381b446b73b 100644
--- a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
@@ -58,8 +58,6 @@ class WinCacheClassLoader
     protected $decorated;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix    The WinCache namespace prefix to use
      * @param object $decorated A class loader object that implements the findFile() method
      *
diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
index aa4dc9d052b9f..1dcfbaea6ec35 100644
--- a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
@@ -58,8 +58,6 @@ class XcacheClassLoader
     private $decorated;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix    The XCache namespace prefix to use
      * @param object $decorated A class loader object that implements the findFile() method
      *
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index dbf36335b69e3..71c18cae3421e 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -33,8 +33,6 @@ abstract class BaseNode implements NodeInterface
     protected $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param string        $name   The name of the node
      * @param NodeInterface $parent The parent of this node
      *
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
index 10112a813df7a..3b55958309164 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -26,8 +26,6 @@ class ExprBuilder
     public $thenPart;
 
     /**
-     * Constructor.
-     *
      * @param NodeDefinition $node The related node
      */
     public function __construct(NodeDefinition $node)
diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
index 1d24953df5742..09327a6db6768 100644
--- a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -23,8 +23,6 @@ class MergeBuilder
     public $allowOverwrite = true;
 
     /**
-     * Constructor.
-     *
      * @param NodeDefinition $node The related node
      */
     public function __construct(NodeDefinition $node)
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
index e780777a1e837..d795f8ff84865 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -21,9 +21,6 @@ class NodeBuilder implements NodeParentInterface
     protected $parent;
     protected $nodeMapping;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->nodeMapping = array(
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
index 1b712a3150bc3..9dcba444ac479 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -40,8 +40,6 @@ abstract class NodeDefinition implements NodeParentInterface
     protected $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param string                   $name   The name of the node
      * @param NodeParentInterface|null $parent The parent
      */
diff --git a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
index ae642a2d49a2c..8ff1d8a045103 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
@@ -23,8 +23,6 @@ class NormalizationBuilder
     public $remappings = array();
 
     /**
-     * Constructor.
-     *
      * @param NodeDefinition $node The related node
      */
     public function __construct(NodeDefinition $node)
diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
index 12aa59a4fd61c..0acd7343910e3 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
@@ -22,8 +22,6 @@ class ValidationBuilder
     public $rules = array();
 
     /**
-     * Constructor.
-     *
      * @param NodeDefinition $node The related node
      */
     public function __construct(NodeDefinition $node)
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index 4816724c8190e..70d9857de3811 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -21,8 +21,6 @@ class FileLocator implements FileLocatorInterface
     protected $paths;
 
     /**
-     * Constructor.
-     *
      * @param string|array $paths A path or an array of paths where to look for resources
      */
     public function __construct($paths = array())
diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php
index 3097878bf0bf2..24a00be201c01 100644
--- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php
+++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php
@@ -24,8 +24,6 @@
 class DelegatingLoader extends Loader
 {
     /**
-     * Constructor.
-     *
      * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
      */
     public function __construct(LoaderResolverInterface $resolver)
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 2b19b52584bdd..fd6947c75a057 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -35,8 +35,6 @@ abstract class FileLoader extends Loader
     private $currentDir;
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface $locator A FileLocatorInterface instance
      */
     public function __construct(FileLocatorInterface $locator)
diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php
index dc6846df8d617..288feb865bd1b 100644
--- a/src/Symfony/Component/Config/Loader/LoaderResolver.php
+++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php
@@ -27,8 +27,6 @@ class LoaderResolver implements LoaderResolverInterface
     private $loaders = array();
 
     /**
-     * Constructor.
-     *
      * @param LoaderInterface[] $loaders An array of loaders
      */
     public function __construct(array $loaders = array())
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
index bde84b1b5bd5c..8ddb4989353af 100644
--- a/src/Symfony/Component/Config/Resource/DirectoryResource.php
+++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -22,8 +22,6 @@ class DirectoryResource implements ResourceInterface, \Serializable
     private $pattern;
 
     /**
-     * Constructor.
-     *
      * @param string      $resource The file path to the resource
      * @param string|null $pattern  A pattern to restrict monitored files
      */
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
index 0723ddf0e1f20..410ad1804f575 100644
--- a/src/Symfony/Component/Config/Resource/FileResource.php
+++ b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -26,8 +26,6 @@ class FileResource implements ResourceInterface, \Serializable
     private $resource;
 
     /**
-     * Constructor.
-     *
      * @param string $resource The file path to the resource
      */
     public function __construct($resource)
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 873b09e808729..82299ffba15a6 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -75,8 +75,6 @@ class Application
     private $initialized;
 
     /**
-     * Constructor.
-     *
      * @param string $name    The name of the application
      * @param string $version The version of the application
      */
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 6b91e548e64e1..ceddc75da765d 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -45,8 +45,6 @@ class Command
     private $helperSet;
 
     /**
-     * Constructor.
-     *
      * @param string|null $name The name of the command; passing null means it must be set in configure()
      *
      * @throws \LogicException When the command name is empty
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 0e871931d81d2..90018a14f37b9 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -49,8 +49,6 @@ class ApplicationDescription
     private $aliases;
 
     /**
-     * Constructor.
-     *
      * @param Application $application
      * @param string|null $namespace
      */
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
index e335b0ab64bc0..c21a569622400 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
@@ -27,8 +27,6 @@ class OutputFormatterStyleStack
     private $emptyStyle;
 
     /**
-     * Constructor.
-     *
      * @param OutputFormatterStyleInterface|null $emptyStyle
      */
     public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 6090bbfd006b5..17fffe509a942 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -30,9 +30,6 @@ class DescriptorHelper extends Helper
      */
     private $descriptors = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this
diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php
index fb04341378181..3bf15525a9c61 100644
--- a/src/Symfony/Component/Console/Helper/HelperSet.php
+++ b/src/Symfony/Component/Console/Helper/HelperSet.php
@@ -27,8 +27,6 @@ class HelperSet implements \IteratorAggregate
     private $command;
 
     /**
-     * Constructor.
-     *
      * @param Helper[] $helpers An array of helper
      */
     public function __construct(array $helpers = array())
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index 62c38528f960e..c6aa1a920bd0f 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -49,8 +49,6 @@ class ProgressBar
     private static $formats;
 
     /**
-     * Constructor.
-     *
      * @param OutputInterface $output An OutputInterface instance
      * @param int             $max    Maximum steps (0 if unknown)
      */
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index 119be49170853..a8e22fdaefe4e 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -42,8 +42,6 @@ class ArgvInput extends Input
     private $parsed;
 
     /**
-     * Constructor.
-     *
      * @param array|null           $argv       An array of parameters from the CLI (in the argv format)
      * @param InputDefinition|null $definition A InputDefinition instance
      */
diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php
index e9d4f8e842a9f..31ce14a3ec4e7 100644
--- a/src/Symfony/Component/Console/Input/ArrayInput.php
+++ b/src/Symfony/Component/Console/Input/ArrayInput.php
@@ -25,8 +25,6 @@ class ArrayInput extends Input
     private $parameters;
 
     /**
-     * Constructor.
-     *
      * @param array                $parameters An array of parameters
      * @param InputDefinition|null $definition A InputDefinition instance
      */
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index 2251b16cb95fa..c9073b9e2438d 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -33,8 +33,6 @@ abstract class Input implements InputInterface
     protected $interactive = true;
 
     /**
-     * Constructor.
-     *
      * @param InputDefinition|null $definition A InputDefinition instance
      */
     public function __construct(InputDefinition $definition = null)
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
index 69edecbc26660..29b80010cf8de 100644
--- a/src/Symfony/Component/Console/Input/InputArgument.php
+++ b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -28,8 +28,6 @@ class InputArgument
     private $description;
 
     /**
-     * Constructor.
-     *
      * @param string $name        The argument name
      * @param int    $mode        The argument mode: self::REQUIRED or self::OPTIONAL
      * @param string $description A description text
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index f7eafbd84f282..2fb5e492ebbe0 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -37,8 +37,6 @@ class InputDefinition
     private $shortcuts;
 
     /**
-     * Constructor.
-     *
      * @param array $definition An array of InputArgument and InputOption instance
      */
     public function __construct(array $definition = array())
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
index 26773ca599a39..6f7d68a9bad13 100644
--- a/src/Symfony/Component/Console/Input/InputOption.php
+++ b/src/Symfony/Component/Console/Input/InputOption.php
@@ -30,8 +30,6 @@ class InputOption
     private $description;
 
     /**
-     * Constructor.
-     *
      * @param string       $name        The option name
      * @param string|array $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
      * @param int          $mode        The option mode: One of the VALUE_* constants
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
index c518d5c910b9a..4e4c4a28b6095 100644
--- a/src/Symfony/Component/Console/Input/StringInput.php
+++ b/src/Symfony/Component/Console/Input/StringInput.php
@@ -26,8 +26,6 @@ class StringInput extends ArgvInput
     const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
     /**
-     * Constructor.
-     *
      * @param string          $input      An array of parameters from the CLI (in the argv format)
      * @param InputDefinition $definition A InputDefinition instance
      *
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
index f666c793e2265..80bea654da6f0 100644
--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -34,8 +34,6 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
     private $stderr;
 
     /**
-     * Constructor.
-     *
      * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
      * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
index 32bfc8cc3b58f..e7e165e5db7a3 100644
--- a/src/Symfony/Component/Console/Output/Output.php
+++ b/src/Symfony/Component/Console/Output/Output.php
@@ -33,8 +33,6 @@ abstract class Output implements OutputInterface
     private $formatter;
 
     /**
-     * Constructor.
-     *
      * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
      * @param bool                          $decorated Whether to decorate messages
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
index a043459440f2f..e547c3a6c0b9f 100644
--- a/src/Symfony/Component/Console/Output/StreamOutput.php
+++ b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -31,8 +31,6 @@ class StreamOutput extends Output
     private $stream;
 
     /**
-     * Constructor.
-     *
      * @param resource                      $stream    A stream resource
      * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
      * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
index be2504b6dde6d..7417f67968284 100644
--- a/src/Symfony/Component/Console/Question/ChoiceQuestion.php
+++ b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -24,8 +24,6 @@ class ChoiceQuestion extends Question
     private $errorMessage = 'Value "%s" is invalid';
 
     /**
-     * Constructor.
-     *
      * @param string $question The question to ask to the user
      * @param array  $choices  The list of available choices
      * @param mixed  $default  The default answer to return
diff --git a/src/Symfony/Component/Console/Question/ConfirmationQuestion.php b/src/Symfony/Component/Console/Question/ConfirmationQuestion.php
index 29d98879f0c56..40f54b4e9b8d8 100644
--- a/src/Symfony/Component/Console/Question/ConfirmationQuestion.php
+++ b/src/Symfony/Component/Console/Question/ConfirmationQuestion.php
@@ -21,8 +21,6 @@ class ConfirmationQuestion extends Question
     private $trueAnswerRegex;
 
     /**
-     * Constructor.
-     *
      * @param string $question        The question to ask to the user
      * @param bool   $default         The default answer to return, true or false
      * @param string $trueAnswerRegex A regex to match the "yes" answer
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index 373501d691f8c..34b476928087d 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -28,8 +28,6 @@ class Question
     private $normalizer;
 
     /**
-     * Constructor.
-     *
      * @param string $question The question to ask to the user
      * @param mixed  $default  The default answer to return if the user enters nothing
      */
diff --git a/src/Symfony/Component/Console/Shell.php b/src/Symfony/Component/Console/Shell.php
index a140a5e4fee83..c4967236d6da2 100644
--- a/src/Symfony/Component/Console/Shell.php
+++ b/src/Symfony/Component/Console/Shell.php
@@ -34,8 +34,6 @@ class Shell
     private $processIsolation = false;
 
     /**
-     * Constructor.
-     *
      * If there is no readline support for the current PHP executable
      * a \RuntimeException exception is thrown.
      *
diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php
index 90efbab2182a8..a8f8dd9702893 100644
--- a/src/Symfony/Component/Console/Tester/ApplicationTester.php
+++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php
@@ -35,8 +35,6 @@ class ApplicationTester
     private $statusCode;
 
     /**
-     * Constructor.
-     *
      * @param Application $application An Application instance to test
      */
     public function __construct(Application $application)
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
index 609f46a654da9..3619281cbb273 100644
--- a/src/Symfony/Component/Console/Tester/CommandTester.php
+++ b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -30,8 +30,6 @@ class CommandTester
     private $statusCode;
 
     /**
-     * Constructor.
-     *
      * @param Command $command A Command instance to test
      */
     public function __construct(Command $command)
diff --git a/src/Symfony/Component/CssSelector/Node/Specificity.php b/src/Symfony/Component/CssSelector/Node/Specificity.php
index 6ee406d1328d1..6adadfb6ff0d0 100644
--- a/src/Symfony/Component/CssSelector/Node/Specificity.php
+++ b/src/Symfony/Component/CssSelector/Node/Specificity.php
@@ -43,8 +43,6 @@ class Specificity
     private $c;
 
     /**
-     * Constructor.
-     *
      * @param int $a
      * @param int $b
      * @param int $c
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index 8b86bce3b77d6..722a32f22f371 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -31,8 +31,6 @@ class Parser implements ParserInterface
     private $tokenizer;
 
     /**
-     * Constructor.
-     *
      * @param null|Tokenizer $tokenizer
      */
     public function __construct(Tokenizer $tokenizer = null)
diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
index 79fa7b77d06fa..d549f9338abc7 100644
--- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
+++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
@@ -31,9 +31,6 @@ class Tokenizer
      */
     private $handlers;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $patterns = new TokenizerPatterns();
diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
index 326f0208219a6..2d0f26ac84f54 100644
--- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
+++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
@@ -81,9 +81,6 @@ class TokenizerPatterns
      */
     private $quotedStringPattern;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->unicodeEscapePattern = '\\\\([0-9a-f]{1,6})(?:\r\n|[ \n\r\t\f])?';
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
index 0da74d47273fb..1ed05bd6b89d9 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
@@ -27,8 +27,6 @@
 class HtmlExtension extends AbstractExtension
 {
     /**
-     * Constructor.
-     *
      * @param Translator $translator
      */
     public function __construct(Translator $translator)
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index c47130aa17c1a..49c77823cf598 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -35,8 +35,6 @@ class NodeExtension extends AbstractExtension
     private $flags;
 
     /**
-     * Constructor.
-     *
      * @param int $flags
      */
     public function __construct($flags = 0)
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
index 2094a85c4cd6a..160e945ccbbe0 100644
--- a/src/Symfony/Component/Debug/DebugClassLoader.php
+++ b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -34,8 +34,6 @@ class DebugClassLoader
     private static $darwinCache = array('/' => array('/', array()));
 
     /**
-     * Constructor.
-     *
      * @param callable|object $classLoader Passing an object is @deprecated since version 2.5 and support for it will be removed in 3.0
      */
     public function __construct($classLoader)
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 4d576df1bd6c8..e5ea4a546de8d 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -813,8 +813,6 @@ private function startClass($class, $baseClass, $namespace)
 $bagClass
 
 /*{$this->docStar}
- * $class.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -838,9 +836,6 @@ private function addConstructor()
 
         $code = <<docStar}
-     * Constructor.
-     */
     public function __construct()
     {{$targetDirs}
         parent::__construct($arguments);
@@ -875,9 +870,6 @@ private function addFrozenConstructor()
 
         $code = <<docStar}
-     * Constructor.
-     */
     public function __construct()
     {{$targetDirs}
 EOF;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index 0fede650233e5..c6616e0563795 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -11,8 +11,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * Container.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -21,9 +19,6 @@ class Container extends AbstractContainer
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 5497a7587ab54..abe9bc0e32e9e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index 923c437bb06a1..a674eae8b49d3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->parameters = $this->getDefaultParameters();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 2119719828d67..10e7f19d23f0e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $dir = __DIR__;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index eaf9c4bef0edc..1a01fc73f237a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->services =
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index a3fde04b78a4b..b9aae84a006bc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php
index ba9a8902e4d06..7acf32be00293 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index c2c52fe3351c7..d599751374a2e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct(new ParameterBag($this->getDefaultParameters()));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
index 1d352601431a6..caefdc09e35d6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         parent::__construct(new ParameterBag($this->getDefaultParameters()));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 22d447e303aa9..0f831b96abfe3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */
@@ -19,9 +17,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->parameters = $this->getDefaultParameters();
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index ed9b0b02398f5..782d5f1d9b1b3 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -41,8 +41,6 @@ class Crawler extends \SplObjectStorage
     private $baseHref;
 
     /**
-     * Constructor.
-     *
      * @param mixed  $node       A Node to use as the base for the crawling
      * @param string $currentUri The current URI
      * @param string $baseHref   The base href value
diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
index a6b33ded2d2f3..496d45d05ac45 100644
--- a/src/Symfony/Component/DomCrawler/Field/FormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
@@ -44,8 +44,6 @@ abstract class FormField
     protected $disabled;
 
     /**
-     * Constructor.
-     *
      * @param \DOMElement $node The node associated with this field
      */
     public function __construct(\DOMElement $node)
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index bad1b34935d04..7f64f7576b36d 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -37,8 +37,6 @@ class Form extends Link implements \ArrayAccess
     private $baseHref;
 
     /**
-     * Constructor.
-     *
      * @param \DOMElement $node       A \DOMElement instance
      * @param string      $currentUri The URI of the page where the form is embedded
      * @param string      $method     The method to use for the link (if null, it defaults to the method defined by the form)
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
index ede0991e6f36c..b68f246b0efd5 100644
--- a/src/Symfony/Component/DomCrawler/Link.php
+++ b/src/Symfony/Component/DomCrawler/Link.php
@@ -34,8 +34,6 @@ class Link
     protected $currentUri;
 
     /**
-     * Constructor.
-     *
      * @param \DOMElement $node       A \DOMElement instance
      * @param string      $currentUri The URI of the page where the link is embedded (or the base href)
      * @param string      $method     The method to use for the link (get by default)
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index dc2816f16906b..601754e460160 100644
--- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -45,8 +45,6 @@ class ContainerAwareEventDispatcher extends EventDispatcher
     private $listeners = array();
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container A ContainerInterface instance
      */
     public function __construct(ContainerInterface $container)
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 12e2b1c67b310..775b75a4f633e 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -34,8 +34,6 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
     private $wrappedListeners;
 
     /**
-     * Constructor.
-     *
      * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
      * @param Stopwatch                $stopwatch  A Stopwatch instance
      * @param LoggerInterface          $logger     A LoggerInterface instance
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index 326bfd184f497..c51942c2cd2d2 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -35,8 +35,6 @@ class RegisterListenersPass implements CompilerPassInterface
     protected $subscriberTag;
 
     /**
-     * Constructor.
-     *
      * @param string $dispatcherService Service name of the event dispatcher in processed container
      * @param string $listenerTag       Tag name used for listener
      * @param string $subscriberTag     Tag name used for subscribers
diff --git a/src/Symfony/Component/ExpressionLanguage/Expression.php b/src/Symfony/Component/ExpressionLanguage/Expression.php
index f5a3820309231..ac656cce033bf 100644
--- a/src/Symfony/Component/ExpressionLanguage/Expression.php
+++ b/src/Symfony/Component/ExpressionLanguage/Expression.php
@@ -21,8 +21,6 @@ class Expression
     protected $expression;
 
     /**
-     * Constructor.
-     *
      * @param string $expression An expression
      */
     public function __construct($expression)
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
index 7222261cd5386..dfb18d1ba3229 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -35,8 +35,6 @@ class ExpressionFunction
     private $evaluator;
 
     /**
-     * Constructor.
-     *
      * @param string   $name      The function name
      * @param callable $compiler  A callable able to compile the function
      * @param callable $evaluator A callable able to evaluate the function
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index da49d6b4b29cc..b5fb2fe7df972 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -24,8 +24,6 @@ class Node
     public $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param array $nodes      An array of nodes
      * @param array $attributes An array of attributes
      */
diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
index 61bf5807c49e7..a5603fc3ca96d 100644
--- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
+++ b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
@@ -23,8 +23,6 @@ class ParsedExpression extends Expression
     private $nodes;
 
     /**
-     * Constructor.
-     *
      * @param string $expression An expression
      * @param Node   $nodes      A Node representing the expression
      */
diff --git a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
index ced25dbc99b1c..dd763f75b524d 100644
--- a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
+++ b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
@@ -21,8 +21,6 @@ class SerializedParsedExpression extends ParsedExpression
     private $nodes;
 
     /**
-     * Constructor.
-     *
      * @param string $expression An expression
      * @param string $nodes      The serialized nodes for the expression
      */
diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php
index 329273a84be64..b231bc25e73f2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Token.php
+++ b/src/Symfony/Component/ExpressionLanguage/Token.php
@@ -30,8 +30,6 @@ class Token
     const PUNCTUATION_TYPE = 'punctuation';
 
     /**
-     * Constructor.
-     *
      * @param string $type   The type of the token (self::*_TYPE)
      * @param string $value  The token value
      * @param int    $cursor The cursor position in the source
diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
index 3c22fc1d46ed3..aa238f46a662b 100644
--- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
@@ -25,8 +25,6 @@ class TokenStream
     private $expression;
 
     /**
-     * Constructor.
-     *
      * @param array  $tokens     An array of tokens
      * @param string $expression
      */
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
index da4004d6b525c..ca407b9ceab7b 100644
--- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
+++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -31,9 +31,6 @@ abstract class AbstractFindAdapter extends AbstractAdapter
      */
     protected $shell;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->shell = new Shell();
diff --git a/src/Symfony/Component/Finder/Comparator/DateComparator.php b/src/Symfony/Component/Finder/Comparator/DateComparator.php
index 8b7746badbe99..3de43ef4b8ddb 100644
--- a/src/Symfony/Component/Finder/Comparator/DateComparator.php
+++ b/src/Symfony/Component/Finder/Comparator/DateComparator.php
@@ -19,8 +19,6 @@
 class DateComparator extends Comparator
 {
     /**
-     * Constructor.
-     *
      * @param string $test A comparison string
      *
      * @throws \InvalidArgumentException If the test is not understood
diff --git a/src/Symfony/Component/Finder/Comparator/NumberComparator.php b/src/Symfony/Component/Finder/Comparator/NumberComparator.php
index 16f91285a6d8c..f62c0e5740f69 100644
--- a/src/Symfony/Component/Finder/Comparator/NumberComparator.php
+++ b/src/Symfony/Component/Finder/Comparator/NumberComparator.php
@@ -35,8 +35,6 @@
 class NumberComparator extends Comparator
 {
     /**
-     * Constructor.
-     *
      * @param string|int $test A comparison string or an integer
      *
      * @throws \InvalidArgumentException If the test is not understood
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index edbdcd6402074..c479f166ca3f0 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -67,9 +67,6 @@ class Finder implements \IteratorAggregate, \Countable
 
     private static $vcsPatterns = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg');
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->ignore = static::IGNORE_VCS_FILES | static::IGNORE_DOT_FILES;
diff --git a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
index b43b88d98df79..399b6a9719c01 100644
--- a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
@@ -24,8 +24,6 @@ class CustomFilterIterator extends FilterIterator
     private $filters = array();
 
     /**
-     * Constructor.
-     *
      * @param \Iterator  $iterator The Iterator to filter
      * @param callable[] $filters  An array of PHP callbacks
      *
diff --git a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
index 0f2d48f39ef99..b01e5e3f5d885 100644
--- a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
@@ -23,8 +23,6 @@ class DateRangeFilterIterator extends FilterIterator
     private $comparators = array();
 
     /**
-     * Constructor.
-     *
      * @param \Iterator        $iterator    The Iterator to filter
      * @param DateComparator[] $comparators An array of DateComparator instances
      */
diff --git a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
index f78c71ed415cc..ce9d3aa73a13e 100644
--- a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
@@ -21,8 +21,6 @@ class DepthRangeFilterIterator extends FilterIterator
     private $minDepth = 0;
 
     /**
-     * Constructor.
-     *
      * @param \RecursiveIteratorIterator $iterator The Iterator to filter
      * @param int                        $minDepth The min depth
      * @param int                        $maxDepth The max depth
diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
index 3f5a5dfeb133c..c57128c278492 100644
--- a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -24,8 +24,6 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
     private $excludedPattern;
 
     /**
-     * Constructor.
-     *
      * @param \Iterator $iterator    The Iterator to filter
      * @param array     $directories An array of directories to exclude
      */
diff --git a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
index f50fd82c345f4..e9811d4a03ee6 100644
--- a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
@@ -24,8 +24,6 @@ class FileTypeFilterIterator extends FilterIterator
     private $mode;
 
     /**
-     * Constructor.
-     *
      * @param \Iterator $iterator The Iterator to filter
      * @param int       $mode     The mode (self::ONLY_FILES or self::ONLY_DIRECTORIES)
      */
diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
index 068a7efbae96e..b816591e48c51 100644
--- a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
@@ -24,8 +24,6 @@ abstract class MultiplePcreFilterIterator extends FilterIterator
     protected $noMatchRegexps = array();
 
     /**
-     * Constructor.
-     *
      * @param \Iterator $iterator        The Iterator to filter
      * @param array     $matchPatterns   An array of patterns that need to match
      * @param array     $noMatchPatterns An array of patterns that need to not match
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index c87096fc87e23..8b94965ef1566 100644
--- a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -37,8 +37,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
     private $directorySeparator = '/';
 
     /**
-     * Constructor.
-     *
      * @param string $path
      * @param int    $flags
      * @param bool   $ignoreUnreadableDirs
diff --git a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
index 3d3140a6ae45a..bd1a7fb700481 100644
--- a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
@@ -23,8 +23,6 @@ class SizeRangeFilterIterator extends FilterIterator
     private $comparators = array();
 
     /**
-     * Constructor.
-     *
      * @param \Iterator          $iterator    The Iterator to filter
      * @param NumberComparator[] $comparators An array of NumberComparator instances
      */
diff --git a/src/Symfony/Component/Finder/Iterator/SortableIterator.php b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
index f1134c00b9489..c2f54b937652f 100644
--- a/src/Symfony/Component/Finder/Iterator/SortableIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
@@ -28,8 +28,6 @@ class SortableIterator implements \IteratorAggregate
     private $sort;
 
     /**
-     * Constructor.
-     *
      * @param \Traversable $iterator The Iterator to filter
      * @param int|callable $sort     The sort type (SORT_BY_NAME, SORT_BY_TYPE, or a PHP callback)
      *
diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
index 1e0747210c7a1..29158d8cac350 100644
--- a/src/Symfony/Component/Finder/Shell/Command.php
+++ b/src/Symfony/Component/Finder/Shell/Command.php
@@ -37,8 +37,6 @@ class Command
     private $errorHandler;
 
     /**
-     * Constructor.
-     *
      * @param Command|null $parent Parent command
      */
     public function __construct(Command $parent = null)
diff --git a/src/Symfony/Component/Finder/SplFileInfo.php b/src/Symfony/Component/Finder/SplFileInfo.php
index 31a3f86a674d5..19f95e26be69a 100644
--- a/src/Symfony/Component/Finder/SplFileInfo.php
+++ b/src/Symfony/Component/Finder/SplFileInfo.php
@@ -22,8 +22,6 @@ class SplFileInfo extends \SplFileInfo
     private $relativePathname;
 
     /**
-     * Constructor.
-     *
      * @param string $file             The file name
      * @param string $relativePath     The relative path
      * @param string $relativePathname The relative path name
diff --git a/src/Symfony/Component/Form/CallbackTransformer.php b/src/Symfony/Component/Form/CallbackTransformer.php
index 7857ad5f598fe..6f61370d5e037 100644
--- a/src/Symfony/Component/Form/CallbackTransformer.php
+++ b/src/Symfony/Component/Form/CallbackTransformer.php
@@ -31,8 +31,6 @@ class CallbackTransformer implements DataTransformerInterface
     private $reverseTransform;
 
     /**
-     * Constructor.
-     *
      * @param callable $transform        The forward transform callback
      * @param callable $reverseTransform The reverse transform callback
      *
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
index 309d46074e00f..44fa3d8119878 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
@@ -30,8 +30,6 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface
     protected $outputTimezone;
 
     /**
-     * Constructor.
-     *
      * @param string $inputTimezone  The name of the input timezone
      * @param string $outputTimezone The name of the output timezone
      *
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
index 50ee4b693e485..b2744c5e82be4 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -30,8 +30,6 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface
     private $placeholderPresent;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      * @param bool                $placeholderPresent
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
index c7a6655b4e65a..369a12343facd 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -23,8 +23,6 @@ class ChoiceToValueTransformer implements DataTransformerInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
index 0a1f2f028863a..9e6dcef12ff1f 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -23,8 +23,6 @@ class ChoicesToValuesTransformer implements DataTransformerInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
index 24479fb0163dd..af8bb836da4df 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -27,8 +27,6 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
     private $fields;
 
     /**
-     * Constructor.
-     *
      * @param string $inputTimezone  The input timezone
      * @param string $outputTimezone The output timezone
      * @param array  $fields         The date fields
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index e1db36bda663d..185846044fe04 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -28,8 +28,6 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
     private $calendar;
 
     /**
-     * Constructor.
-     *
      * @see BaseDateTimeTransformer::formats for available format options
      *
      * @param string $inputTimezone  The name of the input timezone
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index 7fc191a054ff4..af4606c2383a3 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -36,8 +36,6 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
     private $scale;
 
     /**
-     * Constructor.
-     *
      * @see self::$types for a list of supported types
      *
      * @param int    $scale The scale
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
index 68aacd4c56b9e..87d03e05e154a 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -33,8 +33,6 @@ class FixCheckboxInputListener implements EventSubscriberInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
index 9855b374df643..b2e0f852b46d9 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
@@ -34,8 +34,6 @@ class FixRadioInputListener implements EventSubscriberInterface
     private $placeholderPresent;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      * @param bool                $placeholderPresent
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
index e9a51cc988b7e..f132d8709d111 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -25,8 +25,6 @@ class FixUrlProtocolListener implements EventSubscriberInterface
     private $defaultProtocol;
 
     /**
-     * Constructor.
-     *
      * @param string|null $defaultProtocol The URL scheme to add when there is none or null to not modify the data
      */
     public function __construct($defaultProtocol = 'http')
diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
index 0bc8ca7db19d0..b5396669f6d27 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
@@ -41,8 +41,6 @@ class CsrfExtension extends AbstractExtension
     private $translationDomain;
 
     /**
-     * Constructor.
-     *
      * @param CsrfTokenManagerInterface $tokenManager      The CSRF token manager
      * @param TranslatorInterface       $translator        The translator for translating error messages
      * @param null|string               $translationDomain The translation domain for translating
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
index 6b3938868ddde..c35a26f5a3fce 100644
--- a/src/Symfony/Component/Form/FormError.php
+++ b/src/Symfony/Component/Form/FormError.php
@@ -61,8 +61,6 @@ class FormError implements \Serializable
     private $origin;
 
     /**
-     * Constructor.
-     *
      * Any array key in $messageParameters will be used as a placeholder in
      * $messageTemplate.
      *
diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
index 5f0b795e92234..70b0c78e6cfa5 100644
--- a/src/Symfony/Component/Form/FormRegistry.php
+++ b/src/Symfony/Component/Form/FormRegistry.php
@@ -45,8 +45,6 @@ class FormRegistry implements FormRegistryInterface
     private $resolvedTypeFactory;
 
     /**
-     * Constructor.
-     *
      * @param FormExtensionInterface[]         $extensions          An array of FormExtensionInterface
      * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory The factory for resolved form types
      *
diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
index 9d1c075bb5fa7..b731b740dff34 100644
--- a/src/Symfony/Component/Form/FormRenderer.php
+++ b/src/Symfony/Component/Form/FormRenderer.php
@@ -53,8 +53,6 @@ class FormRenderer implements FormRendererInterface
     private $variableStack = array();
 
     /**
-     * Constructor.
-     *
      * @param FormRendererEngineInterface    $engine
      * @param CsrfTokenManagerInterface|null $csrfTokenManager
      *
diff --git a/src/Symfony/Component/Form/FormTypeGuesserChain.php b/src/Symfony/Component/Form/FormTypeGuesserChain.php
index 7c4f65b43579f..25f07ff2af58e 100644
--- a/src/Symfony/Component/Form/FormTypeGuesserChain.php
+++ b/src/Symfony/Component/Form/FormTypeGuesserChain.php
@@ -19,8 +19,6 @@ class FormTypeGuesserChain implements FormTypeGuesserInterface
     private $guessers = array();
 
     /**
-     * Constructor.
-     *
      * @param FormTypeGuesserInterface[] $guessers Guessers as instances of FormTypeGuesserInterface
      *
      * @throws UnexpectedTypeException if any guesser does not implement FormTypeGuesserInterface
diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php
index 36614ffdb9f93..2576b59437859 100644
--- a/src/Symfony/Component/Form/Guess/Guess.php
+++ b/src/Symfony/Component/Form/Guess/Guess.php
@@ -88,8 +88,6 @@ public static function getBestGuess(array $guesses)
     }
 
     /**
-     * Constructor.
-     *
      * @param int $confidence The confidence
      *
      * @throws InvalidArgumentException if the given value of confidence is unknown
diff --git a/src/Symfony/Component/Form/Guess/TypeGuess.php b/src/Symfony/Component/Form/Guess/TypeGuess.php
index 87cc60a0f1ef5..a190d5bc03e12 100644
--- a/src/Symfony/Component/Form/Guess/TypeGuess.php
+++ b/src/Symfony/Component/Form/Guess/TypeGuess.php
@@ -34,8 +34,6 @@ class TypeGuess extends Guess
     private $options;
 
     /**
-     * Constructor.
-     *
      * @param string $type       The guessed field type
      * @param array  $options    The options for creating instances of the
      *                           guessed class
diff --git a/src/Symfony/Component/Form/Guess/ValueGuess.php b/src/Symfony/Component/Form/Guess/ValueGuess.php
index 9a46207eefe42..251e9cd428375 100644
--- a/src/Symfony/Component/Form/Guess/ValueGuess.php
+++ b/src/Symfony/Component/Form/Guess/ValueGuess.php
@@ -21,8 +21,6 @@ class ValueGuess extends Guess
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param string|int|bool|null $value      The guessed value
      * @param int                  $confidence The confidence that the guessed class name
      *                                         is correct
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
index 2aa91dc44cb47..99be6768f9b72 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -32,8 +32,6 @@ class AcceptHeader
     private $sorted = true;
 
     /**
-     * Constructor.
-     *
      * @param AcceptHeaderItem[] $items
      */
     public function __construct(array $items)
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
index fb54b4935a9f3..2758f5c40bcfa 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
@@ -39,8 +39,6 @@ class AcceptHeaderItem
     private $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param string $value
      * @param array  $attributes
      */
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index 177b708e8f054..71823c0f374b3 100644
--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -36,8 +36,6 @@ class BinaryFileResponse extends Response
     protected $deleteFileAfterSend = false;
 
     /**
-     * Constructor.
-     *
      * @param \SplFileInfo|string $file               The file to stream
      * @param int                 $status             The response status code
      * @param array               $headers            An array of response headers
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
index fb1e7dfd74ea4..93bb099cd5d24 100644
--- a/src/Symfony/Component/HttpFoundation/Cookie.php
+++ b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -27,8 +27,6 @@ class Cookie
     protected $httpOnly;
 
     /**
-     * Constructor.
-     *
      * @param string                                  $name     The name of the cookie
      * @param string                                  $value    The value of the cookie
      * @param int|string|\DateTime|\DateTimeInterface $expire   The time the cookie expires
diff --git a/src/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php b/src/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
index 41f7a462506b7..3b8e41d4a2cf9 100644
--- a/src/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
+++ b/src/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
@@ -19,8 +19,6 @@
 class AccessDeniedException extends FileException
 {
     /**
-     * Constructor.
-     *
      * @param string $path The path to the accessed file
      */
     public function __construct($path)
diff --git a/src/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php b/src/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
index ac90d4035b8ce..bfcc37ec66ea0 100644
--- a/src/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
+++ b/src/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
@@ -19,8 +19,6 @@
 class FileNotFoundException extends FileException
 {
     /**
-     * Constructor.
-     *
      * @param string $path The path to the file that was not found
      */
     public function __construct($path)
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
index f917a06d6ccbf..c2ac6768c3013 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -24,8 +24,6 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
     private $cmd;
 
     /**
-     * Constructor.
-     *
      * The $cmd pattern must contain a "%s" string that will be replaced
      * with the file name to guess.
      *
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
index 6fee94798c9cd..9b42835e43044 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -24,8 +24,6 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
     private $magicFile;
 
     /**
-     * Constructor.
-     *
      * @param string $magicFile A magic file to use with the finfo instance
      *
      * @see http://www.php.net/manual/en/function.finfo-open.php
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
index e17a9057b7157..0aaf49aa6eaab 100644
--- a/src/Symfony/Component/HttpFoundation/FileBag.php
+++ b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -24,8 +24,6 @@ class FileBag extends ParameterBag
     private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
 
     /**
-     * Constructor.
-     *
      * @param array $parameters An array of HTTP files
      */
     public function __construct(array $parameters = array())
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index 29bac5e513414..a824ed8649268 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -22,8 +22,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
     protected $cacheControl = array();
 
     /**
-     * Constructor.
-     *
      * @param array $headers An array of HTTP headers
      */
     public function __construct(array $headers = array())
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index c6e0ba6541061..099749084140d 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -32,8 +32,6 @@ class JsonResponse extends Response
     protected $encodingOptions = 15;
 
     /**
-     * Constructor.
-     *
      * @param mixed $data    The response data
      * @param int   $status  The response status code
      * @param array $headers An array of response headers
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index 3436ee9337486..77b05a9000e4c 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -26,8 +26,6 @@ class ParameterBag implements \IteratorAggregate, \Countable
     protected $parameters;
 
     /**
-     * Constructor.
-     *
      * @param array $parameters An array of parameters
      */
     public function __construct(array $parameters = array())
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 0c11adab6a92e..8f372d432c40d 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -207,8 +207,6 @@ class Request
     protected static $requestFactory;
 
     /**
-     * Constructor.
-     *
      * @param array           $query      The GET parameters
      * @param array           $request    The POST parameters
      * @param array           $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index f9512d6706ef9..5e801116083d4 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -188,8 +188,6 @@ class Response
     );
 
     /**
-     * Constructor.
-     *
      * @param mixed $content The response content, see setContent()
      * @param int   $status  The response status code
      * @param array $headers An array of response headers
diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 3223691eb6fe4..32e7187853496 100644
--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -40,8 +40,6 @@ class ResponseHeaderBag extends HeaderBag
     protected $headerNames = array();
 
     /**
-     * Constructor.
-     *
      * @param array $headers An array of HTTP headers
      */
     public function __construct(array $headers = array())
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
index af292e37a4fe4..57c297197b862 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
@@ -29,8 +29,6 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     protected $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey The key used to store attributes in the session
      */
     public function __construct($storageKey = '_sf2_attributes')
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
index d797a6f23886e..7afc6de7c6c06 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
@@ -27,8 +27,6 @@ class NamespacedAttributeBag extends AttributeBag
     private $namespaceCharacter;
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey         Session storage key
      * @param string $namespaceCharacter Namespace character to use in keys
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
index ddd603fdd1efb..8110aee0cffc1 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -35,8 +35,6 @@ class AutoExpireFlashBag implements FlashBagInterface
     private $storageKey;
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey The key used to store flashes in the session
      */
     public function __construct($storageKey = '_sf2_flashes')
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
index 1516de7fe92ef..a4159cd82254e 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
@@ -37,8 +37,6 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate
     private $storageKey;
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey The key used to store flashes in the session
      */
     public function __construct($storageKey = '_sf2_flashes')
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
index cdd97375b9054..5a765654c1dd9 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Session.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -19,8 +19,6 @@
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 
 /**
- * Session.
- *
  * @author Fabien Potencier 
  * @author Drak 
  */
@@ -44,8 +42,6 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
     private $attributeName;
 
     /**
-     * Constructor.
-     *
      * @param SessionStorageInterface $storage    A SessionStorageInterface instance
      * @param AttributeBagInterface   $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag)
      * @param FlashBagInterface       $flashes    A FlashBagInterface instance (defaults null for default FlashBag)
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
index 111541d92d521..900fb9f5f23e1 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
@@ -57,8 +57,6 @@ class LegacyPdoSessionHandler implements \SessionHandlerInterface
     private $timeCol;
 
     /**
-     * Constructor.
-     *
      * List of available options:
      *  * db_table: The name of the table [required]
      *  * db_id_col: The column where to store the session id [default: sess_id]
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
index 4e490a05d4ce0..d31aa7667e657 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MemcacheSessionHandler.
- *
  * @author Drak 
  */
 class MemcacheSessionHandler implements \SessionHandlerInterface
@@ -34,8 +32,6 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
     private $prefix;
 
     /**
-     * Constructor.
-     *
      * List of available options:
      *  * prefix: The prefix to use for the memcache keys in order to avoid collision
      *  * expiretime: The time to live in seconds
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 67a49ad6f5e2a..68901294ebefe 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MemcachedSessionHandler.
- *
  * Memcached based session storage handler based on the Memcached class
  * provided by the PHP memcached extension.
  *
@@ -39,8 +37,6 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
     private $prefix;
 
     /**
-     * Constructor.
-     *
      * List of available options:
      *  * prefix: The prefix to use for the memcached keys in order to avoid collision
      *  * expiretime: The time to live in seconds
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 8408f000cdbf8..80ecc1cc3c788 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * MongoDB session handler.
- *
  * @author Markus Bachmann 
  */
 class MongoDbSessionHandler implements \SessionHandlerInterface
@@ -34,8 +32,6 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
     private $options;
 
     /**
-     * Constructor.
-     *
      * List of available options:
      *  * database: The name of the database [required]
      *  * collection: The name of the collection [required]
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 1be0a39837333..d6ad93749f048 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * NativeFileSessionHandler.
- *
  * Native session handler using PHP's built in file storage.
  *
  * @author Drak 
@@ -21,8 +19,6 @@
 class NativeFileSessionHandler extends NativeSessionHandler
 {
     /**
-     * Constructor.
-     *
      * @param string $savePath Path of directory to save session files
      *                         Default null will leave setting as defined by PHP.
      *                         '/path', 'N;/path', or 'N;octal-mode;/path
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 8909a5f401fdc..66d12aaef835f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -148,8 +148,6 @@ class PdoSessionHandler implements \SessionHandlerInterface
     private $gcCalled = false;
 
     /**
-     * Constructor.
-     *
      * You can either pass an existing database connection as PDO instance or
      * pass a DSN string that will be used to lazy-connect to the database
      * when the session is actually used. Furthermore it's possible to pass null
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
index 322dd560f8087..6f59af486981e 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
@@ -54,8 +54,6 @@ class MetadataBag implements SessionBagInterface
     private $updateThreshold;
 
     /**
-     * Constructor.
-     *
      * @param string $storageKey      The key used to store bag in the session
      * @param int    $updateThreshold The time to wait between two UPDATED updates
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
index 348fd23018a03..0349a43367d76 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -63,8 +63,6 @@ class MockArraySessionStorage implements SessionStorageInterface
     protected $bags = array();
 
     /**
-     * Constructor.
-     *
      * @param string      $name    Session name
      * @param MetadataBag $metaBag MetadataBag instance
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
index 71f9e555121fa..8c1bf73caefb3 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -30,8 +30,6 @@ class MockFileSessionStorage extends MockArraySessionStorage
     private $savePath;
 
     /**
-     * Constructor.
-     *
      * @param string      $savePath Path of directory to save session files
      * @param string      $name     Session name
      * @param MetadataBag $metaBag  MetadataBag instance
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 812f5f2e4fcc0..5888323bd7c30 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -52,8 +52,6 @@ class NativeSessionStorage implements SessionStorageInterface
     protected $metadataBag;
 
     /**
-     * Constructor.
-     *
      * Depending on how you want the storage driver to behave you probably
      * want to override this constructor entirely.
      *
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
index ced706f72c85b..3a2391e762e4e 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
@@ -22,8 +22,6 @@
 class PhpBridgeSessionStorage extends NativeSessionStorage
 {
     /**
-     * Constructor.
-     *
      * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
      * @param MetadataBag                                                      $metaBag MetadataBag
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
index 0db34aa28d385..21ed1ada04b4f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php
@@ -12,17 +12,12 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
 /**
- * NativeProxy.
- *
  * This proxy is built-in session handlers in PHP 5.3.x
  *
  * @author Drak 
  */
 class NativeProxy extends AbstractProxy
 {
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         // this makes an educated guess as to what the handler is since it should already be set.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
index 81643c74b4001..8f91f06048718 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
 /**
- * SessionHandler proxy.
- *
  * @author Drak 
  */
 class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
@@ -24,8 +22,6 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
     protected $handler;
 
     /**
-     * Constructor.
-     *
      * @param \SessionHandlerInterface $handler
      */
     public function __construct(\SessionHandlerInterface $handler)
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index 8be624436c1ba..d6b7b9e53aba2 100644
--- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -31,8 +31,6 @@ class StreamedResponse extends Response
     private $headersSent;
 
     /**
-     * Constructor.
-     *
      * @param callable|null $callback A valid PHP callback or null to set it later
      * @param int           $status   The response status code
      * @param array         $headers  An array of response headers
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
index b1814ad1f3e6b..d89fb85dbb10b 100644
--- a/src/Symfony/Component/HttpKernel/Client.php
+++ b/src/Symfony/Component/HttpKernel/Client.php
@@ -34,8 +34,6 @@ class Client extends BaseClient
     protected $kernel;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $kernel    An HttpKernel instance
      * @param array               $server    The server parameters (equivalent of $_SERVER)
      * @param History             $history   A History instance to store the browser history
diff --git a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php
index 5f54450137a71..bf1e58344304e 100644
--- a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php
+++ b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php
@@ -31,8 +31,6 @@ class EnvParametersResource implements ResourceInterface, \Serializable
     private $variables;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix
      */
     public function __construct($prefix)
diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
index 169c9ad6e502a..fb1f913bdff5d 100644
--- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php
+++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -25,8 +25,6 @@ class FileLocator extends BaseFileLocator
     private $path;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      * @param null|string     $path   The path the global resource directory
      * @param array           $paths  An array of paths where to look for resources
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerReference.php b/src/Symfony/Component/HttpKernel/Controller/ControllerReference.php
index 3d1592e83aee1..fae4e7fa449bc 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerReference.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerReference.php
@@ -31,8 +31,6 @@ class ControllerReference
     public $query = array();
 
     /**
-     * Constructor.
-     *
      * @param string $controller The controller name
      * @param array  $attributes An array of parameters to add to the Request attributes
      * @param array  $query      An array of parameters to add to the Request query string
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index a1cff53535dc1..5d288a4a110e6 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -15,8 +15,6 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * ControllerResolver.
- *
  * This implementation uses the '_controller' request attribute to determine
  * the controller to execute and uses the request attributes to determine
  * the controller method arguments.
@@ -44,8 +42,6 @@ class ControllerResolver implements ControllerResolverInterface
     private $supportsScalarTypes;
 
     /**
-     * Constructor.
-     *
      * @param LoggerInterface $logger A LoggerInterface instance
      */
     public function __construct(LoggerInterface $logger = null)
diff --git a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php
index f8de31cf078c1..2d3d03b231a6f 100644
--- a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php
@@ -15,8 +15,6 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * TraceableControllerResolver.
- *
  * @author Fabien Potencier 
  */
 class TraceableControllerResolver implements ControllerResolverInterface
@@ -25,8 +23,6 @@ class TraceableControllerResolver implements ControllerResolverInterface
     private $stopwatch;
 
     /**
-     * Constructor.
-     *
      * @param ControllerResolverInterface $resolver  A ControllerResolverInterface instance
      * @param Stopwatch                   $stopwatch A Stopwatch instance
      */
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index 395fee3929993..d17e32687a0ab 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -17,8 +17,6 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * ConfigDataCollector.
- *
  * @author Fabien Potencier 
  */
 class ConfigDataCollector extends DataCollector
@@ -32,8 +30,6 @@ class ConfigDataCollector extends DataCollector
     private $cacheVersionInfo = true;
 
     /**
-     * Constructor.
-     *
      * @param string $name    The name of the application using the web profiler
      * @param string $version The version of the application using the web profiler
      */
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
index 4b3e218b85c58..189052b5f1c7e 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -33,8 +33,6 @@ class ContainerAwareHttpKernel extends HttpKernel
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param EventDispatcherInterface    $dispatcher         An EventDispatcherInterface instance
      * @param ContainerInterface          $container          A ContainerInterface instance
      * @param ControllerResolverInterface $controllerResolver A ControllerResolverInterface instance
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
index ad6349286dde7..5c72bae54ed72 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -35,8 +35,6 @@ class FragmentListener implements EventSubscriberInterface
     private $fragmentPath;
 
     /**
-     * Constructor.
-     *
      * @param UriSigner $signer       A UriSigner instance
      * @param string    $fragmentPath The path that triggers this listener
      */
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
index 06a5bbf08bbfb..d4c515e293932 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -39,8 +39,6 @@ class ProfilerListener implements EventSubscriberInterface
     protected $parents;
 
     /**
-     * Constructor.
-     *
      * @param Profiler                     $profiler           A Profiler instance
      * @param RequestMatcherInterface|null $matcher            A RequestMatcher instance
      * @param bool                         $onlyException      true if the profiler only collects data when an exception occurs, false otherwise
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index 297aab6fa12b2..758a76ed6540d 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -46,8 +46,6 @@ class RouterListener implements EventSubscriberInterface
     private $requestStack;
 
     /**
-     * Constructor.
-     *
      * RequestStack will become required in 3.0.
      *
      * @param UrlMatcherInterface|RequestMatcherInterface $matcher      The Url or Request matcher
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
index dc815a216f6c0..b68019a62794b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
@@ -26,8 +26,6 @@ class SurrogateListener implements EventSubscriberInterface
     private $surrogate;
 
     /**
-     * Constructor.
-     *
      * @param SurrogateInterface $surrogate An SurrogateInterface instance
      */
     public function __construct(SurrogateInterface $surrogate = null)
diff --git a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
index 79d8639a5f7d3..39418842666b2 100644
--- a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
@@ -12,16 +12,12 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * AccessDeniedHttpException.
- *
  * @author Fabien Potencier 
  * @author Christophe Coevoet 
  */
 class AccessDeniedHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
index 5f68172a8d44e..c28d83739c7a5 100644
--- a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * BadRequestHttpException.
- *
  * @author Ben Ramsey 
  */
 class BadRequestHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
index 34d738ed12030..79f24f2e56dc0 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * ConflictHttpException.
- *
  * @author Ben Ramsey 
  */
 class ConflictHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
index 16ea223fae558..84e6915df70f7 100644
--- a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * GoneHttpException.
- *
  * @author Ben Ramsey 
  */
 class GoneHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
index 0c4b9431f4b9f..645efe87d7c23 100644
--- a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * LengthRequiredHttpException.
- *
  * @author Ben Ramsey 
  */
 class LengthRequiredHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
index 78dd26bf0fd8f..e308a5fee2767 100644
--- a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * MethodNotAllowedHttpException.
- *
  * @author Kris Wallsmith 
  */
 class MethodNotAllowedHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param array      $allow    An array of allowed methods
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
index cc6be4ba45a7d..097a13fd9bc05 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * NotAcceptableHttpException.
- *
  * @author Ben Ramsey 
  */
 class NotAcceptableHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
index 4639e379b90fc..878173cc7b9ac 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * NotFoundHttpException.
- *
  * @author Fabien Potencier 
  */
 class NotFoundHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
index 9df0e7b49aa9b..9f13a624cc0fb 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * PreconditionFailedHttpException.
- *
  * @author Ben Ramsey 
  */
 class PreconditionFailedHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
index 08ebca2241e00..9d0a36d7d34d6 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * PreconditionRequiredHttpException.
- *
  * @author Ben Ramsey 
  *
  * @see http://tools.ietf.org/html/rfc6585
@@ -21,8 +19,6 @@
 class PreconditionRequiredHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
index 32b9e2d261218..b2767c3fd5bcc 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * ServiceUnavailableHttpException.
- *
  * @author Ben Ramsey 
  */
 class ServiceUnavailableHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
      * @param string     $message    The internal exception message
      * @param \Exception $previous   The previous exception
diff --git a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
index ab86e0920bc69..7d8a803323b7c 100644
--- a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * TooManyRequestsHttpException.
- *
  * @author Ben Ramsey 
  *
  * @see http://tools.ietf.org/html/rfc6585
@@ -21,8 +19,6 @@
 class TooManyRequestsHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
      * @param string     $message    The internal exception message
      * @param \Exception $previous   The previous exception
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
index 0dfe42db97280..05ac875c552e2 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * UnauthorizedHttpException.
- *
  * @author Ben Ramsey 
  */
 class UnauthorizedHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $challenge WWW-Authenticate challenge string
      * @param string     $message   The internal exception message
      * @param \Exception $previous  The previous exception
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
index eb13f563f6cbb..01b8b8465a1a3 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * UnprocessableEntityHttpException.
- *
  * @author Steve Hutchins 
  */
 class UnprocessableEntityHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
index a9d8fa086f13c..6913504e832dc 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -12,15 +12,11 @@
 namespace Symfony\Component\HttpKernel\Exception;
 
 /**
- * UnsupportedMediaTypeHttpException.
- *
  * @author Ben Ramsey 
  */
 class UnsupportedMediaTypeHttpException extends HttpException
 {
     /**
-     * Constructor.
-     *
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
index 1968001a86b98..07eda6f1c1c06 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -29,8 +29,6 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
     private $signer;
 
     /**
-     * Constructor.
-     *
      * The "fallback" strategy when surrogate is not available should always be an
      * instance of InlineFragmentRenderer.
      *
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
index 774870a273a35..108ebd5388e6b 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -40,8 +40,6 @@ class FragmentHandler
     private $requestStack;
 
     /**
-     * Constructor.
-     *
      * RequestStack will become required in 3.0.
      *
      * @param FragmentRendererInterface[] $renderers    An array of FragmentRendererInterface instances
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
index e7d4aedb16404..3252f061e5fc7 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -33,8 +33,6 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
     private $charset;
 
     /**
-     * Constructor.
-     *
      * @param EngineInterface|Environment $templating            An EngineInterface or a Twig instance
      * @param UriSigner                   $signer                A UriSigner instance
      * @param string                      $globalDefaultTemplate The global default content (it can be a template name or the content)
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
index a61b239c158b9..8170ceeb91943 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -30,8 +30,6 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
     private $dispatcher;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface      $kernel     A HttpKernelInterface instance
      * @param EventDispatcherInterface $dispatcher A EventDispatcherInterface instance
      */
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 457793953d1f1..9b17b4fc54039 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -35,8 +35,6 @@ class Esi implements SurrogateInterface
     );
 
     /**
-     * Constructor.
-     *
      * @param array $contentTypes An array of content-type that should be parsed for ESI information
      *                            (default: text/html, text/xml, application/xhtml+xml, and application/xml)
      */
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 941d4c6fa033d..a2a1d11ea3d59 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -36,8 +36,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
     private $traces = array();
 
     /**
-     * Constructor.
-     *
      * The available options are:
      *
      *   * debug:                 If true, the traces are added as a HTTP header to ease debugging
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
index 5f7ee10a5bf60..e7a70c19a23e1 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -29,8 +29,6 @@ class Ssi implements SurrogateInterface
     );
 
     /**
-     * Constructor.
-     *
      * @param array $contentTypes An array of content-type that should be parsed for SSI information
      *                            (default: text/html, text/xml, application/xhtml+xml, and application/xml)
      */
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index c4d961e68f043..b656e28d99442 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -29,8 +29,6 @@ class Store implements StoreInterface
     private $locks;
 
     /**
-     * Constructor.
-     *
      * @param string $root The path to the cache directory
      *
      * @throws \RuntimeException
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 4e628a1409beb..cb32e597bd34b 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -40,8 +40,6 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
     protected $requestStack;
 
     /**
-     * Constructor.
-     *
      * @param EventDispatcherInterface    $dispatcher   An EventDispatcherInterface instance
      * @param ControllerResolverInterface $resolver     A ControllerResolverInterface instance
      * @param RequestStack                $requestStack A stack for master/sub requests
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 401a3626d84b4..83d384dfc49b7 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -69,8 +69,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     const END_OF_LIFE = '05/2019';
 
     /**
-     * Constructor.
-     *
      * @param string $environment The environment
      * @param bool   $debug       Whether to enable debugging or not
      */
diff --git a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
index c6395bd67a2d0..d0f815955eda6 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
@@ -24,8 +24,6 @@ abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface
     protected $lifetime;
 
     /**
-     * Constructor.
-     *
      * @param string $dsn      A data source name
      * @param string $username
      * @param string $password
diff --git a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
index f35a7f74199b3..3a4fa7b79a403 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
@@ -18,8 +18,6 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface
     private $mongo;
 
     /**
-     * Constructor.
-     *
      * @param string $dsn      A data source name
      * @param string $username Not used
      * @param string $password Not used
diff --git a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
index dc273dd97a43a..55dcb30ded984 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
@@ -26,8 +26,6 @@ abstract class PdoProfilerStorage implements ProfilerStorageInterface
     protected $db;
 
     /**
-     * Constructor.
-     *
      * @param string $dsn      A data source name
      * @param string $username The username for the database
      * @param string $password The password for the database
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
index 9e0c9fb7dabdd..ad42652d5d8a3 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
@@ -44,8 +44,6 @@ class Profile
     private $children = array();
 
     /**
-     * Constructor.
-     *
      * @param string $token The token
      */
     public function __construct($token)
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index 9bfc54e1a19cf..2ff0beaf62019 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -46,8 +46,6 @@ class Profiler
     private $enabled = true;
 
     /**
-     * Constructor.
-     *
      * @param ProfilerStorageInterface $storage A ProfilerStorageInterface instance
      * @param LoggerInterface          $logger  A LoggerInterface instance
      */
diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
index b0e14ea456291..0471e87341b60 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
@@ -35,8 +35,6 @@ class RedisProfilerStorage implements ProfilerStorageInterface
     private $redis;
 
     /**
-     * Constructor.
-     *
      * @param string $dsn      A data source name
      * @param string $username Not used
      * @param string $password Not used
diff --git a/src/Symfony/Component/HttpKernel/UriSigner.php b/src/Symfony/Component/HttpKernel/UriSigner.php
index fa84899064e88..a64bf2c4460b5 100644
--- a/src/Symfony/Component/HttpKernel/UriSigner.php
+++ b/src/Symfony/Component/HttpKernel/UriSigner.php
@@ -21,8 +21,6 @@ class UriSigner
     private $secret;
 
     /**
-     * Constructor.
-     *
      * @param string $secret A secret
      */
     public function __construct($secret)
diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php
index 6d79bf30ecc31..2e281951e3e2b 100644
--- a/src/Symfony/Component/Intl/Collator/Collator.php
+++ b/src/Symfony/Component/Intl/Collator/Collator.php
@@ -68,8 +68,6 @@ class Collator
     const SORT_STRING = 1;
 
     /**
-     * Constructor.
-     *
      * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
index 958ba95c7cd69..35373bb6c3a4e 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
@@ -35,8 +35,6 @@ class FullTransformer
     private $timezone;
 
     /**
-     * Constructor.
-     *
      * @param string $pattern  The pattern to be used to format and/or parse values
      * @param string $timezone The timezone to perform the date/time calculations
      */
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
index 4b02c85b24e30..3cb7fd162ead8 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
@@ -57,9 +57,6 @@ class MonthTransformer extends Transformer
      */
     protected static $flippedShortMonths = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         if (0 === count(self::$shortMonths)) {
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index 438b4d73e943b..a59becfddfba4 100644
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -127,8 +127,6 @@ class IntlDateFormatter
     private $timeZoneId;
 
     /**
-     * Constructor.
-     *
      * @param string $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int    $datetype Type of date formatting, one of the format type constants
      * @param int    $timetype Type of time formatting, one of the format type constants
diff --git a/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php
index 3a86da888088e..f3ed0fa928594 100644
--- a/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php
+++ b/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php
@@ -17,8 +17,6 @@
 class MethodArgumentNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName The method name that raised the exception
      * @param string $argName    The argument name that is not implemented
      */
diff --git a/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
index 3193483dfe88a..53b62576843fd 100644
--- a/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
+++ b/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
@@ -17,8 +17,6 @@
 class MethodArgumentValueNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName        The method name that raised the exception
      * @param string $argName           The argument name
      * @param string $argValue          The argument value that is not implemented
diff --git a/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php
index 97b7986bdee92..544e0e40a4821 100644
--- a/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php
+++ b/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php
@@ -17,8 +17,6 @@
 class MethodNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName The name of the method
      */
     public function __construct($methodName)
diff --git a/src/Symfony/Component/Intl/Exception/NotImplementedException.php b/src/Symfony/Component/Intl/Exception/NotImplementedException.php
index cf919fecad22e..47ac32b3201e9 100644
--- a/src/Symfony/Component/Intl/Exception/NotImplementedException.php
+++ b/src/Symfony/Component/Intl/Exception/NotImplementedException.php
@@ -21,8 +21,6 @@ class NotImplementedException extends RuntimeException
     const INTL_INSTALL_MESSAGE = 'Please install the "intl" extension for full localization capabilities.';
 
     /**
-     * Constructor.
-     *
      * @param string $message The exception message. A note to install the intl extension is appended to this string
      */
     public function __construct($message)
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index ce03e9f5d6642..d3c7d5b476e77 100644
--- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -255,8 +255,6 @@ class NumberFormatter
     );
 
     /**
-     * Constructor.
-     *
      * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int    $style   Style of the formatting, one of the format style constants
      *                        The only supported styles are NumberFormatter::DECIMAL
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
index 42ecb66f2bd4d..3ecde89749cc2 100644
--- a/src/Symfony/Component/Process/PhpProcess.php
+++ b/src/Symfony/Component/Process/PhpProcess.php
@@ -25,8 +25,6 @@
 class PhpProcess extends Process
 {
     /**
-     * Constructor.
-     *
      * @param string      $script  The PHP script to run (as a string)
      * @param string|null $cwd     The working directory or null to use the working dir of the current PHP process
      * @param array|null  $env     The environment variables or null to use the same environment as the current PHP process
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 96a93343f1d5d..af0bb2bcb2ecd 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -127,8 +127,6 @@ class Process
     );
 
     /**
-     * Constructor.
-     *
      * @param string         $commandline The command line to run
      * @param string|null    $cwd         The working directory or null to use the working dir of the current PHP process
      * @param array|null     $env         The environment variables or null to use the same environment as the current PHP process
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
index 54877a8282813..3d90f1a5d6d71 100644
--- a/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -15,8 +15,6 @@
 use Symfony\Component\Process\Exception\LogicException;
 
 /**
- * Process builder.
- *
  * @author Kris Wallsmith 
  */
 class ProcessBuilder
@@ -32,8 +30,6 @@ class ProcessBuilder
     private $outputDisabled = false;
 
     /**
-     * Constructor.
-     *
      * @param string[] $arguments An array of arguments
      */
     public function __construct(array $arguments = array())
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php b/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php
index b49e77e271835..7ea0fa2455488 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php
@@ -27,8 +27,6 @@ class PropertyPathIterator extends \ArrayIterator implements PropertyPathIterato
     protected $path;
 
     /**
-     * Constructor.
-     *
      * @param PropertyPathInterface $path The property path to traverse
      */
     public function __construct(PropertyPathInterface $path)
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index 191aa68a57a18..aec320156b4e8 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -32,8 +32,6 @@ class Route
     private $condition;
 
     /**
-     * Constructor.
-     *
      * @param array $data An array of key/value parameters
      *
      * @throws \BadMethodCallException
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
index 3eca9ecd8b010..c95477ae631c1 100644
--- a/src/Symfony/Component/Routing/CompiledRoute.php
+++ b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -28,8 +28,6 @@ class CompiledRoute implements \Serializable
     private $hostTokens;
 
     /**
-     * Constructor.
-     *
      * @param string      $staticPrefix  The static prefix of the compiled route
      * @param string      $regex         The regular expression to use to match this route
      * @param array       $tokens        An array of tokens to use to generate URL for this route
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php
index 4739bd8365cea..4a7051b5ae797 100644
--- a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php
+++ b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php
@@ -26,8 +26,6 @@ abstract class GeneratorDumper implements GeneratorDumperInterface
     private $routes;
 
     /**
-     * Constructor.
-     *
      * @param RouteCollection $routes The RouteCollection to dump
      */
     public function __construct(RouteCollection $routes)
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
index 9fd35ea112559..60bdf1da3522c 100644
--- a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
+++ b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -46,8 +46,6 @@ public function dump(array $options = array())
 use Psr\Log\LoggerInterface;
 
 /**
- * {$options['class']}
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
@@ -55,9 +53,6 @@ class {$options['class']} extends {$options['base_class']}
 {
     private static \$declaredRoutes;
 
-    /**
-     * Constructor.
-     */
     public function __construct(RequestContext \$context, LoggerInterface \$logger = null)
     {
         \$this->context = \$context;
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
index e72b6cf974c74..11e068fec1367 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -76,8 +76,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
     );
 
     /**
-     * Constructor.
-     *
      * @param RouteCollection      $routes  A RouteCollection instance
      * @param RequestContext       $context The context
      * @param LoggerInterface|null $logger  A logger instance
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index 62ad9c3f9fae0..8d6e1c19ba47a 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -73,8 +73,6 @@ abstract class AnnotationClassLoader implements LoaderInterface
     protected $defaultRouteIndex = 0;
 
     /**
-     * Constructor.
-     *
      * @param Reader $reader
      */
     public function __construct(Reader $reader)
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
index d98e024640366..376ad3c585f4f 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -27,8 +27,6 @@ class AnnotationFileLoader extends FileLoader
     protected $loader;
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface  $locator A FileLocator instance
      * @param AnnotationClassLoader $loader  An AnnotationClassLoader instance
      *
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
index 3ad08c2006f24..c2e2a116d12d0 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
@@ -33,8 +33,6 @@ class DumperRoute
     private $route;
 
     /**
-     * Constructor.
-     *
      * @param string $name  The route name
      * @param Route  $route The route
      */
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php
index 52edc017e8473..70c23f647d91d 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php
@@ -26,8 +26,6 @@ abstract class MatcherDumper implements MatcherDumperInterface
     private $routes;
 
     /**
-     * Constructor.
-     *
      * @param RouteCollection $routes The RouteCollection to dump
      */
     public function __construct(RouteCollection $routes)
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index aa7df8a78b5ba..bf629b8f8675b 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -63,16 +63,11 @@ public function dump(array $options = array())
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * {$options['class']}.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
 class {$options['class']} extends {$options['base_class']}
 {
-    /**
-     * Constructor.
-     */
     public function __construct(RequestContext \$context)
     {
         \$this->context = \$context;
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index c646723b3ab08..62bb74a8d6780 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -55,8 +55,6 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
     protected $expressionLanguageProviders = array();
 
     /**
-     * Constructor.
-     *
      * @param RouteCollection $routes  A RouteCollection instance
      * @param RequestContext  $context The context
      */
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
index 9b15cd07d54a3..d522189cb0d51 100644
--- a/src/Symfony/Component/Routing/RequestContext.php
+++ b/src/Symfony/Component/Routing/RequestContext.php
@@ -38,8 +38,6 @@ class RequestContext
     private $parameters = array();
 
     /**
-     * Constructor.
-     *
      * @param string $baseUrl     The base URL
      * @param string $method      The HTTP method
      * @param string $host        The HTTP host name
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index fee2002c9d9bb..4966c16f983c8 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -65,8 +65,6 @@ class Route implements \Serializable
     private $condition = '';
 
     /**
-     * Constructor.
-     *
      * Available options:
      *
      *  * compiler_class: A class name able to compile this route instance (RouteCompiler by default)
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index a04385ead47d1..afec0f5ed5de8 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -84,8 +84,6 @@ class Router implements RouterInterface, RequestMatcherInterface
     private $expressionLanguageProviders = array();
 
     /**
-     * Constructor.
-     *
      * @param LoaderInterface $loader   A LoaderInterface instance
      * @param mixed           $resource The main resource to load
      * @param array           $options  An array of options
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
index 4ea0b8a1a3e7c..6fc15819b131e 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -5,16 +5,11 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
 class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 {
-    /**
-     * Constructor.
-     */
     public function __construct(RequestContext $context)
     {
         $this->context = $context;
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
index f9d3fa2d8257b..b83d904f6e2ac 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -5,16 +5,11 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
 class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher
 {
-    /**
-     * Constructor.
-     */
     public function __construct(RequestContext $context)
     {
         $this->context = $context;
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
index d9da7b02d4b43..774767d2ca406 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
@@ -5,16 +5,11 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
 class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 {
-    /**
-     * Constructor.
-     */
     public function __construct(RequestContext $context)
     {
         $this->context = $context;
diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
index 6709023ff0351..d60b82ce9de20 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -57,8 +57,6 @@ class AclProvider implements AclProviderInterface
     private $permissionGrantingStrategy;
 
     /**
-     * Constructor.
-     *
      * @param Connection                          $connection
      * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
      * @param array                               $options
diff --git a/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php
index 864d0091af3ef..b98423cbc84e9 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/Schema.php
@@ -24,8 +24,6 @@ final class Schema extends BaseSchema
     private $options;
 
     /**
-     * Constructor.
-     *
      * @param array      $options    the names for tables
      * @param Connection $connection
      */
diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
index fb70738ae7f65..a759d5f04793b 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Acl.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php
@@ -48,8 +48,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     private $listeners = array();
 
     /**
-     * Constructor.
-     *
      * @param int                                 $id
      * @param ObjectIdentityInterface             $objectIdentity
      * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
diff --git a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php
index 5dfef08839e6e..97ec20f210187 100644
--- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php
+++ b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php
@@ -28,8 +28,6 @@ class AclCollectionCache
     private $securityIdentityRetrievalStrategy;
 
     /**
-     * Constructor.
-     *
      * @param AclProviderInterface                       $aclProvider
      * @param ObjectIdentityRetrievalStrategyInterface   $oidRetrievalStrategy
      * @param SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy
diff --git a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
index 667a19e0a1ce2..a72622f519ee2 100644
--- a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
+++ b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
@@ -32,8 +32,6 @@ class DoctrineAclCache implements AclCacheInterface
     private $permissionGrantingStrategy;
 
     /**
-     * Constructor.
-     *
      * @param Cache                               $cache
      * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
      * @param string                              $prefix
diff --git a/src/Symfony/Component/Security/Acl/Domain/Entry.php b/src/Symfony/Component/Security/Acl/Domain/Entry.php
index 55c4b378a74b2..57795632ad178 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Entry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Entry.php
@@ -32,8 +32,6 @@ class Entry implements AuditableEntryInterface
     private $granting;
 
     /**
-     * Constructor.
-     *
      * @param int                       $id
      * @param AclInterface              $acl
      * @param SecurityIdentityInterface $sid
diff --git a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
index 86b1e5b30274b..6f4563ffcc6c4 100644
--- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
@@ -25,8 +25,6 @@ class FieldEntry extends Entry implements FieldEntryInterface
     private $field;
 
     /**
-     * Constructor.
-     *
      * @param int                       $id
      * @param AclInterface              $acl
      * @param string                    $field
diff --git a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
index d2f353e653ff9..be524489e7655 100644
--- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
+++ b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
@@ -27,8 +27,6 @@ final class ObjectIdentity implements ObjectIdentityInterface
     private $type;
 
     /**
-     * Constructor.
-     *
      * @param string $identifier
      * @param string $type
      *
diff --git a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php
index c28a1c522da0d..95d2887ead232 100644
--- a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php
+++ b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php
@@ -24,8 +24,6 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
     private $role;
 
     /**
-     * Constructor.
-     *
      * @param mixed $role a Role instance, or its string representation
      */
     public function __construct($role)
diff --git a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php
index a08f67e295515..cad892f7dc583 100644
--- a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php
+++ b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php
@@ -29,8 +29,6 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra
     private $authenticationTrustResolver;
 
     /**
-     * Constructor.
-     *
      * @param RoleHierarchyInterface      $roleHierarchy
      * @param AuthenticationTrustResolver $authenticationTrustResolver
      */
diff --git a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php
index 5766148df0ed6..d6b3d3fcfc477 100644
--- a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php
+++ b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php
@@ -27,8 +27,6 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
     private $class;
 
     /**
-     * Constructor.
-     *
      * @param string $username the username representation
      * @param string $class    the user's fully qualified class name
      *
diff --git a/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php
index 93f1755be6db0..5c50eb6bf6f99 100644
--- a/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php
+++ b/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php
@@ -22,8 +22,6 @@ abstract class AbstractMaskBuilder implements MaskBuilderInterface
     protected $mask;
 
     /**
-     * Constructor.
-     *
      * @param int $mask optional; defaults to 0
      */
     public function __construct($mask = 0)
diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
index 4c0a7459d070c..6d631a62f1ae9 100644
--- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
+++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
@@ -35,8 +35,6 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface
     private $eventDispatcher;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationProviderInterface[] $providers        An array of AuthenticationProviderInterface instances
      * @param bool                              $eraseCredentials Whether to erase credentials after authentication or not
      *
diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php
index c66661a1a32d1..d191d6d532366 100644
--- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php
+++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php
@@ -24,8 +24,6 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac
     private $rememberMeClass;
 
     /**
-     * Constructor.
-     *
      * @param string $anonymousClass
      * @param string $rememberMeClass
      */
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
index 7fbbf858ace91..882443a013970 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
@@ -25,8 +25,6 @@ class AnonymousAuthenticationProvider implements AuthenticationProviderInterface
     private $key;
 
     /**
-     * Constructor.
-     *
      * @param string $key The key shared with the authentication token
      */
     public function __construct($key)
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
index 90cba25d64382..b7b7f51d209fe 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -32,8 +32,6 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
     private $userProvider;
 
     /**
-     * Constructor.
-     *
      * @param UserProviderInterface   $userProvider               An UserProviderInterface instance
      * @param UserCheckerInterface    $userChecker                An UserCheckerInterface instance
      * @param string                  $providerKey                The provider key
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 4f732542ea94f..b871f1f5a3591 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -34,8 +34,6 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param UserProviderInterface $userProvider An UserProviderInterface instance
      * @param UserCheckerInterface  $userChecker  An UserCheckerInterface instance
      * @param string                $providerKey  The provider key
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php
index 82be1d13e9a99..d5e4172bb132d 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php
@@ -23,8 +23,6 @@ class RememberMeAuthenticationProvider implements AuthenticationProviderInterfac
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param UserCheckerInterface $userChecker An UserCheckerInterface interface
      * @param string               $key         A key
      * @param string               $providerKey A provider key
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
index 26740883cfbc9..7527128cc7d3f 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -33,8 +33,6 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param UserCheckerInterface $userChecker                An UserCheckerInterface interface
      * @param string               $providerKey                A provider key
      * @param bool                 $hideUserNotFoundExceptions Whether to hide user not found exception or not
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
index 76873fc603cd7..c6b76c2e6b038 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
@@ -25,8 +25,6 @@ final class PersistentToken implements PersistentTokenInterface
     private $lastUsed;
 
     /**
-     * Constructor.
-     *
      * @param string    $class
      * @param string    $username
      * @param string    $series
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index 0eee6d94a41c6..8a9f2477b2ea8 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -31,8 +31,6 @@ abstract class AbstractToken implements TokenInterface
     private $attributes = array();
 
     /**
-     * Constructor.
-     *
      * @param (RoleInterface|string)[] $roles An array of roles
      *
      * @throws \InvalidArgumentException
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
index 0d7dea08aa97c..218a172c6028c 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
@@ -23,8 +23,6 @@ class AnonymousToken extends AbstractToken
     private $key;
 
     /**
-     * Constructor.
-     *
      * @param string          $key   The key shared with the authentication provider
      * @param string|object   $user  The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
      * @param RoleInterface[] $roles An array of roles
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
index a5460f50839ee..84fdb4b00c086 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -24,8 +24,6 @@ class PreAuthenticatedToken extends AbstractToken
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param string|object            $user        The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
      * @param mixed                    $credentials The user credentials
      * @param string                   $providerKey The provider key
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
index 609fdad1c1fc6..c72a34b1cc768 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
@@ -24,8 +24,6 @@ class RememberMeToken extends AbstractToken
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param UserInterface $user
      * @param string        $providerKey
      * @param string        $key
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
index 7bfc556bdbf25..9c790a98d4e50 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
@@ -24,8 +24,6 @@ class UsernamePasswordToken extends AbstractToken
     private $providerKey;
 
     /**
-     * Constructor.
-     *
      * @param string|object            $user        The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
      * @param mixed                    $credentials This usually is the password of the user
      * @param string                   $providerKey The provider key
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
index c18c2cbf09f0f..dd56a04dc764e 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -32,8 +32,6 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
     private $allowIfEqualGrantedDeniedDecisions;
 
     /**
-     * Constructor.
-     *
      * @param VoterInterface[] $voters                             An array of VoterInterface instances
      * @param string           $strategy                           The vote strategy
      * @param bool             $allowIfAllAbstainDecisions         Whether to grant access if all voters abstained or not
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
index 23c190cb563d0..eb502ef290769 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -31,8 +31,6 @@ class AuthorizationChecker implements AuthorizationCheckerInterface
     private $alwaysAuthenticate;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface          $tokenStorage
      * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
      * @param AccessDecisionManagerInterface $accessDecisionManager An AccessDecisionManager instance
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php
index 5847e0d15c058..7f449bee1cef2 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php
@@ -32,8 +32,6 @@ class AuthenticatedVoter implements VoterInterface
     private $authenticationTrustResolver;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationTrustResolverInterface $authenticationTrustResolver
      */
     public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver)
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
index 98b8f50f15d03..8dd00bfb73e71 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
@@ -31,8 +31,6 @@ class ExpressionVoter implements VoterInterface
     private $roleHierarchy;
 
     /**
-     * Constructor.
-     *
      * @param ExpressionLanguage                   $expressionLanguage
      * @param AuthenticationTrustResolverInterface $trustResolver
      * @param RoleHierarchyInterface|null          $roleHierarchy
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
index 539dcda327932..f130ce39ee73a 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
@@ -24,8 +24,6 @@ class RoleVoter implements VoterInterface
     private $prefix;
 
     /**
-     * Constructor.
-     *
      * @param string $prefix The role prefix
      */
     public function __construct($prefix = 'ROLE_')
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
index f2fe0817dc154..f65d1d9d5801b 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -27,8 +27,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
     private $cost;
 
     /**
-     * Constructor.
-     *
      * @param int $cost The algorithmic cost that should be used
      *
      * @throws \RuntimeException         When no BCrypt encoder is available
diff --git a/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
index 1706fc86a8eb7..e1e430d172888 100644
--- a/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
@@ -25,8 +25,6 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
     private $iterations;
 
     /**
-     * Constructor.
-     *
      * @param string $algorithm          The digest algorithm to use
      * @param bool   $encodeHashAsBase64 Whether to base64 encode the password hash
      * @param int    $iterations         The number of iterations to use to stretch the password hash
diff --git a/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
index 6f24c4f1e279e..9a50829f728b9 100644
--- a/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
@@ -34,8 +34,6 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
     private $length;
 
     /**
-     * Constructor.
-     *
      * @param string $algorithm          The digest algorithm to use
      * @param bool   $encodeHashAsBase64 Whether to base64 encode the password hash
      * @param int    $iterations         The number of iterations to use to stretch the password hash
diff --git a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
index 09059f667a35a..bda6269a52012 100644
--- a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
@@ -23,8 +23,6 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder
     private $ignorePasswordCase;
 
     /**
-     * Constructor.
-     *
      * @param bool $ignorePasswordCase Compare password case-insensitive
      */
     public function __construct($ignorePasswordCase = false)
diff --git a/src/Symfony/Component/Security/Core/Role/Role.php b/src/Symfony/Component/Security/Core/Role/Role.php
index 5b50981fe1a78..123a1262f1f31 100644
--- a/src/Symfony/Component/Security/Core/Role/Role.php
+++ b/src/Symfony/Component/Security/Core/Role/Role.php
@@ -22,8 +22,6 @@ class Role implements RoleInterface
     private $role;
 
     /**
-     * Constructor.
-     *
      * @param string $role The role name
      */
     public function __construct($role)
diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
index 95e76ee279316..ff487f2523ec8 100644
--- a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+++ b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
@@ -22,8 +22,6 @@ class RoleHierarchy implements RoleHierarchyInterface
     protected $map;
 
     /**
-     * Constructor.
-     *
      * @param array $hierarchy An array defining the hierarchy
      */
     public function __construct(array $hierarchy)
diff --git a/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
index c6795841beaba..f68f40750d03b 100644
--- a/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
+++ b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
@@ -24,8 +24,6 @@ class SwitchUserRole extends Role
     private $source;
 
     /**
-     * Constructor.
-     *
      * @param string         $role   The role as a string
      * @param TokenInterface $source The original token
      */
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index e09d72e564f12..9e5a9a8e5a48c 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -27,8 +27,6 @@ class InMemoryUserProvider implements UserProviderInterface
     private $users;
 
     /**
-     * Constructor.
-     *
      * The user array is a hash where the keys are usernames and the values are
      * an array of attributes: 'password', 'enabled', and 'roles'.
      *
diff --git a/src/Symfony/Component/Security/Csrf/CsrfToken.php b/src/Symfony/Component/Security/Csrf/CsrfToken.php
index 9ccaaebf2df1e..693f37be7d251 100644
--- a/src/Symfony/Component/Security/Csrf/CsrfToken.php
+++ b/src/Symfony/Component/Security/Csrf/CsrfToken.php
@@ -29,8 +29,6 @@ class CsrfToken
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param string $id    The token ID
      * @param string $value The actual token value
      */
diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
index 116874a3198ba..acd4101e72a97 100644
--- a/src/Symfony/Component/Security/Http/AccessMap.php
+++ b/src/Symfony/Component/Security/Http/AccessMap.php
@@ -25,8 +25,6 @@ class AccessMap implements AccessMapInterface
     private $map = array();
 
     /**
-     * Constructor.
-     *
      * @param RequestMatcherInterface $requestMatcher A RequestMatcherInterface instance
      * @param array                   $attributes     An array of attributes to pass to the access decision manager (like roles)
      * @param string|null             $channel        The channel to enforce (http, https, or null)
diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
index 36d4a78d6dc8e..1440179131ab7 100644
--- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
@@ -22,8 +22,6 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance
      * @param array                                 $options Options for processing a successful authentication attempt
      */
diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
index 2d1b26ebb9179..369e2d14c7893 100644
--- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
@@ -22,8 +22,6 @@ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationSuccessHandlerInterface $handler     An AuthenticationSuccessHandlerInterface instance
      * @param array                                 $options     Options for processing a successful authentication attempt
      * @param string                                $providerKey The provider key
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
index 830c00aeb0180..08b5faee39827 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
@@ -42,8 +42,6 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
     );
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $httpKernel
      * @param HttpUtils           $httpUtils
      * @param array               $options    Options for processing a failed authentication attempt
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 7da6e35572b47..898dfbc8c8393 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -36,8 +36,6 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     );
 
     /**
-     * Constructor.
-     *
      * @param HttpUtils $httpUtils
      * @param array     $options   Options for processing a successful authentication attempt
      */
diff --git a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
index c5c43f2895734..669dc13489fec 100644
--- a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
@@ -35,8 +35,6 @@ class SimpleAuthenticationHandler implements AuthenticationFailureHandlerInterfa
     protected $logger;
 
     /**
-     * Constructor.
-     *
      * @param SimpleAuthenticatorInterface          $authenticator  SimpleAuthenticatorInterface instance
      * @param AuthenticationSuccessHandlerInterface $successHandler Default success handler
      * @param AuthenticationFailureHandlerInterface $failureHandler Default failure handler
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
index c734db065e16f..35ee02f5401dc 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -29,8 +29,6 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
     private $httpUtils;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $kernel
      * @param HttpUtils           $httpUtils  An HttpUtils instance
      * @param string              $loginPath  The path to the login form
diff --git a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php
index b5ac242d41502..17c6d9e8f78e7 100644
--- a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php
@@ -16,8 +16,6 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * InteractiveLoginEvent.
- *
  * @author Fabien Potencier 
  */
 class InteractiveLoginEvent extends Event
@@ -26,8 +24,6 @@ class InteractiveLoginEvent extends Event
     private $authenticationToken;
 
     /**
-     * Constructor.
-     *
      * @param Request        $request             A Request instance
      * @param TokenInterface $authenticationToken A TokenInterface instance
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
index 7bad47a5bed01..12fb2b5452787 100644
--- a/src/Symfony/Component/Security/Http/Firewall.php
+++ b/src/Symfony/Component/Security/Http/Firewall.php
@@ -34,8 +34,6 @@ class Firewall implements EventSubscriberInterface
     private $exceptionListeners;
 
     /**
-     * Constructor.
-     *
      * @param FirewallMapInterface     $map        A FirewallMapInterface instance
      * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
index 1eae0948a13c3..1056879e348f7 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -64,8 +64,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
     private $rememberMeServices;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
      * @param SessionAuthenticationStrategyInterface $sessionStrategy
diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
index e04a0a601920d..5b5ccbff1009d 100644
--- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -40,8 +40,6 @@ class LogoutListener implements ListenerInterface
     private $csrfTokenManager;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface          $tokenStorage
      * @param HttpUtils                      $httpUtils        An HttpUtils instance
      * @param LogoutSuccessHandlerInterface  $successHandler   A LogoutSuccessHandlerInterface instance
diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
index bc859f9f5dce4..1802dd878738c 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
@@ -39,8 +39,6 @@ class RememberMeListener implements ListenerInterface
     private $sessionStrategy;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                       $tokenStorage
      * @param RememberMeServicesInterface                 $rememberMeServices
      * @param AuthenticationManagerInterface              $authenticationManager
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
index d97a3427138b3..cf61d83d4334c 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
@@ -39,8 +39,6 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
     private $csrfTokenManager;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
      * @param SessionAuthenticationStrategyInterface $sessionStrategy
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
index 7f85a1ec7bd8f..59385e17e7edd 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
@@ -40,8 +40,6 @@ class SimplePreAuthenticationListener implements ListenerInterface
     private $dispatcher;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface           $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface  $authenticationManager An AuthenticationManagerInterface instance
      * @param string                          $providerKey
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
index 56add79926d3e..d30b71ae7b81d 100644
--- a/src/Symfony/Component/Security/Http/HttpUtils.php
+++ b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -31,8 +31,6 @@ class HttpUtils
     private $urlMatcher;
 
     /**
-     * Constructor.
-     *
      * @param UrlGeneratorInterface                       $urlGenerator A UrlGeneratorInterface instance
      * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher   The URL or Request matcher
      *
diff --git a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
index 6838be57e1ee8..a78b25f0c34ec 100644
--- a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
+++ b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
@@ -25,8 +25,6 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface
     private $cookies;
 
     /**
-     * Constructor.
-     *
      * @param array $cookies An array of cookie names to unset
      */
     public function __construct(array $cookies)
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index 4ab3465c66263..0cb4007b13901 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -43,8 +43,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     private $userProviders;
 
     /**
-     * Constructor.
-     *
      * @param array           $userProviders
      * @param string          $key
      * @param string          $providerKey
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index cbbbb235192d9..82aa48fc6664f 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -36,8 +36,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
     private $secureRandom;
 
     /**
-     * Constructor.
-     *
      * @param array                 $userProviders
      * @param string                $key
      * @param string                $providerKey
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php
index 38bb59389a6dd..229111b6ff26b 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php
@@ -26,8 +26,6 @@ abstract class FileLoader implements LoaderInterface
     protected $file;
 
     /**
-     * Constructor.
-     *
      * @param string $file The mapping file to load
      *
      * @throws MappingException if the mapping file does not exist or is not readable
diff --git a/src/Symfony/Component/Stopwatch/Section.php b/src/Symfony/Component/Stopwatch/Section.php
index e2d4dec5cb713..f44ae17856620 100644
--- a/src/Symfony/Component/Stopwatch/Section.php
+++ b/src/Symfony/Component/Stopwatch/Section.php
@@ -39,8 +39,6 @@ class Section
     private $children = array();
 
     /**
-     * Constructor.
-     *
      * @param float|null $origin Set the origin of the events in this section, use null to set their origin to their start time
      */
     public function __construct($origin = null)
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
index 16a30db2aa50e..5fdd62e6e0b1f 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -39,8 +39,6 @@ class StopwatchEvent
     private $started = array();
 
     /**
-     * Constructor.
-     *
      * @param float       $origin   The origin time in milliseconds
      * @param string|null $category The event category or null to use the default
      *
diff --git a/src/Symfony/Component/Stopwatch/StopwatchPeriod.php b/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
index 9876f179aadb6..c14610304f1c6 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
@@ -23,8 +23,6 @@ class StopwatchPeriod
     private $memory;
 
     /**
-     * Constructor.
-     *
      * @param int $start The relative time of the start of the period (in milliseconds)
      * @param int $end   The relative time of the end of the period (in milliseconds)
      */
diff --git a/src/Symfony/Component/Templating/Asset/Package.php b/src/Symfony/Component/Templating/Asset/Package.php
index 1c6bcf2b04a82..beb6a90648bd9 100644
--- a/src/Symfony/Component/Templating/Asset/Package.php
+++ b/src/Symfony/Component/Templating/Asset/Package.php
@@ -26,8 +26,6 @@ class Package implements PackageInterface
     private $format;
 
     /**
-     * Constructor.
-     *
      * @param string $version The package version
      * @param string $format  The format used to apply the version
      */
diff --git a/src/Symfony/Component/Templating/Asset/PathPackage.php b/src/Symfony/Component/Templating/Asset/PathPackage.php
index 265e313cad8ce..0ec12eb940823 100644
--- a/src/Symfony/Component/Templating/Asset/PathPackage.php
+++ b/src/Symfony/Component/Templating/Asset/PathPackage.php
@@ -25,8 +25,6 @@ class PathPackage extends Package
     private $basePath;
 
     /**
-     * Constructor.
-     *
      * @param string $basePath The base path to be prepended to relative paths
      * @param string $version  The package version
      * @param string $format   The format used to apply the version
diff --git a/src/Symfony/Component/Templating/Asset/UrlPackage.php b/src/Symfony/Component/Templating/Asset/UrlPackage.php
index 6831d1245ecab..2c2a659a8261b 100644
--- a/src/Symfony/Component/Templating/Asset/UrlPackage.php
+++ b/src/Symfony/Component/Templating/Asset/UrlPackage.php
@@ -25,8 +25,6 @@ class UrlPackage extends Package
     private $baseUrls;
 
     /**
-     * Constructor.
-     *
      * @param string|array $baseUrls Base asset URLs
      * @param string       $version  The package version
      * @param string       $format   The format used to apply the version
diff --git a/src/Symfony/Component/Templating/DelegatingEngine.php b/src/Symfony/Component/Templating/DelegatingEngine.php
index 4006ea5d92f9a..bef82af7bd21b 100644
--- a/src/Symfony/Component/Templating/DelegatingEngine.php
+++ b/src/Symfony/Component/Templating/DelegatingEngine.php
@@ -24,8 +24,6 @@ class DelegatingEngine implements EngineInterface, StreamingEngineInterface
     protected $engines = array();
 
     /**
-     * Constructor.
-     *
      * @param EngineInterface[] $engines An array of EngineInterface instances to add
      */
     public function __construct(array $engines = array())
diff --git a/src/Symfony/Component/Templating/Helper/AssetsHelper.php b/src/Symfony/Component/Templating/Helper/AssetsHelper.php
index 12c4c638846b2..f07e1c7d76a08 100644
--- a/src/Symfony/Component/Templating/Helper/AssetsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/AssetsHelper.php
@@ -33,8 +33,6 @@
 class AssetsHelper extends CoreAssetsHelper
 {
     /**
-     * Constructor.
-     *
      * @param string       $basePath      The base path
      * @param string|array $baseUrls      Base asset URLs
      * @param string       $version       The asset version
diff --git a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
index fe677e0e0f369..689b17b401d58 100644
--- a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
@@ -35,8 +35,6 @@ class CoreAssetsHelper extends Helper implements PackageInterface
     protected $namedPackages = array();
 
     /**
-     * Constructor.
-     *
      * @param PackageInterface $defaultPackage The default package
      * @param array            $namedPackages  Additional packages indexed by name
      */
diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php
index ab4808d682ac6..9ee24f1daaff8 100644
--- a/src/Symfony/Component/Templating/Loader/CacheLoader.php
+++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php
@@ -30,8 +30,6 @@ class CacheLoader extends Loader
     protected $dir;
 
     /**
-     * Constructor.
-     *
      * @param LoaderInterface $loader A Loader instance
      * @param string          $dir    The directory where to store the cache files
      */
diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
index 9a9d15792101f..ea9aac5f77174 100644
--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
+++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
@@ -24,8 +24,6 @@ class ChainLoader extends Loader
     protected $loaders = array();
 
     /**
-     * Constructor.
-     *
      * @param LoaderInterface[] $loaders An array of loader instances
      */
     public function __construct(array $loaders = array())
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
index 0d102a6326e6c..7cdf5b8a1916e 100644
--- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -25,8 +25,6 @@ class FilesystemLoader extends Loader
     protected $templatePathPatterns;
 
     /**
-     * Constructor.
-     *
      * @param array $templatePathPatterns An array of path patterns to look for templates
      */
     public function __construct($templatePathPatterns)
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
index de243d35e09bf..0828b78fc2784 100644
--- a/src/Symfony/Component/Templating/PhpEngine.php
+++ b/src/Symfony/Component/Templating/PhpEngine.php
@@ -43,8 +43,6 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     private $evalParameters;
 
     /**
-     * Constructor.
-     *
      * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
      * @param LoaderInterface             $loader  A loader instance
      * @param HelperInterface[]           $helpers An array of helper instances
diff --git a/src/Symfony/Component/Templating/Storage/Storage.php b/src/Symfony/Component/Templating/Storage/Storage.php
index e5ad2c48189fe..87245b3d425f3 100644
--- a/src/Symfony/Component/Templating/Storage/Storage.php
+++ b/src/Symfony/Component/Templating/Storage/Storage.php
@@ -21,8 +21,6 @@ abstract class Storage
     protected $template;
 
     /**
-     * Constructor.
-     *
      * @param string $template The template name
      */
     public function __construct($template)
diff --git a/src/Symfony/Component/Translation/IdentityTranslator.php b/src/Symfony/Component/Translation/IdentityTranslator.php
index 46a046365b324..82b247015bfe6 100644
--- a/src/Symfony/Component/Translation/IdentityTranslator.php
+++ b/src/Symfony/Component/Translation/IdentityTranslator.php
@@ -22,8 +22,6 @@ class IdentityTranslator implements TranslatorInterface
     private $locale;
 
     /**
-     * Constructor.
-     *
      * @param MessageSelector|null $selector The message selector for pluralization
      */
     public function __construct(MessageSelector $selector = null)
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
index 73649fb6ddcaa..920bc84c1cdfb 100644
--- a/src/Symfony/Component/Translation/MessageCatalogue.php
+++ b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -14,8 +14,6 @@
 use Symfony\Component\Config\Resource\ResourceInterface;
 
 /**
- * MessageCatalogue.
- *
  * @author Fabien Potencier 
  */
 class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
@@ -28,8 +26,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
     private $parent;
 
     /**
-     * Constructor.
-     *
      * @param string $locale   The locale
      * @param array  $messages An array of messages classified by domain
      */
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 816cfd28f9f2a..4fc517ffb5f68 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -18,8 +18,6 @@
 use Symfony\Component\Config\ConfigCacheFactory;
 
 /**
- * Translator.
- *
  * @author Fabien Potencier 
  */
 class Translator implements TranslatorInterface, TranslatorBagInterface
@@ -70,8 +68,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     private $configCacheFactory;
 
     /**
-     * Constructor.
-     *
      * @param string               $locale   The locale
      * @param MessageSelector|null $selector The message selector for pluralization
      * @param string|null          $cacheDir The directory to use for the cache
diff --git a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php
index cd42c4338cbb5..5a72bd84b7442 100644
--- a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php
@@ -33,8 +33,6 @@
 class GetterMetadata extends MemberMetadata
 {
     /**
-     * Constructor.
-     *
      * @param string      $class    The class the getter is defined on
      * @param string      $property The property which the getter returns
      * @param string|null $method   The method that is called to retrieve the value being validated (null for auto-detection)
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
index 0def248431f2d..af2060c2efe2b 100644
--- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -62,8 +62,6 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat
     private $reflMember = array();
 
     /**
-     * Constructor.
-     *
      * @param string $class    The name of the class this member is defined on
      * @param string $name     The name of the member
      * @param string $property The property the member belongs to
diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
index d12701cb44aba..7fc19dd2f7020 100644
--- a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
@@ -29,8 +29,6 @@
 class PropertyMetadata extends MemberMetadata
 {
     /**
-     * Constructor.
-     *
      * @param string $class The class this property is defined on
      * @param string $name  The name of this property
      *
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
index ef36cfbadd35c..60802b6d701b5 100644
--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -24,8 +24,6 @@ class ParseException extends RuntimeException
     private $rawMessage;
 
     /**
-     * Constructor.
-     *
      * @param string          $message    The error message
      * @param int             $parsedLine The line where the error occurred
      * @param string|null     $snippet    The snippet of code near the problem
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 90a2f34e02123..6fa05e7409422 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -34,8 +34,6 @@ class Parser
     private $locallySkippedLineNumbers = array();
 
     /**
-     * Constructor.
-     *
      * @param int      $offset             The offset of YAML document (used for line numbers in error messages)
      * @param int|null $totalNumberOfLines The overall number of lines being parsed
      * @param int[]    $skippedLineNumbers Number of comment lines that have been skipped by the parser

From aeb57ab658e1a5c67cc0ac12a0b0043c15677ea0 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Fri, 29 Sep 2017 21:16:17 +0200
Subject: [PATCH 0965/1099] [SecurityBundle] Remove auto picking the first
 provider

when no provider is explicitly configured on a firewall
---
 src/Symfony/Bundle/SecurityBundle/CHANGELOG.md                | 1 +
 .../SecurityBundle/DependencyInjection/SecurityExtension.php  | 4 ++++
 .../Tests/DependencyInjection/SecurityExtensionTest.php       | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 25aee704c2713..698d54011000d 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * removed command `acl:set` along with `SetAclCommand` class
  * removed command `init:acl` along with `InitAclCommand` class
  * removed `acl` configuration key and related services, use symfony/acl-bundle instead
+ * removed auto picking the first registered provider when no configured provider on a firewall and ambiguous
 
 3.4.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index bdc83cd14a5c6..5c2bf3278c8de 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -261,6 +261,10 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             }
             $defaultProvider = $providerIds[$normalizedName];
         } else {
+            if (count($providerIds) > 1) {
+                throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider on "%s" firewall is ambiguous as there is more than one registered provider.', $id));
+            }
+
             $defaultProvider = reset($providerIds);
 
             if (count($providerIds) > 1) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index f7d3e4cd5207b..18821f9aedd36 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -175,8 +175,8 @@ public function testSwitchUserNotStatelessOnStatelessFirewall()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Firewall "default" has no "provider" set but multiple providers exist. Using the first configured provider (first) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Not configuring explicitly the provider on "default" firewall is ambiguous as there is more than one registered provider.
      */
     public function testDeprecationForAmbiguousProvider()
     {

From e3190755cf8df517800e405f8b1ca2db3b2038fe Mon Sep 17 00:00:00 2001
From: TeLiXj 
Date: Mon, 11 Sep 2017 10:56:17 +0200
Subject: [PATCH 0966/1099] Hide label button when its setted to false

Added same behaviour in buttons like in other form components when label is setted to false, don't show it. It's very useful with buttons with icon and without text
---
 .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 3d8afe2cba602..3241c6256cab8 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -216,7 +216,7 @@
 {%- endblock range_widget %}
 
 {%- block button_widget -%}
-    {%- if label is empty -%}
+    {%- if label is not same as(false) and label is empty -%}
         {%- if label_format is not empty -%}
             {% set label = label_format|replace({
                 '%name%': name,

From 0067948c2c5370952b742052a7cca0c0fded4144 Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Sat, 30 Sep 2017 20:09:08 +0200
Subject: [PATCH 0967/1099] [SecurityBundle] Remove dead code

---
 .../SecurityBundle/DependencyInjection/SecurityExtension.php  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 5c2bf3278c8de..2b886d93a998a 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -266,10 +266,6 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             }
 
             $defaultProvider = reset($providerIds);
-
-            if (count($providerIds) > 1) {
-                @trigger_error(sprintf('Firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $id, key($providerIds)), E_USER_DEPRECATED);
-            }
         }
 
         $config->replaceArgument(5, $defaultProvider);

From b0c04f83544ce397fb3f34e4b42f5ee21274ed65 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 26 Sep 2017 11:37:36 +0200
Subject: [PATCH 0968/1099] [FrameworkBundle] Don't clear app pools on
 cache:clear

---
 UPGRADE-3.4.md                                              | 4 ++++
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md             | 2 ++
 .../DependencyInjection/Compiler/CachePoolPass.php          | 2 +-
 .../DependencyInjection/FrameworkExtension.php              | 2 +-
 .../Bundle/FrameworkBundle/Resources/config/cache.xml       | 6 +++++-
 .../FrameworkBundle/Tests/Functional/CachePoolsTest.php     | 6 +++---
 .../Tests/Functional/app/CachePools/config.yml              | 1 +
 .../Tests/Functional/app/CachePools/redis_config.yml        | 1 +
 .../Tests/Functional/app/CachePools/redis_custom_config.yml | 1 +
 9 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 6561c15a0b46f..d5ae0a934ffa2 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -113,6 +113,10 @@ Form
 FrameworkBundle
 ---------------
 
+ * The `cache:clear` command doesn't clear "app" PSR-6 cache pools anymore,
+   but still clears "system" ones.
+   Use the `cache:pool:clear` command to clear "app" pools instead.
+
  * The `doctrine/cache` dependency has been removed; require it via `composer
    require doctrine/cache` if you are using Doctrine cache in your project.
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 34af26de698ed..f49eb6dbc2dd3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.4.0
 -----
 
+ * Made the `cache:clear` command to *not* clear "app" PSR-6 cache pools anymore,
+   but to still clear "system" ones; use the `cache:pool:clear` command to clear "app" pools instead
  * Always register a minimalist logger that writes in `stderr`
  * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
index dafe0b7b8fce4..004a2c544da3d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -106,7 +106,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($clearers as $id => $pools) {
             $clearer = $container->getDefinition($id);
-            if ($clearer instanceof ChilDefinition) {
+            if ($clearer instanceof ChildDefinition) {
                 $clearer->replaceArgument(0, $pools);
             } else {
                 $clearer->setArgument(0, $pools);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index dafecf9d581d6..0e136bfe436f7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1802,7 +1802,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             if (!$container->getParameter('kernel.debug')) {
                 $propertyAccessDefinition->setFactory(array(PropertyAccessor::class, 'createCache'));
                 $propertyAccessDefinition->setArguments(array(null, null, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
-                $propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.default_clearer'));
+                $propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.system_clearer'));
                 $propertyAccessDefinition->addTag('monolog.logger', array('channel' => 'cache'));
             } else {
                 $propertyAccessDefinition->setClass(ArrayAdapter::class);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index 16b15a661768c..b4d23a576ed0f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -29,7 +29,7 @@
 
         
             
-            
+            
             
              
             0 
@@ -101,6 +101,10 @@
         
 
         
+            
+        
+
+        
             
         
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
index 06ed75d64d5c1..eafc798a4838b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
@@ -19,7 +19,7 @@ class CachePoolsTest extends WebTestCase
 {
     public function testCachePools()
     {
-        $this->doTestCachePools(array(), FilesystemAdapter::class);
+        $this->doTestCachePools(array(), AdapterInterface::class);
     }
 
     /**
@@ -67,7 +67,7 @@ public function testRedisCustomCachePools()
         }
     }
 
-    public function doTestCachePools($options, $adapterClass)
+    private function doTestCachePools($options, $adapterClass)
     {
         static::bootKernel($options);
         $container = static::$kernel->getContainer();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
index eabf83825e05d..de1e144dad062 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
@@ -6,6 +6,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                adapter: cache.system
             cache.pool2:
                 public: true
                 adapter: cache.pool3
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
index 02de40c5b81e5..3bf10f448f9c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
@@ -11,6 +11,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
index 9206638495947..d0a219753eb8e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -22,6 +22,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~

From 3c801951c8e92a716bd83c0491a601b7adf13039 Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Sun, 1 Oct 2017 11:18:37 +0200
Subject: [PATCH 0969/1099] [Security] Look at headers for switch user username
 parameter

---
 .../Tests/Functional/SwitchUserTest.php          |  2 +-
 .../app/JsonLogin/switchuser_stateless.yml       |  1 +
 .../Http/Firewall/SwitchUserListener.php         | 16 ++++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
index d89c24f1233fb..97b0a559193c4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
@@ -54,7 +54,7 @@ public function testSwitchedUserExit()
     public function testSwitchUserStateless()
     {
         $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'switchuser_stateless.yml'));
-        $client->request('POST', '/chk', array('_switch_user' => 'dunglas'), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "user_can_switch", "password": "test"}}');
+        $client->request('POST', '/chk', array(), array(), array('HTTP_X_SWITCH_USER' => 'dunglas', 'CONTENT_TYPE' => 'application/json'), '{"user": {"login": "user_can_switch", "password": "test"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml
index 29789a4caa25f..b8c832032c6f0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/switchuser_stateless.yml
@@ -10,4 +10,5 @@ security:
     firewalls:
         main:
             switch_user:
+                parameter: X-Switch-User
                 stateless: true
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index d659ffc258db4..426727a738365 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -79,16 +79,17 @@ public function __construct(TokenStorageInterface $tokenStorage, UserProviderInt
     public function handle(GetResponseEvent $event)
     {
         $request = $event->getRequest();
+        $username = $request->get($this->usernameParameter) ?: $request->headers->get($this->usernameParameter);
 
-        if (!$request->get($this->usernameParameter)) {
+        if (!$username) {
             return;
         }
 
-        if (self::EXIT_VALUE === $request->get($this->usernameParameter)) {
+        if (self::EXIT_VALUE === $username) {
             $this->tokenStorage->setToken($this->attemptExitUser($request));
         } else {
             try {
-                $this->tokenStorage->setToken($this->attemptSwitchUser($request));
+                $this->tokenStorage->setToken($this->attemptSwitchUser($request, $username));
             } catch (AuthenticationException $e) {
                 throw new \LogicException(sprintf('Switch User failed: "%s"', $e->getMessage()));
             }
@@ -106,20 +107,21 @@ public function handle(GetResponseEvent $event)
     /**
      * Attempts to switch to another user.
      *
-     * @param Request $request A Request instance
+     * @param Request $request  A Request instance
+     * @param string  $username
      *
      * @return TokenInterface|null The new TokenInterface if successfully switched, null otherwise
      *
      * @throws \LogicException
      * @throws AccessDeniedException
      */
-    private function attemptSwitchUser(Request $request)
+    private function attemptSwitchUser(Request $request, $username)
     {
         $token = $this->tokenStorage->getToken();
         $originalToken = $this->getOriginalToken($token);
 
         if (false !== $originalToken) {
-            if ($token->getUsername() === $request->get($this->usernameParameter)) {
+            if ($token->getUsername() === $username) {
                 return $token;
             }
 
@@ -133,8 +135,6 @@ private function attemptSwitchUser(Request $request)
             throw $exception;
         }
 
-        $username = $request->get($this->usernameParameter);
-
         if (null !== $this->logger) {
             $this->logger->info('Attempting to switch to user.', array('username' => $username));
         }

From ffc74eb959c619f79afeabc6e672083559bc92dd Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Sun, 1 Oct 2017 17:08:32 +0200
Subject: [PATCH 0970/1099] [DoctrineBridge] Deprecate DbalSessionHandler

---
 .../Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php     | 4 ++++
 .../Doctrine/HttpFoundation/DbalSessionHandlerSchema.php      | 4 ++++
 .../Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php  | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
index d819ff0a6c51e..7bbcfe0375bc6 100644
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
+++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\Doctrine\HttpFoundation;
 
+@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler instead.', DbalSessionHandler::class), E_USER_DEPRECATED);
+
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
@@ -25,6 +27,8 @@
  * @author Fabien Potencier 
  * @author Johannes M. Schmitt 
  * @author Tobias Schultze 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler instead.
  */
 class DbalSessionHandler implements \SessionHandlerInterface
 {
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
index 978373da0cbd0..7af50a65074f8 100644
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
+++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Bridge\Doctrine\HttpFoundation;
 
+@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::createTable instead.', DbalSessionHandlerSchema::class), E_USER_DEPRECATED);
+
 use Doctrine\DBAL\Schema\Schema;
 
 /**
  * DBAL Session Storage Schema.
  *
  * @author Johannes M. Schmitt 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::createTable instead.
  */
 final class DbalSessionHandlerSchema extends Schema
 {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
index 1c9c82bc129e6..8d46bf9e63beb 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
@@ -18,6 +18,8 @@
  * Test class for DbalSessionHandler.
  *
  * @author Drak 
+ *
+ * @group legacy
  */
 class DbalSessionHandlerTest extends TestCase
 {

From 41665b759f381ce1942ada2c67695025e73e801d Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Sun, 1 Oct 2017 10:11:23 -0700
Subject: [PATCH 0971/1099] fixed CS

---
 .../Extension/FormExtensionBootstrap4HorizontalLayoutTest.php   | 2 +-
 .../Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
index 842150dc5e0fa..d7afc2cf26238 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -63,7 +63,7 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
index 4650246cda4f7..0dfa1ebadbe39 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -85,7 +85,7 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 

From f96a7f81b87db7bc92822d734b8c7abd495d199d Mon Sep 17 00:00:00 2001
From: adev 
Date: Mon, 17 Apr 2017 20:52:26 +0200
Subject: [PATCH 0972/1099] [Form] Fixed PercentToLocalizedStringTransformer to
 accept both comma and dot as decimal separator, if possible

---
 .../PercentToLocalizedStringTransformer.php   |  12 ++
 ...ercentToLocalizedStringTransformerTest.php | 117 ++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index 7fc191a054ff4..6d209c9d60232 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -119,6 +119,18 @@ public function reverseTransform($value)
         }
 
         $formatter = $this->getNumberFormatter();
+        $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
+        $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
+        $grouping = $formatter->getAttribute(\NumberFormatter::GROUPING_USED);
+
+        if ('.' !== $decSep && (!$grouping || '.' !== $groupSep)) {
+            $value = str_replace('.', $decSep, $value);
+        }
+
+        if (',' !== $decSep && (!$grouping || ',' !== $groupSep)) {
+            $value = str_replace(',', $decSep, $value);
+        }
+
         // replace normal spaces so that the formatter can read them
         $value = $formatter->parse(str_replace(' ', "\xc2\xa0", $value));
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
index abcc72e2315f8..24cef424d1c3e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -119,4 +119,121 @@ public function testReverseTransformExpectsString()
 
         $transformer->reverseTransform(1);
     }
+
+    public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
+    {
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        \Locale::setDefault('fr');
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        // completely valid format
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1 234,5'));
+        // accept dots
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1 234.5'));
+        // omit group separator
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
+    {
+        // Since we test against "de_AT", we need the full implementation
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        \Locale::setDefault('de_AT');
+
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        $transformer->reverseTransform('1.234.5');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
+    {
+        // Since we test against "de_DE", we need the full implementation
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        \Locale::setDefault('de_DE');
+
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        $transformer->reverseTransform('1234.5');
+    }
+
+    public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupingUsed()
+    {
+        // Since we test against other locales, we need the full implementation
+        IntlTestHelper::requireFullIntl($this, false);
+
+        \Locale::setDefault('fr');
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
+    }
+
+    public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
+    {
+        // Since we test against other locales, we need the full implementation
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        \Locale::setDefault('bg');
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        // completely valid format
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1 234.5'));
+        // accept commas
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1 234,5'));
+        // omit group separator
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
+    {
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        $transformer->reverseTransform('1,234,5');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
+    {
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
+        $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
+
+        $transformer->reverseTransform('1234,5');
+    }
+
+    public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGroupingUsed()
+    {
+        $formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::DECIMAL);
+        $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, 1);
+        $formatter->setAttribute(\NumberFormatter::GROUPING_USED, false);
+
+        $transformer = $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer')
+            ->setMethods(array('getNumberFormatter'))
+            ->setConstructorArgs(array(1, 'integer'))
+            ->getMock();
+        $transformer->expects($this->any())
+            ->method('getNumberFormatter')
+            ->willReturn($formatter);
+
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
+    }
 }

From 2eedc1fd3760ca74c909df1de09e3ff6c9ea10cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= 
Date: Thu, 23 Mar 2017 21:40:19 +0100
Subject: [PATCH 0973/1099] [Lock] Automaticaly release lock when user forget
 it

---
 src/Symfony/Component/Lock/Factory.php        |  9 ++--
 src/Symfony/Component/Lock/Lock.php           | 31 +++++++++++---
 .../Component/Lock/Store/SemaphoreStore.php   |  2 +-
 src/Symfony/Component/Lock/Tests/LockTest.php | 42 ++++++++++++++++++-
 4 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Component/Lock/Factory.php b/src/Symfony/Component/Lock/Factory.php
index c050145f90978..e9fdde97e8b35 100644
--- a/src/Symfony/Component/Lock/Factory.php
+++ b/src/Symfony/Component/Lock/Factory.php
@@ -36,14 +36,15 @@ public function __construct(StoreInterface $store)
     /**
      * Creates a lock for the given resource.
      *
-     * @param string $resource The resource to lock
-     * @param float  $ttl      maximum expected lock duration
+     * @param string $resource    The resource to lock
+     * @param float  $ttl         Maximum expected lock duration in seconds
+     * @param bool   $autoRelease Whether to automatically release the lock or not when the lock instance is destroyed
      *
      * @return Lock
      */
-    public function createLock($resource, $ttl = 300.0)
+    public function createLock($resource, $ttl = 300.0, $autoRelease = true)
     {
-        $lock = new Lock(new Key($resource), $this->store, $ttl);
+        $lock = new Lock(new Key($resource), $this->store, $ttl, $autoRelease);
         $lock->setLogger($this->logger);
 
         return $lock;
diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
index d8271569d8c05..e81878a43725c 100644
--- a/src/Symfony/Component/Lock/Lock.php
+++ b/src/Symfony/Component/Lock/Lock.php
@@ -32,21 +32,37 @@ final class Lock implements LockInterface, LoggerAwareInterface
     private $store;
     private $key;
     private $ttl;
+    private $autoRelease;
+    private $dirty = false;
 
     /**
-     * @param Key            $key
-     * @param StoreInterface $store
-     * @param float|null     $ttl
+     * @param Key            $key         Resource to lock
+     * @param StoreInterface $store       Store used to handle lock persistence
+     * @param float|null     $ttl         Maximum expected lock duration in seconds
+     * @param bool           $autoRelease Whether to automatically release the lock or not when the lock instance is destroyed
      */
-    public function __construct(Key $key, StoreInterface $store, $ttl = null)
+    public function __construct(Key $key, StoreInterface $store, $ttl = null, $autoRelease = true)
     {
         $this->store = $store;
         $this->key = $key;
         $this->ttl = $ttl;
+        $this->autoRelease = (bool) $autoRelease;
 
         $this->logger = new NullLogger();
     }
 
+    /**
+     * Automatically releases the underlying lock when the object is destructed.
+     */
+    public function __destruct()
+    {
+        if (!$this->autoRelease || !$this->dirty || !$this->isAcquired()) {
+            return;
+        }
+
+        $this->release();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -59,6 +75,7 @@ public function acquire($blocking = false)
                 $this->store->waitAndSave($this->key);
             }
 
+            $this->dirty = true;
             $this->logger->info('Successfully acquired the "{resource}" lock.', array('resource' => $this->key));
 
             if ($this->ttl) {
@@ -71,6 +88,7 @@ public function acquire($blocking = false)
 
             return true;
         } catch (LockConflictedException $e) {
+            $this->dirty = false;
             $this->logger->warning('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', array('resource' => $this->key));
 
             if ($blocking) {
@@ -96,6 +114,7 @@ public function refresh()
         try {
             $this->key->resetLifetime();
             $this->store->putOffExpiration($this->key, $this->ttl);
+            $this->dirty = true;
 
             if ($this->key->isExpired()) {
                 throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $this->key));
@@ -103,6 +122,7 @@ public function refresh()
 
             $this->logger->info('Expiration defined for "{resource}" lock for "{ttl}" seconds.', array('resource' => $this->key, 'ttl' => $this->ttl));
         } catch (LockConflictedException $e) {
+            $this->dirty = false;
             $this->logger->warning('Failed to define an expiration for the "{resource}" lock, someone else acquired the lock.', array('resource' => $this->key));
             throw $e;
         } catch (\Exception $e) {
@@ -116,7 +136,7 @@ public function refresh()
      */
     public function isAcquired()
     {
-        return $this->store->exists($this->key);
+        return $this->dirty = $this->store->exists($this->key);
     }
 
     /**
@@ -125,6 +145,7 @@ public function isAcquired()
     public function release()
     {
         $this->store->delete($this->key);
+        $this->dirty = false;
 
         if ($this->store->exists($this->key)) {
             $this->logger->warning('Failed to release the "{resource}" lock.', array('resource' => $this->key));
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
index fe9455cccea09..a6cc9ea8b9f1d 100644
--- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -116,7 +116,7 @@ public function delete(Key $key)
      */
     public function putOffExpiration(Key $key, $ttl)
     {
-        // do nothing, the flock locks forever.
+        // do nothing, the semaphore locks forever.
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index 97b376621169a..ece5cf667963a 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -103,10 +103,10 @@ public function testIsAquired()
         $lock = new Lock($key, $store, 10);
 
         $store
-            ->expects($this->once())
+            ->expects($this->any())
             ->method('exists')
             ->with($key)
-            ->willReturn(true);
+            ->will($this->onConsecutiveCalls(true, false));
 
         $this->assertTrue($lock->isAcquired());
     }
@@ -131,6 +131,44 @@ public function testRelease()
         $lock->release();
     }
 
+    public function testReleaseOnDestruction()
+    {
+        $key = new Key(uniqid(__METHOD__, true));
+        $store = $this->getMockBuilder(StoreInterface::class)->getMock();
+        $lock = new Lock($key, $store, 10);
+
+        $store
+            ->method('exists')
+            ->willReturnOnConsecutiveCalls(array(true, false))
+        ;
+        $store
+            ->expects($this->once())
+            ->method('delete')
+        ;
+
+        $lock->acquire(false);
+        unset($lock);
+    }
+
+    public function testNoAutoReleaseWhenNotConfigured()
+    {
+        $key = new Key(uniqid(__METHOD__, true));
+        $store = $this->getMockBuilder(StoreInterface::class)->getMock();
+        $lock = new Lock($key, $store, 10, false);
+
+        $store
+            ->method('exists')
+            ->willReturnOnConsecutiveCalls(array(true, false))
+        ;
+        $store
+            ->expects($this->never())
+            ->method('delete')
+        ;
+
+        $lock->acquire(false);
+        unset($lock);
+    }
+
     /**
      * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
      */

From 7ae06dc6174cd14fee5a2b7c984a2299c199b1a6 Mon Sep 17 00:00:00 2001
From: Ilya Vertakov 
Date: Wed, 9 Aug 2017 22:55:49 +0400
Subject: [PATCH 0974/1099] [Validator] Add unique entity violation cause

---
 src/Symfony/Bridge/Doctrine/CHANGELOG.md      |  1 +
 .../Constraints/UniqueEntityValidatorTest.php | 46 +++++++++++++++++++
 .../Constraints/UniqueEntityValidator.php     |  1 +
 3 files changed, 48 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index ba74440bc6e96..0258a36a998ee 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added support for doctrine/dbal v2.6 types
+ * added cause of UniqueEntity constraint violation
 
 3.1.0
 -----
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index 2074eacae7a99..878e19ccb5cd9 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -190,6 +190,7 @@ public function testValidateUniqueness()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -215,6 +216,7 @@ public function testValidateCustomErrorPath()
             ->atPath('property.path.bar')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -268,6 +270,7 @@ public function testValidateUniquenessWithIgnoreNullDisabled()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue('Foo')
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -346,6 +349,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
             ->atPath('property.path.name2')
             ->setParameter('{{ value }}', '"Bar"')
             ->setInvalidValue('Bar')
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -481,6 +485,7 @@ public function testAssociatedEntity()
             ->setParameter('{{ value }}', 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity") identified by (id => 1)')
             ->setInvalidValue($entity1)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->setCause(array($associated, $associated2))
             ->assertRaised();
     }
 
@@ -517,6 +522,7 @@ public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()
             ->atPath('property.path.single')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($entity1)
+            ->setCause(array($associated, $associated2))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -575,6 +581,7 @@ public function testValidateUniquenessWithArrayValue()
             ->atPath('property.path.phoneNumbers')
             ->setParameter('{{ value }}', 'array')
             ->setInvalidValue(array(123))
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -652,6 +659,7 @@ public function testValidateInheritanceUniqueness()
             ->atPath('property.path.name')
             ->setInvalidValue('Foo')
             ->setCode('23bd9dbf-6b9b-41cd-a99e-4844bcf3077f')
+            ->setCause(array($entity1))
             ->setParameters(array('{{ value }}' => '"Foo"'))
             ->assertRaised();
     }
@@ -703,6 +711,7 @@ public function testValidateUniquenessWithCompositeObjectNoToStringIdEntity()
             ->atPath('property.path.objectOne')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($objectOne)
+            ->setCause(array($entity))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -730,6 +739,43 @@ public function testValidateUniquenessWithCustomDoctrineTypeValue()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($existingEntity->name)
+            ->setCause(array($existingEntity))
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->assertRaised();
+    }
+
+    /**
+     * This is a functional test as there is a large integration necessary to get the validator working.
+     */
+    public function testValidateUniquenessCause()
+    {
+        $constraint = new UniqueEntity(array(
+            'message' => 'myMessage',
+            'fields' => array('name'),
+            'em' => self::EM_NAME,
+        ));
+
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $entity2 = new SingleIntIdEntity(2, 'Foo');
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->em->persist($entity1);
+        $this->em->flush();
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->validator->validate($entity2, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->atPath('property.path.name')
+            ->setParameter('{{ value }}', '"Foo"')
+            ->setInvalidValue($entity2)
+            ->setCause(array($entity1))
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 78d82b322568b..95e8197c35fac 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -171,6 +171,7 @@ public function validate($entity, Constraint $constraint)
             ->setParameter('{{ value }}', $this->formatWithIdentifiers($em, $class, $invalidValue))
             ->setInvalidValue($invalidValue)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->setCause($result)
             ->addViolation();
     }
 

From aaba6b4c2bdbe2d4a92754ea4f9a43570af2ff16 Mon Sep 17 00:00:00 2001
From: stoccc 
Date: Fri, 25 Aug 2017 09:11:28 +0200
Subject: [PATCH 0975/1099] Tests and fix for issue in array model data in
 EntityType field with multiple=true

---
 .../Tests/Form/Type/EntityTypeTest.php        | 34 +++++++++++++++++++
 src/Symfony/Bridge/Doctrine/composer.json     |  2 +-
 .../EventListener/MergeCollectionListener.php |  2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index 587ebd6b3e24d..a7d41ce8f3270 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -1482,4 +1482,38 @@ public function testSubmitNullExpandedMultiple()
         $this->assertEquals($collection, $form->getNormData());
         $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
     }
+
+    public function testSetDataEmptyArraySubmitNullMultiple()
+    {
+        $emptyArray = array();
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $form->setData($emptyArray);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
+
+    public function testSetDataNonEmptyArraySubmitNullMultiple()
+    {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $this->persist(array($entity1));
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $existing = array(0 => $entity1);
+        $form->setData($existing);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 22635d45ecc7b..dc8e0d528f5db 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/stopwatch": "~2.2",
         "symfony/dependency-injection": "~2.2",
-        "symfony/form": "~2.7.25|^2.8.18",
+        "symfony/form": "~2.7.34|^2.8.27",
         "symfony/http-kernel": "~2.2",
         "symfony/property-access": "~2.3",
         "symfony/security": "~2.2",
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index a65116fd5c8ce..0c16bd42ba9cd 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -80,7 +80,7 @@ public function onSubmit(FormEvent $event)
             return;
         }
 
-        if (!$dataToMergeInto) {
+        if (null === $dataToMergeInto) {
             // No original data was set. Set it if allowed
             if ($this->allowAdd) {
                 $dataToMergeInto = $data;

From 17a413876a3d04597e01772a9aee35ea56ae0cae Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 1 Oct 2017 22:19:02 +0200
Subject: [PATCH 0976/1099] Remove remaining `@experimental` annotations

---
 .../DependencyInjection/Security/Factory/JsonLoginFactory.php   | 2 --
 src/Symfony/Component/Cache/CacheItem.php                       | 2 --
 .../Firewall/UsernamePasswordJsonAuthenticationListener.php     | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
index c69cab8949af6..28a7bf5743078 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
@@ -19,8 +19,6 @@
  * JsonLoginFactory creates services for JSON login authentication.
  *
  * @author Kévin Dunglas 
- *
- * @experimental in version 3.3
  */
 class JsonLoginFactory extends AbstractFactory
 {
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
index d6f629b2abc70..93ffea495e88f 100644
--- a/src/Symfony/Component/Cache/CacheItem.php
+++ b/src/Symfony/Component/Cache/CacheItem.php
@@ -135,8 +135,6 @@ public function tag($tags)
      * Returns the list of tags bound to the value coming from the pool storage if any.
      *
      * @return array
-     *
-     * @experimental in version 3.3
      */
     public function getPreviousTags()
     {
diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
index 0c7e8bda36878..955288c23c375 100644
--- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -39,8 +39,6 @@
  * an authentication via a JSON document composed of a username and a password.
  *
  * @author Kévin Dunglas 
- *
- * @experimental in version 3.3
  */
 class UsernamePasswordJsonAuthenticationListener implements ListenerInterface
 {

From 09e512851ffb84288e55a1ac9c2d31514032e764 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 08:54:00 +0200
Subject: [PATCH 0977/1099] Fix in simple-phpunit script

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index ae4c818aa327f..869e8dc0d52b5 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -38,7 +38,11 @@ $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rt
     ? $PHP.' '.escapeshellarg($COMPOSER)
     : 'composer';
 
-if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".getenv('SYMFONY_PHPUNIT_REMOVE') !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) {
+if (false === $SYMFONY_PHPUNIT_REMOVE = getenv('SYMFONY_PHPUNIT_REMOVE')) {
+    $SYMFONY_PHPUNIT_REMOVE = 'phpspec/prophecy symfony/yaml';
+}
+
+if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".$SYMFONY_PHPUNIT_REMOVE !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) {
     // Build a standalone phpunit without symfony/yaml nor prophecy by default
 
     @mkdir($PHPUNIT_DIR, 0777, true);
@@ -60,8 +64,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $zip->extractTo(getcwd());
     $zip->close();
     chdir("phpunit-$PHPUNIT_VERSION");
-    $SYMFONY_PHPUNIT_REMOVE = getenv('SYMFONY_PHPUNIT_REMOVE');
-    passthru("$COMPOSER remove --no-update ".('' === $SYMFONY_PHPUNIT_REMOVE ?: 'phpspec/prophecy symfony/yaml'));
+    passthru("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
@@ -83,7 +86,7 @@ Symfony\Bridge\PhpUnit\TextUI\Command::main();
 EOPHP
     );
     chdir('..');
-    file_put_contents(".$PHPUNIT_VERSION.md5", md5_file(__FILE__)."\n".getenv('SYMFONY_PHPUNIT_REMOVE'));
+    file_put_contents(".$PHPUNIT_VERSION.md5", md5_file(__FILE__)."\n".$SYMFONY_PHPUNIT_REMOVE);
     chdir($oldPwd);
 
 }

From 90986f450251a02067cd263427c40d0e6ea7a46e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 09:00:01 +0200
Subject: [PATCH 0978/1099] fix merge

---
 .../Tests/Fixtures/php/services9_as_files.txt                  | 3 ---
 .../Tests/Fixtures/php/services_array_params.php               | 3 ---
 .../Tests/Fixtures/php/services_base64_env.php                 | 3 ---
 .../Tests/Fixtures/php/services_legacy_privates.php            | 3 ---
 .../Tests/Fixtures/php/services_rot13_env.php                  | 3 ---
 .../Tests/Fixtures/php/services_uninitialized_ref.php          | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index d6c0fc11eddff..4af0de98e4b26 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -279,9 +279,6 @@ class Container%s extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $dir = $this->targetDirs[0] = dirname(__DIR__);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index d848941013388..69a1297129bd9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -21,9 +21,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $dir = __DIR__;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 4f4c7e79df38b..4b143565f153d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -21,9 +21,6 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->parameters = $this->getDefaultParameters();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
index 611b0cf4acadd..25e7943ed49b0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -21,9 +21,6 @@ class Symfony_DI_PhpDumper_Test_Legacy_Privates extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $dir = __DIR__;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 2e08cdcb42f92..cc5235bba6a59 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -21,9 +21,6 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->parameters = $this->getDefaultParameters();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 4c26d58d70c28..f89b35c9eb1a0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -21,9 +21,6 @@ class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->services = array();

From ef4f532395a65c5b67855412c0fd0ccfc9b35261 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 09:17:52 +0200
Subject: [PATCH 0979/1099] fix merge

---
 .../DependencyInjection/Tests/Fixtures/php/services24.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 2f34ad9fb7fa9..f546d6736ca3b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -9,8 +9,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer.
- *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
  */

From 7fa94dc84608e0f5347547a00dd52dd4be7ef85e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 09:25:00 +0200
Subject: [PATCH 0980/1099] fix merge

---
 .../Component/Routing/Tests/Fixtures/dumper/url_matcher4.php    | 2 --
 .../Component/Routing/Tests/Fixtures/dumper/url_matcher5.php    | 2 --
 .../Component/Routing/Tests/Fixtures/dumper/url_matcher6.php    | 2 --
 .../Component/Routing/Tests/Fixtures/dumper/url_matcher7.php    | 2 --
 4 files changed, 8 deletions(-)

diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php
index 2dc9028325ca7..6aefd6938272c 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php
index c92de2fcc5ca5..1884df1c45e27 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php
index c85334cb4b769..bb9d80b55181b 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php
index b701742320fd0..404d462ed5415 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */

From f86b4c43a3dbd2c49bfc8814fcfec5e1067f4bb3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 09:56:07 +0200
Subject: [PATCH 0981/1099] fix tests

---
 ...application_renderexception_linebreaks.txt |  2 +-
 .../Filesystem/Tests/FilesystemTest.php       | 37 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
index e9a9518b4aead..88ee0f29ff748 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
@@ -1,6 +1,6 @@
 
+In ApplicationTest.php line 761:
                                     
-  [InvalidArgumentException]        
   line 1 with extra spaces          
   line 2                            
                                     
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 1954aef93a38b..0273a81b5d7c3 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1101,7 +1101,6 @@ public function providePathsForMakePathRelative()
             array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
             array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
             array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
-            array('usr/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
             array('/aa/bb', '/aa/bb', './'),
             array('/aa/bb', '/aa/bb/', './'),
@@ -1133,17 +1132,6 @@ public function providePathsForMakePathRelative()
             array('C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'),
             array('C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'),
             array('C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'),
-            array('aa/bb', 'aa/cc', '../bb/'),
-            array('aa/cc', 'bb/cc', '../../aa/cc/'),
-            array('aa/bb', 'aa/./cc', '../bb/'),
-            array('aa/./bb', 'aa/cc', '../bb/'),
-            array('aa/./bb', 'aa/./cc', '../bb/'),
-            array('../../', '../../', './'),
-            array('../aa/bb/', 'aa/bb/', '../../../aa/bb/'),
-            array('../../../', '../../', '../'),
-            array('', '', './'),
-            array('', 'aa/', '../'),
-            array('aa/', '', 'aa/'),
         );
 
         if ('\\' === DIRECTORY_SEPARATOR) {
@@ -1155,11 +1143,32 @@ public function providePathsForMakePathRelative()
 
     /**
      * @group legacy
+     * @dataProvider provideLegacyPathsForMakePathRelativeWithRelativePaths
      * @expectedDeprecation Support for passing relative paths to Symfony\Component\Filesystem\Filesystem::makePathRelative() is deprecated since version 3.4 and will be removed in 4.0.
      */
-    public function testMakePathRelativeWithRelativePaths()
+    public function testMakePathRelativeWithRelativePaths($endPath, $startPath, $expectedPath)
+    {
+        $path = $this->filesystem->makePathRelative($endPath, $startPath);
+
+        $this->assertEquals($expectedPath, $path);
+    }
+
+    public function provideLegacyPathsForMakePathRelativeWithRelativePaths()
     {
-        $this->assertSame('../../../', $this->filesystem->makePathRelative('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component'));
+        return array(
+            array('usr/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
+            array('aa/bb', 'aa/cc', '../bb/'),
+            array('aa/cc', 'bb/cc', '../../aa/cc/'),
+            array('aa/bb', 'aa/./cc', '../bb/'),
+            array('aa/./bb', 'aa/cc', '../bb/'),
+            array('aa/./bb', 'aa/./cc', '../bb/'),
+            array('../../', '../../', './'),
+            array('../aa/bb/', 'aa/bb/', '../../../aa/bb/'),
+            array('../../../', '../../', '../'),
+            array('', '', './'),
+            array('', 'aa/', '../'),
+            array('aa/', '', 'aa/'),
+        );
     }
 
     public function testMirrorCopiesFilesAndDirectoriesRecursively()

From 817f594f48c86f2357ffb41a544d0b5838277676 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 10:43:16 +0200
Subject: [PATCH 0982/1099] fix tests

---
 src/Symfony/Bridge/Doctrine/composer.json                 | 2 +-
 src/Symfony/Component/Filesystem/Tests/FilesystemTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index dc8e0d528f5db..e9dda5f59ae43 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/stopwatch": "~2.2",
         "symfony/dependency-injection": "~2.2",
-        "symfony/form": "~2.7.34|^2.8.27",
+        "symfony/form": "~2.7.35|^2.8.28",
         "symfony/http-kernel": "~2.2",
         "symfony/property-access": "~2.3",
         "symfony/security": "~2.2",
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index fb6c135f925b3..8daee9a9cbfbc 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -374,6 +374,9 @@ public function testFilesExists()
      */
     public function testFilesExistsFails()
     {
+        if ('\\' !== DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Long file names are an issue on Windows');
+        }
         $basePath = $this->workspace.'\\directory\\';
         $maxPathLength = PHP_MAXPATHLEN - 2;
 

From 7d85ff27bd421efc32caab0ed3cd6e48d9148de8 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 2 Oct 2017 10:49:00 +0200
Subject: [PATCH 0983/1099] fix merge

---
 .../Tests/Fixtures/application_renderexception_linebreaks.txt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
index 88ee0f29ff748..64bfe9a183c7a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 761:
+In ApplicationTest.php line 760:
                                     
   line 1 with extra spaces          
   line 2                            

From 1eee2a461c40f5de3788d7de832e9ebc05b7c7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Mon, 2 Oct 2017 11:08:26 +0200
Subject: [PATCH 0984/1099] [Process] Removed dead code in the start method

---
 src/Symfony/Component/Process/Process.php | 27 ++++++++---------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 6141c8b4753c6..5e1e369cffb7e 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -268,26 +268,21 @@ public function start(callable $callback = null, array $env = array())
             }
         }
 
-        if (null === $env) {
-            $env = $this->env;
-        } elseif ($this->env) {
+        if ($this->env) {
             $env += $this->env;
         }
 
         $envBackup = array();
-        if (null !== $env) {
-            foreach ($env as $k => $v) {
-                $envBackup[$k] = getenv($k);
-                putenv(false === $v || null === $v ? $k : "$k=$v");
-            }
-            $env = null;
+        foreach ($env as $k => $v) {
+            $envBackup[$k] = getenv($k);
+            putenv(false === $v || null === $v ? $k : "$k=$v");
         }
 
         $options = array('suppress_errors' => true);
 
         if ('\\' === DIRECTORY_SEPARATOR) {
             $options['bypass_shell'] = true;
-            $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup, $env);
+            $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup);
         } elseif (!$this->useFileHandles && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
             $descriptors[3] = array('pipe', 'w');
@@ -301,7 +296,7 @@ public function start(callable $callback = null, array $env = array())
             $ptsWorkaround = fopen(__FILE__, 'r');
         }
 
-        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $env, $options);
+        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, null, $options);
 
         foreach ($envBackup as $k => $v) {
             putenv(false === $v ? $k : "$k=$v");
@@ -1464,7 +1459,7 @@ private function doSignal($signal, $throwException)
         return true;
     }
 
-    private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env = null)
+    private function prepareWindowsCommandLine($cmd, array &$envBackup)
     {
         $uid = uniqid('', true);
         $varCount = 0;
@@ -1477,7 +1472,7 @@ private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env
                     [^"%!^]*+
                 )++
             ) | [^"]*+ )"/x',
-            function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
+            function ($m) use (&$envBackup, &$varCache, &$varCount, $uid) {
                 if (!isset($m[1])) {
                     return $m[0];
                 }
@@ -1495,11 +1490,7 @@ function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
                 $value = '"'.preg_replace('/(\\\\*)"/', '$1$1\\"', $value).'"';
                 $var = $uid.++$varCount;
 
-                if (null === $env) {
-                    putenv("$var=$value");
-                } else {
-                    $env[$var] = $value;
-                }
+                putenv("$var=$value");
 
                 $envBackup[$var] = false;
 

From f9aeee5e630cee960d4da6dec193943862b14dc3 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Mon, 2 Oct 2017 13:59:28 +0200
Subject: [PATCH 0985/1099] [DI] Fix missing CHANGELOG update + typo

---
 src/Symfony/Component/DependencyInjection/CHANGELOG.md          | 2 ++
 .../Compiler/DefinitionErrorExceptionPass.php                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 013da9ad4ec3f..a004161b963d9 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -14,6 +14,8 @@ CHANGELOG
  * deprecated case insensitivity of parameter names
  * deprecated the `ResolveDefinitionTemplatesPass` class in favor of `ResolveChildDefinitionsPass`
  * added `TaggedIteratorArgument` with YAML (`!tagged foo`) and XML (``) support
+ * deprecated `AutowireExceptionPass` and `AutowirePass::getAutowiringExceptions()`, use `Definition::addError()` and the `DefinitionErrorExceptionPass` instead
+
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
index 69cd899f2a5d4..73b5d1d57d582 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
@@ -30,7 +30,7 @@ protected function processValue($value, $isRoot = false)
             return parent::processValue($value, $isRoot);
         }
 
-        // only show the first error so they user can focus on it
+        // only show the first error so the user can focus on it
         $errors = $value->getErrors();
         $message = reset($errors);
 

From 5b07ca7f2fa7e5db90161e6623f23ad960424361 Mon Sep 17 00:00:00 2001
From: apetitpa 
Date: Tue, 9 May 2017 15:39:49 +0200
Subject: [PATCH 0986/1099] [Form] Add tel and color types

---
 .../views/Form/form_div_layout.html.twig      | 10 ++++++
 .../views/Form/color_widget.html.php          |  1 +
 .../Resources/views/Form/tel_widget.html.php  |  1 +
 .../Form/Extension/Core/CoreExtension.php     |  2 ++
 .../Form/Extension/Core/Type/ColorType.php    | 33 +++++++++++++++++++
 .../Form/Extension/Core/Type/TelType.php      | 33 +++++++++++++++++++
 .../Tests/AbstractBootstrap3LayoutTest.php    | 30 +++++++++++++++++
 .../Form/Tests/AbstractLayoutTest.php         | 28 ++++++++++++++++
 .../Tests/Fixtures/Descriptor/defaults_1.json |  2 ++
 .../Tests/Fixtures/Descriptor/defaults_1.txt  | 12 +++----
 src/Symfony/Component/Form/composer.json      |  4 +--
 11 files changed, 148 insertions(+), 8 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
 create mode 100644 src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
 create mode 100644 src/Symfony/Component/Form/Extension/Core/Type/TelType.php

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 2a0dd466bbc81..52525c061ccba 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -239,6 +239,16 @@
     {{ block('button_widget') }}
 {%- endblock reset_widget -%}
 
+{%- block tel_widget -%}
+    {%- set type = type|default('tel') -%}
+    {{ block('form_widget_simple') }}
+{%- endblock tel_widget -%}
+
+{%- block color_widget -%}
+    {%- set type = type|default('color') -%}
+    {{ block('form_widget_simple') }}
+{%- endblock color_widget -%}
+
 {# Labels #}
 
 {%- block form_label -%}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
new file mode 100644
index 0000000000000..10a8cdf14930e
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
@@ -0,0 +1 @@
+block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'color'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
new file mode 100644
index 0000000000000..7779538127026
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
@@ -0,0 +1 @@
+block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'tel'));
diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
index 156d5568801a8..857792ad9f066 100644
--- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
@@ -77,6 +77,8 @@ protected function loadTypes()
             new Type\SubmitType(),
             new Type\ResetType(),
             new Type\CurrencyType(),
+            new Type\TelType(),
+            new Type\ColorType(),
         );
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
new file mode 100644
index 0000000000000..9c2734ead6f40
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
@@ -0,0 +1,33 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\Type;
+
+use Symfony\Component\Form\AbstractType;
+
+class ColorType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return TextType::class;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'color';
+    }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
new file mode 100644
index 0000000000000..de74a3ed3721d
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
@@ -0,0 +1,33 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\Type;
+
+use Symfony\Component\Form\AbstractType;
+
+class TelType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return TextType::class;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'tel';
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
index 09138b1da7dcd..6415d7f4a9096 100644
--- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -2468,4 +2468,34 @@ public function testButtonAttributeNameRepeatedIfTrue()
         // foo="foo"
         $this->assertSame('', $html);
     }
+
+    public function testTel()
+    {
+        $tel = '0102030405';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel);
+
+        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+            '/input
+    [@type="tel"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="0102030405"]
+'
+        );
+    }
+
+    public function testColor()
+    {
+        $color = '#0000ff';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color);
+
+        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+            '/input
+    [@type="color"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="#0000ff"]
+'
+        );
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index db6c64d54e3a4..98d2d48cbe360 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -2463,4 +2463,32 @@ public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()
         $this->assertMatchesXpath($html, '/form//input[@title="Foo"]');
         $this->assertMatchesXpath($html, '/form//input[@placeholder="Bar"]');
     }
+
+    public function testTel()
+    {
+        $tel = '0102030405';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel);
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+            '/input
+    [@type="tel"]
+    [@name="name"]
+    [@value="0102030405"]
+'
+        );
+    }
+
+    public function testColor()
+    {
+        $color = '#0000ff';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color);
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+            '/input
+    [@type="color"]
+    [@name="name"]
+    [@value="#0000ff"]
+'
+        );
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
index 565c17601ed1e..99858a2f997e8 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
@@ -5,6 +5,7 @@
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\CheckboxType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\ChoiceType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\CollectionType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ColorType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\CountryType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\CurrencyType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateIntervalType",
@@ -27,6 +28,7 @@
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\SearchType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType",
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TelType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextareaType",
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimeType",
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
index dd08d5f7a64c3..52a579ac43e62 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
@@ -3,12 +3,12 @@
 [33m----------------------------------------------------------------[39m
 
  BirthdayType, ButtonType, CheckboxType, ChoiceType, CollectionType
- CountryType, CurrencyType, DateIntervalType, DateTimeType, DateType
- EmailType, FileType, FormType, HiddenType, IntegerType
- LanguageType, LocaleType, MoneyType, NumberType, PasswordType
- PercentType, RadioType, RangeType, RepeatedType, ResetType
- SearchType, SubmitType, TextType, TextareaType, TimeType
- TimezoneType, UrlType
+ ColorType, CountryType, CurrencyType, DateIntervalType, DateTimeType
+ DateType, EmailType, FileType, FormType, HiddenType
+ IntegerType, LanguageType, LocaleType, MoneyType, NumberType
+ PasswordType, PercentType, RadioType, RangeType, RepeatedType
+ ResetType, SearchType, SubmitType, TelType, TextType
+ TextareaType, TimeType, TimezoneType, UrlType
 
 [33mService form types[39m
 [33m------------------[39m
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 77fc3e565ffa7..4106c65890aa2 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -39,9 +39,9 @@
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/dependency-injection": "<3.3",
         "symfony/doctrine-bridge": "<2.7",
-        "symfony/framework-bundle": "<2.7",
+        "symfony/framework-bundle": "<3.4",
         "symfony/http-kernel": "<3.3.5",
-        "symfony/twig-bridge": "<2.7"
+        "symfony/twig-bridge": "<3.4"
     },
     "suggest": {
         "symfony/validator": "For form validation.",

From 2ada55878a6dfcbd609d08c89d29b8f61ab1802b Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Mon, 2 Oct 2017 13:43:47 +0200
Subject: [PATCH 0987/1099] [DI] Remove AutowireExceptionPass

---
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../Compiler/AutowireExceptionPass.php        |  74 ---------
 .../Compiler/AutowirePass.php                 |  17 --
 .../Compiler/InlineServiceDefinitionsPass.php |  18 ---
 .../Compiler/AutowireExceptionPassTest.php    | 145 ------------------
 .../Tests/Compiler/AutowirePassTest.php       |  18 ---
 .../InlineServiceDefinitionsPassTest.php      |  27 ----
 7 files changed, 1 insertion(+), 299 deletions(-)
 delete mode 100644 src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
 delete mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 2c11feb0e082d..ca437e2cf6701 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -22,6 +22,7 @@ CHANGELOG
  * removed support for setting and accessing private services in `Container`
  * removed support for setting pre-defined services in `Container`
  * removed support for case insensitivity of parameter names
+ * removed `AutowireExceptionPass` and `AutowirePass::getAutowiringExceptions()`, use `Definition::addError()` and the `DefinitionErrorExceptionPass` instead
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
deleted file mode 100644
index f01617dd633c6..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection\Compiler;
-
-@trigger_error('The '.__NAMESPACE__.'\AutowireExceptionPass class is deprecated since version 3.4 and will be removed in 4.0. Use the DefinitionErrorExceptionPass class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Throws autowire exceptions from AutowirePass for definitions that still exist.
- *
- * @deprecated since version 3.4, will be removed in 4.0.
- *
- * @author Ryan Weaver 
- */
-class AutowireExceptionPass implements CompilerPassInterface
-{
-    private $autowirePass;
-    private $inlineServicePass;
-
-    public function __construct(AutowirePass $autowirePass, InlineServiceDefinitionsPass $inlineServicePass)
-    {
-        $this->autowirePass = $autowirePass;
-        $this->inlineServicePass = $inlineServicePass;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        // the pass should only be run once
-        if (null === $this->autowirePass || null === $this->inlineServicePass) {
-            return;
-        }
-
-        $inlinedIds = $this->inlineServicePass->getInlinedServiceIds();
-        $exceptions = $this->autowirePass->getAutowiringExceptions();
-
-        // free up references
-        $this->autowirePass = null;
-        $this->inlineServicePass = null;
-
-        foreach ($exceptions as $exception) {
-            if ($this->doesServiceExistInTheContainer($exception->getServiceId(), $container, $inlinedIds)) {
-                throw $exception;
-            }
-        }
-    }
-
-    private function doesServiceExistInTheContainer($serviceId, ContainerBuilder $container, array $inlinedIds)
-    {
-        if ($container->hasDefinition($serviceId)) {
-            return true;
-        }
-
-        // was the service inlined? Of so, does its parent service exist?
-        if (isset($inlinedIds[$serviceId])) {
-            foreach ($inlinedIds[$serviceId] as $parentId) {
-                if ($this->doesServiceExistInTheContainer($parentId, $container, $inlinedIds)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index dba3fa82ce1aa..1b099e0ac8885 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -31,7 +31,6 @@ class AutowirePass extends AbstractRecursivePass
     private $autowired = array();
     private $lastFailure;
     private $throwOnAutowiringException;
-    private $autowiringExceptions = array();
 
     /**
      * @param bool $throwOnAutowireException Errors can be retrieved via Definition::getErrors()
@@ -41,26 +40,11 @@ public function __construct($throwOnAutowireException = true)
         $this->throwOnAutowiringException = $throwOnAutowireException;
     }
 
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0.
-     *
-     * @return AutowiringFailedException[]
-     */
-    public function getAutowiringExceptions()
-    {
-        @trigger_error('Calling AutowirePass::getAutowiringExceptions() is deprecated since Symfony 3.4 and will be removed in 4.0. Use Definition::getErrors() instead.', E_USER_DEPRECATED);
-
-        return $this->autowiringExceptions;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
-        // clear out any possibly stored exceptions from before
-        $this->autowiringExceptions = array();
-
         try {
             parent::process($container);
         } finally {
@@ -82,7 +66,6 @@ protected function processValue($value, $isRoot = false)
                 throw $e;
             }
 
-            $this->autowiringExceptions[] = $e;
             $this->container->getDefinition($this->currentId)->addError($e->getMessage());
 
             return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 254ac3c00c6da..76f2e502170de 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -23,7 +23,6 @@
 class InlineServiceDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface
 {
     private $repeatedPass;
-    private $inlinedServiceIds = array();
 
     /**
      * {@inheritdoc}
@@ -33,22 +32,6 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
         $this->repeatedPass = $repeatedPass;
     }
 
-    /**
-     * Returns an array of all services inlined by this pass.
-     *
-     * The key is the inlined service id and its value is the list of services it was inlined into.
-     *
-     * @deprecated since version 3.4, to be removed in 4.0.
-     *
-     * @return array
-     */
-    public function getInlinedServiceIds()
-    {
-        @trigger_error('Calling InlineServiceDefinitionsPass::getInlinedServiceIds() is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-        return $this->inlinedServiceIds;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -63,7 +46,6 @@ protected function processValue($value, $isRoot = false)
 
             if ($this->isInlineableDefinition($id, $definition, $this->container->getCompiler()->getServiceReferenceGraph())) {
                 $this->container->log($this, sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));
-                $this->inlinedServiceIds[$id][] = $this->currentId;
 
                 if ($definition->isShared()) {
                     return $definition;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
deleted file mode 100644
index a9c3445cefdd8..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
+++ /dev/null
@@ -1,145 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection\Tests\Compiler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\Compiler\AutowireExceptionPass;
-use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
-use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
-
-/**
- * @group legacy
- */
-class AutowireExceptionPassTest extends TestCase
-{
-    public function testThrowsException()
-    {
-        $autowirePass = $this->getMockBuilder(AutowirePass::class)
-            ->getMock();
-
-        $autowireException = new AutowiringFailedException('foo_service_id', 'An autowiring exception message');
-        $autowirePass->expects($this->any())
-            ->method('getAutowiringExceptions')
-            ->will($this->returnValue(array($autowireException)));
-
-        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
-            ->getMock();
-        $inlinePass->expects($this->any())
-            ->method('getInlinedServiceIds')
-            ->will($this->returnValue(array()));
-
-        $container = new ContainerBuilder();
-        $container->register('foo_service_id');
-
-        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
-
-        try {
-            $pass->process($container);
-            $this->fail('->process() should throw the exception if the service id exists');
-        } catch (\Exception $e) {
-            $this->assertSame($autowireException, $e);
-        }
-    }
-
-    public function testThrowExceptionIfServiceInlined()
-    {
-        $autowirePass = $this->getMockBuilder(AutowirePass::class)
-            ->getMock();
-
-        $autowireException = new AutowiringFailedException('a_service', 'An autowiring exception message');
-        $autowirePass->expects($this->any())
-            ->method('getAutowiringExceptions')
-            ->will($this->returnValue(array($autowireException)));
-
-        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
-            ->getMock();
-        $inlinePass->expects($this->any())
-            ->method('getInlinedServiceIds')
-            ->will($this->returnValue(array(
-                // a_service inlined into b_service
-                'a_service' => array('b_service'),
-                // b_service inlined into c_service
-                'b_service' => array('c_service'),
-            )));
-
-        $container = new ContainerBuilder();
-        // ONLY register c_service in the final container
-        $container->register('c_service', 'stdClass');
-
-        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
-
-        try {
-            $pass->process($container);
-            $this->fail('->process() should throw the exception if the service id exists');
-        } catch (\Exception $e) {
-            $this->assertSame($autowireException, $e);
-        }
-    }
-
-    public function testDoNotThrowExceptionIfServiceInlinedButRemoved()
-    {
-        $autowirePass = $this->getMockBuilder(AutowirePass::class)
-            ->getMock();
-
-        $autowireException = new AutowiringFailedException('a_service', 'An autowiring exception message');
-        $autowirePass->expects($this->any())
-            ->method('getAutowiringExceptions')
-            ->will($this->returnValue(array($autowireException)));
-
-        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
-            ->getMock();
-        $inlinePass->expects($this->any())
-            ->method('getInlinedServiceIds')
-            ->will($this->returnValue(array(
-                // a_service inlined into b_service
-                'a_service' => array('b_service'),
-                // b_service inlined into c_service
-                'b_service' => array('c_service'),
-            )));
-
-        // do NOT register c_service in the container
-        $container = new ContainerBuilder();
-
-        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
-
-        $pass->process($container);
-        // mark the test as passed
-        $this->assertTrue(true);
-    }
-
-    public function testNoExceptionIfServiceRemoved()
-    {
-        $autowirePass = $this->getMockBuilder(AutowirePass::class)
-            ->getMock();
-
-        $autowireException = new AutowiringFailedException('non_existent_service');
-        $autowirePass->expects($this->any())
-            ->method('getAutowiringExceptions')
-            ->will($this->returnValue(array($autowireException)));
-
-        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
-            ->getMock();
-        $inlinePass->expects($this->any())
-            ->method('getInlinedServiceIds')
-            ->will($this->returnValue(array()));
-
-        $container = new ContainerBuilder();
-
-        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
-
-        $pass->process($container);
-        // mark the test as passed
-        $this->assertTrue(true);
-    }
-}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index b8cd5216fe9d4..c47d813220973 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -131,24 +131,6 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
         $this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testExceptionsAreStored()
-    {
-        $container = new ContainerBuilder();
-
-        $container->register('c1', __NAMESPACE__.'\CollisionA');
-        $container->register('c2', __NAMESPACE__.'\CollisionB');
-        $container->register('c3', __NAMESPACE__.'\CollisionB');
-        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
-        $aDefinition->setAutowired(true);
-
-        $pass = new AutowirePass(false);
-        $pass->process($container);
-        $this->assertCount(1, $pass->getAutowiringExceptions());
-    }
-
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
      * @expectedExceptionMessage Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
index 6154080c8bc0e..3e1cf8a8c2b10 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -252,33 +252,6 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
         $this->assertSame('inline', (string) $values[0]);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testGetInlinedServiceIdData()
-    {
-        $container = new ContainerBuilder();
-        $container
-            ->register('inlinable.service')
-            ->setPublic(false)
-        ;
-        $container
-            ->register('non_inlinable.service')
-            ->setPublic(true)
-        ;
-
-        $container
-            ->register('other_service')
-            ->setArguments(array(new Reference('inlinable.service')))
-        ;
-
-        $inlinePass = new InlineServiceDefinitionsPass();
-        $repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), $inlinePass));
-        $repeatedPass->process($container);
-
-        $this->assertEquals(array('inlinable.service' => array('other_service')), $inlinePass->getInlinedServiceIds());
-    }
-
     protected function process(ContainerBuilder $container)
     {
         $repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));

From e097ab3141413158d66db4c12a7e5596fa68a93c Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Mon, 2 Oct 2017 11:39:30 -0400
Subject: [PATCH 0988/1099] Show welcome message if no routing configuration
 could be found

---
 .../Resources/config/routing.xml              |  2 +
 .../EventListener/RouterListener.php          | 30 ++++++-
 .../HttpKernel/Resources/welcome.html.php     | 84 +++++++++++++++++++
 .../EventListener/RouterListenerTest.php      | 23 +++++
 .../Component/HttpKernel/composer.json        |  2 +-
 src/Symfony/Component/Routing/CHANGELOG.md    |  1 +
 .../Exception/NoConfigurationException.php    | 21 +++++
 .../Matcher/Dumper/PhpMatcherDumper.php       |  6 ++
 .../Matcher/RequestMatcherInterface.php       |  2 +
 .../Component/Routing/Matcher/UrlMatcher.php  |  6 ++
 .../Routing/Matcher/UrlMatcherInterface.php   |  2 +
 .../Tests/Fixtures/dumper/url_matcher0.php    | 39 +++++++++
 .../Matcher/Dumper/PhpMatcherDumperTest.php   |  1 +
 .../Routing/Tests/Matcher/UrlMatcherTest.php  | 11 +++
 14 files changed, 228 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Resources/welcome.html.php
 create mode 100644 src/Symfony/Component/Routing/Exception/NoConfigurationException.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher0.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 6856512e20349..d92cb1164ac90 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -109,6 +109,8 @@
             
             
             
+            %kernel.project_dir%
+            %kernel.debug%
         
     
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index 16f31a2d947a7..a8f7dd7e7ed97 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -12,13 +12,16 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
@@ -31,6 +34,7 @@
  * Initializes the context from the request and sets request attributes based on a matching route.
  *
  * @author Fabien Potencier 
+ * @author Yonel Ceruto 
  */
 class RouterListener implements EventSubscriberInterface
 {
@@ -38,16 +42,20 @@ class RouterListener implements EventSubscriberInterface
     private $context;
     private $logger;
     private $requestStack;
+    private $projectDir;
+    private $debug;
 
     /**
      * @param UrlMatcherInterface|RequestMatcherInterface $matcher      The Url or Request matcher
      * @param RequestStack                                $requestStack A RequestStack instance
      * @param RequestContext|null                         $context      The RequestContext (can be null when $matcher implements RequestContextAwareInterface)
      * @param LoggerInterface|null                        $logger       The logger
+     * @param string                                      $projectDir
+     * @param bool                                        $debug
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null)
+    public function __construct($matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null, $projectDir = null, $debug = true)
     {
         if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) {
             throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
@@ -61,6 +69,8 @@ public function __construct($matcher, RequestStack $requestStack, RequestContext
         $this->context = $context ?: $matcher->getContext();
         $this->requestStack = $requestStack;
         $this->logger = $logger;
+        $this->projectDir = $projectDir;
+        $this->debug = $debug;
     }
 
     private function setCurrentRequest(Request $request = null)
@@ -114,6 +124,12 @@ public function onKernelRequest(GetResponseEvent $event)
             unset($parameters['_route'], $parameters['_controller']);
             $request->attributes->set('_route_params', $parameters);
         } catch (ResourceNotFoundException $e) {
+            if ($this->debug && $e instanceof NoConfigurationException) {
+                $event->setResponse($this->createWelcomeResponse());
+
+                return;
+            }
+
             $message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getPathInfo());
 
             if ($referer = $request->headers->get('referer')) {
@@ -135,4 +151,16 @@ public static function getSubscribedEvents()
             KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
         );
     }
+
+    private function createWelcomeResponse()
+    {
+        $version = Kernel::VERSION;
+        $baseDir = realpath($this->projectDir).DIRECTORY_SEPARATOR;
+        $docVersion = substr(Kernel::VERSION, 0, 3);
+
+        ob_start();
+        include __DIR__.'/../Resources/welcome.html.php';
+
+        return new Response(ob_get_clean(), Response::HTTP_NOT_FOUND);
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Resources/welcome.html.php b/src/Symfony/Component/HttpKernel/Resources/welcome.html.php
new file mode 100644
index 0000000000000..d8c37beb56ae2
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Resources/welcome.html.php
@@ -0,0 +1,84 @@
+
+
+
+    
+    Welcome!
+    
+
+
+
+    
+        
+            Welcome to Symfony 
+        
+
+        
+            
+                
+
+                Your application is now ready. You can start working on it at:

+                
+            
+        
+
+        
+            What's next?
+            
+                
+
+                Read the documentation to learn
+                
+                    How to create your first page in Symfony
+                
+            
+        
+    
+    
+        
+            You're seeing this message because you have debug mode enabled and you haven't configured any URLs.
+        
+    
+
+
+
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index a40e57998dee2..8ef2dc29f7a25 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -24,6 +24,7 @@
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\RequestContext;
 
 class RouterListenerTest extends TestCase
@@ -185,4 +186,26 @@ public function testWithBadRequest()
         $response = $kernel->handle($request);
         $this->assertSame(400, $response->getStatusCode());
     }
+
+    public function testNoRoutingConfigurationResponse()
+    {
+        $requestStack = new RequestStack();
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher
+            ->expects($this->once())
+            ->method('matchRequest')
+            ->willThrowException(new NoConfigurationException())
+        ;
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber(new RouterListener($requestMatcher, $requestStack, new RequestContext()));
+
+        $kernel = new HttpKernel($dispatcher, new ControllerResolver(), $requestStack, new ArgumentResolver());
+
+        $request = Request::create('http://localhost/');
+        $response = $kernel->handle($request);
+        $this->assertSame(404, $response->getStatusCode());
+        $this->assertContains('Welcome', $response->getContent());
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index a372edb588601..888cd3f23852d 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -33,7 +33,7 @@
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/process": "~2.8|~3.0|~4.0",
-        "symfony/routing": "~2.8|~3.0|~4.0",
+        "symfony/routing": "~3.4|~4.0",
         "symfony/stopwatch": "~2.8|~3.0|~4.0",
         "symfony/templating": "~2.8|~3.0|~4.0",
         "symfony/translation": "~2.8|~3.0|~4.0",
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
index 3785709d42425..e278f8b1e5936 100644
--- a/src/Symfony/Component/Routing/CHANGELOG.md
+++ b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Added `NoConfigurationException`.
  * Added the possibility to define a prefix for all routes of a controller via @Route(name="prefix_")
  * Added support for prioritized routing loaders.
  * Add matched and default parameters to redirect responses
diff --git a/src/Symfony/Component/Routing/Exception/NoConfigurationException.php b/src/Symfony/Component/Routing/Exception/NoConfigurationException.php
new file mode 100644
index 0000000000000..333bc74331460
--- /dev/null
+++ b/src/Symfony/Component/Routing/Exception/NoConfigurationException.php
@@ -0,0 +1,21 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Exception;
+
+/**
+ * Exception thrown when no routes are configured.
+ *
+ * @author Yonel Ceruto 
+ */
+class NoConfigurationException extends ResourceNotFoundException
+{
+}
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index 589e4f75390aa..aaa352d22c069 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -155,6 +155,12 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
             }
         }
 
+        if ('' === $code) {
+            $code .= "        if ('/' === \$pathinfo) {\n";
+            $code .= "            throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n";
+            $code .= "        }\n";
+        }
+
         return $code;
     }
 
diff --git a/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php
index b5def3d468ab3..097929555d7e5 100644
--- a/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php
+++ b/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Matcher;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
@@ -32,6 +33,7 @@ interface RequestMatcherInterface
      *
      * @return array An array of parameters
      *
+     * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If no matching resource could be found
      * @throws MethodNotAllowedException If a matching resource was found but the request method is not allowed
      */
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 12c15c68917ae..abd04c4208edf 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Matcher;
 
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
@@ -91,6 +92,10 @@ public function match($pathinfo)
             return $ret;
         }
 
+        if (0 === count($this->routes) && '/' === $pathinfo) {
+            throw new NoConfigurationException();
+        }
+
         throw 0 < count($this->allow)
             ? new MethodNotAllowedException(array_unique($this->allow))
             : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
@@ -123,6 +128,7 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
      *
      * @return array An array of parameters
      *
+     * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
      */
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php
index af38662fea930..2c7c3135bc66f 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
+use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\RequestContextAwareInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
@@ -32,6 +33,7 @@ interface UrlMatcherInterface extends RequestContextAwareInterface
      *
      * @return array An array of parameters
      *
+     * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
      */
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher0.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher0.php
new file mode 100644
index 0000000000000..0fa8ea45e0a15
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher0.php
@@ -0,0 +1,39 @@
+context = $context;
+    }
+
+    public function match($pathinfo)
+    {
+        $allow = array();
+        $pathinfo = rawurldecode($pathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+        $scheme = $context->getScheme();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+
+        if ('/' === $pathinfo) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
index 4fb65f4a11a47..8b32e0cd3d194 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -374,6 +374,7 @@ public function getRouteCollections()
         $trailingSlashCollection->add('regex_not_trailing_slash_POST_method', new Route('/not-trailing/regex/post-method/{param}', array(), array(), array(), '', array(), array('POST')));
 
         return array(
+           array(new RouteCollection(), 'url_matcher0.php', array()),
            array($collection, 'url_matcher1.php', array()),
            array($redirectCollection, 'url_matcher2.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
            array($rootprefixCollection, 'url_matcher3.php', array()),
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
index 1eeb5d4360cde..8545c2c29d83d 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -427,4 +427,15 @@ public function testHostIsCaseInsensitive()
         $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
         $this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/'));
     }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\NoConfigurationException
+     */
+    public function testNoConfiguration()
+    {
+        $coll = new RouteCollection();
+
+        $matcher = new UrlMatcher($coll, new RequestContext());
+        $matcher->match('/');
+    }
 }

From bbc52a1d14358500b39073ba7cb46ed95fbc5810 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 3 Oct 2017 11:44:07 +0200
Subject: [PATCH 0989/1099] [FrameworkBundle] Make Controller helpers final

---
 .../FrameworkBundle/Controller/Controller.php | 24 -------
 .../Controller/ControllerTrait.php            | 66 +++++++++++++++++++
 2 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index 870965201e397..11161d46ebd17 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -26,30 +26,6 @@ abstract class Controller implements ContainerAwareInterface
     use ContainerAwareTrait;
     use ControllerTrait;
 
-    /**
-     * Returns true if the service id is defined.
-     *
-     * @param string $id The service id
-     *
-     * @return bool true if the service id is defined, false otherwise
-     */
-    protected function has($id)
-    {
-        return $this->container->has($id);
-    }
-
-    /**
-     * Gets a container service by its id.
-     *
-     * @param string $id The service id
-     *
-     * @return object The service
-     */
-    protected function get($id)
-    {
-        return $this->container->get($id);
-    }
-
     /**
      * Gets a container configuration parameter by its name.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
index 77a02883083b7..593c02f14522d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -39,6 +39,34 @@
  */
 trait ControllerTrait
 {
+    /**
+     * Returns true if the service id is defined.
+     *
+     * @param string $id The service id
+     *
+     * @return bool true if the service id is defined, false otherwise
+     *
+     * @final since version 3.4
+     */
+    protected function has($id)
+    {
+        return $this->container->has($id);
+    }
+
+    /**
+     * Gets a container service by its id.
+     *
+     * @param string $id The service id
+     *
+     * @return object The service
+     *
+     * @final since version 3.4
+     */
+    protected function get($id)
+    {
+        return $this->container->get($id);
+    }
+
     /**
      * Generates a URL from the given parameters.
      *
@@ -49,6 +77,8 @@ trait ControllerTrait
      * @return string The generated URL
      *
      * @see UrlGeneratorInterface
+     *
+     * @final since version 3.4
      */
     protected function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
@@ -63,6 +93,8 @@ protected function generateUrl($route, $parameters = array(), $referenceType = U
      * @param array  $query      An array of query parameters
      *
      * @return Response A Response instance
+     *
+     * @final since version 3.4
      */
     protected function forward($controller, array $path = array(), array $query = array())
     {
@@ -81,6 +113,8 @@ protected function forward($controller, array $path = array(), array $query = ar
      * @param int    $status The status code to use for the Response
      *
      * @return RedirectResponse
+     *
+     * @final since version 3.4
      */
     protected function redirect($url, $status = 302)
     {
@@ -95,6 +129,8 @@ protected function redirect($url, $status = 302)
      * @param int    $status     The status code to use for the Response
      *
      * @return RedirectResponse
+     *
+     * @final since version 3.4
      */
     protected function redirectToRoute($route, array $parameters = array(), $status = 302)
     {
@@ -110,6 +146,8 @@ protected function redirectToRoute($route, array $parameters = array(), $status
      * @param array $context Context to pass to serializer when using serializer component
      *
      * @return JsonResponse
+     *
+     * @final since version 3.4
      */
     protected function json($data, $status = 200, $headers = array(), $context = array())
     {
@@ -132,6 +170,8 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
      * @param string              $disposition Disposition of response ("attachment" is default, other type is "inline")
      *
      * @return BinaryFileResponse
+     *
+     * @final since version 3.4
      */
     protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
     {
@@ -148,6 +188,8 @@ protected function file($file, $fileName = null, $disposition = ResponseHeaderBa
      * @param string $message The message
      *
      * @throws \LogicException
+     *
+     * @final since version 3.4
      */
     protected function addFlash($type, $message)
     {
@@ -167,6 +209,8 @@ protected function addFlash($type, $message)
      * @return bool
      *
      * @throws \LogicException
+     *
+     * @final since version 3.4
      */
     protected function isGranted($attributes, $subject = null)
     {
@@ -186,6 +230,8 @@ protected function isGranted($attributes, $subject = null)
      * @param string $message    The message passed to the exception
      *
      * @throws AccessDeniedException
+     *
+     * @final since version 3.4
      */
     protected function denyAccessUnlessGranted($attributes, $subject = null, $message = 'Access Denied.')
     {
@@ -205,6 +251,8 @@ protected function denyAccessUnlessGranted($attributes, $subject = null, $messag
      * @param array  $parameters An array of parameters to pass to the view
      *
      * @return string The rendered view
+     *
+     * @final since version 3.4
      */
     protected function renderView($view, array $parameters = array())
     {
@@ -227,6 +275,8 @@ protected function renderView($view, array $parameters = array())
      * @param Response $response   A response instance
      *
      * @return Response A Response instance
+     *
+     * @final since version 3.4
      */
     protected function render($view, array $parameters = array(), Response $response = null)
     {
@@ -255,6 +305,8 @@ protected function render($view, array $parameters = array(), Response $response
      * @param StreamedResponse $response   A response instance
      *
      * @return StreamedResponse A StreamedResponse instance
+     *
+     * @final since version 3.4
      */
     protected function stream($view, array $parameters = array(), StreamedResponse $response = null)
     {
@@ -294,6 +346,8 @@ protected function stream($view, array $parameters = array(), StreamedResponse $
      * @param \Exception|null $previous The previous exception
      *
      * @return NotFoundHttpException
+     *
+     * @final since version 3.4
      */
     protected function createNotFoundException($message = 'Not Found', \Exception $previous = null)
     {
@@ -311,6 +365,8 @@ protected function createNotFoundException($message = 'Not Found', \Exception $p
      * @param \Exception|null $previous The previous exception
      *
      * @return AccessDeniedException
+     *
+     * @final since version 3.4
      */
     protected function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)
     {
@@ -325,6 +381,8 @@ protected function createAccessDeniedException($message = 'Access Denied.', \Exc
      * @param array  $options Options for the form
      *
      * @return Form
+     *
+     * @final since version 3.4
      */
     protected function createForm($type, $data = null, array $options = array())
     {
@@ -338,6 +396,8 @@ protected function createForm($type, $data = null, array $options = array())
      * @param array $options Options for the form
      *
      * @return FormBuilder
+     *
+     * @final since version 3.4
      */
     protected function createFormBuilder($data = null, array $options = array())
     {
@@ -350,6 +410,8 @@ protected function createFormBuilder($data = null, array $options = array())
      * @return Registry
      *
      * @throws \LogicException If DoctrineBundle is not available
+     *
+     * @final since version 3.4
      */
     protected function getDoctrine()
     {
@@ -368,6 +430,8 @@ protected function getDoctrine()
      * @throws \LogicException If SecurityBundle is not available
      *
      * @see TokenInterface::getUser()
+     *
+     * @final since version 3.4
      */
     protected function getUser()
     {
@@ -394,6 +458,8 @@ protected function getUser()
      * @param string $token The actual token sent with the request that should be validated
      *
      * @return bool
+     *
+     * @final since version 3.4
      */
     protected function isCsrfTokenValid($id, $token)
     {

From 8bbb5e788417c4dca8e88d79688b6ab2e959d4cc Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Thu, 14 Sep 2017 15:14:31 -0400
Subject: [PATCH 0990/1099] Add debug:form type option

---
 .../Component/Form/Command/DebugCommand.php   | 85 ++++++++++++++++++-
 .../Form/Console/Descriptor/Descriptor.php    | 47 +++++-----
 .../Console/Descriptor/JsonDescriptor.php     | 31 ++++++-
 .../Console/Descriptor/TextDescriptor.php     | 60 +++++++++++--
 .../Form/Tests/Command/DebugCommandTest.php   | 11 ++-
 .../Descriptor/AbstractDescriptorTest.php     | 74 ++++++++++++++--
 .../default_option_with_normalizer.json       | 11 +++
 .../default_option_with_normalizer.txt        | 24 ++++++
 .../Tests/Fixtures/Descriptor/defaults_1.json | 35 +-------
 .../Tests/Fixtures/Descriptor/defaults_1.txt  | 24 ++----
 ...erridden_option_with_default_closures.json |  6 ++
 ...verridden_option_with_default_closures.txt | 29 +++++++
 .../required_option_with_allowed_values.json  | 11 +++
 .../required_option_with_allowed_values.txt   | 25 ++++++
 .../Descriptor/resolved_form_type_1.txt       | 16 ++--
 15 files changed, 391 insertions(+), 98 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.json
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.json
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.json
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt

diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index d8e1f5a0789b0..68f3bc96f100d 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -19,7 +19,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Form\Console\Helper\DescriptorHelper;
+use Symfony\Component\Form\Extension\Core\CoreExtension;
 use Symfony\Component\Form\FormRegistryInterface;
+use Symfony\Component\Form\FormTypeInterface;
 
 /**
  * A console command for retrieving information about form types.
@@ -55,6 +57,7 @@ protected function configure()
         $this
             ->setDefinition(array(
                 new InputArgument('class', InputArgument::OPTIONAL, 'The form type class'),
+                new InputArgument('option', InputArgument::OPTIONAL, 'The form type option'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt or json)', 'txt'),
             ))
             ->setDescription('Displays form type information')
@@ -70,6 +73,10 @@ protected function configure()
 
 The command lists all defined options that contains the given form type, as well as their parents and type extensions.
 
+  php %command.full_name% ChoiceType choice_value
+
+The command displays the definition of the given option name.
+
   php %command.full_name% --format=json
 
 The command lists everything in a machine readable json format.
@@ -87,14 +94,42 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (null === $class = $input->getArgument('class')) {
             $object = null;
-            $options['types'] = $this->types;
+            $options['core_types'] = $this->getCoreTypes();
+            $options['service_types'] = array_values(array_diff($this->types, $options['core_types']));
             $options['extensions'] = $this->extensions;
             $options['guessers'] = $this->guessers;
+            foreach ($options as $k => $list) {
+                sort($options[$k]);
+            }
         } else {
             if (!class_exists($class)) {
                 $class = $this->getFqcnTypeClass($input, $io, $class);
             }
-            $object = $this->formRegistry->getType($class);
+            $resolvedType = $this->formRegistry->getType($class);
+
+            if ($option = $input->getArgument('option')) {
+                $object = $resolvedType->getOptionsResolver();
+
+                if (!$object->isDefined($option)) {
+                    $message = sprintf('Option "%s" is not defined in "%s".', $option, get_class($resolvedType->getInnerType()));
+
+                    if ($alternatives = $this->findAlternatives($option, $object->getDefinedOptions())) {
+                        if (1 == count($alternatives)) {
+                            $message .= "\n\nDid you mean this?\n    ";
+                        } else {
+                            $message .= "\n\nDid you mean one of these?\n    ";
+                        }
+                        $message .= implode("\n    ", $alternatives);
+                    }
+
+                    throw new InvalidArgumentException($message);
+                }
+
+                $options['type'] = $resolvedType->getInnerType();
+                $options['option'] = $option;
+            } else {
+                $object = $resolvedType;
+            }
         }
 
         $helper = new DescriptorHelper();
@@ -105,6 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shortClassName)
     {
         $classes = array();
+        sort($this->namespaces);
         foreach ($this->namespaces as $namespace) {
             if (class_exists($fqcn = $namespace.'\\'.$shortClassName)) {
                 $classes[] = $fqcn;
@@ -112,7 +148,19 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shor
         }
 
         if (0 === $count = count($classes)) {
-            throw new InvalidArgumentException(sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces)));
+            $message = sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces));
+
+            $allTypes = array_merge($this->getCoreTypes(), $this->types);
+            if ($alternatives = $this->findAlternatives($shortClassName, $allTypes)) {
+                if (1 == count($alternatives)) {
+                    $message .= "\n\nDid you mean this?\n    ";
+                } else {
+                    $message .= "\n\nDid you mean one of these?\n    ";
+                }
+                $message .= implode("\n    ", $alternatives);
+            }
+
+            throw new InvalidArgumentException($message);
         }
         if (1 === $count) {
             return $classes[0];
@@ -121,6 +169,35 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shor
             throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\n\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
         }
 
-        return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\n Select one of the following form types to display its information:", $shortClassName), $classes, $classes[0]);
+        return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\nSelect one of the following form types to display its information:", $shortClassName), $classes, $classes[0]);
+    }
+
+    private function getCoreTypes()
+    {
+        $coreExtension = new CoreExtension();
+        $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
+        $loadTypesRefMethod->setAccessible(true);
+        $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
+        $coreTypes = array_map(function (FormTypeInterface $type) { return get_class($type); }, $coreTypes);
+        sort($coreTypes);
+
+        return $coreTypes;
+    }
+
+    private function findAlternatives($name, array $collection)
+    {
+        $alternatives = array();
+        foreach ($collection as $item) {
+            $lev = levenshtein($name, $item);
+            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
+                $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev;
+            }
+        }
+
+        $threshold = 1e3;
+        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
+        ksort($alternatives, SORT_NATURAL | SORT_FLAG_CASE);
+
+        return array_keys($alternatives);
     }
 }
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index c72a19d7993f1..f149becc66469 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -14,10 +14,8 @@
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\StyleInterface;
+use Symfony\Component\Console\Style\OutputStyle;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Form\Extension\Core\CoreExtension;
-use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
 use Symfony\Component\Form\Util\OptionsResolverWrapper;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -29,7 +27,7 @@
  */
 abstract class Descriptor implements DescriptorInterface
 {
-    /** @var StyleInterface */
+    /** @var OutputStyle */
     protected $output;
     protected $type;
     protected $ownOptions = array();
@@ -45,7 +43,7 @@ abstract class Descriptor implements DescriptorInterface
      */
     public function describe(OutputInterface $output, $object, array $options = array())
     {
-        $this->output = $output instanceof StyleInterface ? $output : new SymfonyStyle(new ArrayInput(array()), $output);
+        $this->output = $output instanceof OutputStyle ? $output : new SymfonyStyle(new ArrayInput(array()), $output);
 
         switch (true) {
             case null === $object:
@@ -54,28 +52,19 @@ public function describe(OutputInterface $output, $object, array $options = arra
             case $object instanceof ResolvedFormTypeInterface:
                 $this->describeResolvedFormType($object, $options);
                 break;
+            case $object instanceof OptionsResolver:
+                $this->describeOption($object, $options);
+                break;
             default:
                 throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
         }
     }
 
-    abstract protected function describeDefaults(array $options = array());
+    abstract protected function describeDefaults(array $options);
 
     abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = array());
 
-    protected function getCoreTypes()
-    {
-        $coreExtension = new CoreExtension();
-        $coreExtensionRefObject = new \ReflectionObject($coreExtension);
-        $loadTypesRefMethod = $coreExtensionRefObject->getMethod('loadTypes');
-        $loadTypesRefMethod->setAccessible(true);
-        $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
-
-        $coreTypes = array_map(function (FormTypeInterface $type) { return get_class($type); }, $coreTypes);
-        sort($coreTypes);
-
-        return $coreTypes;
-    }
+    abstract protected function describeOption(OptionsResolver $optionsResolver, array $options);
 
     protected function collectOptions(ResolvedFormTypeInterface $type)
     {
@@ -113,6 +102,26 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
         $this->extensions = array_keys($this->extensions);
     }
 
+    protected function getOptionDefinition(OptionsResolver $optionsResolver, $option)
+    {
+        $refObject = new \ReflectionObject($optionsResolver);
+        foreach (array('defaults', 'lazy', 'allowedTypes', 'allowedValues', 'normalizers') as $name) {
+            $property = $refObject->getProperty($name);
+            $property->setAccessible(true);
+            $value = $property->getValue($optionsResolver);
+            if (array_key_exists($option, $value)) {
+                $definition[$name] = $value[$option];
+            }
+        }
+        $definition['required'] = $optionsResolver->isRequired($option);
+
+        if (isset($definition['lazy']) && 1 === count($definition['lazy'])) {
+            $definition['lazy'] = $definition['lazy'][0];
+        }
+
+        return $definition;
+    }
+
     private function getParentOptionsResolver(ResolvedFormTypeInterface $type)
     {
         $this->parents[$class = get_class($type->getInnerType())] = array();
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index 7616d616f1441..de296e19b7906 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Console\Descriptor;
 
 use Symfony\Component\Form\ResolvedFormTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Yonel Ceruto 
@@ -20,10 +21,10 @@
  */
 class JsonDescriptor extends Descriptor
 {
-    protected function describeDefaults(array $options = array())
+    protected function describeDefaults(array $options)
     {
-        $data['builtin_form_types'] = $this->getCoreTypes();
-        $data['service_form_types'] = array_values(array_diff($options['types'], $data['builtin_form_types']));
+        $data['builtin_form_types'] = $options['core_types'];
+        $data['service_form_types'] = $options['service_types'];
         $data['type_extensions'] = $options['extensions'];
         $data['type_guessers'] = $options['guessers'];
 
@@ -54,6 +55,30 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
         $this->writeData($data, $options);
     }
 
+    protected function describeOption(OptionsResolver $optionsResolver, array $options)
+    {
+        $definition = $this->getOptionDefinition($optionsResolver, $options['option']);
+
+        $map = array(
+            'required' => 'required',
+            'default' => 'defaults',
+            'allowed_types' => 'allowedTypes',
+            'allowed_values' => 'allowedValues',
+        );
+        foreach ($map as $label => $name) {
+            if (array_key_exists($name, $definition)) {
+                $data[$label] = $definition[$name];
+
+                if ('defaults' === $name) {
+                    $data['is_lazy'] = isset($definition['lazy']);
+                }
+            }
+        }
+        $data['has_normalizer'] = isset($definition['normalizers']);
+
+        $this->writeData($data, $options);
+    }
+
     private function writeData(array $data, array $options)
     {
         $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index d5072f1e9a632..2b58d8ffb3c33 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -13,6 +13,10 @@
 
 use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
 
 /**
  * @author Yonel Ceruto 
@@ -21,18 +25,16 @@
  */
 class TextDescriptor extends Descriptor
 {
-    protected function describeDefaults(array $options = array())
+    protected function describeDefaults(array $options)
     {
-        $coreTypes = $this->getCoreTypes();
-
         $this->output->section('Built-in form types (Symfony\Component\Form\Extension\Core\Type)');
-        $shortClassNames = array_map(function ($fqcn) { return array_slice(explode('\\', $fqcn), -1)[0]; }, $coreTypes);
+        $shortClassNames = array_map(function ($fqcn) { return array_slice(explode('\\', $fqcn), -1)[0]; }, $options['core_types']);
         for ($i = 0; $i * 5 < count($shortClassNames); ++$i) {
             $this->output->writeln(' '.implode(', ', array_slice($shortClassNames, $i * 5, 5)));
         }
 
         $this->output->section('Service form types');
-        $this->output->listing(array_diff($options['types'], $coreTypes));
+        $this->output->listing($options['service_types']);
 
         $this->output->section('Type extensions');
         $this->output->listing($options['extensions']);
@@ -94,6 +96,34 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
         }
     }
 
+    protected function describeOption(OptionsResolver $optionsResolver, array $options)
+    {
+        $definition = $this->getOptionDefinition($optionsResolver, $options['option']);
+
+        $dump = $this->getDumpFunction();
+        $map = array(
+            'Required' => 'required',
+            'Default' => 'defaults',
+            'Allowed types' => 'allowedTypes',
+            'Allowed values' => 'allowedValues',
+            'Normalizer' => 'normalizers',
+        );
+        $rows = array();
+        foreach ($map as $label => $name) {
+            $value = array_key_exists($name, $definition) ? $dump($definition[$name]) : '-';
+            if ('defaults' === $name && isset($definition['lazy'])) {
+                $value = "Value: $value\n\nClosure(s): ".$dump($definition['lazy']);
+            }
+
+            $rows[] = array("$label", $value);
+            $rows[] = new TableSeparator();
+        }
+        array_pop($rows);
+
+        $this->output->title(sprintf('%s (%s)', get_class($options['type']), $options['option']));
+        $this->output->table(array(), $rows);
+    }
+
     private function normalizeAndSortOptionsColumns(array $options)
     {
         foreach ($options as $group => &$opts) {
@@ -125,4 +155,24 @@ private function normalizeAndSortOptionsColumns(array $options)
 
         return $options;
     }
+
+    private function getDumpFunction()
+    {
+        $cloner = new VarCloner();
+        $cloner->addCasters(array('Closure' => function ($c, $a) {
+            $prefix = Caster::PREFIX_VIRTUAL;
+
+            return array(
+                $prefix.'parameters' => isset($a[$prefix.'parameters']) ? count($a[$prefix.'parameters']->value) : 0,
+                $prefix.'file' => $a[$prefix.'file'],
+                $prefix.'line' => $a[$prefix.'line'],
+            );
+        }));
+        $dumper = new CliDumper(null, null, CliDumper::DUMP_LIGHT_ARRAY | CliDumper::DUMP_COMMA_SEPARATOR);
+        $dumper->setColors($this->output->isDecorated());
+
+        return function ($value) use ($dumper, $cloner) {
+            return rtrim($dumper->dump($cloner->cloneVar($value)->withRefHandles(false), true));
+        };
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index d24af0a4b1bc5..f69222c345edb 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -39,6 +39,15 @@ public function testDebugSingleFormType()
         $this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (Block prefix: "form")', $tester->getDisplay());
     }
 
+    public function testDebugFormTypeOption()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(array('class' => 'FormType', 'option' => 'method'), array('decorated' => false));
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (method)', $tester->getDisplay());
+    }
+
     /**
      * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
      * @expectedExceptionMessage Could not find type "NonExistentType"
@@ -90,7 +99,7 @@ public function testDebugAmbiguousFormTypeInteractive()
 
  The type "AmbiguousType" is ambiguous.
 
- Select one of the following form types to display its information: [%A\A\AmbiguousType]:
+Select one of the following form types to display its information: [%A\A\AmbiguousType]:
   [0] %A\A\AmbiguousType
   [1] %A\B\AmbiguousType
 %A
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
index 3a5efcefeb684..8849266527d81 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -15,11 +15,15 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\ResolvedFormType;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Csrf\CsrfTokenManager;
 
 abstract class AbstractDescriptorTest extends TestCase
@@ -27,8 +31,8 @@ abstract class AbstractDescriptorTest extends TestCase
     /** @dataProvider getDescribeDefaultsTestData */
     public function testDescribeDefaults($object, array $options, $fixtureName)
     {
-        $expectedDescription = $this->getExpectedDescription($fixtureName);
         $describedObject = $this->getObjectDescription($object, $options);
+        $expectedDescription = $this->getExpectedDescription($fixtureName);
 
         if ('json' === $this->getFormat()) {
             $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($describedObject), JSON_PRETTY_PRINT));
@@ -40,8 +44,8 @@ public function testDescribeDefaults($object, array $options, $fixtureName)
     /** @dataProvider getDescribeResolvedFormTypeTestData */
     public function testDescribeResolvedFormType(ResolvedFormTypeInterface $type, array $options, $fixtureName)
     {
-        $expectedDescription = $this->getExpectedDescription($fixtureName);
         $describedObject = $this->getObjectDescription($type, $options);
+        $expectedDescription = $this->getExpectedDescription($fixtureName);
 
         if ('json' === $this->getFormat()) {
             $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($describedObject), JSON_PRETTY_PRINT));
@@ -50,32 +54,64 @@ public function testDescribeResolvedFormType(ResolvedFormTypeInterface $type, ar
         }
     }
 
+    /** @dataProvider getDescribeOptionTestData */
+    public function testDescribeOption(OptionsResolver $optionsResolver, array $options, $fixtureName)
+    {
+        $describedObject = $this->getObjectDescription($optionsResolver, $options);
+        $expectedDescription = $this->getExpectedDescription($fixtureName);
+
+        if ('json' === $this->getFormat()) {
+            $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($describedObject), JSON_PRETTY_PRINT));
+        } else {
+            $this->assertStringMatchesFormat(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $describedObject)));
+        }
+    }
+
     public function getDescribeDefaultsTestData()
     {
-        $options['types'] = array('Symfony\Bridge\Doctrine\Form\Type\EntityType');
+        $options['core_types'] = array('Symfony\Component\Form\Extension\Core\Type\FormType');
+        $options['service_types'] = array('Symfony\Bridge\Doctrine\Form\Type\EntityType');
         $options['extensions'] = array('Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension');
         $options['guessers'] = array('Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser');
+        $options['decorated'] = false;
 
         yield array(null, $options, 'defaults_1');
     }
 
     public function getDescribeResolvedFormTypeTestData()
     {
-        $typeExtensions = array(
-            new FormTypeCsrfExtension(new CsrfTokenManager()),
-        );
+        $typeExtensions = array(new FormTypeCsrfExtension(new CsrfTokenManager()));
         $parent = new ResolvedFormType(new FormType(), $typeExtensions);
 
-        yield array(new ResolvedFormType(new ChoiceType(), array(), $parent), array(), 'resolved_form_type_1');
+        yield array(new ResolvedFormType(new ChoiceType(), array(), $parent), array('decorated' => false), 'resolved_form_type_1');
+    }
+
+    public function getDescribeOptionTestData()
+    {
+        $parent = new ResolvedFormType(new FormType());
+        $options['decorated'] = false;
+
+        $resolvedType = new ResolvedFormType(new ChoiceType(), array(), $parent);
+        $options['type'] = $resolvedType->getInnerType();
+        $options['option'] = 'choice_translation_domain';
+        yield array($resolvedType->getOptionsResolver(), $options, 'default_option_with_normalizer');
+
+        $resolvedType = new ResolvedFormType(new FooType(), array(), $parent);
+        $options['type'] = $resolvedType->getInnerType();
+        $options['option'] = 'foo';
+        yield array($resolvedType->getOptionsResolver(), $options, 'required_option_with_allowed_values');
+
+        $options['option'] = 'empty_data';
+        yield array($resolvedType->getOptionsResolver(), $options, 'overridden_option_with_default_closures');
     }
 
     abstract protected function getDescriptor();
 
     abstract protected function getFormat();
 
-    private function getObjectDescription($object, array $options = array())
+    private function getObjectDescription($object, array $options)
     {
-        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
+        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, $options['decorated']);
         $io = new SymfonyStyle(new ArrayInput(array()), $output);
 
         $this->getDescriptor()->describe($io, $object, $options);
@@ -93,3 +129,23 @@ private function getFixtureFilename($name)
         return sprintf('%s/../../Fixtures/Descriptor/%s.%s', __DIR__, $name, $this->getFormat());
     }
 }
+
+class FooType extends AbstractType
+{
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setRequired('foo');
+        $resolver->setDefault('empty_data', function (Options $options, $value) {
+            $foo = $options['foo'];
+
+            return function (FormInterface $form) use ($foo) {
+                return $form->getConfig()->getCompound() ? array($foo) : $foo;
+            };
+        });
+        $resolver->setAllowedTypes('foo', 'string');
+        $resolver->setAllowedValues('foo', array('bar', 'baz'));
+        $resolver->setNormalizer('foo', function (Options $options, $value) {
+            return (string) $value;
+        });
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.json
new file mode 100644
index 0000000000000..0ac903a954754
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.json
@@ -0,0 +1,11 @@
+{
+    "required": false,
+    "default": true,
+    "is_lazy": false,
+    "allowed_types": [
+        "null",
+        "bool",
+        "string"
+    ],
+    "has_normalizer": true
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
new file mode 100644
index 0000000000000..a579a90e53b58
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
@@ -0,0 +1,24 @@
+
+Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain)
+=================================================================================
+
+ ---------------- --------------------%s 
+  Required         false              %s 
+ ---------------- --------------------%s 
+  Default          true               %s 
+ ---------------- --------------------%s 
+  Allowed types    [                  %s 
+                     "null",          %s 
+                     "bool",          %s 
+                     "string"         %s 
+                   ]                  %s 
+ ---------------- --------------------%s 
+  Allowed values   -                  %s 
+ ---------------- --------------------%s 
+  Normalizer       Closure {          %s 
+                     parameters: 2,   %s 
+                     file: "%s%eExtension%eCore%eType%eChoiceType.php",  
+                     line: "%s to %s" %s 
+                   }                  %s 
+ ---------------- --------------------%s 
+
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
index 99858a2f997e8..7629e80431ebe 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json
@@ -1,39 +1,6 @@
 {
     "builtin_form_types": [
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\BirthdayType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CheckboxType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ChoiceType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CollectionType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ColorType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CountryType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\CurrencyType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateIntervalType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateTimeType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\EmailType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\FileType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\HiddenType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\IntegerType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\LanguageType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\LocaleType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\MoneyType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\NumberType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\PasswordType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\PercentType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RadioType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RangeType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\RepeatedType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\SearchType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TelType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextareaType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimeType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimezoneType",
-        "Symfony\\Component\\Form\\Extension\\Core\\Type\\UrlType"
+        "Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType"
     ],
     "service_form_types": [
         "Symfony\\Bridge\\Doctrine\\Form\\Type\\EntityType"
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
index 52a579ac43e62..9b3338ec7bd31 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt
@@ -1,27 +1,21 @@
 
-[33mBuilt-in form types (Symfony\Component\Form\Extension\Core\Type)[39m
-[33m----------------------------------------------------------------[39m
+Built-in form types (Symfony\Component\Form\Extension\Core\Type)
+----------------------------------------------------------------
 
- BirthdayType, ButtonType, CheckboxType, ChoiceType, CollectionType
- ColorType, CountryType, CurrencyType, DateIntervalType, DateTimeType
- DateType, EmailType, FileType, FormType, HiddenType
- IntegerType, LanguageType, LocaleType, MoneyType, NumberType
- PasswordType, PercentType, RadioType, RangeType, RepeatedType
- ResetType, SearchType, SubmitType, TelType, TextType
- TextareaType, TimeType, TimezoneType, UrlType
+ FormType
 
-[33mService form types[39m
-[33m------------------[39m
+Service form types
+------------------
 
  * Symfony\Bridge\Doctrine\Form\Type\EntityType
 
-[33mType extensions[39m
-[33m---------------[39m
+Type extensions
+---------------
 
  * Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension
 
-[33mType guessers[39m
-[33m-------------[39m
+Type guessers
+-------------
 
  * Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.json
new file mode 100644
index 0000000000000..c41e377acd3db
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.json
@@ -0,0 +1,6 @@
+{
+    "required": false,
+    "default": null,
+    "is_lazy": true,
+    "has_normalizer": false
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
new file mode 100644
index 0000000000000..662d982979bc4
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
@@ -0,0 +1,29 @@
+
+Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
+====================================================================
+
+ ---------------- ----------------------%s 
+  Required         false                %s 
+ ---------------- ----------------------%s 
+  Default          Value: null          %s 
+                                        %s 
+                   Closure(s): [        %s 
+                     Closure {          %s 
+                       parameters: 1,   %s 
+                       file: "%s%eExtension%eCore%eType%eFormType.php",                     
+                       line: "%s to %s" %s 
+                     },                 %s 
+                     Closure {          %s 
+                       parameters: 2,   %s 
+                       file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",  
+                       line: "%s to %s" %s 
+                     }                  %s 
+                   ]                    %s 
+ ---------------- ----------------------%s 
+  Allowed types    -                    %s 
+ ---------------- ----------------------%s 
+  Allowed values   -                    %s 
+ ---------------- ----------------------%s 
+  Normalizer       -                    %s 
+ ---------------- ----------------------%s 
+
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.json
new file mode 100644
index 0000000000000..126933c6b0485
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.json
@@ -0,0 +1,11 @@
+{
+    "required": true,
+    "allowed_types": [
+        "string"
+    ],
+    "allowed_values": [
+        "bar",
+        "baz"
+    ],
+    "has_normalizer": true
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
new file mode 100644
index 0000000000000..049b692f1dc7f
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
@@ -0,0 +1,25 @@
+
+Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
+=============================================================
+
+ ---------------- --------------------%s 
+  Required         true               %s 
+ ---------------- --------------------%s 
+  Default          -                  %s 
+ ---------------- --------------------%s 
+  Allowed types    [                  %s 
+                     "string"         %s 
+                   ]                  %s 
+ ---------------- --------------------%s 
+  Allowed values   [                  %s 
+                     "bar",           %s 
+                     "baz"            %s 
+                   ]                  %s 
+ ---------------- --------------------%s 
+  Normalizer       Closure {          %s 
+                     parameters: 2,   %s 
+                     file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",  
+                     line: "%s to %s" %s 
+                   }                  %s 
+ ---------------- --------------------%s 
+
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
index 5f839b85ac6b0..2b34ad960d672 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
@@ -1,11 +1,11 @@
 
-[33mSymfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")[39m
-[33m==============================================================================[39m
+Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
+==============================================================================
 
  --------------------------- -------------------- ------------------------- ----------------------- 
- [32m Options                   [39m [32m Overridden options [39m [32m Parent options          [39m [32m Extension options     [39m 
+  Options                     Overridden options   Parent options            Extension options      
  --------------------------- -------------------- ------------------------- ----------------------- 
-  choice_attr                 [32mFormType[39m             [32mFormType[39m                  [32mFormTypeCsrfExtension[39m  
+  choice_attr                 FormType             FormType                  FormTypeCsrfExtension  
   choice_label               -------------------- ------------------------- ----------------------- 
   choice_loader               compound             action                    csrf_field_name        
   choice_name                 data_class           attr                      csrf_message           
@@ -28,13 +28,13 @@
                                                    upload_max_size_message                          
  --------------------------- -------------------- ------------------------- ----------------------- 
 
-[33mParent types[39m
-[33m------------[39m
+Parent types
+------------
 
  * Symfony\Component\Form\Extension\Core\Type\FormType
 
-[33mType extensions[39m
-[33m---------------[39m
+Type extensions
+---------------
 
  * Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension
 

From 0e1ce341025d14f35e9171e09f38960ff7aa757e Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 3 Oct 2017 13:02:27 +0200
Subject: [PATCH 0991/1099] [Intl] fix return type value

---
 src/Symfony/Component/Intl/Locale.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
index 9eef59ea6c155..236e58e3f676f 100644
--- a/src/Symfony/Component/Intl/Locale.php
+++ b/src/Symfony/Component/Intl/Locale.php
@@ -105,6 +105,8 @@ public static function getFallback($locale): ?string
         if (strlen($locale) < 4) {
             return self::$defaultFallback;
         }
+
+        return null;
     }
 
     /**

From d6d187d26e0921a428c7ecc423d4f915c8f72c14 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser 
Date: Tue, 26 Sep 2017 18:43:11 +0200
Subject: [PATCH 0992/1099] Add & use OptionResolverIntrospector

---
 .../Form/Console/Descriptor/Descriptor.php    |  31 +--
 .../Console/Descriptor/JsonDescriptor.php     |   6 +-
 .../Console/Descriptor/TextDescriptor.php     |   6 +-
 .../Component/OptionsResolver/CHANGELOG.md    |   5 +
 .../Debug/OptionsResolverIntrospector.php     | 102 +++++++++
 .../Exception/NoConfigurationException.php    |  26 +++
 .../Debug/OptionsResolverIntrospectorTest.php | 203 ++++++++++++++++++
 7 files changed, 361 insertions(+), 18 deletions(-)
 create mode 100644 src/Symfony/Component/OptionsResolver/Debug/OptionsResolverIntrospector.php
 create mode 100644 src/Symfony/Component/OptionsResolver/Exception/NoConfigurationException.php
 create mode 100644 src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php

diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index f149becc66469..6cccd8ead235f 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -18,6 +18,8 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
 use Symfony\Component\Form\Util\OptionsResolverWrapper;
+use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
+use Symfony\Component\OptionsResolver\Exception\NoConfigurationException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -104,20 +106,25 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
 
     protected function getOptionDefinition(OptionsResolver $optionsResolver, $option)
     {
-        $refObject = new \ReflectionObject($optionsResolver);
-        foreach (array('defaults', 'lazy', 'allowedTypes', 'allowedValues', 'normalizers') as $name) {
-            $property = $refObject->getProperty($name);
-            $property->setAccessible(true);
-            $value = $property->getValue($optionsResolver);
-            if (array_key_exists($option, $value)) {
-                $definition[$name] = $value[$option];
+        $definition = array('required' => $optionsResolver->isRequired($option));
+
+        $introspector = new OptionsResolverIntrospector($optionsResolver);
+
+        $map = array(
+            'default' => 'getDefault',
+            'lazy' => 'getLazyClosures',
+            'allowedTypes' => 'getAllowedTypes',
+            'allowedValues' => 'getAllowedValues',
+            'normalizer' => 'getNormalizer',
+        );
+
+        foreach ($map as $key => $method) {
+            try {
+                $definition[$key] = $introspector->{$method}($option);
+            } catch (NoConfigurationException $e) {
+                // noop
             }
         }
-        $definition['required'] = $optionsResolver->isRequired($option);
-
-        if (isset($definition['lazy']) && 1 === count($definition['lazy'])) {
-            $definition['lazy'] = $definition['lazy'][0];
-        }
 
         return $definition;
     }
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index de296e19b7906..9d02aba3c12ad 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -61,7 +61,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
 
         $map = array(
             'required' => 'required',
-            'default' => 'defaults',
+            'default' => 'default',
             'allowed_types' => 'allowedTypes',
             'allowed_values' => 'allowedValues',
         );
@@ -69,12 +69,12 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
             if (array_key_exists($name, $definition)) {
                 $data[$label] = $definition[$name];
 
-                if ('defaults' === $name) {
+                if ('default' === $name) {
                     $data['is_lazy'] = isset($definition['lazy']);
                 }
             }
         }
-        $data['has_normalizer'] = isset($definition['normalizers']);
+        $data['has_normalizer'] = isset($definition['normalizer']);
 
         $this->writeData($data, $options);
     }
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index 2b58d8ffb3c33..6e17e9b859e01 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -103,15 +103,15 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
         $dump = $this->getDumpFunction();
         $map = array(
             'Required' => 'required',
-            'Default' => 'defaults',
+            'Default' => 'default',
             'Allowed types' => 'allowedTypes',
             'Allowed values' => 'allowedValues',
-            'Normalizer' => 'normalizers',
+            'Normalizer' => 'normalizer',
         );
         $rows = array();
         foreach ($map as $label => $name) {
             $value = array_key_exists($name, $definition) ? $dump($definition[$name]) : '-';
-            if ('defaults' === $name && isset($definition['lazy'])) {
+            if ('default' === $name && isset($definition['lazy'])) {
                 $value = "Value: $value\n\nClosure(s): ".$dump($definition['lazy']);
             }
 
diff --git a/src/Symfony/Component/OptionsResolver/CHANGELOG.md b/src/Symfony/Component/OptionsResolver/CHANGELOG.md
index 5f6d15b2c7ddc..d19116f37c280 100644
--- a/src/Symfony/Component/OptionsResolver/CHANGELOG.md
+++ b/src/Symfony/Component/OptionsResolver/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * added `OptionsResolverIntrospector` to inspect options definitions inside an `OptionsResolver` instance
+
 2.6.0
 -----
 
diff --git a/src/Symfony/Component/OptionsResolver/Debug/OptionsResolverIntrospector.php b/src/Symfony/Component/OptionsResolver/Debug/OptionsResolverIntrospector.php
new file mode 100644
index 0000000000000..60317243e9c4f
--- /dev/null
+++ b/src/Symfony/Component/OptionsResolver/Debug/OptionsResolverIntrospector.php
@@ -0,0 +1,102 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\OptionsResolver\Debug;
+
+use Symfony\Component\OptionsResolver\Exception\NoConfigurationException;
+use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * @author Maxime Steinhausser 
+ *
+ * @final
+ */
+class OptionsResolverIntrospector
+{
+    private $get;
+
+    public function __construct(OptionsResolver $optionsResolver)
+    {
+        $this->get = \Closure::bind(function ($property, $option, $message) {
+            /** @var OptionsResolver $this */
+            if (!$this->isDefined($option)) {
+                throw new UndefinedOptionsException(sprintf('The option "%s" does not exist.', $option));
+            }
+
+            if (!array_key_exists($option, $this->{$property})) {
+                throw new NoConfigurationException($message);
+            }
+
+            return $this->{$property}[$option];
+        }, $optionsResolver, $optionsResolver);
+    }
+
+    /**
+     * @param string $option
+     *
+     * @return mixed
+     *
+     * @throws NoConfigurationException on no configured value
+     */
+    public function getDefault($option)
+    {
+        return call_user_func($this->get, 'defaults', $option, sprintf('No default value was set for the "%s" option.', $option));
+    }
+
+    /**
+     * @param string $option
+     *
+     * @return \Closure[]
+     *
+     * @throws NoConfigurationException on no configured closures
+     */
+    public function getLazyClosures($option)
+    {
+        return call_user_func($this->get, 'lazy', $option, sprintf('No lazy closures were set for the "%s" option.', $option));
+    }
+
+    /**
+     * @param string $option
+     *
+     * @return string[]
+     *
+     * @throws NoConfigurationException on no configured types
+     */
+    public function getAllowedTypes($option)
+    {
+        return call_user_func($this->get, 'allowedTypes', $option, sprintf('No allowed types were set for the "%s" option.', $option));
+    }
+
+    /**
+     * @param string $option
+     *
+     * @return mixed[]
+     *
+     * @throws NoConfigurationException on no configured values
+     */
+    public function getAllowedValues($option)
+    {
+        return call_user_func($this->get, 'allowedValues', $option, sprintf('No allowed values were set for the "%s" option.', $option));
+    }
+
+    /**
+     * @param string $option
+     *
+     * @return \Closure
+     *
+     * @throws NoConfigurationException on no configured normalizer
+     */
+    public function getNormalizer($option)
+    {
+        return call_user_func($this->get, 'normalizers', $option, sprintf('No normalizer was set for the "%s" option.', $option));
+    }
+}
diff --git a/src/Symfony/Component/OptionsResolver/Exception/NoConfigurationException.php b/src/Symfony/Component/OptionsResolver/Exception/NoConfigurationException.php
new file mode 100644
index 0000000000000..6693ec14df892
--- /dev/null
+++ b/src/Symfony/Component/OptionsResolver/Exception/NoConfigurationException.php
@@ -0,0 +1,26 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\OptionsResolver\Exception;
+
+use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
+
+/**
+ * Thrown when trying to introspect an option definition property
+ * for which no value was configured inside the OptionsResolver instance.
+ *
+ * @see OptionsResolverIntrospector
+ *
+ * @author Maxime Steinhausser 
+ */
+class NoConfigurationException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
new file mode 100644
index 0000000000000..7c4753ab5f6b4
--- /dev/null
+++ b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
@@ -0,0 +1,203 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\OptionsResolver\Tests\Debug;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class OptionsResolverIntrospectorTest extends TestCase
+{
+    public function testGetDefault()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefault($option = 'foo', 'bar');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getDefault($option));
+    }
+
+    public function testGetDefaultNull()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefault($option = 'foo', null);
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertNull($debug->getDefault($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
+     * @expectedExceptionMessage No default value was set for the "foo" option.
+     */
+    public function testGetDefaultThrowsOnNoConfiguredValue()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getDefault($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist.
+     */
+    public function testGetDefaultThrowsOnNotDefinedOption()
+    {
+        $resolver = new OptionsResolver();
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getDefault('foo'));
+    }
+
+    public function testGetLazyClosures()
+    {
+        $resolver = new OptionsResolver();
+        $closures = array();
+        $resolver->setDefault($option = 'foo', $closures[] = function (Options $options) {});
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame($closures, $debug->getLazyClosures($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
+     * @expectedExceptionMessage No lazy closures were set for the "foo" option.
+     */
+    public function testGetLazyClosuresThrowsOnNoConfiguredValue()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getLazyClosures($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist.
+     */
+    public function testGetLazyClosuresThrowsOnNotDefinedOption()
+    {
+        $resolver = new OptionsResolver();
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getLazyClosures('foo'));
+    }
+
+    public function testGetAllowedTypes()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+        $resolver->setAllowedTypes($option = 'foo', $allowedTypes = array('string', 'bool'));
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame($allowedTypes, $debug->getAllowedTypes($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
+     * @expectedExceptionMessage No allowed types were set for the "foo" option.
+     */
+    public function testGetAllowedTypesThrowsOnNoConfiguredValue()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getAllowedTypes($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist.
+     */
+    public function testGetAllowedTypesThrowsOnNotDefinedOption()
+    {
+        $resolver = new OptionsResolver();
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getAllowedTypes('foo'));
+    }
+
+    public function testGetAllowedValues()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+        $resolver->setAllowedValues($option = 'foo', $allowedValues = array('bar', 'baz'));
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame($allowedValues, $debug->getAllowedValues($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
+     * @expectedExceptionMessage No allowed values were set for the "foo" option.
+     */
+    public function testGetAllowedValuesThrowsOnNoConfiguredValue()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getAllowedValues($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist.
+     */
+    public function testGetAllowedValuesThrowsOnNotDefinedOption()
+    {
+        $resolver = new OptionsResolver();
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getAllowedValues('foo'));
+    }
+
+    public function testGetNormalizer()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+        $resolver->setNormalizer($option = 'foo', $normalizer = function () {});
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame($normalizer, $debug->getNormalizer($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
+     * @expectedExceptionMessage No normalizer was set for the "foo" option.
+     */
+    public function testGetNormalizerThrowsOnNoConfiguredValue()
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined($option = 'foo');
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getNormalizer($option));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist.
+     */
+    public function testGetNormalizerThrowsOnNotDefinedOption()
+    {
+        $resolver = new OptionsResolver();
+
+        $debug = new OptionsResolverIntrospector($resolver);
+        $this->assertSame('bar', $debug->getNormalizer('foo'));
+    }
+}

From ed57e748dc26c5210581d205b698f1d89e05d09a Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 3 Oct 2017 15:54:22 +0200
Subject: [PATCH 0993/1099] fix version in changelog

---
 src/Symfony/Component/Filesystem/CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Filesystem/CHANGELOG.md b/src/Symfony/Component/Filesystem/CHANGELOG.md
index ba3eff0f0d1e4..d01f5f45e1a7d 100644
--- a/src/Symfony/Component/Filesystem/CHANGELOG.md
+++ b/src/Symfony/Component/Filesystem/CHANGELOG.md
@@ -1,11 +1,15 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0
+
 3.3.0
 -----
 
  * added `appendToFile()` to append contents to existing files
- * support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0
 
 3.2.0
 -----

From 5518896c2650ea678c8b70e70d62fada53de3b0d Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 3 Oct 2017 17:01:31 +0200
Subject: [PATCH 0994/1099] fix refreshing line numbers for the inline parser

---
 src/Symfony/Component/Yaml/Inline.php           | 7 +++++--
 src/Symfony/Component/Yaml/Parser.php           | 5 ++---
 src/Symfony/Component/Yaml/Tests/ParserTest.php | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 12d99a20bfb7e..1ba3c57c59945 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -39,14 +39,17 @@ class Inline
      * @param int|null    $parsedLineNumber
      * @param string|null $parsedFilename
      */
-    public static function initialize($flags, $parsedLineNumber = 0, $parsedFilename = null)
+    public static function initialize($flags, $parsedLineNumber = null, $parsedFilename = null)
     {
         self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
         self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
         self::$objectForMap = (bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags);
         self::$constantSupport = (bool) (Yaml::PARSE_CONSTANT & $flags);
         self::$parsedFilename = $parsedFilename;
-        self::$parsedLineNumber = $parsedLineNumber;
+
+        if (null !== $parsedLineNumber) {
+            self::$parsedLineNumber = $parsedLineNumber;
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index b81871730c95d..82391b216d709 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -201,6 +201,8 @@ private function doParse($value, $flags)
                 throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
             }
 
+            Inline::initialize($flags, $this->getRealCurrentLineNb(), $this->filename);
+
             $isRef = $mergeNode = false;
             if (self::preg_match('#^\-((?P\s+)(?P.+))?$#u', rtrim($this->currentLine), $values)) {
                 if ($context && 'mapping' == $context) {
@@ -252,7 +254,6 @@ private function doParse($value, $flags)
                 }
                 $context = 'mapping';
 
-                Inline::initialize($flags, $this->getRealCurrentLineNb(), $this->filename);
                 try {
                     $i = 0;
                     $evaluateKey = !(Yaml::PARSE_KEYS_AS_STRINGS & $flags);
@@ -402,7 +403,6 @@ private function doParse($value, $flags)
                 // 1-liner optionally followed by newline(s)
                 if (is_string($value) && $this->lines[0] === trim($value)) {
                     try {
-                        Inline::$parsedLineNumber = $this->getRealCurrentLineNb();
                         $value = Inline::parse($this->lines[0], $flags, $this->refs);
                     } catch (ParseException $e) {
                         $e->setParsedLine($this->getRealCurrentLineNb() + 1);
@@ -744,7 +744,6 @@ private function parseValue($value, $flags, $context)
                 }
             }
 
-            Inline::$parsedLineNumber = $this->getRealCurrentLineNb();
             $parsedValue = Inline::parse($value, $flags, $this->refs);
 
             if ('mapping' === $context && is_string($parsedValue) && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 38ee2e06051e2..868545683e57b 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1853,8 +1853,8 @@ public function testPhpConstantTagMappingKey()
     /**
      * @group legacy
      * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 2.
-     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 1.
-     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 1.
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 4.
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since version 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 5.
      */
     public function testDeprecatedPhpConstantTagMappingKey()
     {

From 9011f47e8fcc29a07b8895c40185836b63f277b3 Mon Sep 17 00:00:00 2001
From: Roland Franssen 
Date: Sun, 10 Sep 2017 15:11:38 +0200
Subject: [PATCH 0995/1099] [FrameworkBundle] Expose dotenv in bin/console
 about

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../FrameworkBundle/Command/AboutCommand.php  | 42 +++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index f49eb6dbc2dd3..49fd03165a5b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -59,6 +59,7 @@ CHANGELOG
     and `YamlLintCommand` classes have been marked as final
  * Added `asset.request_context.base_path` and `asset.request_context.secure` parameters
    to provide a default request context in case the stack is empty (similar to `router.request_context.*` parameters)
+ * Display environment variables managed by `Dotenv` in `AboutCommand`
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
index 4a594d3ae70ce..3c5ba3e93d3cf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -35,7 +35,19 @@ class AboutCommand extends ContainerAwareCommand
      */
     protected function configure()
     {
-        $this->setDescription('Displays information about the current project');
+        $this
+            ->setDescription('Displays information about the current project')
+            ->setHelp(<<<'EOT'
+The %command.name% command displays information about the current Symfony project.
+
+The PHP section displays important configuration that could affect your application. The values might
+be different between web and CLI.
+
+The Environment section displays the current environment variables managed by Symfony Dotenv. It will not
+be shown if no variables were found. The values might be different between web and CLI.
+EOT
+            )
+        ;
     }
 
     /**
@@ -48,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var $kernel KernelInterface */
         $kernel = $this->getApplication()->getKernel();
 
-        $io->table(array(), array(
+        $rows = array(
             array('Symfony'),
             new TableSeparator(),
             array('Version', Kernel::VERSION),
@@ -75,7 +87,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('OPcache', extension_loaded('Zend OPcache') && ini_get('opcache.enable') ? 'true' : 'false'),
             array('APCu', extension_loaded('apcu') && ini_get('apc.enabled') ? 'true' : 'false'),
             array('Xdebug', extension_loaded('xdebug') ? 'true' : 'false'),
-        ));
+        );
+
+        if ($dotenv = self::getDotEnvVars()) {
+            $rows = array_merge($rows, array(
+                new TableSeparator(),
+                array('Environment (.env)'),
+                new TableSeparator(),
+            ), array_map(function ($value, $name) {
+                return array($name, $value);
+            }, $dotenv, array_keys($dotenv)));
+        }
+
+        $io->table(array(), $rows);
     }
 
     private static function formatPath($path, $baseDir = null)
@@ -103,4 +127,16 @@ private static function isExpired($date)
 
         return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');
     }
+
+    private static function getDotEnvVars()
+    {
+        $vars = array();
+        foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
+            if ('' !== $name && false !== $value = getenv($name)) {
+                $vars[$name] = $value;
+            }
+        }
+
+        return $vars;
+    }
 }

From 80af9b8562ca87a1a0a05ccb3179c2888e90e4a2 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 3 Oct 2017 17:15:12 +0200
Subject: [PATCH 0996/1099] treat trailing backslashes in multi-line strings

---
 src/Symfony/Component/Yaml/Parser.php         | 21 +++++++++++++++----
 .../Component/Yaml/Tests/ParserTest.php       | 11 ++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 611bbac3ae1ba..7d40c0597fd56 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -384,6 +384,7 @@ private function doParse($value, $flags)
                 if (0 === $this->currentLineNb) {
                     $parseError = false;
                     $previousLineWasNewline = false;
+                    $previousLineWasTerminatedWithBackslash = false;
                     $value = '';
 
                     foreach ($this->lines as $line) {
@@ -401,13 +402,25 @@ private function doParse($value, $flags)
 
                             if ('' === trim($parsedLine)) {
                                 $value .= "\n";
-                                $previousLineWasNewline = true;
-                            } elseif ($previousLineWasNewline) {
+                            } elseif (!$previousLineWasNewline && !$previousLineWasTerminatedWithBackslash) {
+                                $value .= ' ';
+                            }
+
+                            if ('' !== trim($parsedLine) && '\\' === substr($parsedLine, -1)) {
+                                $value .= ltrim(substr($parsedLine, 0, -1));
+                            } elseif ('' !== trim($parsedLine)) {
                                 $value .= trim($parsedLine);
+                            }
+
+                            if ('' === trim($parsedLine)) {
+                                $previousLineWasNewline = true;
+                                $previousLineWasTerminatedWithBackslash = false;
+                            } elseif ('\\' === substr($parsedLine, -1)) {
                                 $previousLineWasNewline = false;
+                                $previousLineWasTerminatedWithBackslash = true;
                             } else {
-                                $value .= ' '.trim($parsedLine);
                                 $previousLineWasNewline = false;
+                                $previousLineWasTerminatedWithBackslash = false;
                             }
                         } catch (ParseException $e) {
                             $parseError = true;
@@ -416,7 +429,7 @@ private function doParse($value, $flags)
                     }
 
                     if (!$parseError) {
-                        return trim($value);
+                        return Inline::parse(trim($value));
                     }
                 }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 4c62f9bd172ef..67ed642084711 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1543,6 +1543,17 @@ public function testParseMultiLineQuotedString()
         $this->assertSame(array('foo' => 'bar baz foobar foo', 'bar' => 'baz'), $this->parser->parse($yaml));
     }
 
+    public function testMultiLineQuotedStringWithTrailingBackslash()
+    {
+        $yaml = <<assertSame(array('foobar' => 'foobar'), $this->parser->parse($yaml));
+    }
+
     public function testParseMultiLineUnquotedString()
     {
         $yaml = <<
Date: Wed, 4 Oct 2017 00:12:02 +0200
Subject: [PATCH 0997/1099] [Yaml] parse references on merge keys

---
 src/Symfony/Component/Yaml/Parser.php         | 16 +++++++----
 .../Component/Yaml/Tests/ParserTest.php       | 28 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 94eafb5d0ae5c..6817e71ea8667 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -181,7 +181,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                     $key = (string) $key;
                 }
 
-                if ('<<' === $key) {
+                if ('<<' === $key && (!isset($values['value']) || !self::preg_match('#^&(?P[^ ]+)#u', $values['value'], $refMatches))) {
                     $mergeNode = true;
                     $allowOverwrite = true;
                     if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
@@ -226,14 +226,14 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                             $data += $parsed; // array union
                         }
                     }
-                } elseif (isset($values['value']) && self::preg_match('#^&(?P[^ ]+) *(?P.*)#u', $values['value'], $matches)) {
+                } elseif ('<<' !== $key && isset($values['value']) && self::preg_match('#^&(?P[^ ]+) *(?P.*)#u', $values['value'], $matches)) {
                     $isRef = $matches['ref'];
                     $values['value'] = $matches['value'];
                 }
 
                 if ($mergeNode) {
                     // Merge keys
-                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#') || '<<' === $key) {
                     // hash
                     // if next line is less indented or equal, then it means that the current value is null
                     if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
@@ -244,9 +244,13 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                         }
                     } else {
                         $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
+
+                        if ('<<' === $key) {
+                            $this->refs[$refMatches['ref']] = $value;
+                            $data += $value;
+                        } elseif ($allowOverwrite || !isset($data[$key])) {
+                            // Spec: Keys MUST be unique; first one wins.
+                            // But overwriting is allowed when a merge node is used in current block.
                             $data[$key] = $value;
                         }
                     }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 1ff5e3e8a5042..9be278f67ec92 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1179,6 +1179,34 @@ public function testParserCleansUpReferencesBetweenRuns()
 YAML;
         $this->parser->parse($yaml);
     }
+
+    public function testParseReferencesOnMergeKeys()
+    {
+        $yaml = << array(
+                'a' => 'foo',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+            'mergekeyderef' => array(
+                'd' => 'quux',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
 }
 
 class B

From d314b1ff628295ef085f93463bfcc125fd65e6b3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 4 Oct 2017 09:45:46 +0200
Subject: [PATCH 0998/1099] [DI] Allow setting any public non-initialized
 services

---
 .../DependencyInjection/Container.php         |  7 ++++---
 .../Tests/ContainerTest.php                   | 20 ++++++++++++++++---
 .../Tests/Dumper/PhpDumperTest.php            |  9 ++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 6eceb0defeba9..2d43ba7a60290 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -190,6 +190,7 @@ public function set($id, $service)
             unset($this->aliases[$id]);
         }
 
+        $wasSet = isset($this->services[$id]);
         $this->services[$id] = $service;
 
         if (null === $service) {
@@ -203,11 +204,11 @@ public function set($id, $service)
             } else {
                 @trigger_error(sprintf('Setting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
             }
-        } elseif (isset($this->methodMap[$id])) {
+        } elseif ($wasSet && isset($this->methodMap[$id])) {
             if (null === $service) {
-                @trigger_error(sprintf('Unsetting the "%s" pre-defined service is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Unsetting the "%s" service after it\'s been initialized is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
             } else {
-                @trigger_error(sprintf('Setting the "%s" pre-defined service is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Setting the "%s" service after it\'s been initialized is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index e2478ea22b3b4..5cd988714ad75 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -186,15 +186,29 @@ public function testSetReplacesAlias()
 
     /**
      * @group legacy
-     * @expectedDeprecation Unsetting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Unsetting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
      */
-    public function testSetWithNullResetPredefinedService()
+    public function testSetWithNullOnInitializedPredefinedService()
     {
         $sc = new Container();
         $sc->set('foo', new \stdClass());
         $sc->set('foo', null);
         $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
 
+        $sc = new ProjectServiceContainer();
+        $sc->get('bar');
+        $sc->set('bar', null);
+        $this->assertTrue($sc->has('bar'), '->set() with null service resets the pre-defined service');
+    }
+
+    public function testSetWithNullOnUninitializedPredefinedService()
+    {
+        $sc = new Container();
+        $sc->set('foo', new \stdClass());
+        $sc->get('foo', null);
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
+
         $sc = new ProjectServiceContainer();
         $sc->set('bar', null);
         $this->assertTrue($sc->has('bar'), '->set() with null service resets the pre-defined service');
@@ -481,7 +495,7 @@ public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
      */
     public function testReplacingAPreDefinedServiceIsDeprecated()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index a1422bf96a29c..d832a220c7afc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -269,7 +269,7 @@ public function testFrozenContainerWithoutAliases()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
      */
     public function testOverrideServiceWhenUsingADumpedContainer()
     {
@@ -277,15 +277,16 @@ public function testOverrideServiceWhenUsingADumpedContainer()
         require_once self::$fixturesPath.'/includes/foo.php';
 
         $container = new \ProjectServiceContainer();
-        $container->set('bar', $bar = new \stdClass());
         $container->setParameter('foo_bar', 'foo_bar');
+        $container->get('bar');
+        $container->set('bar', $bar = new \stdClass());
 
         $this->assertSame($bar, $container->get('bar'), '->set() overrides an already defined service');
     }
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
      */
     public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFromAnotherOne()
     {
@@ -294,6 +295,8 @@ public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFrom
         require_once self::$fixturesPath.'/includes/classes.php';
 
         $container = new \ProjectServiceContainer();
+        $container->setParameter('foo_bar', 'foo_bar');
+        $container->get('bar');
         $container->set('bar', $bar = new \stdClass());
 
         $this->assertSame($bar, $container->get('foo')->bar, '->set() overrides an already defined service');

From fa24fa8a3cb97aaa1baae0cd5efc0eb20c8fd93f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 4 Oct 2017 09:58:49 +0200
Subject: [PATCH 0999/1099] [Cache] Fix race condition in TagAwareAdapter

---
 .../Component/Cache/Adapter/TagAwareAdapter.php       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 1e0617ebe271d..d8ea34603823f 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -250,19 +250,12 @@ public function commit()
 
             $f = $this->getTagsByKey;
             $tagsByKey = $f($items);
-            $deletedTags = $this->deferred = array();
+            $this->deferred = array();
             $tagVersions = $this->getTagVersions($tagsByKey);
             $f = $this->createCacheItem;
 
             foreach ($tagsByKey as $key => $tags) {
-                if ($tags) {
-                    $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
-                } else {
-                    $deletedTags[] = static::TAGS_PREFIX.$key;
-                }
-            }
-            if ($deletedTags) {
-                $this->itemsAdapter->deleteItems($deletedTags);
+                $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
             }
         }
 

From a7a6f8a6788019183508afc89a597d12926242ef Mon Sep 17 00:00:00 2001
From: Amaury Leroux de Lens 
Date: Fri, 4 Dec 2015 13:21:25 +0100
Subject: [PATCH 1000/1099] [Security] Add Guard authenticator 
 method

This method will be called before starting an authentication against a guard authhenticator.
The authentication will be tried only if the supports method returned 
This improves understanding of code, increase consistency and removes responsability for  method
To decide if the current request should be supported or not.
---
 UPGRADE-3.4.md                                |   3 +
 UPGRADE-4.0.md                                |   3 +
 .../Guard/AbstractGuardAuthenticator.php      |  19 +-
 .../Security/Guard/AuthenticatorInterface.php | 170 +++++++++++++++++
 .../Firewall/GuardAuthenticationListener.php  |  54 ++++--
 .../Guard/GuardAuthenticatorHandler.php       |  30 +--
 .../Guard/GuardAuthenticatorInterface.php     |   5 +-
 .../Provider/GuardAuthenticationProvider.php  |  18 +-
 .../GuardAuthenticationListenerTest.php       | 176 +++++++++++++++++-
 .../Tests/GuardAuthenticatorHandlerTest.php   |   2 +-
 .../Token/PreAuthenticationGuardToken.php     |   2 +-
 11 files changed, 435 insertions(+), 47 deletions(-)
 create mode 100644 src/Symfony/Component/Security/Guard/AuthenticatorInterface.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index e5b6434c37f4e..3996618fc18ff 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -302,6 +302,9 @@ SecurityBundle
  * Using voters that do not implement the `VoterInterface`is now deprecated in
    the `AccessDecisionManager` and this functionality will be removed in 4.0.
 
+ * Using guard authenticator that implement the `GuardAuthenticatorInterface` is now
+   deprecated, this will be removed in 4.0. `AuthenticatorInterface` must be used now.
+
  * `FirewallContext::getListeners()` now returns `\Traversable|array`
 
  * `InitAclCommand::__construct()` now takes an instance of
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2d2e04899c18b..a9a382b8e9d14 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -659,6 +659,9 @@ Security
  * The `RoleInterface` has been removed. Extend the `Symfony\Component\Security\Core\Role\Role`
    class instead.
 
+ * The `GuardAuthenticatorInterface` has been removed. Implement
+   `Symfony\Component\Security\Guard\AuthenticatorInterface` class instead.
+
  * The `LogoutUrlGenerator::registerListener()` method expects a 6th `string $context = null` argument.
 
  * The `AccessDecisionManager::setVoters()` method has been removed. Pass the
diff --git a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
index 609d772e194b4..97c9c4a0922d9 100644
--- a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
+++ b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Guard;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken;
 
@@ -19,8 +20,24 @@
  *
  * @author Ryan Weaver 
  */
-abstract class AbstractGuardAuthenticator implements GuardAuthenticatorInterface
+abstract class AbstractGuardAuthenticator implements AuthenticatorInterface
 {
+    /**
+     * Default implementation of the AuthenticatorInterface::supports method
+     * As we still have the deprecated GuardAuthenticatorInterface, this method must be implemented here
+     * Once GuardAuthenticatorInterface will be removed, this method should be removed too.
+     *
+     * @param Request $request
+     *
+     * @return bool
+     */
+    public function supports(Request $request)
+    {
+        @trigger_error('The Symfony\Component\Security\Guard\AbstractGuardAuthenticator::supports default implementation is used. This is provided for backward compatibility on GuardAuthenticationInterface that is deprecated since version 3.1 and will be removed in 4.0. Provide your own implementation of the supports method instead.', E_USER_DEPRECATED);
+
+        return true;
+    }
+
     /**
      * Shortcut to create a PostAuthenticationGuardToken for you, if you don't really
      * care about which authenticated token you're using.
diff --git a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
new file mode 100644
index 0000000000000..a1497b0eef4f9
--- /dev/null
+++ b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
@@ -0,0 +1,170 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Guard;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
+use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
+
+/**
+ * The interface for all "guard" authenticators.
+ *
+ * The methods on this interface are called throughout the guard authentication
+ * process to give you the power to control most parts of the process from
+ * one location.
+ *
+ * @author Ryan Weaver 
+ * @author Amaury Leroux de Lens 
+ */
+interface AuthenticatorInterface extends AuthenticationEntryPointInterface
+{
+    /**
+     * Does the authenticator support the given Request ?
+     *
+     * If this returns true, authentication will continue (e.g. getCredentials() will be called).
+     * If false, this authenticator is done. The next (if any) authenticators will be called and
+     * may authenticate the user, or leave the user as anonymous.
+     *
+     * @param Request $request
+     *
+     * @return bool
+     */
+    public function supports(Request $request);
+
+    /**
+     * Get the authentication credentials from the request and return them
+     * as any type (e.g. an associate array). If you return null, authentication
+     * will be skipped.
+     *
+     * Whatever value you return here will be passed to getUser() and checkCredentials()
+     *
+     * For example, for a form login, you might:
+     *
+     *      return array(
+     *          'username' => $request->request->get('_username'),
+     *          'password' => $request->request->get('_password'),
+     *      );
+     *
+     * Or for an API token that's on a header, you might use:
+     *
+     *      return array('api_key' => $request->headers->get('X-API-TOKEN'));
+     *
+     * @param Request $request
+     *
+     * @return mixed|null
+     */
+    public function getCredentials(Request $request);
+
+    /**
+     * Return a UserInterface object based on the credentials.
+     *
+     * The *credentials* are the return value from getCredentials()
+     *
+     * You may throw an AuthenticationException if you wish. If you return
+     * null, then a UsernameNotFoundException is thrown for you.
+     *
+     * @param mixed                 $credentials
+     * @param UserProviderInterface $userProvider
+     *
+     * @throws AuthenticationException
+     *
+     * @return UserInterface|null
+     */
+    public function getUser($credentials, UserProviderInterface $userProvider);
+
+    /**
+     * Returns true if the credentials are valid.
+     *
+     * If any value other than true is returned, authentication will
+     * fail. You may also throw an AuthenticationException if you wish
+     * to cause authentication to fail.
+     *
+     * The *credentials* are the return value from getCredentials()
+     *
+     * @param mixed         $credentials
+     * @param UserInterface $user
+     *
+     * @return bool
+     *
+     * @throws AuthenticationException
+     */
+    public function checkCredentials($credentials, UserInterface $user);
+
+    /**
+     * Creates an authenticated token for the given user.
+     *
+     * If you don't care about which token class is used or don't really
+     * understand what a "token" is, you can skip this method by extending
+     * the AbstractGuardAuthenticator class from your authenticator.
+     *
+     * @see AbstractGuardAuthenticator
+     *
+     * @param UserInterface $user
+     * @param string        $providerKey The provider (i.e. firewall) key
+     *
+     * @return GuardTokenInterface
+     */
+    public function createAuthenticatedToken(UserInterface $user, $providerKey);
+
+    /**
+     * Called when authentication executed, but failed (e.g. wrong username password).
+     *
+     * This should return the Response sent back to the user, like a
+     * RedirectResponse to the login page or a 403 response.
+     *
+     * If you return null, the request will continue, but the user will
+     * not be authenticated. This is probably not what you want to do.
+     *
+     * @param Request                 $request
+     * @param AuthenticationException $exception
+     *
+     * @return Response|null
+     */
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
+
+    /**
+     * Called when authentication executed and was successful!
+     *
+     * This should return the Response sent back to the user, like a
+     * RedirectResponse to the last page they visited.
+     *
+     * If you return null, the current request will continue, and the user
+     * will be authenticated. This makes sense, for example, with an API.
+     *
+     * @param Request        $request
+     * @param TokenInterface $token
+     * @param string         $providerKey The provider (i.e. firewall) key
+     *
+     * @return Response|null
+     */
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey);
+
+    /**
+     * Does this method support remember me cookies?
+     *
+     * Remember me cookie will be set if *all* of the following are met:
+     *  A) This method returns true
+     *  B) The remember_me key under your firewall is configured
+     *  C) The "remember me" functionality is activated. This is usually
+     *      done by having a _remember_me checkbox in your form, but
+     *      can be configured by the "always_remember_me" and "remember_me_parameter"
+     *      parameters under the "remember_me" firewall key
+     *
+     * @return bool
+     */
+    public function supportsRememberMe();
+}
diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
index 41a37e6fef55b..dd5ae2c16b9f4 100644
--- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -28,6 +29,7 @@
  * Authentication listener for the "guard" system.
  *
  * @author Ryan Weaver 
+ * @author Amaury Leroux de Lens 
  */
 class GuardAuthenticationListener implements ListenerInterface
 {
@@ -39,11 +41,11 @@ class GuardAuthenticationListener implements ListenerInterface
     private $rememberMeServices;
 
     /**
-     * @param GuardAuthenticatorHandler              $guardHandler          The Guard handler
-     * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
-     * @param string                                 $providerKey           The provider (i.e. firewall) key
-     * @param iterable|GuardAuthenticatorInterface[] $guardAuthenticators   The authenticators, with keys that match what's passed to GuardAuthenticationProvider
-     * @param LoggerInterface                        $logger                A LoggerInterface instance
+     * @param GuardAuthenticatorHandler         $guardHandler          The Guard handler
+     * @param AuthenticationManagerInterface    $authenticationManager An AuthenticationManagerInterface instance
+     * @param string                            $providerKey           The provider (i.e. firewall) key
+     * @param iterable|AuthenticatorInterface[] $guardAuthenticators   The authenticators, with keys that match what's passed to GuardAuthenticationProvider
+     * @param LoggerInterface                   $logger                A LoggerInterface instance
      */
     public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, $providerKey, $guardAuthenticators, LoggerInterface $logger = null)
     {
@@ -92,7 +94,7 @@ public function handle(GetResponseEvent $event)
         }
     }
 
-    private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
+    private function executeGuardAuthenticator($uniqueGuardKey, AuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
     {
         $request = $event->getRequest();
         try {
@@ -100,12 +102,38 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
                 $this->logger->debug('Calling getCredentials() on guard configurator.', array('firewall_key' => $this->providerKey, 'authenticator' => get_class($guardAuthenticator)));
             }
 
+            // abort the execution of the authenticator if it doesn't support the request.
+            if ($guardAuthenticator instanceof GuardAuthenticatorInterface) {
+                // it's a GuardAuthenticatorInterface
+                // we support the previous behaviour to avoid BC break.
+                $credentialsCanBeNull = true;
+                @trigger_error('The Symfony\Component\Security\Guard\GuardAuthenticatorInterface interface is deprecated since version 3.1 and will be removed in 4.0. Use Symfony\Component\Security\Guard\Authenticator\GuardAuthenticatorInterface instead.', E_USER_DEPRECATED);
+            } else {
+                if (true !== $guardAuthenticator->supports($request)) {
+                    return;
+                }
+                // as there was a support for given request,
+                // authenticator is expected to give not-null credentials.
+                $credentialsCanBeNull = false;
+            }
+
             // allow the authenticator to fetch authentication info from the request
             $credentials = $guardAuthenticator->getCredentials($request);
 
-            // allow null to be returned to skip authentication
             if (null === $credentials) {
-                return;
+                // if GuardAuthenticatorInterface is used
+                // allow null to skip authentication.
+                if ($credentialsCanBeNull) {
+                    return;
+                }
+
+                // otherwise something went wrong and the authentication must fail
+                throw new \UnexpectedValueException(sprintf(
+                    'You must return some credentials from %s:getCredentials().
+                    To skip authentication, return false from %s::supports().',
+                    get_class($guardAuthenticator),
+                    get_class($guardAuthenticator)
+                ));
             }
 
             // create a token with the unique key, so that the provider knows which authenticator to use
@@ -172,12 +200,12 @@ public function setRememberMeServices(RememberMeServicesInterface $rememberMeSer
      * Checks to see if remember me is supported in the authenticator and
      * on the firewall. If it is, the RememberMeServicesInterface is notified.
      *
-     * @param GuardAuthenticatorInterface $guardAuthenticator
-     * @param Request                     $request
-     * @param TokenInterface              $token
-     * @param Response                    $response
+     * @param AuthenticatorInterface $guardAuthenticator
+     * @param Request                $request
+     * @param TokenInterface         $token
+     * @param Response               $response
      */
-    private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
+    private function triggerRememberMe(AuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
     {
         if (null === $this->rememberMeServices) {
             if (null !== $this->logger) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index 5e1351dcc25ee..c8fb6e394e992 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -61,14 +61,14 @@ public function authenticateWithToken(TokenInterface $token, Request $request)
     /**
      * Returns the "on success" response for the given GuardAuthenticator.
      *
-     * @param TokenInterface              $token
-     * @param Request                     $request
-     * @param GuardAuthenticatorInterface $guardAuthenticator
-     * @param string                      $providerKey        The provider (i.e. firewall) key
+     * @param TokenInterface         $token
+     * @param Request                $request
+     * @param AuthenticatorInterface $guardAuthenticator
+     * @param string                 $providerKey        The provider (i.e. firewall) key
      *
      * @return null|Response
      */
-    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $response = $guardAuthenticator->onAuthenticationSuccess($request, $token, $providerKey);
 
@@ -88,14 +88,14 @@ public function handleAuthenticationSuccess(TokenInterface $token, Request $requ
      * Convenience method for authenticating the user and returning the
      * Response *if any* for success.
      *
-     * @param UserInterface               $user
-     * @param Request                     $request
-     * @param GuardAuthenticatorInterface $authenticator
-     * @param string                      $providerKey   The provider (i.e. firewall) key
+     * @param UserInterface          $user
+     * @param Request                $request
+     * @param AuthenticatorInterface $authenticator
+     * @param string                 $providerKey   The provider (i.e. firewall) key
      *
      * @return Response|null
      */
-    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, GuardAuthenticatorInterface $authenticator, $providerKey)
+    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, AuthenticatorInterface $authenticator, $providerKey)
     {
         // create an authenticated token for the User
         $token = $authenticator->createAuthenticatedToken($user, $providerKey);
@@ -110,14 +110,14 @@ public function authenticateUserAndHandleSuccess(UserInterface $user, Request $r
      * Handles an authentication failure and returns the Response for the
      * GuardAuthenticator.
      *
-     * @param AuthenticationException     $authenticationException
-     * @param Request                     $request
-     * @param GuardAuthenticatorInterface $guardAuthenticator
-     * @param string                      $providerKey             The key of the firewall
+     * @param AuthenticationException $authenticationException
+     * @param Request                 $request
+     * @param AuthenticatorInterface  $guardAuthenticator
+     * @param string                  $providerKey             The key of the firewall
      *
      * @return null|Response
      */
-    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $token = $this->tokenStorage->getToken();
         if ($token instanceof PostAuthenticationGuardToken && $providerKey === $token->getProviderKey()) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
index 307d70f9e973e..2078ad237b9e2 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
-use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 
 /**
  * The interface for all "guard" authenticators.
@@ -28,8 +27,10 @@
  * one location.
  *
  * @author Ryan Weaver 
+ *
+ * @deprecated Symfony\Component\Security\Guard\AuthenticatorInterface must be used instead
  */
-interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
+interface GuardAuthenticatorInterface extends AuthenticatorInterface
 {
     /**
      * Get the authentication credentials from the request and return them
diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
index 90b9580a3a876..c93776a34857d 100644
--- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
@@ -32,7 +32,7 @@
 class GuardAuthenticationProvider implements AuthenticationProviderInterface
 {
     /**
-     * @var GuardAuthenticatorInterface[]
+     * @var AuthenticatorInterface[]
      */
     private $guardAuthenticators;
     private $userProvider;
@@ -40,10 +40,10 @@ class GuardAuthenticationProvider implements AuthenticationProviderInterface
     private $userChecker;
 
     /**
-     * @param iterable|GuardAuthenticatorInterface[] $guardAuthenticators The authenticators, with keys that match what's passed to GuardAuthenticationListener
-     * @param UserProviderInterface                  $userProvider        The user provider
-     * @param string                                 $providerKey         The provider (i.e. firewall) key
-     * @param UserCheckerInterface                   $userChecker
+     * @param iterable|AuthenticatorInterface[] $guardAuthenticators The authenticators, with keys that match what's passed to GuardAuthenticationListener
+     * @param UserProviderInterface             $userProvider        The user provider
+     * @param string                            $providerKey         The provider (i.e. firewall) key
+     * @param UserCheckerInterface              $userChecker
      */
     public function __construct($guardAuthenticators, UserProviderInterface $userProvider, $providerKey, UserCheckerInterface $userChecker)
     {
@@ -56,7 +56,7 @@ public function __construct($guardAuthenticators, UserProviderInterface $userPro
     /**
      * Finds the correct authenticator for the token and calls it.
      *
-     * @param GuardTokenInterface $token
+     * @param TokenInterface|GuardTokenInterface $token
      *
      * @return TokenInterface
      */
@@ -101,7 +101,7 @@ public function authenticate(TokenInterface $token)
         // instances that will be checked if you have multiple firewalls.
     }
 
-    private function authenticateViaGuard(GuardAuthenticatorInterface $guardAuthenticator, PreAuthenticationGuardToken $token)
+    private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator, PreAuthenticationGuardToken $token)
     {
         // get the user from the GuardAuthenticator
         $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider);
@@ -142,6 +142,6 @@ private function authenticateViaGuard(GuardAuthenticatorInterface $guardAuthenti
 
     public function supports(TokenInterface $token)
     {
-        return $token instanceof GuardTokenInterface;
+        return $token instanceof TokenInterface;
     }
 }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 943ca49247574..60f703904cffd 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -20,6 +20,7 @@
 
 /**
  * @author Ryan Weaver 
+ * @author Amaury Leroux de Lens 
  */
 class GuardAuthenticationListenerTest extends TestCase
 {
@@ -32,11 +33,16 @@ class GuardAuthenticationListenerTest extends TestCase
 
     public function testHandleSuccess()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
         $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $providerKey = 'my_firewall';
 
         $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
+
+        $authenticator
+            ->expects($this->once())
+            ->method('supports')
+            ->willReturn(true);
         $authenticator
             ->expects($this->once())
             ->method('getCredentials')
@@ -82,10 +88,14 @@ public function testHandleSuccess()
 
     public function testHandleSuccessStopsAfterResponseIsSet()
     {
-        $authenticator1 = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticator2 = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticator1 = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $authenticator2 = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
 
         // mock the first authenticator to fail, and set a Response
+        $authenticator1
+            ->expects($this->once())
+            ->method('supports')
+            ->willReturn(true);
         $authenticator1
             ->expects($this->once())
             ->method('getCredentials')
@@ -94,6 +104,7 @@ public function testHandleSuccessStopsAfterResponseIsSet()
             ->expects($this->once())
             ->method('handleAuthenticationFailure')
             ->willReturn(new Response());
+
         // the second authenticator should *never* be called
         $authenticator2
             ->expects($this->never())
@@ -112,10 +123,15 @@ public function testHandleSuccessStopsAfterResponseIsSet()
 
     public function testHandleSuccessWithRememberMe()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
         $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $providerKey = 'my_firewall_with_rememberme';
 
+        $authenticator
+            ->expects($this->once())
+            ->method('supports')
+            ->with($this->equalTo($this->request))
+            ->willReturn(true);
         $authenticator
             ->expects($this->once())
             ->method('getCredentials')
@@ -155,10 +171,14 @@ public function testHandleSuccessWithRememberMe()
 
     public function testHandleCatchesAuthenticationException()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
         $providerKey = 'my_firewall2';
 
         $authException = new AuthenticationException('Get outta here crazy user with a bad password!');
+        $authenticator
+            ->expects($this->once())
+            ->method('supports')
+            ->willReturn(true);
         $authenticator
             ->expects($this->once())
             ->method('getCredentials')
@@ -185,6 +205,96 @@ public function testHandleCatchesAuthenticationException()
         $listener->handle($this->event);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testLegacyInterfaceNullCredentials()
+    {
+        $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $providerKey = 'my_firewall3';
+
+        $authenticatorA
+            ->expects($this->once())
+            ->method('getCredentials')
+            ->will($this->returnValue(null));
+
+        // this is not called
+        $this->authenticationManager
+            ->expects($this->never())
+            ->method('authenticate');
+
+        $this->guardAuthenticatorHandler
+            ->expects($this->never())
+            ->method('handleAuthenticationSuccess');
+
+        $listener = new GuardAuthenticationListener(
+            $this->guardAuthenticatorHandler,
+            $this->authenticationManager,
+            $providerKey,
+            array($authenticatorA),
+            $this->logger
+        );
+
+        $listener->handle($this->event);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyInterfaceKeepsWorking()
+    {
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $providerKey = 'my_firewall';
+
+        $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
+
+        $authenticator
+            ->expects($this->once())
+            ->method('getCredentials')
+            ->with($this->equalTo($this->request))
+            ->will($this->returnValue($credentials));
+
+        // a clone of the token that should be created internally
+        $uniqueGuardKey = 'my_firewall_0';
+        $nonAuthedToken = new PreAuthenticationGuardToken($credentials, $uniqueGuardKey);
+
+        $this->authenticationManager
+            ->expects($this->once())
+            ->method('authenticate')
+            ->with($this->equalTo($nonAuthedToken))
+            ->will($this->returnValue($authenticateToken));
+
+        $this->guardAuthenticatorHandler
+            ->expects($this->once())
+            ->method('authenticateWithToken')
+            ->with($authenticateToken, $this->request);
+
+        $this->guardAuthenticatorHandler
+            ->expects($this->once())
+            ->method('handleAuthenticationSuccess')
+            ->with($authenticateToken, $this->request, $authenticator, $providerKey);
+
+        $listener = new GuardAuthenticationListener(
+            $this->guardAuthenticatorHandler,
+            $this->authenticationManager,
+            $providerKey,
+            array($authenticator),
+            $this->logger
+        );
+
+        $listener->setRememberMeServices($this->rememberMeServices);
+        // should never be called - our handleAuthenticationSuccess() does not return a Response
+        $this->rememberMeServices
+            ->expects($this->never())
+            ->method('loginSuccess');
+
+        $listener->handle($this->event);
+    }
+
+    /**
+     * @group legacy
+     */
     public function testReturnNullToSkipAuth()
     {
         $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
@@ -220,6 +330,62 @@ public function testReturnNullToSkipAuth()
         $listener->handle($this->event);
     }
 
+    public function testSupportsReturnFalseSkipAuth()
+    {
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $providerKey = 'my_firewall4';
+
+        $authenticator
+            ->expects($this->once())
+            ->method('supports')
+            ->will($this->returnValue(false));
+
+        // this is not called
+        $authenticator
+            ->expects($this->never())
+            ->method('getCredentials');
+
+        $listener = new GuardAuthenticationListener(
+            $this->guardAuthenticatorHandler,
+            $this->authenticationManager,
+            $providerKey,
+            array($authenticator),
+            $this->logger
+        );
+
+        $listener->handle($this->event);
+    }
+
+    /**
+     * @expectedException \UnexpectedValueException
+     */
+    public function testSupportsReturnTrueRaiseMissingCredentialsException()
+    {
+        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $providerKey = 'my_firewall4';
+
+        $authenticator
+            ->expects($this->once())
+            ->method('supports')
+            ->will($this->returnValue(true));
+
+        // this will raise exception
+        $authenticator
+            ->expects($this->once())
+            ->method('getCredentials')
+            ->will($this->returnValue(null));
+
+        $listener = new GuardAuthenticationListener(
+            $this->guardAuthenticatorHandler,
+            $this->authenticationManager,
+            $providerKey,
+            array($authenticator),
+            $this->logger
+        );
+
+        $listener->handle($this->event);
+    }
+
     protected function setUp()
     {
         $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager')
diff --git a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
index b46bc4a78d4f1..29199d820eb11 100644
--- a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -128,7 +128,7 @@ protected function setUp()
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $this->request = new Request(array(), array(), array(), array(), array(), array());
-        $this->guardAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $this->guardAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
     }
 
     protected function tearDown()
diff --git a/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php b/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
index abbe985c9e0b2..e1b39417d78e2 100644
--- a/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
+++ b/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
@@ -29,7 +29,7 @@ class PreAuthenticationGuardToken extends AbstractToken implements GuardTokenInt
 
     /**
      * @param mixed  $credentials
-     * @param string $guardProviderKey Unique key that bind this token to a specific GuardAuthenticatorInterface
+     * @param string $guardProviderKey Unique key that bind this token to a specific AuthenticatorInterface
      */
     public function __construct($credentials, $guardProviderKey)
     {

From b1290da21bf0aec570e7852ebcdd032ff86a5074 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 4 Oct 2017 11:26:14 +0200
Subject: [PATCH 1001/1099] [Config] Fix dumped files invalidation by OPCache

---
 src/Symfony/Component/Config/ConfigCache.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
index a34328ee8f31f..814ae7fb3b46b 100644
--- a/src/Symfony/Component/Config/ConfigCache.php
+++ b/src/Symfony/Component/Config/ConfigCache.php
@@ -149,6 +149,10 @@ public function write($content, array $metadata = null)
                 // discard chmod failure (some filesystem may not support it)
             }
         }
+
+        if (\function_exists('opcache_invalidate') && ini_get('opcache.enable')) {
+            @opcache_invalidate($this->file, true);
+        }
     }
 
     /**

From d779845c3b54fd17b5edb2dec8e601e4b12d541e Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Wed, 4 Oct 2017 18:30:17 +0200
Subject: [PATCH 1002/1099] [DI] remove inheritdoc from dumped container

---
 .../DependencyInjection/Dumper/PhpDumper.php  | 27 -------------------
 .../Tests/Fixtures/php/services1-1.php        |  9 -------
 .../Tests/Fixtures/php/services1.php          |  9 -------
 .../Tests/Fixtures/php/services10.php         | 21 ---------------
 .../Tests/Fixtures/php/services12.php         | 21 ---------------
 .../Tests/Fixtures/php/services13.php         |  9 -------
 .../Tests/Fixtures/php/services19.php         |  9 -------
 .../Tests/Fixtures/php/services24.php         |  9 -------
 .../Tests/Fixtures/php/services26.php         | 21 ---------------
 .../Tests/Fixtures/php/services31.php         |  9 -------
 .../Tests/Fixtures/php/services33.php         |  9 -------
 .../Tests/Fixtures/php/services8.php          | 21 ---------------
 .../Tests/Fixtures/php/services9_as_files.txt | 24 -----------------
 .../Tests/Fixtures/php/services9_compiled.php | 21 ---------------
 .../Fixtures/php/services_array_params.php    | 21 ---------------
 .../Fixtures/php/services_base64_env.php      | 21 ---------------
 .../Fixtures/php/services_legacy_privates.php |  9 -------
 .../Tests/Fixtures/php/services_locator.php   |  9 -------
 .../Fixtures/php/services_private_frozen.php  |  9 -------
 .../php/services_private_in_expression.php    |  9 -------
 .../Tests/Fixtures/php/services_rot13_env.php | 21 ---------------
 .../Fixtures/php/services_subscriber.php      |  9 -------
 .../php/services_uninitialized_ref.php        |  9 -------
 23 files changed, 336 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index e08e385e35851..c8a4d5cd3af68 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -899,25 +899,16 @@ public function __construct()
         if ($this->container->isCompiled()) {
             $code .= <<docStar}
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /*{$this->docStar}
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /*{$this->docStar}
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -931,9 +922,6 @@ public function isFrozen()
         if ($this->asFiles) {
             $code .= <<docStar}
-     * {@inheritdoc}
-     */
     protected function load(\$file, \$lazyLoad = true)
     {
         return require \$file;
@@ -1125,9 +1113,6 @@ private function addDefaultParametersMethod()
         if ($this->container->isCompiled()) {
             $code .= <<<'EOF'
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -1144,9 +1129,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -1154,17 +1136,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
@@ -1179,9 +1155,6 @@ public function getParameterBag()
     }
 
 EOF;
-            if ('' === $this->docStar) {
-                $code = str_replace('/**', '/*', $code);
-            }
 
             if ($dynamicPhp) {
                 $loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, count($dynamicPhp), false)), '', 8);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index b791398c138ab..e696dec6aedb4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -28,25 +28,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 44c052c0a9521..c339856f0276b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -26,25 +26,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index 4353f7b06574b..219cf3431b573 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -31,25 +31,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -67,9 +58,6 @@ protected function getTestService()
         return $this->services['test'] = new \stdClass(array('only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end'));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -86,9 +74,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -96,17 +81,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 9017441bd69ae..2bd134a9f8400 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -35,25 +35,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -71,9 +62,6 @@ protected function getTestService()
         return $this->services['test'] = new \stdClass(('wiz'.$this->targetDirs[1]), array(('wiz'.$this->targetDirs[1]) => ($this->targetDirs[2].'/')));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -90,9 +78,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -100,17 +85,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index a7fe891692018..4cc353ca278de 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -29,25 +29,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index e6870bcc45e4b..0a6b97e65ded6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -30,25 +30,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 7cff4f35bbb85..7546b1765a658 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -29,25 +29,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index c802c9ae090cc..7dc51d12afed1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -35,25 +35,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -73,9 +64,6 @@ protected function getTestService()
         return $this->services['test'] = new $class($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -92,9 +80,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -102,17 +87,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php
index 51d9626372ca4..ffc76d892226a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php
@@ -30,25 +30,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index af310ce2bd58f..e36cdcaedb918 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -34,25 +34,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index f9de3098273d4..357b8aa697560 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -28,25 +28,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -54,9 +45,6 @@ public function isFrozen()
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -73,9 +61,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -83,17 +68,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index ced52118cf1b6..3795ade4806e6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -322,25 +322,16 @@ class Container%s extends Container
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -348,9 +339,6 @@ class Container%s extends Container
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function load($file, $lazyLoad = true)
     {
         return require $file;
@@ -366,9 +354,6 @@ class Container%s extends Container
         return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->load(__DIR__.'/getDeprecatedServiceService.php')) && false ?: '_'});
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -385,9 +370,6 @@ class Container%s extends Container
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -395,17 +377,11 @@ class Container%s extends Container
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index c75138447deb6..7ec609ca5e6cb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -58,25 +58,16 @@ public function __construct()
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -374,9 +365,6 @@ protected function getTaggedIteratorFooService()
         return $this->services['tagged_iterator_foo'] = new \Bar();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -393,9 +381,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -403,17 +388,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 9c6f55d25966a..e5159861b4708 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -35,25 +35,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -75,9 +66,6 @@ protected function getBarService()
         return $instance;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -94,9 +82,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -104,17 +89,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 49fcf6e45891c..8513e25d2e085 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -28,25 +28,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -54,9 +45,6 @@ public function isFrozen()
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -73,9 +61,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -83,17 +68,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
index bedf268d47b28..fad546d7fc348 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -55,25 +55,16 @@ public function __construct()
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index 87c8b5800349e..74e2a8ce094a2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -40,25 +40,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index bbb0e9e00eccc..c7ea243ae81a0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -34,25 +34,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index 8f3e7aa7fc8ab..8269736c0b8df 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -33,25 +33,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 0d2bb22b75361..3b26928577247 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -35,25 +35,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -83,9 +74,6 @@ protected function getContainer_EnvVarProcessorsLocatorService()
         }));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameter($name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -102,9 +90,6 @@ public function getParameter($name)
         return $this->parameters[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasParameter($name)
     {
         $name = $this->normalizeParameterName($name);
@@ -112,17 +97,11 @@ public function hasParameter($name)
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setParameter($name, $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameterBag()
     {
         if (null === $this->parameterBag) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 400b28ca97e97..a4ab454e3efc0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -38,25 +38,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index ef70ffb76c18d..c47e7c15d1291 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -35,25 +35,16 @@ public function __construct()
         $this->aliases = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isCompiled()
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFrozen()
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

From 3e8076023d2fe472e0612eb940e18f64d3407e43 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 4 Oct 2017 14:14:21 +0200
Subject: [PATCH 1003/1099] [DI] Improve some deprecation messages

---
 .../Component/DependencyInjection/Container.php      | 12 ++++++------
 .../DependencyInjection/Tests/ContainerTest.php      | 12 ++++++------
 .../Tests/Dumper/PhpDumperTest.php                   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 2d43ba7a60290..c878af3d9e0e4 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -199,16 +199,16 @@ public function set($id, $service)
 
         if (isset($this->privates[$id])) {
             if (null === $service) {
-                @trigger_error(sprintf('Unsetting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);
                 unset($this->privates[$id]);
             } else {
-                @trigger_error(sprintf('Setting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             }
         } elseif ($wasSet && isset($this->methodMap[$id])) {
             if (null === $service) {
-                @trigger_error(sprintf('Unsetting the "%s" service after it\'s been initialized is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is already initialized, unsetting it is deprecated since Symfony 3.3 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             } else {
-                @trigger_error(sprintf('Setting the "%s" service after it\'s been initialized is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             }
         }
     }
@@ -224,7 +224,7 @@ public function has($id)
     {
         for ($i = 2;;) {
             if (isset($this->privates[$id])) {
-                @trigger_error(sprintf('Checking for the existence of the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is private, checking for its existence is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
@@ -282,7 +282,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         // calling $this->normalizeId($id) unless necessary.
         for ($i = 2;;) {
             if (isset($this->privates[$id])) {
-                @trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.', $id), E_USER_DEPRECATED);
             }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index 5cd988714ad75..3afc118b3d505 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -186,7 +186,7 @@ public function testSetReplacesAlias()
 
     /**
      * @group legacy
-     * @expectedDeprecation Unsetting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "bar" service is already initialized, unsetting it is deprecated since Symfony 3.3 and will fail in 4.0.
      */
     public function testSetWithNullOnInitializedPredefinedService()
     {
@@ -452,7 +452,7 @@ public function testThatCloningIsNotSupported()
 
     /**
      * @group legacy
-     * @expectedDeprecation Unsetting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "internal" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.
      */
     public function testUnsetInternalPrivateServiceIsDeprecated()
     {
@@ -462,7 +462,7 @@ public function testUnsetInternalPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "internal" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0.
      */
     public function testChangeInternalPrivateServiceIsDeprecated()
     {
@@ -473,7 +473,7 @@ public function testChangeInternalPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation Checking for the existence of the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "internal" service is private, checking for its existence is deprecated since Symfony 3.2 and will fail in 4.0.
      */
     public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
     {
@@ -484,7 +484,7 @@ public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation Requesting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "internal" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
      */
     public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
     {
@@ -495,7 +495,7 @@ public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
      */
     public function testReplacingAPreDefinedServiceIsDeprecated()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index d832a220c7afc..991337681fc07 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -269,7 +269,7 @@ public function testFrozenContainerWithoutAliases()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
      */
     public function testOverrideServiceWhenUsingADumpedContainer()
     {
@@ -286,7 +286,7 @@ public function testOverrideServiceWhenUsingADumpedContainer()
 
     /**
      * @group legacy
-     * @expectedDeprecation Setting the "bar" service after it's been initialized is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
      */
     public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFromAnotherOne()
     {

From 87bd741f2d4f6b66f03b5856d6bafa9fa7e7f6c5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Wed, 4 Oct 2017 16:43:22 +0200
Subject: [PATCH 1004/1099] [Console][HttpKernel] Handle new SHELL_VERBOSITY,
 also configures the default logger

---
 src/Symfony/Component/Console/Application.php | 21 ++++++++++++++++++-
 src/Symfony/Component/Console/CHANGELOG.md    |  1 +
 .../Console/Tests/ApplicationTest.php         |  7 +++++++
 .../DependencyInjection/LoggerPass.php        | 12 ++++-------
 src/Symfony/Component/HttpKernel/Kernel.php   |  6 ++++++
 .../Component/HttpKernel/Log/Logger.php       | 17 +++++++++++++--
 .../DependencyInjection/LoggerPassTest.php    | 12 -----------
 7 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index da9d803d1b66c..481a63e732d02 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -895,18 +895,37 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
             }
         }
 
+        switch ($shellVerbosity = (int) getenv('SHELL_VERBOSITY')) {
+            case -1: $output->setVerbosity(OutputInterface::VERBOSITY_QUIET); break;
+            case 1: $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE); break;
+            case 2: $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE); break;
+            case 3: $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG); break;
+            default: $shellVerbosity = 0; break;
+        }
+
         if (true === $input->hasParameterOption(array('--quiet', '-q'), true)) {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-            $input->setInteractive(false);
+            $shellVerbosity = -1;
         } else {
             if ($input->hasParameterOption('-vvv', true) || $input->hasParameterOption('--verbose=3', true) || 3 === $input->getParameterOption('--verbose', false, true)) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
+                $shellVerbosity = 3;
             } elseif ($input->hasParameterOption('-vv', true) || $input->hasParameterOption('--verbose=2', true) || 2 === $input->getParameterOption('--verbose', false, true)) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
+                $shellVerbosity = 2;
             } elseif ($input->hasParameterOption('-v', true) || $input->hasParameterOption('--verbose=1', true) || $input->hasParameterOption('--verbose', true) || $input->getParameterOption('--verbose', false, true)) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+                $shellVerbosity = 1;
             }
         }
+
+        if (-1 === $shellVerbosity) {
+            $input->setInteractive(false);
+        }
+
+        putenv('SHELL_VERBOSITY='.$shellVerbosity);
+        $_ENV['SHELL_VERBOSITY'] = $shellVerbosity;
+        $_SERVER['SHELL_VERBOSITY'] = $shellVerbosity;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index 24d7ff7af40e0..946ff1e0ba08f 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added `SHELL_VERBOSITY` env var to control verbosity
  * added `CommandLoaderInterface`, `FactoryCommandLoader` and PSR-11
    `ContainerCommandLoader` for commands lazy-loading
  * added a case-insensitive command name matching fallback
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index d96f5e98f8850..396c35c733d0e 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -1580,6 +1580,13 @@ public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEn
             $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
         }
     }
+
+    protected function tearDown()
+    {
+        putenv('SHELL_VERBOSITY');
+        unset($_ENV['SHELL_VERBOSITY']);
+        unset($_SERVER['SHELL_VERBOSITY']);
+    }
 }
 
 class CustomApplication extends Application
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
index 2cffb99b321ec..2ad7f322289f3 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
 use Symfony\Component\HttpKernel\Log\Logger;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -29,17 +28,14 @@ class LoggerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $alias = $container->setAlias(LoggerInterface::class, 'logger');
-        $alias->setPublic(false);
+        $container->setAlias(LoggerInterface::class, 'logger')
+            ->setPublic(false);
 
         if ($container->has('logger')) {
             return;
         }
 
-        $loggerDefinition = $container->register('logger', Logger::class);
-        $loggerDefinition->setPublic(false);
-        if ($container->getParameter('kernel.debug')) {
-            $loggerDefinition->addArgument(LogLevel::DEBUG);
-        }
+        $container->register('logger', Logger::class)
+            ->setPublic(false);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 986b7cbcd640a..6f4f2b72b63b7 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -177,6 +177,12 @@ public function shutdown()
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
         if (false === $this->booted) {
+            if ($this->debug && !isset($_SERVER['SHELL_VERBOSITY'])) {
+                putenv('SHELL_VERBOSITY=3');
+                $_ENV['SHELL_VERBOSITY'] = 3;
+                $_SERVER['SHELL_VERBOSITY'] = 3;
+            }
+
             $this->boot();
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
index cf20ca258a322..c43936ed40943 100644
--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -37,15 +37,28 @@ class Logger extends AbstractLogger
     private $formatter;
     private $handle;
 
-    public function __construct($minLevel = LogLevel::WARNING, $output = 'php://stderr', callable $formatter = null)
+    public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
     {
+        if (!$minLevel) {
+            $minLevel = LogLevel::WARNING;
+
+            if (isset($_SERVER['SHELL_VERBOSITY'])) {
+                switch ((int) $_SERVER['SHELL_VERBOSITY']) {
+                    case -1: $minLevel = LogLevel::ERROR; break;
+                    case 1: $minLevel = LogLevel::NOTICE; break;
+                    case 2: $minLevel = LogLevel::INFO; break;
+                    case 3: $minLevel = LogLevel::DEBUG; break;
+                }
+            }
+        }
+
         if (!isset(self::$levels[$minLevel])) {
             throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $minLevel));
         }
 
         $this->minLevelIndex = self::$levels[$minLevel];
         $this->formatter = $formatter ?: array($this, 'format');
-        if (false === $this->handle = @fopen($output, 'a')) {
+        if (false === $this->handle = is_resource($output) ? $output : @fopen($output, 'a')) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
index d018929b2a830..b199e11dabe75 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LoggerPassTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Log\Logger;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -54,15 +53,4 @@ public function testRegisterLogger()
         $this->assertSame(Logger::class, $definition->getClass());
         $this->assertFalse($definition->isPublic());
     }
-
-    public function testSetMinLevelWhenDebugging()
-    {
-        $container = new ContainerBuilder();
-        $container->setParameter('kernel.debug', true);
-
-        (new LoggerPass())->process($container);
-
-        $definition = $container->getDefinition('logger');
-        $this->assertSame(LogLevel::DEBUG, $definition->getArgument(0));
-    }
 }

From 8c39bf7845c1517284cacd979db16a0abaf20c83 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" 
Date: Thu, 5 Oct 2017 11:48:08 +0200
Subject: [PATCH 1005/1099] Reset profiler.

---
 UPGRADE-3.4.md                                | 14 +++++++--
 UPGRADE-4.0.md                                | 10 +++++--
 composer.json                                 |  2 +-
 .../DataCollector/DoctrineDataCollector.php   | 14 +++++++++
 .../DoctrineDataCollectorTest.php             | 14 +++++++++
 src/Symfony/Bridge/Monolog/Logger.php         | 10 +++++++
 .../Monolog/Processor/DebugProcessor.php      |  9 ++++++
 .../Bridge/Monolog/Tests/LoggerTest.php       | 13 ++++++++
 .../Twig/DataCollector/TwigDataCollector.php  | 10 +++++++
 src/Symfony/Bridge/Twig/composer.json         |  2 +-
 .../FrameworkExtension.php                    |  6 ++--
 .../DataCollector/SecurityDataCollector.php   |  8 +++++
 .../DataCollector/CacheDataCollector.php      |  9 ++++++
 .../Component/EventDispatcher/CHANGELOG.md    |  5 ++++
 .../Debug/TraceableEventDispatcher.php        |  5 ++++
 .../TraceableEventDispatcherInterface.php     |  2 ++
 .../Debug/TraceableEventDispatcherTest.php    | 15 ++++++++++
 .../DataCollector/FormDataCollector.php       | 16 ++++++----
 .../DataCollector/FormDataCollectorTest.php   | 30 +++++++++++++++++++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  4 ++-
 .../DataCollector/AjaxDataCollector.php       |  5 ++++
 .../DataCollector/ConfigDataCollector.php     |  8 +++++
 .../DataCollector/DataCollectorInterface.php  |  2 ++
 .../DataCollector/EventDataCollector.php      | 16 ++++++++++
 .../DataCollector/ExceptionDataCollector.php  |  8 +++++
 .../DataCollector/LoggerDataCollector.php     | 15 ++++++++++
 .../DataCollector/MemoryDataCollector.php     | 16 +++++++---
 .../DataCollector/RequestDataCollector.php    |  6 ++++
 .../DataCollector/RouterDataCollector.php     | 22 +++++++++-----
 .../DataCollector/TimeDataCollector.php       |  8 +++++
 .../HttpKernel/Log/DebugLoggerInterface.php   |  2 ++
 .../HttpKernel/Profiler/Profiler.php          | 25 +++++++++++++++-
 .../ExceptionDataCollectorTest.php            | 19 ++++++++++++
 .../DataCollector/LoggerDataCollectorTest.php | 22 ++++++++++++--
 .../DataCollector/CloneVarDataCollector.php   |  5 ++++
 .../Tests/Fixtures/TestEventDispatcher.php    |  4 +++
 .../Tests/Profiler/ProfilerTest.php           | 14 +++++++++
 .../TranslationDataCollector.php              |  8 +++++
 .../DataCollector/ValidatorDataCollector.php  | 25 ++++++++++++----
 .../ValidatorDataCollectorTest.php            | 27 +++++++++++++++++
 .../Validator/TraceableValidator.php          |  8 +++--
 41 files changed, 426 insertions(+), 37 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index e5b6434c37f4e..c0573eb219ab8 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -63,6 +63,12 @@ Debug
 
  * Support for stacked errors in the `ErrorHandler` is deprecated and will be removed in Symfony 4.0.
 
+EventDispatcher
+---------------
+
+ * Implementing `TraceableEventDispatcherInterface` without the `reset()` method
+   is deprecated and will be unsupported in 4.0.
+
 Filesystem
 ----------
 
@@ -270,6 +276,10 @@ HttpKernel
 
  * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been deprecated and will be removed in 4.0.
 
+ * Implementing `DataCollectorInterface` without a `reset()` method has been deprecated and will be unsupported in 4.0.
+
+ * Implementing `DebugLoggerInterface` without a `clear()` method has been deprecated and will be unsupported in 4.0.
+
  * The `ChainCacheClearer::add()` method has been deprecated and will be removed in 4.0,
    inject the list of clearers as a constructor argument instead.
 
@@ -320,11 +330,11 @@ SecurityBundle
 
  * Deprecated the HTTP digest authentication: `HttpDigestFactory` will be removed in 4.0.
    Use another authentication system like `http_basic` instead.
-   
+
  * Deprecated setting the `switch_user.stateless` option to false when the firewall is `stateless`.
    Setting it to false will have no effect in 4.0.
 
- * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider. 
+ * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider.
    Using the first configured provider is deprecated since 3.4 and will throw an exception on 4.0.
    Explicitly configure the provider to use on your firewalls.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2d2e04899c18b..5bc486f44f466 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -192,6 +192,8 @@ EventDispatcher
  * The `ContainerAwareEventDispatcher` class has been removed.
    Use `EventDispatcher` with closure factories instead.
 
+ * The `reset()` method has been added to `TraceableEventDispatcherInterface`.
+
 ExpressionLanguage
 ------------------
 
@@ -611,6 +613,10 @@ HttpKernel
 
  * The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been removed.
 
+ * The `reset()` method has been added to `Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface`.
+
+ * The `clear()` method has been added to `Symfony\Component\HttpKernel\Log\DebugLoggerInterface`.
+
  * The `ChainCacheClearer::add()` method has been removed,
    inject the list of clearers as a constructor argument instead.
 
@@ -693,10 +699,10 @@ SecurityBundle
 
  * Removed the HTTP digest authentication system. The `HttpDigestFactory` class
    has been removed. Use another authentication system like `http_basic` instead.
-   
+
  * The `switch_user.stateless` option is now always true if the firewall is stateless.
 
- * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider. 
+ * Not configuring explicitly the provider on a firewall is ambiguous when there is more than one registered provider.
    The first configured provider is not used anymore and an exception is thrown instead.
    Explicitly configure the provider to use on your firewalls.
 
diff --git a/composer.json b/composer.json
index 7b55e30efd330..373e4b6aca9c1 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "doctrine/common": "~2.4",
         "fig/link-util": "^1.0",
-        "twig/twig": "~1.34|~2.4",
+        "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index 62c6a2381a940..bca53ef4092b7 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -28,6 +28,10 @@ class DoctrineDataCollector extends DataCollector
     private $registry;
     private $connections;
     private $managers;
+
+    /**
+     * @var DebugStack[]
+     */
     private $loggers = array();
 
     public function __construct(ManagerRegistry $registry)
@@ -65,6 +69,16 @@ public function collect(Request $request, Response $response, \Exception $except
         );
     }
 
+    public function reset()
+    {
+        $this->data = array();
+
+        foreach ($this->loggers as $logger) {
+            $logger->queries = array();
+            $logger->currentQuery = 0;
+        }
+    }
+
     public function getManagers()
     {
         return $this->data['managers'];
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
index 8cbd2c3eacb3c..cc20869c7c5c6 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -101,6 +101,20 @@ public function testCollectQueryWithNoParams()
         $this->assertTrue($collectedQueries['default'][1]['explainable']);
     }
 
+    public function testReset()
+    {
+        $queries = array(
+            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
+        );
+        $c = $this->createCollector($queries);
+        $c->collect(new Request(), new Response());
+
+        $c->reset();
+        $c->collect(new Request(), new Response());
+
+        $this->assertEquals(array('default' => array()), $c->getQueries());
+    }
+
     /**
      * @dataProvider paramProvider
      */
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
index ec6434fe791b8..7cd75c5ec11ca 100644
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@@ -45,6 +45,16 @@ public function countErrors()
         return 0;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        if (($logger = $this->getDebugLogger()) && method_exists($logger, 'clear')) {
+            $logger->clear();
+        }
+    }
+
     /**
      * Returns a DebugLoggerInterface instance if one is registered with this logger.
      *
diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
index 22a4faac5cc9a..8774045192f3b 100644
--- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
@@ -55,4 +55,13 @@ public function countErrors()
     {
         return $this->errorCount;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        $this->records = array();
+        $this->errorCount = 0;
+    }
 }
diff --git a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
index c24c7a4133baf..a5fab0583c749 100644
--- a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
@@ -128,4 +128,17 @@ public function testGetLogsWithDebugProcessor2()
         $this->assertEquals('test', $record['message']);
         $this->assertEquals(Logger::INFO, $record['priority']);
     }
+
+    public function testClear()
+    {
+        $handler = new TestHandler();
+        $logger = new Logger('test', array($handler));
+        $logger->pushProcessor(new DebugProcessor());
+
+        $logger->addInfo('test');
+        $logger->clear();
+
+        $this->assertEmpty($logger->getLogs());
+        $this->assertSame(0, $logger->countErrors());
+    }
 }
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index d5efaa805362c..66f2a764e7617 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -44,6 +44,16 @@ public function collect(Request $request, Response $response, \Exception $except
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->profile->reset();
+        $this->computed = null;
+        $this->data = array();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index e1e86408cff33..bf4deb3f6e787 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^5.5.9|>=7.0.8",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "^1.35|^2.4.4"
     },
     "require-dev": {
         "fig/link-util": "^1.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 0e136bfe436f7..90673719814b5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -609,9 +609,9 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             }
         }
 
-        if (!$config['collect']) {
-            $container->getDefinition('profiler')->addMethodCall('disable', array());
-        }
+        $container->getDefinition('profiler')
+            ->addArgument($config['collect'])
+            ->addTag('kernel.reset', array('method' => 'reset'));
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
index fbd146452f26d..086cea89d9620 100644
--- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
+++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -203,6 +203,14 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     public function lateCollect()
     {
         $this->data = $this->cloneVar($this->data);
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
index 07ddaf3f4790a..62d502f01fd6b 100644
--- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -53,6 +53,15 @@ public function collect(Request $request, Response $response, \Exception $except
         $this->data['total']['statistics'] = $this->calculateTotalStatistics();
     }
 
+    public function reset()
+    {
+        $this->data = array();
+        foreach ($this->instances as $instance) {
+            // Calling getCalls() will clear the calls.
+            $instance->getCalls();
+        }
+    }
+
     public function lateCollect()
     {
         $this->data = $this->cloneVar($this->data);
diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
index 736bd84903b4b..c6aa5389ac724 100644
--- a/src/Symfony/Component/EventDispatcher/CHANGELOG.md
+++ b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+  * Implementing `TraceableEventDispatcherInterface` without the `reset()` method has been deprecated.
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 3f1035e13dd98..2fb795f77b246 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -212,6 +212,11 @@ public function getNotCalledListeners()
         return $notCalled;
     }
 
+    public function reset()
+    {
+        $this->called = array();
+    }
+
     /**
      * Proxies all method calls to the original event dispatcher.
      *
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
index 5483e815068c4..f0212753be591 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Fabien Potencier 
+ *
+ * @method reset() Resets the trace.
  */
 interface TraceableEventDispatcherInterface extends EventDispatcherInterface
 {
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index a1cf6708b3a56..53a3421afaf6a 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -124,6 +124,21 @@ public function testGetCalledListeners()
         $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
     }
 
+    public function testClearCalledListeners()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->addListener('foo', function () {}, 5);
+
+        $tdispatcher->dispatch('foo');
+        $tdispatcher->reset();
+
+        $listeners = $tdispatcher->getNotCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners['foo.closure']);
+        unset($listeners['foo.closure']['stub']);
+        $this->assertEquals(array(), $tdispatcher->getCalledListeners());
+        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
+    }
+
     public function testGetCalledListenersNested()
     {
         $tdispatcher = null;
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 378edf563b972..db854b01bf7a0 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -72,12 +72,9 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
     public function __construct(FormDataExtractorInterface $dataExtractor)
     {
         $this->dataExtractor = $dataExtractor;
-        $this->data = array(
-            'forms' => array(),
-            'forms_by_hash' => array(),
-            'nb_errors' => 0,
-        );
         $this->hasVarDumper = class_exists(ClassStub::class);
+
+        $this->reset();
     }
 
     /**
@@ -87,6 +84,15 @@ public function collect(Request $request, Response $response, \Exception $except
     {
     }
 
+    public function reset()
+    {
+        $this->data = array(
+            'forms' => array(),
+            'forms_by_hash' => array(),
+            'nb_errors' => 0,
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
index 24c0f8e871da1..7e591d414e456 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -695,6 +695,36 @@ public function testCollectSubmittedDataExpandedFormsErrors()
         $this->assertFalse(isset($child21Data['has_children_error']), 'The leaf data does not contains "has_children_error" property.');
     }
 
+    public function testReset()
+    {
+        $form = $this->createForm('my_form');
+
+        $this->dataExtractor->expects($this->any())
+            ->method('extractConfiguration')
+            ->will($this->returnValue(array()));
+        $this->dataExtractor->expects($this->any())
+            ->method('extractDefaultData')
+            ->will($this->returnValue(array()));
+        $this->dataExtractor->expects($this->any())
+            ->method('extractSubmittedData')
+            ->with($form)
+            ->will($this->returnValue(array('errors' => array('baz'))));
+
+        $this->dataCollector->buildPreliminaryFormTree($form);
+        $this->dataCollector->collectSubmittedData($form);
+
+        $this->dataCollector->reset();
+
+        $this->assertSame(
+            array(
+                'forms' => array(),
+                'forms_by_hash' => array(),
+                'nb_errors' => 0,
+            ),
+            $this->dataCollector->getData()
+        );
+    }
+
     private function createForm($name)
     {
         $builder = new FormBuilder($name, null, $this->dispatcher, $this->factory);
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 1da376f7ad36c..fb29f76962928 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -14,7 +14,9 @@ CHANGELOG
  * deprecated the `ChainCacheClearer::add()` method
  * deprecated the `CacheaWarmerAggregate::add()` and `setWarmers()` methods
  * made `CacheWarmerAggregate` and `ChainCacheClearer` classes final
-
+ * added the possibility to reset the profiler to its initial state
+ * deprecated data collectors without a `reset()` method
+ * deprecated implementing `DebugLoggerInterface` without a `clear()` method
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
index b8405d5945af0..370a874fe5d5c 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
@@ -26,6 +26,11 @@ public function collect(Request $request, Response $response, \Exception $except
         // all collecting is done client side
     }
 
+    public function reset()
+    {
+        // all collecting is done client side
+    }
+
     public function getName()
     {
         return 'ajax';
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index 965342191b4cf..0a6aa82b263bd 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -95,6 +95,14 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     public function lateCollect()
     {
         $this->data = $this->cloneVar($this->data);
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
index 2820ad5b289b5..c0a0c0a982b3b 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
@@ -18,6 +18,8 @@
  * DataCollectorInterface.
  *
  * @author Fabien Potencier 
+ *
+ * @method reset() Resets this data collector to its initial state.
  */
 interface DataCollectorInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index 3d75f322d831b..ab44405edb2e7 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -27,6 +27,9 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function __construct(EventDispatcherInterface $dispatcher = null)
     {
+        if ($dispatcher instanceof TraceableEventDispatcherInterface && !method_exists($dispatcher, 'reset')) {
+            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', TraceableEventDispatcherInterface::class, \get_class($dispatcher)), E_USER_DEPRECATED);
+        }
         $this->dispatcher = $dispatcher;
     }
 
@@ -41,6 +44,19 @@ public function collect(Request $request, Response $response, \Exception $except
         );
     }
 
+    public function reset()
+    {
+        $this->data = array();
+
+        if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
+            if (!method_exists($this->dispatcher, 'reset')) {
+                return; // @deprecated
+            }
+
+            $this->dispatcher->reset();
+        }
+    }
+
     public function lateCollect()
     {
         if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
index 9fe826446b195..7a25f149215b8 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -34,6 +34,14 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     /**
      * Checks if the exception is not null.
      *
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 92fd0da71e648..ee645d53e8fdb 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -29,6 +29,10 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
     public function __construct($logger = null, $containerPathPrefix = null)
     {
         if (null !== $logger && $logger instanceof DebugLoggerInterface) {
+            if (!method_exists($logger, 'clear')) {
+                @trigger_error(sprintf('Implementing "%s" without the "clear()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DebugLoggerInterface::class, \get_class($logger)), E_USER_DEPRECATED);
+            }
+
             $this->logger = $logger;
         }
 
@@ -43,6 +47,17 @@ public function collect(Request $request, Response $response, \Exception $except
         // everything is done as late as possible
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if ($this->logger && method_exists($this->logger, 'clear')) {
+            $this->logger->clear();
+        }
+        $this->data = array();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index b7f61f46fd19b..8d8cc1a04d181 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -23,10 +23,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
 {
     public function __construct()
     {
-        $this->data = array(
-            'memory' => 0,
-            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
-        );
+        $this->reset();
     }
 
     /**
@@ -37,6 +34,17 @@ public function collect(Request $request, Response $response, \Exception $except
         $this->updateMemoryUsage();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array(
+            'memory' => 0,
+            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 7049844f9ed5d..d27940266a8f1 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -156,6 +156,12 @@ public function lateCollect()
         $this->data = $this->cloneVar($this->data);
     }
 
+    public function reset()
+    {
+        $this->data = array();
+        $this->controllers = new \SplObjectStorage();
+    }
+
     public function getMethod()
     {
         return $this->data['method'];
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
index 76d962346175e..59f77c4ba29d8 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -23,17 +23,14 @@
  */
 class RouterDataCollector extends DataCollector
 {
+    /**
+     * @var \SplObjectStorage
+     */
     protected $controllers;
 
     public function __construct()
     {
-        $this->controllers = new \SplObjectStorage();
-
-        $this->data = array(
-            'redirect' => false,
-            'url' => null,
-            'route' => null,
-        );
+        $this->reset();
     }
 
     /**
@@ -53,6 +50,17 @@ public function collect(Request $request, Response $response, \Exception $except
         unset($this->controllers[$request]);
     }
 
+    public function reset()
+    {
+        $this->controllers = new \SplObjectStorage();
+
+        $this->data = array(
+            'redirect' => false,
+            'url' => null,
+            'route' => null,
+        );
+    }
+
     protected function guessRoute(Request $request, $controller)
     {
         return 'n/a';
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index 2d39156e69e44..6588304935d3d 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -49,6 +49,14 @@ public function collect(Request $request, Response $response, \Exception $except
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
index 5635a2184f007..f0606d3b0e5ee 100644
--- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
+++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -15,6 +15,8 @@
  * DebugLoggerInterface.
  *
  * @author Fabien Potencier 
+ *
+ * @method clear() Removes all log records.
  */
 interface DebugLoggerInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index 2580b4fffa002..85a71641be6fe 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -40,6 +40,11 @@ class Profiler
      */
     private $logger;
 
+    /**
+     * @var bool
+     */
+    private $initiallyEnabled = true;
+
     /**
      * @var bool
      */
@@ -48,11 +53,13 @@ class Profiler
     /**
      * @param ProfilerStorageInterface $storage A ProfilerStorageInterface instance
      * @param LoggerInterface          $logger  A LoggerInterface instance
+     * @param bool                     $enable  The initial enabled state
      */
-    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null)
+    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, $enable = true)
     {
         $this->storage = $storage;
         $this->logger = $logger;
+        $this->initiallyEnabled = $this->enabled = (bool) $enable;
     }
 
     /**
@@ -188,6 +195,18 @@ public function collect(Request $request, Response $response, \Exception $except
         return $profile;
     }
 
+    public function reset()
+    {
+        foreach ($this->collectors as $collector) {
+            if (!method_exists($collector, 'reset')) {
+                continue;
+            }
+
+            $collector->reset();
+        }
+        $this->enabled = $this->initiallyEnabled;
+    }
+
     /**
      * Gets the Collectors associated with this profiler.
      *
@@ -218,6 +237,10 @@ public function set(array $collectors = array())
      */
     public function add(DataCollectorInterface $collector)
     {
+        if (!method_exists($collector, 'reset')) {
+            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DataCollectorInterface::class, \get_class($collector)), E_USER_DEPRECATED);
+        }
+
         $this->collectors[$collector->getName()] = $collector;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
index afad9f58af638..178f1f01a3fc0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -37,4 +37,23 @@ public function testCollect()
         $this->assertSame('exception', $c->getName());
         $this->assertSame($trace, $c->getTrace());
     }
+
+    public function testCollectWithoutException()
+    {
+        $c = new ExceptionDataCollector();
+        $c->collect(new Request(), new Response());
+
+        $this->assertFalse($c->hasException());
+    }
+
+    public function testReset()
+    {
+        $c = new ExceptionDataCollector();
+
+        $c->collect(new Request(), new Response(), new \Exception());
+        $c->reset();
+        $c->collect(new Request(), new Response());
+
+        $this->assertFalse($c->hasException());
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
index 62bf2c00c7586..3dec3bd7f87a0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -19,7 +19,10 @@ class LoggerDataCollectorTest extends TestCase
 {
     public function testCollectWithUnexpectedFormat()
     {
-        $logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->getMock();
         $logger->expects($this->once())->method('countErrors')->will($this->returnValue('foo'));
         $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue(array()));
 
@@ -43,7 +46,10 @@ public function testCollectWithUnexpectedFormat()
      */
     public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)
     {
-        $logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->getMock();
         $logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
         $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
 
@@ -70,6 +76,18 @@ public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount
         }
     }
 
+    public function testReset()
+    {
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->getMock();
+        $logger->expects($this->once())->method('clear');
+
+        $c = new LoggerDataCollector($logger);
+        $c->reset();
+    }
+
     public function getCollectTestData()
     {
         yield 'simple log' => array(
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
index 867ccdce57892..89dec36af4110 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
@@ -29,6 +29,11 @@ public function collect(Request $request, Response $response, \Exception $except
         $this->data = $this->cloneVar($this->varToClone);
     }
 
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     public function getData()
     {
         return $this->data;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
index da7ef5bd60381..ca2e6a693da6e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
@@ -25,4 +25,8 @@ public function getNotCalledListeners()
     {
         return array('bar');
     }
+
+    public function reset()
+    {
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
index 1a6f54636a508..243c3c5c5a7cb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\Profiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
 use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
@@ -40,6 +41,19 @@ public function testCollect()
         $this->assertSame('bar', $profile->getCollector('request')->getRequestQuery()->all()['foo']->getValue());
     }
 
+    public function testReset()
+    {
+        $collector = $this->getMockBuilder(DataCollectorInterface::class)
+            ->setMethods(['collect', 'getName', 'reset'])
+            ->getMock();
+        $collector->expects($this->any())->method('getName')->willReturn('mock');
+        $collector->expects($this->once())->method('reset');
+
+        $profiler = new Profiler($this->storage);
+        $profiler->add($collector);
+        $profiler->reset();
+    }
+
     public function testFindWorksWithDates()
     {
         $profiler = new Profiler($this->storage);
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index 1696fc71ffeea..da45cce31e659 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -58,6 +58,14 @@ public function collect(Request $request, Response $response, \Exception $except
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     /**
      * @return array
      */
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
index d2b3f4626264c..aa8c61f96bff9 100644
--- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
+++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Validator\TraceableValidator;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
@@ -31,10 +32,7 @@ class ValidatorDataCollector extends DataCollector implements LateDataCollectorI
     public function __construct(TraceableValidator $validator)
     {
         $this->validator = $validator;
-        $this->data = array(
-            'calls' => array(),
-            'violations_count' => 0,
-        );
+        $this->reset();
     }
 
     /**
@@ -45,6 +43,15 @@ public function collect(Request $request, Response $response, \Exception $except
         // Everything is collected once, on kernel terminate.
     }
 
+    public function reset()
+    {
+        $this->validator->reset();
+        $this->data = array(
+            'calls' => $this->cloneVar(array()),
+            'violations_count' => 0,
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -52,16 +59,22 @@ public function lateCollect()
     {
         $collected = $this->validator->getCollectedData();
         $this->data['calls'] = $this->cloneVar($collected);
-        $this->data['violations_count'] += array_reduce($collected, function ($previous, $item) {
-            return $previous += count($item['violations']);
+        $this->data['violations_count'] = array_reduce($collected, function ($previous, $item) {
+            return $previous + count($item['violations']);
         }, 0);
     }
 
+    /**
+     * @return Data
+     */
     public function getCalls()
     {
         return $this->data['calls'];
     }
 
+    /**
+     * @return int
+     */
     public function getViolationsCount()
     {
         return $this->data['violations_count'];
diff --git a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
index 811a55829a479..c078d283509c6 100644
--- a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
+++ b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
@@ -50,6 +50,33 @@ public function testCollectsValidatorCalls()
         $this->assertCount(2, $call['violations']);
     }
 
+    public function testReset()
+    {
+        $originalValidator = $this->createMock(ValidatorInterface::class);
+        $validator = new TraceableValidator($originalValidator);
+
+        $collector = new ValidatorDataCollector($validator);
+
+        $violations = new ConstraintViolationList(array(
+            $this->createMock(ConstraintViolation::class),
+            $this->createMock(ConstraintViolation::class),
+        ));
+        $originalValidator->method('validate')->willReturn($violations);
+
+        $validator->validate(new \stdClass());
+
+        $collector->lateCollect();
+        $collector->reset();
+
+        $this->assertCount(0, $collector->getCalls());
+        $this->assertSame(0, $collector->getViolationsCount());
+
+        $collector->lateCollect();
+
+        $this->assertCount(0, $collector->getCalls());
+        $this->assertSame(0, $collector->getViolationsCount());
+    }
+
     protected function createMock($classname)
     {
         return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock();
diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
index 019559ae0023d..96134e2767468 100644
--- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php
+++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Validator;
 
-use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
@@ -30,13 +29,18 @@ public function __construct(ValidatorInterface $validator)
     }
 
     /**
-     * @return ConstraintViolationList[]
+     * @return array
      */
     public function getCollectedData()
     {
         return $this->collectedData;
     }
 
+    public function reset()
+    {
+        $this->collectedData = array();
+    }
+
     /**
      * {@inheritdoc}
      */

From 78eecba780a059034028660ebb1ea81dcb8a511f Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Thu, 5 Oct 2017 09:59:11 +0200
Subject: [PATCH 1006/1099] Fix BC layer

---
 UPGRADE-3.4.md                                |   6 +-
 UPGRADE-4.0.md                                |   6 +-
 src/Symfony/Component/Security/CHANGELOG.md   |   1 +
 .../Guard/AbstractGuardAuthenticator.php      |  10 +-
 .../Security/Guard/AuthenticatorInterface.php | 121 +-----------------
 .../Firewall/GuardAuthenticationListener.php  |  31 ++---
 .../Guard/GuardAuthenticatorHandler.php       |   8 +-
 .../Guard/GuardAuthenticatorInterface.php     |   5 +-
 .../Provider/GuardAuthenticationProvider.php  |   6 +-
 .../GuardAuthenticationListenerTest.php       |  30 +++--
 .../Tests/GuardAuthenticatorHandlerTest.php   |   3 +-
 .../GuardAuthenticationProviderTest.php       |  65 ++++++++++
 12 files changed, 122 insertions(+), 170 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 3996618fc18ff..c410d5c4cc44d 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -295,6 +295,9 @@ Security
  * Deprecated the HTTP digest authentication: `NonceExpiredException`,
    `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` will be
    removed in 4.0. Use another authentication system like `http_basic` instead.
+   
+ * The `GuardAuthenticatorInterface` has been deprecated and will be removed in 4.0.
+   Use `AuthenticatorInterface` instead.
 
 SecurityBundle
 --------------
@@ -302,9 +305,6 @@ SecurityBundle
  * Using voters that do not implement the `VoterInterface`is now deprecated in
    the `AccessDecisionManager` and this functionality will be removed in 4.0.
 
- * Using guard authenticator that implement the `GuardAuthenticatorInterface` is now
-   deprecated, this will be removed in 4.0. `AuthenticatorInterface` must be used now.
-
  * `FirewallContext::getListeners()` now returns `\Traversable|array`
 
  * `InitAclCommand::__construct()` now takes an instance of
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index a9a382b8e9d14..bd645e3444987 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -659,9 +659,6 @@ Security
  * The `RoleInterface` has been removed. Extend the `Symfony\Component\Security\Core\Role\Role`
    class instead.
 
- * The `GuardAuthenticatorInterface` has been removed. Implement
-   `Symfony\Component\Security\Guard\AuthenticatorInterface` class instead.
-
  * The `LogoutUrlGenerator::registerListener()` method expects a 6th `string $context = null` argument.
 
  * The `AccessDecisionManager::setVoters()` method has been removed. Pass the
@@ -676,6 +673,9 @@ Security
    `DigestAuthenticationListener` and `DigestAuthenticationEntryPoint` classes
    have been removed. Use another authentication system like `http_basic` instead.
 
+ * The `GuardAuthenticatorInterface` interface has been removed.
+   Use `AuthenticatorInterface` instead.
+
 SecurityBundle
 --------------
 
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 25e89572a557a..bd1b7b59eb793 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
    requests.
  * deprecated HTTP digest authentication
  * Added a new password encoder for the Argon2i hashing algorithm
+ * deprecated `GuardAuthenticatorInterface` in favor of `AuthenticatorInterface`
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
index 97c9c4a0922d9..5eceb8470a567 100644
--- a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
+++ b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
@@ -23,17 +23,13 @@
 abstract class AbstractGuardAuthenticator implements AuthenticatorInterface
 {
     /**
-     * Default implementation of the AuthenticatorInterface::supports method
-     * As we still have the deprecated GuardAuthenticatorInterface, this method must be implemented here
-     * Once GuardAuthenticatorInterface will be removed, this method should be removed too.
+     * {@inheritdoc}
      *
-     * @param Request $request
-     *
-     * @return bool
+     * @deprecated since version 3.4, to be removed in 4.0
      */
     public function supports(Request $request)
     {
-        @trigger_error('The Symfony\Component\Security\Guard\AbstractGuardAuthenticator::supports default implementation is used. This is provided for backward compatibility on GuardAuthenticationInterface that is deprecated since version 3.1 and will be removed in 4.0. Provide your own implementation of the supports method instead.', E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Implement the "%s::supports()" method in class "%s" instead.', __METHOD__, AuthenticatorInterface::class, get_class($this)), E_USER_DEPRECATED);
 
         return true;
     }
diff --git a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
index a1497b0eef4f9..f68b8d6f43b08 100644
--- a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
@@ -12,13 +12,6 @@
 namespace Symfony\Component\Security\Guard;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
-use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 
 /**
  * The interface for all "guard" authenticators.
@@ -30,14 +23,12 @@
  * @author Ryan Weaver 
  * @author Amaury Leroux de Lens 
  */
-interface AuthenticatorInterface extends AuthenticationEntryPointInterface
+interface AuthenticatorInterface extends GuardAuthenticatorInterface
 {
     /**
-     * Does the authenticator support the given Request ?
+     * Does the authenticator support the given Request?
      *
-     * If this returns true, authentication will continue (e.g. getCredentials() will be called).
-     * If false, this authenticator is done. The next (if any) authenticators will be called and
-     * may authenticate the user, or leave the user as anonymous.
+     * If this returns false, the authenticator will be skipped.
      *
      * @param Request $request
      *
@@ -47,8 +38,7 @@ public function supports(Request $request);
 
     /**
      * Get the authentication credentials from the request and return them
-     * as any type (e.g. an associate array). If you return null, authentication
-     * will be skipped.
+     * as any type (e.g. an associate array).
      *
      * Whatever value you return here will be passed to getUser() and checkCredentials()
      *
@@ -65,106 +55,9 @@ public function supports(Request $request);
      *
      * @param Request $request
      *
-     * @return mixed|null
-     */
-    public function getCredentials(Request $request);
-
-    /**
-     * Return a UserInterface object based on the credentials.
-     *
-     * The *credentials* are the return value from getCredentials()
-     *
-     * You may throw an AuthenticationException if you wish. If you return
-     * null, then a UsernameNotFoundException is thrown for you.
+     * @return mixed Any non-null value
      *
-     * @param mixed                 $credentials
-     * @param UserProviderInterface $userProvider
-     *
-     * @throws AuthenticationException
-     *
-     * @return UserInterface|null
+     * @throws \UnexpectedValueException If null is returned
      */
-    public function getUser($credentials, UserProviderInterface $userProvider);
-
-    /**
-     * Returns true if the credentials are valid.
-     *
-     * If any value other than true is returned, authentication will
-     * fail. You may also throw an AuthenticationException if you wish
-     * to cause authentication to fail.
-     *
-     * The *credentials* are the return value from getCredentials()
-     *
-     * @param mixed         $credentials
-     * @param UserInterface $user
-     *
-     * @return bool
-     *
-     * @throws AuthenticationException
-     */
-    public function checkCredentials($credentials, UserInterface $user);
-
-    /**
-     * Creates an authenticated token for the given user.
-     *
-     * If you don't care about which token class is used or don't really
-     * understand what a "token" is, you can skip this method by extending
-     * the AbstractGuardAuthenticator class from your authenticator.
-     *
-     * @see AbstractGuardAuthenticator
-     *
-     * @param UserInterface $user
-     * @param string        $providerKey The provider (i.e. firewall) key
-     *
-     * @return GuardTokenInterface
-     */
-    public function createAuthenticatedToken(UserInterface $user, $providerKey);
-
-    /**
-     * Called when authentication executed, but failed (e.g. wrong username password).
-     *
-     * This should return the Response sent back to the user, like a
-     * RedirectResponse to the login page or a 403 response.
-     *
-     * If you return null, the request will continue, but the user will
-     * not be authenticated. This is probably not what you want to do.
-     *
-     * @param Request                 $request
-     * @param AuthenticationException $exception
-     *
-     * @return Response|null
-     */
-    public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
-
-    /**
-     * Called when authentication executed and was successful!
-     *
-     * This should return the Response sent back to the user, like a
-     * RedirectResponse to the last page they visited.
-     *
-     * If you return null, the current request will continue, and the user
-     * will be authenticated. This makes sense, for example, with an API.
-     *
-     * @param Request        $request
-     * @param TokenInterface $token
-     * @param string         $providerKey The provider (i.e. firewall) key
-     *
-     * @return Response|null
-     */
-    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey);
-
-    /**
-     * Does this method support remember me cookies?
-     *
-     * Remember me cookie will be set if *all* of the following are met:
-     *  A) This method returns true
-     *  B) The remember_me key under your firewall is configured
-     *  C) The "remember me" functionality is activated. This is usually
-     *      done by having a _remember_me checkbox in your form, but
-     *      can be configured by the "always_remember_me" and "remember_me_parameter"
-     *      parameters under the "remember_me" firewall key
-     *
-     * @return bool
-     */
-    public function supportsRememberMe();
+    public function getCredentials(Request $request);
 }
diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
index dd5ae2c16b9f4..4ec0b8f32630d 100644
--- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -15,9 +15,9 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Security\Guard\GuardAuthenticatorHandler;
+use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
 use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -94,7 +94,7 @@ public function handle(GetResponseEvent $event)
         }
     }
 
-    private function executeGuardAuthenticator($uniqueGuardKey, AuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
+    private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
     {
         $request = $event->getRequest();
         try {
@@ -102,38 +102,29 @@ private function executeGuardAuthenticator($uniqueGuardKey, AuthenticatorInterfa
                 $this->logger->debug('Calling getCredentials() on guard configurator.', array('firewall_key' => $this->providerKey, 'authenticator' => get_class($guardAuthenticator)));
             }
 
-            // abort the execution of the authenticator if it doesn't support the request.
-            if ($guardAuthenticator instanceof GuardAuthenticatorInterface) {
-                // it's a GuardAuthenticatorInterface
-                // we support the previous behaviour to avoid BC break.
-                $credentialsCanBeNull = true;
-                @trigger_error('The Symfony\Component\Security\Guard\GuardAuthenticatorInterface interface is deprecated since version 3.1 and will be removed in 4.0. Use Symfony\Component\Security\Guard\Authenticator\GuardAuthenticatorInterface instead.', E_USER_DEPRECATED);
-            } else {
-                if (true !== $guardAuthenticator->supports($request)) {
+            // abort the execution of the authenticator if it doesn't support the request
+            if ($guardAuthenticator instanceof AuthenticatorInterface) {
+                if (!$guardAuthenticator->supports($request)) {
                     return;
                 }
                 // as there was a support for given request,
                 // authenticator is expected to give not-null credentials.
                 $credentialsCanBeNull = false;
+            } else {
+                // deprecated since version 3.4, to be removed in 4.0
+                $credentialsCanBeNull = true;
             }
 
             // allow the authenticator to fetch authentication info from the request
             $credentials = $guardAuthenticator->getCredentials($request);
 
             if (null === $credentials) {
-                // if GuardAuthenticatorInterface is used
-                // allow null to skip authentication.
+                // deprecated since version 3.4, to be removed in 4.0
                 if ($credentialsCanBeNull) {
                     return;
                 }
 
-                // otherwise something went wrong and the authentication must fail
-                throw new \UnexpectedValueException(sprintf(
-                    'You must return some credentials from %s:getCredentials().
-                    To skip authentication, return false from %s::supports().',
-                    get_class($guardAuthenticator),
-                    get_class($guardAuthenticator)
-                ));
+                throw new \UnexpectedValueException(sprintf('The return value of "%s::getCredentials()" must not be null. Return false from "%s::supports()" instead.', get_class($guardAuthenticator), get_class($guardAuthenticator)));
             }
 
             // create a token with the unique key, so that the provider knows which authenticator to use
@@ -205,7 +196,7 @@ public function setRememberMeServices(RememberMeServicesInterface $rememberMeSer
      * @param TokenInterface         $token
      * @param Response               $response
      */
-    private function triggerRememberMe(AuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
+    private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
     {
         if (null === $this->rememberMeServices) {
             if (null !== $this->logger) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index c8fb6e394e992..abe263d888d5f 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -29,6 +29,8 @@
  * can be called directly (e.g. for manual authentication) or overridden.
  *
  * @author Ryan Weaver 
+ *
+ * @final since version 3.4
  */
 class GuardAuthenticatorHandler
 {
@@ -68,7 +70,7 @@ public function authenticateWithToken(TokenInterface $token, Request $request)
      *
      * @return null|Response
      */
-    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $response = $guardAuthenticator->onAuthenticationSuccess($request, $token, $providerKey);
 
@@ -95,7 +97,7 @@ public function handleAuthenticationSuccess(TokenInterface $token, Request $requ
      *
      * @return Response|null
      */
-    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, AuthenticatorInterface $authenticator, $providerKey)
+    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, GuardAuthenticatorInterface $authenticator, $providerKey)
     {
         // create an authenticated token for the User
         $token = $authenticator->createAuthenticatedToken($user, $providerKey);
@@ -117,7 +119,7 @@ public function authenticateUserAndHandleSuccess(UserInterface $user, Request $r
      *
      * @return null|Response
      */
-    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $token = $this->tokenStorage->getToken();
         if ($token instanceof PostAuthenticationGuardToken && $providerKey === $token->getProviderKey()) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
index 2078ad237b9e2..0d11573c03b11 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
+use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 
 /**
  * The interface for all "guard" authenticators.
@@ -28,9 +29,9 @@
  *
  * @author Ryan Weaver 
  *
- * @deprecated Symfony\Component\Security\Guard\AuthenticatorInterface must be used instead
+ * @deprecated since version 3.4, to be removed in 4.0. Use AuthenticatorInterface instead
  */
-interface GuardAuthenticatorInterface extends AuthenticatorInterface
+interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
 {
     /**
      * Get the authentication credentials from the request and return them
diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
index c93776a34857d..2f2678035fbcf 100644
--- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
@@ -56,7 +56,7 @@ public function __construct($guardAuthenticators, UserProviderInterface $userPro
     /**
      * Finds the correct authenticator for the token and calls it.
      *
-     * @param TokenInterface|GuardTokenInterface $token
+     * @param GuardTokenInterface $token
      *
      * @return TokenInterface
      */
@@ -101,7 +101,7 @@ public function authenticate(TokenInterface $token)
         // instances that will be checked if you have multiple firewalls.
     }
 
-    private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator, PreAuthenticationGuardToken $token)
+    private function authenticateViaGuard($guardAuthenticator, PreAuthenticationGuardToken $token)
     {
         // get the user from the GuardAuthenticator
         $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider);
@@ -142,6 +142,6 @@ private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator
 
     public function supports(TokenInterface $token)
     {
-        return $token instanceof TokenInterface;
+        return $token instanceof GuardTokenInterface;
     }
 }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 60f703904cffd..5af9f130f8645 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -14,7 +14,10 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\Firewall\GuardAuthenticationListener;
+use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
@@ -33,8 +36,8 @@ class GuardAuthenticationListenerTest extends TestCase
 
     public function testHandleSuccess()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
-        $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticateToken = $this->getMockBuilder(TokenInterface::class)->getMock();
         $providerKey = 'my_firewall';
 
         $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
@@ -88,8 +91,8 @@ public function testHandleSuccess()
 
     public function testHandleSuccessStopsAfterResponseIsSet()
     {
-        $authenticator1 = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
-        $authenticator2 = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $authenticator1 = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticator2 = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
 
         // mock the first authenticator to fail, and set a Response
         $authenticator1
@@ -104,7 +107,6 @@ public function testHandleSuccessStopsAfterResponseIsSet()
             ->expects($this->once())
             ->method('handleAuthenticationFailure')
             ->willReturn(new Response());
-
         // the second authenticator should *never* be called
         $authenticator2
             ->expects($this->never())
@@ -123,8 +125,8 @@ public function testHandleSuccessStopsAfterResponseIsSet()
 
     public function testHandleSuccessWithRememberMe()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
-        $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticateToken = $this->getMockBuilder(TokenInterface::class)->getMock();
         $providerKey = 'my_firewall_with_rememberme';
 
         $authenticator
@@ -171,7 +173,7 @@ public function testHandleSuccessWithRememberMe()
 
     public function testHandleCatchesAuthenticationException()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $providerKey = 'my_firewall2';
 
         $authException = new AuthenticationException('Get outta here crazy user with a bad password!');
@@ -210,7 +212,7 @@ public function testHandleCatchesAuthenticationException()
      */
     public function testLegacyInterfaceNullCredentials()
     {
-        $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticatorA = $this->getMockBuilder(GuardAuthenticatorInterface::class)->getMock();
         $providerKey = 'my_firewall3';
 
         $authenticatorA
@@ -243,8 +245,8 @@ public function testLegacyInterfaceNullCredentials()
      */
     public function testLegacyInterfaceKeepsWorking()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $authenticator = $this->getMockBuilder(GuardAuthenticatorInterface::class)->getMock();
+        $authenticateToken = $this->getMockBuilder(TokenInterface::class)->getMock();
         $providerKey = 'my_firewall';
 
         $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
@@ -332,7 +334,7 @@ public function testReturnNullToSkipAuth()
 
     public function testSupportsReturnFalseSkipAuth()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $providerKey = 'my_firewall4';
 
         $authenticator
@@ -359,9 +361,9 @@ public function testSupportsReturnFalseSkipAuth()
     /**
      * @expectedException \UnexpectedValueException
      */
-    public function testSupportsReturnTrueRaiseMissingCredentialsException()
+    public function testReturnNullFromGetCredentials()
     {
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $providerKey = 'my_firewall4';
 
         $authenticator
diff --git a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
index 29199d820eb11..c67f38e9ef91c 100644
--- a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\GuardAuthenticatorHandler;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
@@ -128,7 +129,7 @@ protected function setUp()
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $this->request = new Request(array(), array(), array(), array(), array(), array());
-        $this->guardAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\AuthenticatorInterface')->getMock();
+        $this->guardAuthenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
     }
 
     protected function tearDown()
diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index ed3920533fe92..9d8301fce8011 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -12,6 +12,9 @@
 namespace Symfony\Component\Security\Guard\Tests\Provider;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\Provider\GuardAuthenticationProvider;
 use Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken;
 
@@ -28,6 +31,68 @@ public function testAuthenticate()
     {
         $providerKey = 'my_cool_firewall';
 
+        $authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticatorB = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticatorC = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
+        $authenticators = array($authenticatorA, $authenticatorB, $authenticatorC);
+
+        // called 2 times - for authenticator A and B (stops on B because of match)
+        $this->preAuthenticationToken->expects($this->exactly(2))
+            ->method('getGuardProviderKey')
+            // it will return the "1" index, which will match authenticatorB
+            ->will($this->returnValue('my_cool_firewall_1'));
+
+        $enteredCredentials = array(
+            'username' => '_weaverryan_test_user',
+            'password' => 'guard_auth_ftw',
+        );
+        $this->preAuthenticationToken->expects($this->atLeastOnce())
+            ->method('getCredentials')
+            ->will($this->returnValue($enteredCredentials));
+
+        // authenticators A and C are never called
+        $authenticatorA->expects($this->never())
+            ->method('getUser');
+        $authenticatorC->expects($this->never())
+            ->method('getUser');
+
+        $mockedUser = $this->getMockBuilder(UserInterface::class)->getMock();
+        $authenticatorB->expects($this->once())
+            ->method('getUser')
+            ->with($enteredCredentials, $this->userProvider)
+            ->will($this->returnValue($mockedUser));
+        // checkCredentials is called
+        $authenticatorB->expects($this->once())
+            ->method('checkCredentials')
+            ->with($enteredCredentials, $mockedUser)
+            // authentication works!
+            ->will($this->returnValue(true));
+        $authedToken = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $authenticatorB->expects($this->once())
+            ->method('createAuthenticatedToken')
+            ->with($mockedUser, $providerKey)
+            ->will($this->returnValue($authedToken));
+
+        // user checker should be called
+        $this->userChecker->expects($this->once())
+            ->method('checkPreAuth')
+            ->with($mockedUser);
+        $this->userChecker->expects($this->once())
+            ->method('checkPostAuth')
+            ->with($mockedUser);
+
+        $provider = new GuardAuthenticationProvider($authenticators, $this->userProvider, $providerKey, $this->userChecker);
+        $actualAuthedToken = $provider->authenticate($this->preAuthenticationToken);
+        $this->assertSame($authedToken, $actualAuthedToken);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAuthenticate()
+    {
+        $providerKey = 'my_cool_firewall';
+
         $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
         $authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
         $authenticatorC = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();

From 6651af07c2fad05d79b4ab4f972579e15b382f51 Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 14:27:30 +0200
Subject: [PATCH 1007/1099] [HttpFoundation] deprecate using  with the legacy
 mongo extension; use it with the mongodb/mongodb package and ext-mongodb
 instead

---
 UPGRADE-3.4.md                                      |  3 +++
 UPGRADE-4.0.md                                      |  3 +++
 src/Symfony/Component/HttpFoundation/CHANGELOG.md   |  1 +
 .../Storage/Handler/MongoDbSessionHandler.php       | 13 +++++++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index e5b6434c37f4e..c6d5675d782fe 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -234,6 +234,9 @@ HttpFoundation
  * `NativeSessionStorage::setSaveHandler()` now takes an instance of `\SessionHandlerInterface` as argument.
    Not passing it is deprecated and will throw a `TypeError` in 4.0.
 
+ * Using `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` with the legacy mongo extension
+   has been deprecated and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.
+
 HttpKernel
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2d2e04899c18b..04fd5197add8c 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -540,6 +540,9 @@ HttpFoundation
 
  * `NativeSessionStorage::setSaveHandler()` now requires an instance of `\SessionHandlerInterface` as argument.
 
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` does not work with the legacy
+   mongo extension anymore. It requires mongodb/mongodb package and ext-mongodb.
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index d60ebdfe8daaa..608bac2d6db10 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * deprecated the `NativeSessionHandler` class,
  * deprecated the `AbstractProxy`, `NativeProxy` and `SessionHandlerProxy` classes,
  * deprecated setting session save handlers that do not implement `\SessionHandlerInterface` in `NativeSessionStorage::setSaveHandler()`
+ * deprecated using `MongoDbSessionHandler` with the legacy mongo extension; use it with the mongodb/mongodb package and ext-mongodb instead
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 80ecc1cc3c788..20e1a897e480b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -12,7 +12,12 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
+ * Session handler using the mongodb/mongodb package and MongoDB driver extension.
+ *
  * @author Markus Bachmann 
+ *
+ * @see https://packagist.org/packages/mongodb/mongodb
+ * @see http://php.net/manual/en/set.mongodb.php
  */
 class MongoDbSessionHandler implements \SessionHandlerInterface
 {
@@ -57,14 +62,18 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
      * If you use such an index, you can drop `gc_probability` to 0 since
      * no garbage-collection is required.
      *
-     * @param \Mongo|\MongoClient|\MongoDB\Client $mongo   A MongoDB\Client, MongoClient or Mongo instance
-     * @param array                               $options An associative array of field options
+     * @param \MongoDB\Client $mongo   A MongoDB\Client instance
+     * @param array           $options An associative array of field options
      *
      * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided
      * @throws \InvalidArgumentException When "database" or "collection" not provided
      */
     public function __construct($mongo, array $options)
     {
+        if ($mongo instanceof \MongoClient || $mongo instanceof \Mongo) {
+            @trigger_error(sprintf('Using %s with the legacy mongo extension is deprecated as of 3.4 and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.', __CLASS__), E_USER_DEPRECATED);
+        }
+
         if (!($mongo instanceof \MongoDB\Client || $mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
             throw new \InvalidArgumentException('MongoClient or Mongo instance required');
         }

From d535ff60c2477f45e8552b80a4935004b44a3608 Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 14:34:03 +0200
Subject: [PATCH 1008/1099] [VarDumper] deprecate MongoCaster

---
 src/Symfony/Component/VarDumper/CHANGELOG.md           | 1 +
 src/Symfony/Component/VarDumper/Caster/MongoCaster.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
index 24a5843f64dff..2d44cad2259c0 100644
--- a/src/Symfony/Component/VarDumper/CHANGELOG.md
+++ b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `AbstractCloner::setMinDepth()` function to ensure minimum tree depth
+ * deprecated `MongoCaster`
 
 2.7.0
 -----
diff --git a/src/Symfony/Component/VarDumper/Caster/MongoCaster.php b/src/Symfony/Component/VarDumper/Caster/MongoCaster.php
index 92258f06fa238..2219386bc243d 100644
--- a/src/Symfony/Component/VarDumper/Caster/MongoCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/MongoCaster.php
@@ -13,10 +13,14 @@
 
 use Symfony\Component\VarDumper\Cloner\Stub;
 
+@trigger_error('The '.__NAMESPACE__.'\MongoCaster class is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
 /**
  * Casts classes from the MongoDb extension to array representation.
  *
  * @author Nicolas Grekas 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0.
  */
 class MongoCaster
 {

From af0aa1e530215e2c09b95a8f9d4657c4ab28ef4e Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 15:13:44 +0200
Subject: [PATCH 1009/1099] Add changelog for deprecated DbalSessionHandler

---
 UPGRADE-3.4.md                           | 7 +++++++
 UPGRADE-4.0.md                           | 7 +++++++
 src/Symfony/Bridge/Doctrine/CHANGELOG.md | 2 ++
 3 files changed, 16 insertions(+)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index a06a8cd5151e4..8bbaf85fb0116 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -63,6 +63,13 @@ Debug
 
  * Support for stacked errors in the `ErrorHandler` is deprecated and will be removed in Symfony 4.0.
 
+DoctrineBridge
+--------------
+
+* Deprecated `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler` and
+  `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandlerSchema`. Use
+  `Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler` instead.
+
 EventDispatcher
 ---------------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 46fa72302e271..daf14138b60a8 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -186,6 +186,13 @@ DependencyInjection
 
  * The `ExtensionCompilerPass` has been moved to before-optimization passes with priority -1000.
 
+DoctrineBridge
+--------------
+
+* The `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler` and
+  `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandlerSchema` have been removed. Use
+  `Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler` instead.
+
 EventDispatcher
 ---------------
 
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index 0258a36a998ee..378db70d14926 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -6,6 +6,8 @@ CHANGELOG
 
  * added support for doctrine/dbal v2.6 types
  * added cause of UniqueEntity constraint violation
+ * deprecated `DbalSessionHandler` and `DbalSessionHandlerSchema` in favor of
+   `Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler`
 
 3.1.0
 -----

From 5d29dd0d28aaf3e15967c393d889dbb400721d13 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 5 Oct 2017 10:44:57 +0200
Subject: [PATCH 1010/1099] [FrameworkBundle] Fix bad interface hint in
 AbstractController

---
 .../FrameworkBundle/Controller/ControllerTrait.php     | 10 +++++-----
 .../Tests/Controller/ControllerTraitTest.php           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
index 8a8eafe0ced59..7d47d59585762 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -231,10 +231,10 @@ protected function renderView($view, array $parameters = array())
     protected function render($view, array $parameters = array(), Response $response = null)
     {
         if ($this->container->has('templating')) {
-            return $this->container->get('templating')->renderResponse($view, $parameters, $response);
-        }
-
-        if (!$this->container->has('twig')) {
+            $content = $this->container->get('templating')->render($view, $parameters);
+        } elseif ($this->container->has('twig')) {
+            $content = $this->container->get('twig')->render($view, $parameters);
+        } else {
             throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');
         }
 
@@ -242,7 +242,7 @@ protected function render($view, array $parameters = array(), Response $response
             $response = new Response();
         }
 
-        $response->setContent($this->container->get('twig')->render($view, $parameters));
+        $response->setContent($content);
 
         return $response;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
index 3feabfd12e273..8321ebd5b49ab 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -451,7 +451,7 @@ public function testRenderViewTemplating()
     public function testRenderTemplating()
     {
         $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
-        $templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));
+        $templating->expects($this->once())->method('render')->willReturn('bar');
 
         $container = new Container();
         $container->set('templating', $templating);

From df9c8748e3d6d37b7c62da896fffd84577e923a1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 3 Oct 2017 11:46:06 +0200
Subject: [PATCH 1011/1099] [Bridge\Doctrine][FrameworkBundle] Deprecate some
 remaining uses of ContainerAwareTrait

---
 .../Bridge/Doctrine/ManagerRegistry.php       | 19 +++++++-
 .../Doctrine/Tests/ManagerRegistryTest.php    |  7 ++-
 .../Controller/ControllerResolver.php         | 20 ++++----
 .../Controller/RedirectController.php         | 43 +++++++++++++++--
 .../Controller/TemplateController.php         | 43 ++++++++++++++---
 .../Resources/config/routing.xml              | 11 +++++
 .../Controller/RedirectControllerTest.php     | 48 ++++++++++++++-----
 .../Controller/TemplateControllerTest.php     | 37 ++++++++++----
 .../Handler/MongoDbSessionHandlerTest.php     |  1 +
 9 files changed, 187 insertions(+), 42 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
index c353e36e66282..af5ccaa1ab64e 100644
--- a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
+++ b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -12,9 +12,10 @@
 namespace Symfony\Bridge\Doctrine;
 
 use ProxyManager\Proxy\LazyLoadingInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Doctrine\Common\Persistence\AbstractManagerRegistry;
 
 /**
@@ -24,7 +25,21 @@
  */
 abstract class ManagerRegistry extends AbstractManagerRegistry implements ContainerAwareInterface
 {
-    use ContainerAwareTrait;
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
+     * @final since version 3.4
+     */
+    public function setContainer(SymfonyContainerInterface $container = null)
+    {
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject a PSR-11 container using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->container = $container;
+    }
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
index fa3037a609d8a..d1596a1968b76 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -31,7 +31,7 @@ public function testResetService()
         $container = new \LazyServiceProjectServiceContainer();
 
         $registry = new TestManagerRegistry('name', array(), array('defaultManager' => 'foo'), 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
-        $registry->setContainer($container);
+        $registry->setTestContainer($container);
 
         $foo = $container->get('foo');
         $foo->bar = 123;
@@ -46,6 +46,11 @@ public function testResetService()
 
 class TestManagerRegistry extends ManagerRegistry
 {
+    public function setTestContainer($container)
+    {
+        $this->container = $container;
+    }
+
     public function getAliasNamespace($alias)
     {
         return 'Foo';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
index b88ad0cc7de33..a688abbabaf9a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -48,13 +48,7 @@ protected function createController($controller)
         $resolvedController = parent::createController($controller);
 
         if (1 === substr_count($controller, ':') && is_array($resolvedController)) {
-            if ($resolvedController[0] instanceof ContainerAwareInterface) {
-                $resolvedController[0]->setContainer($this->container);
-            }
-
-            if ($resolvedController[0] instanceof AbstractController && null !== $previousContainer = $resolvedController[0]->setContainer($this->container)) {
-                $resolvedController[0]->setContainer($previousContainer);
-            }
+            $resolvedController[0] = $this->configureController($resolvedController[0]);
         }
 
         return $resolvedController;
@@ -65,9 +59,19 @@ protected function createController($controller)
      */
     protected function instantiateController($class)
     {
-        $controller = parent::instantiateController($class);
+        return $this->configureController(parent::instantiateController($class));
+    }
 
+    private function configureController($controller)
+    {
         if ($controller instanceof ContainerAwareInterface) {
+            // @deprecated switch, to be removed in 4.0 where these classes
+            // won't implement ContainerAwareInterface anymore
+            switch (\get_class($controller)) {
+                case RedirectController::class:
+                case TemplateController::class:
+                    return $controller;
+            }
             $controller->setContainer($this->container);
         }
         if ($controller instanceof AbstractController && null !== $previousContainer = $controller->setContainer($this->container)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index b2cb1d1acc07d..6edee88ce5dda 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -12,7 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -23,10 +23,37 @@
  * Redirects a request to another URL.
  *
  * @author Fabien Potencier 
+ *
+ * @final since version 3.4
  */
 class RedirectController implements ContainerAwareInterface
 {
-    use ContainerAwareTrait;
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0
+     */
+    protected $container;
+
+    private $router;
+    private $httpPort;
+    private $httpsPort;
+
+    public function __construct(UrlGeneratorInterface $router = null, $httpPort = null, $httpsPort = null)
+    {
+        $this->router = $router;
+        $this->httpPort = $httpPort;
+        $this->httpsPort = $httpsPort;
+    }
+
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject an UrlGeneratorInterface using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->container = $container;
+        $this->router = $container->get('router');
+    }
 
     /**
      * Redirects to another route with the given name.
@@ -61,7 +88,7 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
             }
         }
 
-        return new RedirectResponse($this->container->get('router')->generate($route, $attributes, UrlGeneratorInterface::ABSOLUTE_URL), $permanent ? 301 : 302);
+        return new RedirectResponse($this->router->generate($route, $attributes, UrlGeneratorInterface::ABSOLUTE_URL), $permanent ? 301 : 302);
     }
 
     /**
@@ -115,8 +142,11 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
             if (null === $httpPort) {
                 if ('http' === $request->getScheme()) {
                     $httpPort = $request->getPort();
-                } elseif ($this->container->hasParameter('request_listener.http_port')) {
+                } elseif ($this->container && $this->container->hasParameter('request_listener.http_port')) {
+                    @trigger_error(sprintf('Passing the http port as a container parameter is deprecated since Symfony 3.4 and won\'t be possible in 4.0. Pass it to the constructor of the "%s" class instead.', __CLASS__), E_USER_DEPRECATED);
                     $httpPort = $this->container->getParameter('request_listener.http_port');
+                } else {
+                    $httpPort = $this->httpPort;
                 }
             }
 
@@ -127,8 +157,11 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
             if (null === $httpsPort) {
                 if ('https' === $request->getScheme()) {
                     $httpsPort = $request->getPort();
-                } elseif ($this->container->hasParameter('request_listener.https_port')) {
+                } elseif ($this->container && $this->container->hasParameter('request_listener.https_port')) {
+                    @trigger_error(sprintf('Passing the https port as a container parameter is deprecated since Symfony 3.4 and won\'t be possible in 4.0. Pass it to the constructor of the "%s" class instead.', __CLASS__), E_USER_DEPRECATED);
                     $httpsPort = $this->container->getParameter('request_listener.https_port');
+                } else {
+                    $httpsPort = $this->httpsPort;
                 }
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index 42ebd33bad9f2..5d13355208dcc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -12,17 +12,48 @@
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
+use Twig\Environment;
 
 /**
  * TemplateController.
  *
  * @author Fabien Potencier 
+ *
+ * @final since version 3.4
  */
 class TemplateController implements ContainerAwareInterface
 {
-    use ContainerAwareTrait;
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0
+     */
+    protected $container;
+
+    private $twig;
+    private $templating;
+
+    public function __construct(Environment $twig = null, EngineInterface $templating = null)
+    {
+        $this->twig = $twig;
+        $this->templating = $templating;
+    }
+
+    /**
+     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject a Twig Environment or an EngineInterface using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
+
+        if ($container->has('templating')) {
+            $this->templating = $container->get('templating');
+        } elseif ($container->has('twig')) {
+            $this->twig = $container->get('twig');
+        }
+        $this->container = $container;
+    }
 
     /**
      * Renders a template.
@@ -36,10 +67,10 @@ class TemplateController implements ContainerAwareInterface
      */
     public function templateAction($template, $maxAge = null, $sharedAge = null, $private = null)
     {
-        if ($this->container->has('templating')) {
-            $response = $this->container->get('templating')->renderResponse($template);
-        } elseif ($this->container->has('twig')) {
-            $response = new Response($this->container->get('twig')->render($template));
+        if ($this->templating) {
+            $response = new Response($this->templating->render($template));
+        } elseif ($this->twig) {
+            $response = new Response($this->twig->render($template));
         } else {
             throw new \LogicException('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 6856512e20349..ed8dbfe8d7f72 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -110,5 +110,16 @@
             
             
         
+
+        
+            
+            %request_listener.http_port%
+            %request_listener.https_port%
+        
+
+        
+            
+            
+        
     
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index 14b6e4428e550..a95083a382639 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 
@@ -66,23 +67,14 @@ public function testRoute($permanent, $ignoreAttributes, $expectedCode, $expecte
 
         $request->attributes = new ParameterBag($attributes);
 
-        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router = $this->getMockBuilder(UrlGeneratorInterface::class)->getMock();
         $router
             ->expects($this->once())
             ->method('generate')
             ->with($this->equalTo($route), $this->equalTo($expectedAttributes))
             ->will($this->returnValue($url));
 
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-
-        $container
-            ->expects($this->once())
-            ->method('get')
-            ->with($this->equalTo('router'))
-            ->will($this->returnValue($router));
-
-        $controller = new RedirectController();
-        $controller->setContainer($container);
+        $controller = new RedirectController($router);
 
         $returnResponse = $controller->redirectAction($request, $route, $permanent, $ignoreAttributes);
 
@@ -130,7 +122,7 @@ public function testFullURL()
         $this->assertEquals(302, $returnResponse->getStatusCode());
     }
 
-    public function testUrlRedirectDefaultPortParameters()
+    public function testUrlRedirectDefaultPorts()
     {
         $host = 'www.example.com';
         $baseUrl = '/base';
@@ -151,6 +143,30 @@ public function testUrlRedirectDefaultPortParameters()
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testUrlRedirectDefaultPortParameters()
+    {
+        $host = 'www.example.com';
+        $baseUrl = '/base';
+        $path = '/redirect-path';
+        $httpPort = 1080;
+        $httpsPort = 1443;
+
+        $expectedUrl = "https://$host:$httpsPort$baseUrl$path";
+        $request = $this->createRequestObject('http', $host, $httpPort, $baseUrl);
+        $controller = $this->createLegacyRedirectController(null, $httpsPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'https');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+
+        $expectedUrl = "http://$host:$httpPort$baseUrl$path";
+        $request = $this->createRequestObject('https', $host, $httpPort, $baseUrl);
+        $controller = $this->createLegacyRedirectController($httpPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'http');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+    }
+
     public function urlRedirectProvider()
     {
         return array(
@@ -256,6 +272,14 @@ private function createRequestObject($scheme, $host, $port, $baseUrl, $queryStri
     }
 
     private function createRedirectController($httpPort = null, $httpsPort = null)
+    {
+        return new RedirectController(null, $httpPort, $httpsPort);
+    }
+
+    /**
+     * @deprecated
+     */
+    private function createLegacyRedirectController($httpPort = null, $httpsPort = null)
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
index 6afb5e3203f28..497c112eedb5f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @author Kévin Dunglas 
@@ -25,6 +25,29 @@ public function testTwig()
         $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
         $twig->expects($this->once())->method('render')->willReturn('bar');
 
+        $controller = new TemplateController($twig);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    public function testTemplating()
+    {
+        $templating = $this->getMockBuilder(EngineInterface::class)->getMock();
+        $templating->expects($this->once())->method('render')->willReturn('bar');
+
+        $controller = new TemplateController(null, $templating);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->at(0))->method('has')->will($this->returnValue(false));
         $container->expects($this->at(1))->method('has')->will($this->returnValue(true));
@@ -36,10 +59,13 @@ public function testTwig()
         $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
     }
 
-    public function testTemplating()
+    /**
+     * @group legacy
+     */
+    public function testLegacyTemplating()
     {
         $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
-        $templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));
+        $templating->expects($this->once())->method('render')->willReturn('bar');
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->at(0))->method('has')->willReturn(true);
@@ -57,12 +83,7 @@ public function testTemplating()
      */
     public function testNoTwigNorTemplating()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-        $container->expects($this->at(0))->method('has')->willReturn(false);
-        $container->expects($this->at(1))->method('has')->willReturn(false);
-
         $controller = new TemplateController();
-        $controller->setContainer($container);
 
         $controller->templateAction('mytemplate')->getContent();
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 74366863f7126..9b28f066d6dc5 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -17,6 +17,7 @@
 /**
  * @author Markus Bachmann 
  * @group time-sensitive
+ * @group legacy
  */
 class MongoDbSessionHandlerTest extends TestCase
 {

From 51a1b57c67b57c20717491732d0703c37d4864c1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 5 Oct 2017 17:24:04 +0200
Subject: [PATCH 1012/1099] fix merge

---
 .../Tests/Dumper/PhpDumperTest.php               | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 2f29729005f2f..bda74490c9382 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -799,14 +799,14 @@ public function testDumpHandlesLiteralClassWithRootNamespace()
 
     /**
      * @group legacy
-     * @expectedDeprecation Requesting the "private" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "private_alias" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "decorated_private" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "decorated_private_alias" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "private_not_inlined" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "private_not_removed" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "private_child" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
-     * @expectedDeprecation Requesting the "private_parent" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
+     * @expectedDeprecation The "private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private_not_inlined" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private_not_removed" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private_child" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private_parent" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
      */
     public function testLegacyPrivateServices()
     {

From 3b1b8cfdf30e5470700c356f67995f62b3179ae3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Thu, 5 Oct 2017 17:34:34 +0200
Subject: [PATCH 1013/1099] [Bridge\Doctrine][FrameworkBundle] Remove legacy
 uses of ContainerAwareInterface

---
 .../Bridge/Doctrine/ManagerRegistry.php       | 15 +----
 .../Controller/ControllerResolver.php         |  7 ---
 .../Controller/RedirectController.php         | 30 +--------
 .../Controller/TemplateController.php         | 24 +------
 .../Controller/RedirectControllerTest.php     | 62 -------------------
 .../Controller/TemplateControllerTest.php     | 37 -----------
 6 files changed, 5 insertions(+), 170 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
index 9239fd31afa99..fd09e82ded922 100644
--- a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
+++ b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -14,8 +14,6 @@
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Doctrine\Common\Persistence\AbstractManagerRegistry;
 
 /**
@@ -23,24 +21,13 @@
  *
  * @author  Lukas Kahwe Smith 
  */
-abstract class ManagerRegistry extends AbstractManagerRegistry implements ContainerAwareInterface
+abstract class ManagerRegistry extends AbstractManagerRegistry
 {
     /**
      * @var ContainerInterface
      */
     protected $container;
 
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
-     * @final since version 3.4
-     */
-    public function setContainer(SymfonyContainerInterface $container = null)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject a PSR-11 container using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->container = $container;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
index a688abbabaf9a..e42703b941e35 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -65,13 +65,6 @@ protected function instantiateController($class)
     private function configureController($controller)
     {
         if ($controller instanceof ContainerAwareInterface) {
-            // @deprecated switch, to be removed in 4.0 where these classes
-            // won't implement ContainerAwareInterface anymore
-            switch (\get_class($controller)) {
-                case RedirectController::class:
-                case TemplateController::class:
-                    return $controller;
-            }
             $controller->setContainer($this->container);
         }
         if ($controller instanceof AbstractController && null !== $previousContainer = $controller->setContainer($this->container)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index 6edee88ce5dda..487481623e9b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -26,13 +24,8 @@
  *
  * @final since version 3.4
  */
-class RedirectController implements ContainerAwareInterface
+class RedirectController
 {
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    protected $container;
-
     private $router;
     private $httpPort;
     private $httpsPort;
@@ -44,17 +37,6 @@ public function __construct(UrlGeneratorInterface $router = null, $httpPort = nu
         $this->httpsPort = $httpsPort;
     }
 
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject an UrlGeneratorInterface using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->container = $container;
-        $this->router = $container->get('router');
-    }
-
     /**
      * Redirects to another route with the given name.
      *
@@ -104,8 +86,8 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
      * @param string      $path      The absolute path or URL to redirect to
      * @param bool        $permanent Whether the redirect is permanent or not
      * @param string|null $scheme    The URL scheme (null to keep the current one)
-     * @param int|null    $httpPort  The HTTP port (null to keep the current one for the same scheme or the configured port in the container)
-     * @param int|null    $httpsPort The HTTPS port (null to keep the current one for the same scheme or the configured port in the container)
+     * @param int|null    $httpPort  The HTTP port (null to keep the current one for the same scheme or the default configured port)
+     * @param int|null    $httpsPort The HTTPS port (null to keep the current one for the same scheme or the default configured port)
      *
      * @return Response A Response instance
      *
@@ -142,9 +124,6 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
             if (null === $httpPort) {
                 if ('http' === $request->getScheme()) {
                     $httpPort = $request->getPort();
-                } elseif ($this->container && $this->container->hasParameter('request_listener.http_port')) {
-                    @trigger_error(sprintf('Passing the http port as a container parameter is deprecated since Symfony 3.4 and won\'t be possible in 4.0. Pass it to the constructor of the "%s" class instead.', __CLASS__), E_USER_DEPRECATED);
-                    $httpPort = $this->container->getParameter('request_listener.http_port');
                 } else {
                     $httpPort = $this->httpPort;
                 }
@@ -157,9 +136,6 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
             if (null === $httpsPort) {
                 if ('https' === $request->getScheme()) {
                     $httpsPort = $request->getPort();
-                } elseif ($this->container && $this->container->hasParameter('request_listener.https_port')) {
-                    @trigger_error(sprintf('Passing the https port as a container parameter is deprecated since Symfony 3.4 and won\'t be possible in 4.0. Pass it to the constructor of the "%s" class instead.', __CLASS__), E_USER_DEPRECATED);
-                    $httpsPort = $this->container->getParameter('request_listener.https_port');
                 } else {
                     $httpsPort = $this->httpsPort;
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index 5d13355208dcc..65eb35fc2a2fd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
@@ -24,13 +22,8 @@
  *
  * @final since version 3.4
  */
-class TemplateController implements ContainerAwareInterface
+class TemplateController
 {
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    protected $container;
-
     private $twig;
     private $templating;
 
@@ -40,21 +33,6 @@ public function __construct(Environment $twig = null, EngineInterface $templatin
         $this->templating = $templating;
     }
 
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0 alongside with the ContainerAwareInterface type.
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Inject a Twig Environment or an EngineInterface using the constructor instead.', __METHOD__), E_USER_DEPRECATED);
-
-        if ($container->has('templating')) {
-            $this->templating = $container->get('templating');
-        } elseif ($container->has('twig')) {
-            $this->twig = $container->get('twig');
-        }
-        $this->container = $container;
-    }
-
     /**
      * Renders a template.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index a95083a382639..7555f8f7aa025 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -143,30 +143,6 @@ public function testUrlRedirectDefaultPorts()
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testUrlRedirectDefaultPortParameters()
-    {
-        $host = 'www.example.com';
-        $baseUrl = '/base';
-        $path = '/redirect-path';
-        $httpPort = 1080;
-        $httpsPort = 1443;
-
-        $expectedUrl = "https://$host:$httpsPort$baseUrl$path";
-        $request = $this->createRequestObject('http', $host, $httpPort, $baseUrl);
-        $controller = $this->createLegacyRedirectController(null, $httpsPort);
-        $returnValue = $controller->urlRedirectAction($request, $path, false, 'https');
-        $this->assertRedirectUrl($returnValue, $expectedUrl);
-
-        $expectedUrl = "http://$host:$httpPort$baseUrl$path";
-        $request = $this->createRequestObject('https', $host, $httpPort, $baseUrl);
-        $controller = $this->createLegacyRedirectController($httpPort);
-        $returnValue = $controller->urlRedirectAction($request, $path, false, 'http');
-        $this->assertRedirectUrl($returnValue, $expectedUrl);
-    }
-
     public function urlRedirectProvider()
     {
         return array(
@@ -276,44 +252,6 @@ private function createRedirectController($httpPort = null, $httpsPort = null)
         return new RedirectController(null, $httpPort, $httpsPort);
     }
 
-    /**
-     * @deprecated
-     */
-    private function createLegacyRedirectController($httpPort = null, $httpsPort = null)
-    {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-
-        if (null !== $httpPort) {
-            $container
-                ->expects($this->once())
-                ->method('hasParameter')
-                ->with($this->equalTo('request_listener.http_port'))
-                ->will($this->returnValue(true));
-            $container
-                ->expects($this->once())
-                ->method('getParameter')
-                ->with($this->equalTo('request_listener.http_port'))
-                ->will($this->returnValue($httpPort));
-        }
-        if (null !== $httpsPort) {
-            $container
-                ->expects($this->once())
-                ->method('hasParameter')
-                ->with($this->equalTo('request_listener.https_port'))
-                ->will($this->returnValue(true));
-            $container
-                ->expects($this->once())
-                ->method('getParameter')
-                ->with($this->equalTo('request_listener.https_port'))
-                ->will($this->returnValue($httpsPort));
-        }
-
-        $controller = new RedirectController();
-        $controller->setContainer($container);
-
-        return $controller;
-    }
-
     public function assertRedirectUrl(Response $returnResponse, $expectedUrl)
     {
         $this->assertTrue($returnResponse->isRedirect($expectedUrl), "Expected: $expectedUrl\nGot:      ".$returnResponse->headers->get('Location'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
index 497c112eedb5f..0bc068d76a556 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
@@ -40,43 +40,6 @@ public function testTemplating()
         $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLegacyTwig()
-    {
-        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
-        $twig->expects($this->once())->method('render')->willReturn('bar');
-
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-        $container->expects($this->at(0))->method('has')->will($this->returnValue(false));
-        $container->expects($this->at(1))->method('has')->will($this->returnValue(true));
-        $container->expects($this->at(2))->method('get')->will($this->returnValue($twig));
-
-        $controller = new TemplateController();
-        $controller->setContainer($container);
-
-        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyTemplating()
-    {
-        $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
-        $templating->expects($this->once())->method('render')->willReturn('bar');
-
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-        $container->expects($this->at(0))->method('has')->willReturn(true);
-        $container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
-
-        $controller = new TemplateController();
-        $controller->setContainer($container);
-
-        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
-    }
-
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessage You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.

From 989326b98819edfc119391f6c3f4e61b2455135e Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 17:58:33 +0200
Subject: [PATCH 1014/1099] [Session] deprecate MemcacheSessionHandler

memcache extension didn't get a release since 4.5 years and is not compatible with PHP 7
---
 UPGRADE-3.4.md                                                | 3 +++
 UPGRADE-4.0.md                                                | 3 +++
 src/Symfony/Component/HttpFoundation/CHANGELOG.md             | 1 +
 .../Session/Storage/Handler/MemcacheSessionHandler.php        | 4 ++++
 .../Session/Storage/Handler/MemcacheSessionHandlerTest.php    | 1 +
 5 files changed, 12 insertions(+)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index a06a8cd5151e4..763e45285ef81 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -243,6 +243,9 @@ HttpFoundation
  * Using `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` with the legacy mongo extension
    has been deprecated and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.
 
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler` class has been deprecated and
+   will be removed in 4.0. Use `Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler` instead.
+
 HttpKernel
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 46fa72302e271..11e7cdfe92c0e 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -545,6 +545,9 @@ HttpFoundation
  * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` does not work with the legacy
    mongo extension anymore. It requires mongodb/mongodb package and ext-mongodb.
 
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler` class has been removed.
+   Use `Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler` instead.
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 608bac2d6db10..83a3c8e32eaf6 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * deprecated the `AbstractProxy`, `NativeProxy` and `SessionHandlerProxy` classes,
  * deprecated setting session save handlers that do not implement `\SessionHandlerInterface` in `NativeSessionStorage::setSaveHandler()`
  * deprecated using `MongoDbSessionHandler` with the legacy mongo extension; use it with the mongodb/mongodb package and ext-mongodb instead
+ * deprecated `MemcacheSessionHandler`; use `MemcachedSessionHandler` instead
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
index d31aa7667e657..2978ef4a2c1fa 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -11,8 +11,12 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
+@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.', MemcacheSessionHandler::class), E_USER_DEPRECATED);
+
 /**
  * @author Drak 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.
  */
 class MemcacheSessionHandler implements \SessionHandlerInterface
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
index 06193c8befbeb..05470ed80a363 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
@@ -17,6 +17,7 @@
 /**
  * @requires extension memcache
  * @group time-sensitive
+ * @group legacy
  */
 class MemcacheSessionHandlerTest extends TestCase
 {

From 0a7af3fb50544f9cf1a07e4c79c11c3ce69ab697 Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 19:59:13 +0200
Subject: [PATCH 1015/1099] [Session] remove deprecated session handlers

---
 .../HttpFoundation/DbalSessionHandler.php     | 276 ------------------
 .../DbalSessionHandlerSchema.php              |  49 ----
 .../HttpFoundation/DbalSessionHandlerTest.php |  33 ---
 .../Handler/MemcacheSessionHandler.php        | 121 --------
 .../Storage/Handler/MongoDbSessionHandler.php |  79 +----
 .../Handler/MemcacheSessionHandlerTest.php    | 130 ---------
 .../Handler/MongoDbSessionHandlerTest.php     | 151 ++--------
 .../VarDumper/Caster/MongoCaster.php          |  38 ---
 .../VarDumper/Cloner/AbstractCloner.php       |   2 -
 9 files changed, 37 insertions(+), 842 deletions(-)
 delete mode 100644 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
 delete mode 100644 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
 delete mode 100644 src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
 delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
 delete mode 100644 src/Symfony/Component/VarDumper/Caster/MongoCaster.php

diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
deleted file mode 100644
index 6036636f5c46f..0000000000000
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
+++ /dev/null
@@ -1,276 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\Doctrine\HttpFoundation;
-
-@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler instead.', DbalSessionHandler::class), E_USER_DEPRECATED);
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\DriverException;
-use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
-use Doctrine\DBAL\Platforms\SQLServer2008Platform;
-
-/**
- * DBAL based session storage.
- *
- * This implementation is very similar to Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
- * but uses a Doctrine connection and thus also works with non-PDO-based drivers like mysqli and OCI8.
- *
- * @author Fabien Potencier 
- * @author Johannes M. Schmitt 
- * @author Tobias Schultze 
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler instead.
- */
-class DbalSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var Connection
-     */
-    private $con;
-
-    /**
-     * @var string
-     */
-    private $table;
-
-    /**
-     * @var string Column for session id
-     */
-    private $idCol = 'sess_id';
-
-    /**
-     * @var string Column for session data
-     */
-    private $dataCol = 'sess_data';
-
-    /**
-     * @var string Column for timestamp
-     */
-    private $timeCol = 'sess_time';
-
-    /**
-     * @param Connection $con       A connection
-     * @param string     $tableName Table name
-     */
-    public function __construct(Connection $con, $tableName = 'sessions')
-    {
-        $this->con = $con;
-        $this->table = $tableName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        // delete the record associated with this id
-        $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
-
-        try {
-            $stmt = $this->con->prepare($sql);
-            $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $stmt->execute();
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Exception was thrown when trying to delete a session: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // delete the session records that have expired
-        $sql = "DELETE FROM $this->table WHERE $this->timeCol < :time";
-
-        try {
-            $stmt = $this->con->prepare($sql);
-            $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Exception was thrown when trying to delete expired sessions: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        $sql = "SELECT $this->dataCol FROM $this->table WHERE $this->idCol = :id";
-
-        try {
-            $stmt = $this->con->prepare($sql);
-            $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $stmt->execute();
-
-            // We use fetchAll instead of fetchColumn to make sure the DB cursor gets closed
-            $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
-
-            if ($sessionRows) {
-                return base64_decode($sessionRows[0][0]);
-            }
-
-            return '';
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Exception was thrown when trying to read the session data: %s', $e->getMessage()), 0, $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        $encoded = base64_encode($data);
-
-        try {
-            // We use a single MERGE SQL query when supported by the database.
-            $mergeSql = $this->getMergeSql();
-
-            if (null !== $mergeSql) {
-                $mergeStmt = $this->con->prepare($mergeSql);
-                $mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                $mergeStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-                $mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-
-                // Oracle has a bug that will intermittently happen if you
-                // have only 1 bind on a CLOB field for 2 different statements
-                // (INSERT and UPDATE in this case)
-                if ('oracle' == $this->con->getDatabasePlatform()->getName()) {
-                    $mergeStmt->bindParam(':data2', $encoded, \PDO::PARAM_STR);
-                }
-
-                $mergeStmt->execute();
-
-                return true;
-            }
-
-            $updateStmt = $this->con->prepare(
-                "UPDATE $this->table SET $this->dataCol = :data, $this->timeCol = :time WHERE $this->idCol = :id"
-            );
-            $updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $updateStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-            $updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-            $updateStmt->execute();
-
-            // When MERGE is not supported, like in Postgres < 9.5, we have to use this approach that can result in
-            // duplicate key errors when the same session is written simultaneously. We can just catch such an
-            // error and re-execute the update. This is similar to a serializable transaction with retry logic
-            // on serialization failures but without the overhead and without possible false positives due to
-            // longer gap locking.
-            if (!$updateStmt->rowCount()) {
-                try {
-                    $insertStmt = $this->con->prepare(
-                        "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)"
-                    );
-                    $insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                    $insertStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-                    $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                    $insertStmt->execute();
-                } catch (\Exception $e) {
-                    $driverException = $e->getPrevious();
-                    // Handle integrity violation SQLSTATE 23000 (or a subclass like 23505 in Postgres) for duplicate keys
-                    // DriverException only available since DBAL 2.5
-                    if (
-                        ($driverException instanceof DriverException && 0 === strpos($driverException->getSQLState(), '23')) ||
-                        ($driverException instanceof \PDOException && 0 === strpos($driverException->getCode(), '23'))
-                    ) {
-                        $updateStmt->execute();
-                    } else {
-                        throw $e;
-                    }
-                }
-            }
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Exception was thrown when trying to write the session data: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database.
-     *
-     * @return string|null The SQL string or null when not supported
-     */
-    private function getMergeSql()
-    {
-        $platform = $this->con->getDatabasePlatform()->getName();
-
-        switch (true) {
-            case 'mysql' === $platform:
-                return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                    "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->timeCol = VALUES($this->timeCol)";
-            case 'oracle' === $platform:
-                // DUAL is Oracle specific dummy table
-                return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) ".
-                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data2, $this->timeCol = :time";
-            case $this->con->getDatabasePlatform() instanceof SQLServer2008Platform:
-                // MERGE is only available since SQL Server 2008 and must be terminated by semicolon
-                // It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
-                return "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = :id) ".
-                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time;";
-            case 'sqlite' === $platform:
-                return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
-            case 'postgresql' === $platform && version_compare($this->getServerVersion(), '9.5', '>='):
-                return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                    "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";
-        }
-    }
-
-    private function getServerVersion()
-    {
-        $params = $this->con->getParams();
-
-        // Explicit platform version requested (supersedes auto-detection), so we respect it.
-        if (isset($params['serverVersion'])) {
-            return $params['serverVersion'];
-        }
-
-        $wrappedConnection = $this->con->getWrappedConnection();
-
-        if ($wrappedConnection instanceof ServerInfoAwareConnection) {
-            return $wrappedConnection->getServerVersion();
-        }
-
-        // Support DBAL 2.4 by accessing it directly when using PDO PgSQL
-        if ($wrappedConnection instanceof \PDO) {
-            return $wrappedConnection->getAttribute(\PDO::ATTR_SERVER_VERSION);
-        }
-
-        // If we cannot guess the version, the empty string will mean we won't use the code for newer versions when doing version checks.
-        return '';
-    }
-}
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
deleted file mode 100644
index 7af50a65074f8..0000000000000
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\Doctrine\HttpFoundation;
-
-@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::createTable instead.', DbalSessionHandlerSchema::class), E_USER_DEPRECATED);
-
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * DBAL Session Storage Schema.
- *
- * @author Johannes M. Schmitt 
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::createTable instead.
- */
-final class DbalSessionHandlerSchema extends Schema
-{
-    public function __construct($tableName = 'sessions')
-    {
-        parent::__construct();
-
-        $this->addSessionTable($tableName);
-    }
-
-    public function addToSchema(Schema $schema)
-    {
-        foreach ($this->getTables() as $table) {
-            $schema->_addTable($table);
-        }
-    }
-
-    private function addSessionTable($tableName)
-    {
-        $table = $this->createTable($tableName);
-        $table->addColumn('sess_id', 'string');
-        $table->addColumn('sess_data', 'text')->setNotNull(true);
-        $table->addColumn('sess_time', 'integer')->setNotNull(true)->setUnsigned(true);
-        $table->setPrimaryKey(array('sess_id'));
-    }
-}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
deleted file mode 100644
index 8d46bf9e63beb..0000000000000
--- a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\Doctrine\Tests\HttpFoundation;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler;
-
-/**
- * Test class for DbalSessionHandler.
- *
- * @author Drak 
- *
- * @group legacy
- */
-class DbalSessionHandlerTest extends TestCase
-{
-    public function testConstruct()
-    {
-        $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')->disableOriginalConstructor()->getMock();
-        $handler = new DbalSessionHandler($connection);
-
-        $this->assertInstanceOf('Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler', $handler);
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
deleted file mode 100644
index 2978ef4a2c1fa..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-
-@trigger_error(sprintf('The class %s is deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.', MemcacheSessionHandler::class), E_USER_DEPRECATED);
-
-/**
- * @author Drak 
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.
- */
-class MemcacheSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \Memcache Memcache driver
-     */
-    private $memcache;
-
-    /**
-     * @var int Time to live in seconds
-     */
-    private $ttl;
-
-    /**
-     * @var string Key prefix for shared environments
-     */
-    private $prefix;
-
-    /**
-     * List of available options:
-     *  * prefix: The prefix to use for the memcache keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
-     *
-     * @param \Memcache $memcache A \Memcache instance
-     * @param array     $options  An associative array of Memcache options
-     *
-     * @throws \InvalidArgumentException When unsupported options are passed
-     */
-    public function __construct(\Memcache $memcache, array $options = array())
-    {
-        if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
-            throw new \InvalidArgumentException(sprintf(
-                'The following options are not supported "%s"', implode(', ', $diff)
-            ));
-        }
-
-        $this->memcache = $memcache;
-        $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
-        $this->prefix = isset($options['prefix']) ? $options['prefix'] : 'sf2s';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return $this->memcache->get($this->prefix.$sessionId) ?: '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return $this->memcache->set($this->prefix.$sessionId, $data, 0, time() + $this->ttl);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        $this->memcache->delete($this->prefix.$sessionId);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // not required here because memcache will auto expire the records anyhow.
-        return true;
-    }
-
-    /**
-     * Return a Memcache instance.
-     *
-     * @return \Memcache
-     */
-    protected function getMemcache()
-    {
-        return $this->memcache;
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 20e1a897e480b..c028acd4ffeed 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -22,7 +22,7 @@
 class MongoDbSessionHandler implements \SessionHandlerInterface
 {
     /**
-     * @var \Mongo|\MongoClient|\MongoDB\Client
+     * @var \MongoDB\Client
      */
     private $mongo;
 
@@ -65,19 +65,10 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
      * @param \MongoDB\Client $mongo   A MongoDB\Client instance
      * @param array           $options An associative array of field options
      *
-     * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided
      * @throws \InvalidArgumentException When "database" or "collection" not provided
      */
-    public function __construct($mongo, array $options)
+    public function __construct(\MongoDB\Client $mongo, array $options)
     {
-        if ($mongo instanceof \MongoClient || $mongo instanceof \Mongo) {
-            @trigger_error(sprintf('Using %s with the legacy mongo extension is deprecated as of 3.4 and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.', __CLASS__), E_USER_DEPRECATED);
-        }
-
-        if (!($mongo instanceof \MongoDB\Client || $mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
-            throw new \InvalidArgumentException('MongoClient or Mongo instance required');
-        }
-
         if (!isset($options['database']) || !isset($options['collection'])) {
             throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');
         }
@@ -113,9 +104,7 @@ public function close()
      */
     public function destroy($sessionId)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
-
-        $this->getCollection()->$methodName(array(
+        $this->getCollection()->deleteOne(array(
             $this->options['id_field'] => $sessionId,
         ));
 
@@ -127,10 +116,8 @@ public function destroy($sessionId)
      */
     public function gc($maxlifetime)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
-
-        $this->getCollection()->$methodName(array(
-            $this->options['expiry_field'] => array('$lt' => $this->createDateTime()),
+        $this->getCollection()->deleteOne(array(
+            $this->options['expiry_field'] => array('$lt' => new \MongoDB\BSON\UTCDateTime()),
         ));
 
         return true;
@@ -141,28 +128,18 @@ public function gc($maxlifetime)
      */
     public function write($sessionId, $data)
     {
-        $expiry = $this->createDateTime(time() + (int) ini_get('session.gc_maxlifetime'));
+        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
 
         $fields = array(
-            $this->options['time_field'] => $this->createDateTime(),
+            $this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
             $this->options['expiry_field'] => $expiry,
+            $this->options['data_field'] => new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
         );
 
-        $options = array('upsert' => true);
-
-        if ($this->mongo instanceof \MongoDB\Client) {
-            $fields[$this->options['data_field']] = new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_OLD_BINARY);
-        } else {
-            $fields[$this->options['data_field']] = new \MongoBinData($data, \MongoBinData::BYTE_ARRAY);
-            $options['multiple'] = false;
-        }
-
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'updateOne' : 'update';
-
-        $this->getCollection()->$methodName(
+        $this->getCollection()->updateOne(
             array($this->options['id_field'] => $sessionId),
             array('$set' => $fields),
-            $options
+            array('upsert' => true)
         );
 
         return true;
@@ -175,23 +152,17 @@ public function read($sessionId)
     {
         $dbData = $this->getCollection()->findOne(array(
             $this->options['id_field'] => $sessionId,
-            $this->options['expiry_field'] => array('$gte' => $this->createDateTime()),
+            $this->options['expiry_field'] => array('$gte' => new \MongoDB\BSON\UTCDateTime()),
         ));
 
         if (null === $dbData) {
             return '';
         }
 
-        if ($dbData[$this->options['data_field']] instanceof \MongoDB\BSON\Binary) {
-            return $dbData[$this->options['data_field']]->getData();
-        }
-
-        return $dbData[$this->options['data_field']]->bin;
+        return $dbData[$this->options['data_field']]->getData();
     }
 
     /**
-     * Return a "MongoCollection" instance.
-     *
      * @return \MongoCollection
      */
     private function getCollection()
@@ -204,34 +175,10 @@ private function getCollection()
     }
 
     /**
-     * Return a Mongo instance.
-     *
-     * @return \Mongo|\MongoClient|\MongoDB\Client
+     * @return \MongoDB\Client
      */
     protected function getMongo()
     {
         return $this->mongo;
     }
-
-    /**
-     * Create a date object using the class appropriate for the current mongo connection.
-     *
-     * Return an instance of a MongoDate or \MongoDB\BSON\UTCDateTime
-     *
-     * @param int $seconds An integer representing UTC seconds since Jan 1 1970.  Defaults to now.
-     *
-     * @return \MongoDate|\MongoDB\BSON\UTCDateTime
-     */
-    private function createDateTime($seconds = null)
-    {
-        if (null === $seconds) {
-            $seconds = time();
-        }
-
-        if ($this->mongo instanceof \MongoDB\Client) {
-            return new \MongoDB\BSON\UTCDateTime($seconds * 1000);
-        }
-
-        return new \MongoDate($seconds);
-    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
deleted file mode 100644
index d2ddad27d5802..0000000000000
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler;
-
-/**
- * @requires extension memcache
- * @group time-sensitive
- * @group legacy
- */
-class MemcacheSessionHandlerTest extends TestCase
-{
-    const PREFIX = 'prefix_';
-    const TTL = 1000;
-    /**
-     * @var MemcacheSessionHandler
-     */
-    protected $storage;
-
-    protected $memcache;
-
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->memcache = $this->getMockBuilder('Memcache')->getMock();
-        $this->storage = new MemcacheSessionHandler(
-            $this->memcache,
-            array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
-        );
-    }
-
-    protected function tearDown()
-    {
-        $this->memcache = null;
-        $this->storage = null;
-        parent::tearDown();
-    }
-
-    public function testOpenSession()
-    {
-        $this->assertTrue($this->storage->open('', ''));
-    }
-
-    public function testCloseSession()
-    {
-        $this->assertTrue($this->storage->close());
-    }
-
-    public function testReadSession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('get')
-            ->with(self::PREFIX.'id')
-        ;
-
-        $this->assertEquals('', $this->storage->read('id'));
-    }
-
-    public function testWriteSession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('set')
-            ->with(self::PREFIX.'id', 'data', 0, $this->equalTo(time() + self::TTL, 2))
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($this->storage->write('id', 'data'));
-    }
-
-    public function testDestroySession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('delete')
-            ->with(self::PREFIX.'id')
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($this->storage->destroy('id'));
-    }
-
-    public function testGcSession()
-    {
-        $this->assertTrue($this->storage->gc(123));
-    }
-
-    /**
-     * @dataProvider getOptionFixtures
-     */
-    public function testSupportedOptions($options, $supported)
-    {
-        try {
-            new MemcacheSessionHandler($this->memcache, $options);
-            $this->assertTrue($supported);
-        } catch (\InvalidArgumentException $e) {
-            $this->assertFalse($supported);
-        }
-    }
-
-    public function getOptionFixtures()
-    {
-        return array(
-            array(array('prefix' => 'session'), true),
-            array(array('expiretime' => 100), true),
-            array(array('prefix' => 'session', 'expiretime' => 200), true),
-            array(array('expiretime' => 100, 'foo' => 'bar'), false),
-        );
-    }
-
-    public function testGetConnection()
-    {
-        $method = new \ReflectionMethod($this->storage, 'getMemcache');
-        $method->setAccessible(true);
-
-        $this->assertInstanceOf('\Memcache', $method->invoke($this->storage));
-    }
-}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 89a8c3d0cbb8a..177ee1242d1ee 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -32,11 +32,11 @@ protected function setUp()
     {
         parent::setUp();
 
-        if (!class_exists('MongoDB\Client')) {
+        if (!class_exists(\MongoDB\Client::class)) {
             $this->markTestSkipped('The mongodb/mongodb package is required.');
         }
 
-        $this->mongo = $this->getMockBuilder('MongoDB\Client')
+        $this->mongo = $this->getMockBuilder(\MongoDB\Client::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -52,14 +52,6 @@ protected function setUp()
         $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testConstructorShouldThrowExceptionForInvalidMongo()
-    {
-        new MongoDbSessionHandler(new \stdClass(), $this->options);
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      */
@@ -100,27 +92,14 @@ public function testRead()
                 $this->assertArrayHasKey($this->options['expiry_field'], $criteria);
                 $this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
 
-                if (phpversion('mongodb')) {
-                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$gte']);
-                    $this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
-                } else {
-                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$gte']);
-                    $this->assertGreaterThanOrEqual($criteria[$this->options['expiry_field']]['$gte']->sec, $testTimeout);
-                }
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $criteria[$this->options['expiry_field']]['$gte']);
+                $this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
 
-                $fields = array(
+                return array(
                     $this->options['id_field'] => 'foo',
+                    $this->options['expiry_field'] => new \MongoDB\BSON\UTCDateTime(),
+                    $this->options['data_field'] => new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
                 );
-
-                if (phpversion('mongodb')) {
-                    $fields[$this->options['data_field']] = new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY);
-                    $fields[$this->options['id_field']] = new \MongoDB\BSON\UTCDateTime(time() * 1000);
-                } else {
-                    $fields[$this->options['data_field']] = new \MongoBinData('bar', \MongoBinData::BYTE_ARRAY);
-                    $fields[$this->options['id_field']] = new \MongoDate();
-                }
-
-                return $fields;
             }));
 
         $this->assertEquals('bar', $this->storage->read('foo'));
@@ -135,89 +114,22 @@ public function testWrite()
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $data = array();
-
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
         $collection->expects($this->once())
-            ->method($methodName)
-            ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
+            ->method('updateOne')
+            ->will($this->returnCallback(function ($criteria, $updateData, $options) {
                 $this->assertEquals(array($this->options['id_field'] => 'foo'), $criteria);
-
-                if (phpversion('mongodb')) {
-                    $this->assertEquals(array('upsert' => true), $options);
-                } else {
-                    $this->assertEquals(array('upsert' => true, 'multiple' => false), $options);
-                }
+                $this->assertEquals(array('upsert' => true), $options);
 
                 $data = $updateData['$set'];
+                $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
+                $this->assertInstanceOf(\MongoDB\BSON\Binary::class, $data[$this->options['data_field']]);
+                $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $data[$this->options['time_field']]);
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $data[$this->options['expiry_field']]);
+                $this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
             }));
 
-        $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
         $this->assertTrue($this->storage->write('foo', 'bar'));
-
-        if (phpversion('mongodb')) {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
-            $this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
-        } else {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
-            $this->assertGreaterThanOrEqual($expectedExpiry, $data[$this->options['expiry_field']]->sec);
-        }
-    }
-
-    public function testWriteWhenUsingExpiresField()
-    {
-        $this->options = array(
-            'id_field' => '_id',
-            'data_field' => 'data',
-            'time_field' => 'time',
-            'database' => 'sf2-test',
-            'collection' => 'session-test',
-            'expiry_field' => 'expiresAt',
-        );
-
-        $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
-
-        $collection = $this->createMongoCollectionMock();
-
-        $this->mongo->expects($this->once())
-            ->method('selectCollection')
-            ->with($this->options['database'], $this->options['collection'])
-            ->will($this->returnValue($collection));
-
-        $data = array();
-
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
-        $collection->expects($this->once())
-            ->method($methodName)
-            ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
-                $this->assertEquals(array($this->options['id_field'] => 'foo'), $criteria);
-
-                if (phpversion('mongodb')) {
-                    $this->assertEquals(array('upsert' => true), $options);
-                } else {
-                    $this->assertEquals(array('upsert' => true, 'multiple' => false), $options);
-                }
-
-                $data = $updateData['$set'];
-            }));
-
-        $this->assertTrue($this->storage->write('foo', 'bar'));
-
-        if (phpversion('mongodb')) {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
-        } else {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
-        }
     }
 
     public function testReplaceSessionData()
@@ -231,10 +143,8 @@ public function testReplaceSessionData()
 
         $data = array();
 
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
         $collection->expects($this->exactly(2))
-            ->method($methodName)
+            ->method('updateOne')
             ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
                 $data = $updateData;
             }));
@@ -242,11 +152,7 @@ public function testReplaceSessionData()
         $this->storage->write('foo', 'bar');
         $this->storage->write('foo', 'foobar');
 
-        if (phpversion('mongodb')) {
-            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->getData());
-        } else {
-            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->bin);
-        }
+        $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->getData());
     }
 
     public function testDestroy()
@@ -258,10 +164,8 @@ public function testDestroy()
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
-
         $collection->expects($this->once())
-            ->method($methodName)
+            ->method('deleteOne')
             ->with(array($this->options['id_field'] => 'foo'));
 
         $this->assertTrue($this->storage->destroy('foo'));
@@ -276,18 +180,11 @@ public function testGc()
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
-
         $collection->expects($this->once())
-            ->method($methodName)
+            ->method('deleteOne')
             ->will($this->returnCallback(function ($criteria) {
-                if (phpversion('mongodb')) {
-                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$lt']);
-                    $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
-                } else {
-                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$lt']);
-                    $this->assertGreaterThanOrEqual(time() - 1, $criteria[$this->options['expiry_field']]['$lt']->sec);
-                }
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $criteria[$this->options['expiry_field']]['$lt']);
+                $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
             }));
 
         $this->assertTrue($this->storage->gc(1));
@@ -298,12 +195,12 @@ public function testGetConnection()
         $method = new \ReflectionMethod($this->storage, 'getMongo');
         $method->setAccessible(true);
 
-        $this->assertInstanceOf('MongoDB\Client', $method->invoke($this->storage));
+        $this->assertInstanceOf(\MongoDB\Client::class, $method->invoke($this->storage));
     }
 
     private function createMongoCollectionMock()
     {
-        $collection = $this->getMockBuilder('MongoDB\Collection')
+        $collection = $this->getMockBuilder(\MongoDB\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/src/Symfony/Component/VarDumper/Caster/MongoCaster.php b/src/Symfony/Component/VarDumper/Caster/MongoCaster.php
deleted file mode 100644
index 2219386bc243d..0000000000000
--- a/src/Symfony/Component/VarDumper/Caster/MongoCaster.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarDumper\Caster;
-
-use Symfony\Component\VarDumper\Cloner\Stub;
-
-@trigger_error('The '.__NAMESPACE__.'\MongoCaster class is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-/**
- * Casts classes from the MongoDb extension to array representation.
- *
- * @author Nicolas Grekas 
- *
- * @deprecated since version 3.4, to be removed in 4.0.
- */
-class MongoCaster
-{
-    public static function castCursor(\MongoCursorInterface $cursor, array $a, Stub $stub, $isNested)
-    {
-        if ($info = $cursor->info()) {
-            foreach ($info as $k => $v) {
-                $a[Caster::PREFIX_VIRTUAL.$k] = $v;
-            }
-        }
-        $a[Caster::PREFIX_VIRTUAL.'dead'] = $cursor->dead();
-
-        return $a;
-    }
-}
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index 6c5b5ff4a63eb..c8e6929c6eb6e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -104,8 +104,6 @@ abstract class AbstractCloner implements ClonerInterface
         'SplPriorityQueue' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castHeap'),
         'OuterIterator' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castOuterIterator'),
 
-        'MongoCursorInterface' => array('Symfony\Component\VarDumper\Caster\MongoCaster', 'castCursor'),
-
         'Redis' => array('Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'),
         'RedisArray' => array('Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisArray'),
 

From 3408152365ab971b6193f9501de7a3636d84bd4f Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Thu, 5 Oct 2017 19:29:32 +0200
Subject: [PATCH 1016/1099] [Security][Guard] Remove
 GuardAuthenticatorInterface

---
 src/Symfony/Component/Security/CHANGELOG.md   |   2 +
 .../Guard/AbstractGuardAuthenticator.php      |  13 --
 .../Security/Guard/AuthenticatorInterface.php | 109 +++++++++++-
 .../Firewall/GuardAuthenticationListener.php  |  24 +--
 .../Guard/GuardAuthenticatorHandler.php       |   6 +-
 .../Guard/GuardAuthenticatorInterface.php     | 163 ------------------
 .../FormLoginAuthenticatorTest.php            |   5 +
 .../GuardAuthenticationListenerTest.php       | 126 --------------
 .../GuardAuthenticationProviderTest.php       |  64 +------
 9 files changed, 124 insertions(+), 388 deletions(-)
 delete mode 100644 src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php

diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index c8aece01401db..945e3cb3264b4 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -11,6 +11,8 @@ CHANGELOG
  * removed support for voters that don't implement the `VoterInterface`
  * added a sixth `string $context` argument to `LogoutUrlGenerator::registerListener()`
  * removed HTTP digest authentication
+ * removed `GuardAuthenticatorInterface` in favor of `AuthenticatorInterface`
+ * removed `AbstractGuardAuthenticator::supports()`
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
index 5eceb8470a567..cdfb613593928 100644
--- a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
+++ b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Security\Guard;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken;
 
@@ -22,18 +21,6 @@
  */
 abstract class AbstractGuardAuthenticator implements AuthenticatorInterface
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 3.4, to be removed in 4.0
-     */
-    public function supports(Request $request)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since version 3.4 and will be removed in 4.0. Implement the "%s::supports()" method in class "%s" instead.', __METHOD__, AuthenticatorInterface::class, get_class($this)), E_USER_DEPRECATED);
-
-        return true;
-    }
-
     /**
      * Shortcut to create a PostAuthenticationGuardToken for you, if you don't really
      * care about which authenticated token you're using.
diff --git a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
index f68b8d6f43b08..10577d74cdffc 100644
--- a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
@@ -12,6 +12,13 @@
 namespace Symfony\Component\Security\Guard;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
+use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 
 /**
  * The interface for all "guard" authenticators.
@@ -23,7 +30,7 @@
  * @author Ryan Weaver 
  * @author Amaury Leroux de Lens 
  */
-interface AuthenticatorInterface extends GuardAuthenticatorInterface
+interface AuthenticatorInterface extends AuthenticationEntryPointInterface
 {
     /**
      * Does the authenticator support the given Request?
@@ -60,4 +67,104 @@ public function supports(Request $request);
      * @throws \UnexpectedValueException If null is returned
      */
     public function getCredentials(Request $request);
+
+    /**
+     * Return a UserInterface object based on the credentials.
+     *
+     * The *credentials* are the return value from getCredentials()
+     *
+     * You may throw an AuthenticationException if you wish. If you return
+     * null, then a UsernameNotFoundException is thrown for you.
+     *
+     * @param mixed                 $credentials
+     * @param UserProviderInterface $userProvider
+     *
+     * @throws AuthenticationException
+     *
+     * @return UserInterface|null
+     */
+    public function getUser($credentials, UserProviderInterface $userProvider);
+
+    /**
+     * Returns true if the credentials are valid.
+     *
+     * If any value other than true is returned, authentication will
+     * fail. You may also throw an AuthenticationException if you wish
+     * to cause authentication to fail.
+     *
+     * The *credentials* are the return value from getCredentials()
+     *
+     * @param mixed         $credentials
+     * @param UserInterface $user
+     *
+     * @return bool
+     *
+     * @throws AuthenticationException
+     */
+    public function checkCredentials($credentials, UserInterface $user);
+
+    /**
+     * Create an authenticated token for the given user.
+     *
+     * If you don't care about which token class is used or don't really
+     * understand what a "token" is, you can skip this method by extending
+     * the AbstractGuardAuthenticator class from your authenticator.
+     *
+     * @see AbstractGuardAuthenticator
+     *
+     * @param UserInterface $user
+     * @param string        $providerKey The provider (i.e. firewall) key
+     *
+     * @return GuardTokenInterface
+     */
+    public function createAuthenticatedToken(UserInterface $user, $providerKey);
+
+    /**
+     * Called when authentication executed, but failed (e.g. wrong username password).
+     *
+     * This should return the Response sent back to the user, like a
+     * RedirectResponse to the login page or a 403 response.
+     *
+     * If you return null, the request will continue, but the user will
+     * not be authenticated. This is probably not what you want to do.
+     *
+     * @param Request                 $request
+     * @param AuthenticationException $exception
+     *
+     * @return Response|null
+     */
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
+
+    /**
+     * Called when authentication executed and was successful!
+     *
+     * This should return the Response sent back to the user, like a
+     * RedirectResponse to the last page they visited.
+     *
+     * If you return null, the current request will continue, and the user
+     * will be authenticated. This makes sense, for example, with an API.
+     *
+     * @param Request        $request
+     * @param TokenInterface $token
+     * @param string         $providerKey The provider (i.e. firewall) key
+     *
+     * @return Response|null
+     */
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey);
+
+    /**
+     * Does this method support remember me cookies?
+     *
+     * Remember me cookie will be set if *all* of the following are met:
+     *  A) This method returns true
+     *  B) The remember_me key under your firewall is configured
+     *  C) The "remember me" functionality is activated. This is usually
+     *      done by having a _remember_me checkbox in your form, but
+     *      can be configured by the "always_remember_me" and "remember_me_parameter"
+     *      parameters under the "remember_me" firewall key
+     *  D) The onAuthenticationSuccess method returns a Response object
+     *
+     * @return bool
+     */
+    public function supportsRememberMe();
 }
diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
index 4ec0b8f32630d..0e2c7d91b2533 100644
--- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -15,10 +15,9 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Security\Guard\GuardAuthenticatorHandler;
-use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
+use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -94,7 +93,7 @@ public function handle(GetResponseEvent $event)
         }
     }
 
-    private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
+    private function executeGuardAuthenticator($uniqueGuardKey, AuthenticatorInterface $guardAuthenticator, GetResponseEvent $event)
     {
         $request = $event->getRequest();
         try {
@@ -103,27 +102,14 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
             }
 
             // abort the execution of the authenticator if it doesn't support the request
-            if ($guardAuthenticator instanceof AuthenticatorInterface) {
-                if (!$guardAuthenticator->supports($request)) {
-                    return;
-                }
-                // as there was a support for given request,
-                // authenticator is expected to give not-null credentials.
-                $credentialsCanBeNull = false;
-            } else {
-                // deprecated since version 3.4, to be removed in 4.0
-                $credentialsCanBeNull = true;
+            if (!$guardAuthenticator->supports($request)) {
+                return;
             }
 
             // allow the authenticator to fetch authentication info from the request
             $credentials = $guardAuthenticator->getCredentials($request);
 
             if (null === $credentials) {
-                // deprecated since version 3.4, to be removed in 4.0
-                if ($credentialsCanBeNull) {
-                    return;
-                }
-
                 throw new \UnexpectedValueException(sprintf('The return value of "%s::getCredentials()" must not be null. Return false from "%s::supports()" instead.', get_class($guardAuthenticator), get_class($guardAuthenticator)));
             }
 
@@ -196,7 +182,7 @@ public function setRememberMeServices(RememberMeServicesInterface $rememberMeSer
      * @param TokenInterface         $token
      * @param Response               $response
      */
-    private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
+    private function triggerRememberMe(AuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null)
     {
         if (null === $this->rememberMeServices) {
             if (null !== $this->logger) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index abe263d888d5f..8bec87c318d80 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -70,7 +70,7 @@ public function authenticateWithToken(TokenInterface $token, Request $request)
      *
      * @return null|Response
      */
-    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationSuccess(TokenInterface $token, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $response = $guardAuthenticator->onAuthenticationSuccess($request, $token, $providerKey);
 
@@ -97,7 +97,7 @@ public function handleAuthenticationSuccess(TokenInterface $token, Request $requ
      *
      * @return Response|null
      */
-    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, GuardAuthenticatorInterface $authenticator, $providerKey)
+    public function authenticateUserAndHandleSuccess(UserInterface $user, Request $request, AuthenticatorInterface $authenticator, $providerKey)
     {
         // create an authenticated token for the User
         $token = $authenticator->createAuthenticatedToken($user, $providerKey);
@@ -119,7 +119,7 @@ public function authenticateUserAndHandleSuccess(UserInterface $user, Request $r
      *
      * @return null|Response
      */
-    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
+    public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, AuthenticatorInterface $guardAuthenticator, $providerKey)
     {
         $token = $this->tokenStorage->getToken();
         if ($token instanceof PostAuthenticationGuardToken && $providerKey === $token->getProviderKey()) {
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
deleted file mode 100644
index 0d11573c03b11..0000000000000
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
+++ /dev/null
@@ -1,163 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Guard;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Guard\Token\GuardTokenInterface;
-use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
-
-/**
- * The interface for all "guard" authenticators.
- *
- * The methods on this interface are called throughout the guard authentication
- * process to give you the power to control most parts of the process from
- * one location.
- *
- * @author Ryan Weaver 
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use AuthenticatorInterface instead
- */
-interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
-{
-    /**
-     * Get the authentication credentials from the request and return them
-     * as any type (e.g. an associate array). If you return null, authentication
-     * will be skipped.
-     *
-     * Whatever value you return here will be passed to getUser() and checkCredentials()
-     *
-     * For example, for a form login, you might:
-     *
-     *      if ($request->request->has('_username')) {
-     *          return array(
-     *              'username' => $request->request->get('_username'),
-     *              'password' => $request->request->get('_password'),
-     *          );
-     *      } else {
-     *          return;
-     *      }
-     *
-     * Or for an API token that's on a header, you might use:
-     *
-     *      return array('api_key' => $request->headers->get('X-API-TOKEN'));
-     *
-     * @param Request $request
-     *
-     * @return mixed|null
-     */
-    public function getCredentials(Request $request);
-
-    /**
-     * Return a UserInterface object based on the credentials.
-     *
-     * The *credentials* are the return value from getCredentials()
-     *
-     * You may throw an AuthenticationException if you wish. If you return
-     * null, then a UsernameNotFoundException is thrown for you.
-     *
-     * @param mixed                 $credentials
-     * @param UserProviderInterface $userProvider
-     *
-     * @throws AuthenticationException
-     *
-     * @return UserInterface|null
-     */
-    public function getUser($credentials, UserProviderInterface $userProvider);
-
-    /**
-     * Returns true if the credentials are valid.
-     *
-     * If any value other than true is returned, authentication will
-     * fail. You may also throw an AuthenticationException if you wish
-     * to cause authentication to fail.
-     *
-     * The *credentials* are the return value from getCredentials()
-     *
-     * @param mixed         $credentials
-     * @param UserInterface $user
-     *
-     * @return bool
-     *
-     * @throws AuthenticationException
-     */
-    public function checkCredentials($credentials, UserInterface $user);
-
-    /**
-     * Create an authenticated token for the given user.
-     *
-     * If you don't care about which token class is used or don't really
-     * understand what a "token" is, you can skip this method by extending
-     * the AbstractGuardAuthenticator class from your authenticator.
-     *
-     * @see AbstractGuardAuthenticator
-     *
-     * @param UserInterface $user
-     * @param string        $providerKey The provider (i.e. firewall) key
-     *
-     * @return GuardTokenInterface
-     */
-    public function createAuthenticatedToken(UserInterface $user, $providerKey);
-
-    /**
-     * Called when authentication executed, but failed (e.g. wrong username password).
-     *
-     * This should return the Response sent back to the user, like a
-     * RedirectResponse to the login page or a 403 response.
-     *
-     * If you return null, the request will continue, but the user will
-     * not be authenticated. This is probably not what you want to do.
-     *
-     * @param Request                 $request
-     * @param AuthenticationException $exception
-     *
-     * @return Response|null
-     */
-    public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
-
-    /**
-     * Called when authentication executed and was successful!
-     *
-     * This should return the Response sent back to the user, like a
-     * RedirectResponse to the last page they visited.
-     *
-     * If you return null, the current request will continue, and the user
-     * will be authenticated. This makes sense, for example, with an API.
-     *
-     * @param Request        $request
-     * @param TokenInterface $token
-     * @param string         $providerKey The provider (i.e. firewall) key
-     *
-     * @return Response|null
-     */
-    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey);
-
-    /**
-     * Does this method support remember me cookies?
-     *
-     * Remember me cookie will be set if *all* of the following are met:
-     *  A) This method returns true
-     *  B) The remember_me key under your firewall is configured
-     *  C) The "remember me" functionality is activated. This is usually
-     *      done by having a _remember_me checkbox in your form, but
-     *      can be configured by the "always_remember_me" and "remember_me_parameter"
-     *      parameters under the "remember_me" firewall key
-     *  D) The onAuthenticationSuccess method returns a Response object
-     *
-     * @return bool
-     */
-    public function supportsRememberMe();
-}
diff --git a/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php b/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
index 1789b95d8c4ed..e9759cd4f2ec0 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
@@ -104,6 +104,11 @@ class TestFormLoginAuthenticator extends AbstractFormLoginAuthenticator
     private $loginUrl;
     private $defaultSuccessRedirectUrl;
 
+    public function supports(Request $request)
+    {
+        return true;
+    }
+
     public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
     {
     }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 5af9f130f8645..e4a47fd8f0eb9 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Guard\AuthenticatorInterface;
 use Symfony\Component\Security\Guard\Firewall\GuardAuthenticationListener;
-use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
 use Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
@@ -207,131 +206,6 @@ public function testHandleCatchesAuthenticationException()
         $listener->handle($this->event);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLegacyInterfaceNullCredentials()
-    {
-        $authenticatorA = $this->getMockBuilder(GuardAuthenticatorInterface::class)->getMock();
-        $providerKey = 'my_firewall3';
-
-        $authenticatorA
-            ->expects($this->once())
-            ->method('getCredentials')
-            ->will($this->returnValue(null));
-
-        // this is not called
-        $this->authenticationManager
-            ->expects($this->never())
-            ->method('authenticate');
-
-        $this->guardAuthenticatorHandler
-            ->expects($this->never())
-            ->method('handleAuthenticationSuccess');
-
-        $listener = new GuardAuthenticationListener(
-            $this->guardAuthenticatorHandler,
-            $this->authenticationManager,
-            $providerKey,
-            array($authenticatorA),
-            $this->logger
-        );
-
-        $listener->handle($this->event);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyInterfaceKeepsWorking()
-    {
-        $authenticator = $this->getMockBuilder(GuardAuthenticatorInterface::class)->getMock();
-        $authenticateToken = $this->getMockBuilder(TokenInterface::class)->getMock();
-        $providerKey = 'my_firewall';
-
-        $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
-
-        $authenticator
-            ->expects($this->once())
-            ->method('getCredentials')
-            ->with($this->equalTo($this->request))
-            ->will($this->returnValue($credentials));
-
-        // a clone of the token that should be created internally
-        $uniqueGuardKey = 'my_firewall_0';
-        $nonAuthedToken = new PreAuthenticationGuardToken($credentials, $uniqueGuardKey);
-
-        $this->authenticationManager
-            ->expects($this->once())
-            ->method('authenticate')
-            ->with($this->equalTo($nonAuthedToken))
-            ->will($this->returnValue($authenticateToken));
-
-        $this->guardAuthenticatorHandler
-            ->expects($this->once())
-            ->method('authenticateWithToken')
-            ->with($authenticateToken, $this->request);
-
-        $this->guardAuthenticatorHandler
-            ->expects($this->once())
-            ->method('handleAuthenticationSuccess')
-            ->with($authenticateToken, $this->request, $authenticator, $providerKey);
-
-        $listener = new GuardAuthenticationListener(
-            $this->guardAuthenticatorHandler,
-            $this->authenticationManager,
-            $providerKey,
-            array($authenticator),
-            $this->logger
-        );
-
-        $listener->setRememberMeServices($this->rememberMeServices);
-        // should never be called - our handleAuthenticationSuccess() does not return a Response
-        $this->rememberMeServices
-            ->expects($this->never())
-            ->method('loginSuccess');
-
-        $listener->handle($this->event);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testReturnNullToSkipAuth()
-    {
-        $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $providerKey = 'my_firewall3';
-
-        $authenticatorA
-            ->expects($this->once())
-            ->method('getCredentials')
-            ->will($this->returnValue(null));
-        $authenticatorB
-            ->expects($this->once())
-            ->method('getCredentials')
-            ->will($this->returnValue(null));
-
-        // this is not called
-        $this->authenticationManager
-            ->expects($this->never())
-            ->method('authenticate');
-
-        $this->guardAuthenticatorHandler
-            ->expects($this->never())
-            ->method('handleAuthenticationSuccess');
-
-        $listener = new GuardAuthenticationListener(
-            $this->guardAuthenticatorHandler,
-            $this->authenticationManager,
-            $providerKey,
-            array($authenticatorA, $authenticatorB),
-            $this->logger
-        );
-
-        $listener->handle($this->event);
-    }
-
     public function testSupportsReturnFalseSkipAuth()
     {
         $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index 9d8301fce8011..71b53f62f36b2 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -86,68 +86,6 @@ public function testAuthenticate()
         $this->assertSame($authedToken, $actualAuthedToken);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLegacyAuthenticate()
-    {
-        $providerKey = 'my_cool_firewall';
-
-        $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticatorC = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
-        $authenticators = array($authenticatorA, $authenticatorB, $authenticatorC);
-
-        // called 2 times - for authenticator A and B (stops on B because of match)
-        $this->preAuthenticationToken->expects($this->exactly(2))
-            ->method('getGuardProviderKey')
-            // it will return the "1" index, which will match authenticatorB
-            ->will($this->returnValue('my_cool_firewall_1'));
-
-        $enteredCredentials = array(
-            'username' => '_weaverryan_test_user',
-            'password' => 'guard_auth_ftw',
-        );
-        $this->preAuthenticationToken->expects($this->atLeastOnce())
-            ->method('getCredentials')
-            ->will($this->returnValue($enteredCredentials));
-
-        // authenticators A and C are never called
-        $authenticatorA->expects($this->never())
-            ->method('getUser');
-        $authenticatorC->expects($this->never())
-            ->method('getUser');
-
-        $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
-        $authenticatorB->expects($this->once())
-            ->method('getUser')
-            ->with($enteredCredentials, $this->userProvider)
-            ->will($this->returnValue($mockedUser));
-        // checkCredentials is called
-        $authenticatorB->expects($this->once())
-            ->method('checkCredentials')
-            ->with($enteredCredentials, $mockedUser)
-            // authentication works!
-            ->will($this->returnValue(true));
-        $authedToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-        $authenticatorB->expects($this->once())
-            ->method('createAuthenticatedToken')
-            ->with($mockedUser, $providerKey)
-            ->will($this->returnValue($authedToken));
-
-        // user checker should be called
-        $this->userChecker->expects($this->once())
-            ->method('checkPreAuth')
-            ->with($mockedUser);
-        $this->userChecker->expects($this->once())
-            ->method('checkPostAuth')
-            ->with($mockedUser);
-
-        $provider = new GuardAuthenticationProvider($authenticators, $this->userProvider, $providerKey, $this->userChecker);
-        $actualAuthedToken = $provider->authenticate($this->preAuthenticationToken);
-        $this->assertSame($authedToken, $actualAuthedToken);
-    }
-
     /**
      * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
      */
@@ -155,7 +93,7 @@ public function testCheckCredentialsReturningNonTrueFailsAuthentication()
     {
         $providerKey = 'my_uncool_firewall';
 
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+        $authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
 
         // make sure the authenticator is used
         $this->preAuthenticationToken->expects($this->any())

From e6895bfac53e12e76e2552ed17e582a3d13d416a Mon Sep 17 00:00:00 2001
From: Tobias Schultze 
Date: Thu, 5 Oct 2017 21:04:13 +0200
Subject: [PATCH 1017/1099] [Session] fix MongoDb session handler to gc all
 expired sessions

---
 .../Session/Storage/Handler/MongoDbSessionHandler.php           | 2 +-
 .../Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 80ecc1cc3c788..f140939dbd49a 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -118,7 +118,7 @@ public function destroy($sessionId)
      */
     public function gc($maxlifetime)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
+        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteMany' : 'remove';
 
         $this->getCollection()->$methodName(array(
             $this->options['expiry_field'] => array('$lt' => $this->createDateTime()),
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 128b9b52f505f..8ea0c52a87d71 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -291,7 +291,7 @@ public function testGc()
 
         $that = $this;
 
-        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
+        $methodName = phpversion('mongodb') ? 'deleteMany' : 'remove';
 
         $collection->expects($this->once())
             ->method($methodName)

From 261eae970f351a0cfc8006cbf7ea97080f24cef8 Mon Sep 17 00:00:00 2001
From: Alex Bowers 
Date: Fri, 28 Jul 2017 22:09:12 +0100
Subject: [PATCH 1018/1099] Added deprecation to cwd not existing Fixes #18249

---
 UPGRADE-3.4.md                                |  2 +
 UPGRADE-4.0.md                                |  2 +
 src/Symfony/Component/Process/CHANGELOG.md    |  1 +
 src/Symfony/Component/Process/Process.php     | 16 +++++--
 .../Component/Process/Tests/ProcessTest.php   | 44 ++++++++++++++++++-
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 2c80252b5b8ab..9ad662ffed825 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -210,6 +210,8 @@ Process
  * The `Symfony\Component\Process\ProcessBuilder` class has been deprecated,
    use the `Symfony\Component\Process\Process` class directly instead.
 
+ * Calling `Process::start()` without setting a valid working directory (via `setWorkingDirectory()` or constructor) beforehand is deprecated and will throw an exception in 4.0.
+
 Profiler
 --------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 9f8017c47e8a4..59f4607863ad1 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -567,6 +567,8 @@ Ldap
 Process
 -------
 
+ * Passing a not existing working directory to the constructor of the `Symfony\Component\Process\Process` class is not supported anymore.
+
  * The `Symfony\Component\Process\ProcessBuilder` class has been removed,
    use the `Symfony\Component\Process\Process` class directly instead.
 
diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md
index 7193c498d4326..c5cdb9944164b 100644
--- a/src/Symfony/Component/Process/CHANGELOG.md
+++ b/src/Symfony/Component/Process/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * deprecated the ProcessBuilder class
+ * deprecated calling `Process::start()` without setting a valid working directory beforehand (via `setWorkingDirectory()` or constructor)
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index e925e913863a9..79cb20cb66ebd 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -334,6 +334,14 @@ public function start(callable $callback = null/*, array $env = array()*/)
             $ptsWorkaround = fopen(__FILE__, 'r');
         }
 
+        if (!is_dir($this->cwd)) {
+            if ('\\' === DIRECTORY_SEPARATOR) {
+                throw new RuntimeException('The provided cwd does not exist.');
+            }
+
+            @trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+        }
+
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $env, $this->options);
 
         foreach ($envBackup as $k => $v) {
@@ -831,7 +839,7 @@ public function isRunning()
      */
     public function isStarted()
     {
-        return $this->status != self::STATUS_READY;
+        return self::STATUS_READY != $this->status;
     }
 
     /**
@@ -843,7 +851,7 @@ public function isTerminated()
     {
         $this->updateStatus(false);
 
-        return $this->status == self::STATUS_TERMINATED;
+        return self::STATUS_TERMINATED == $this->status;
     }
 
     /**
@@ -1322,7 +1330,7 @@ public function areEnvironmentVariablesInherited()
      */
     public function checkTimeout()
     {
-        if ($this->status !== self::STATUS_STARTED) {
+        if (self::STATUS_STARTED !== $this->status) {
             return;
         }
 
@@ -1513,7 +1521,7 @@ private function readPipes($blocking, $close)
         $callback = $this->callback;
         foreach ($result as $type => $data) {
             if (3 !== $type) {
-                $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
+                $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data);
             } elseif (!isset($this->fallbackStatus['signaled'])) {
                 $this->fallbackStatus['exitcode'] = (int) $data;
             }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 267257117d43d..1ad601c715aaf 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -48,6 +48,46 @@ protected function tearDown()
         }
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.
+     */
+    public function testInvalidCwd()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Windows handles this automatically.');
+        }
+
+        // Check that it works fine if the CWD exists
+        $cmd = new Process('echo test', __DIR__);
+        $cmd->run();
+
+        $cmd = new Process('echo test', __DIR__.'/notfound/');
+        $cmd->run();
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
+     * @expectedExceptionMessage The provided cwd does not exist.
+     */
+    public function testInvalidCwdOnWindows()
+    {
+        if ('\\' !== DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Unix handles this automatically.');
+        }
+
+        try {
+            // Check that it works fine if the CWD exists
+            $cmd = new Process('echo test', __DIR__);
+            $cmd->run();
+        } catch (\Exception $e) {
+            $this->fail($e);
+        }
+
+        $cmd = new Process('echo test', __DIR__.'/notfound/');
+        $cmd->run();
+    }
+
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
@@ -313,7 +353,7 @@ public function testCallbackIsExecutedForOutput()
 
         $called = false;
         $p->run(function ($type, $buffer) use (&$called) {
-            $called = $buffer === 'foo';
+            $called = 'foo' === $buffer;
         });
 
         $this->assertTrue($called, 'The callback should be executed with the output');
@@ -326,7 +366,7 @@ public function testCallbackIsExecutedForOutputWheneverOutputIsDisabled()
 
         $called = false;
         $p->run(function ($type, $buffer) use (&$called) {
-            $called = $buffer === 'foo';
+            $called = 'foo' === $buffer;
         });
 
         $this->assertTrue($called, 'The callback should be executed with the output');

From 88f8c6526a741178c31388106c0cfb5b0fa5b366 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 15:51:42 -0700
Subject: [PATCH 1019/1099] updated CHANGELOG for 2.7.35

---
 CHANGELOG-2.7.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGELOG-2.7.md b/CHANGELOG-2.7.md
index f742ca8ea0385..4a58749b55582 100644
--- a/CHANGELOG-2.7.md
+++ b/CHANGELOG-2.7.md
@@ -7,6 +7,33 @@ in 2.7 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
 
+* 2.7.35 (2017-10-05)
+
+ * bug #24448 [Session] fix MongoDb session handler to gc all expired sessions (Tobion)
+ * bug #24417 [Yaml] parse references on merge keys (xabbuh)
+ * bug #24421 [Config] Fix dumped files invalidation by OPCache (nicolas-grekas)
+ * bug #23980 Tests and fix for issue in array model data in EntityType field with multiple=true (stoccc)
+ * bug #22586 [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible (aaa2000)
+ * bug #24157 [Intl] Fixed support of Locale::getFallback (lyrixx)
+ * bug #24198 [HttpFoundation] Fix file upload multiple with no files (enumag)
+ * bug #24036 [Form] Fix precision of MoneyToLocalizedStringTransformer's divisions and multiplications (Rubinum)
+ * bug #24367 PdoSessionHandler: fix advisory lock for pgsql (Tobion)
+ * bug #24243 HttpCache does not consider ESI resources in HEAD requests (mpdude)
+ * bug #24304 [FrameworkBundle] Fix Routing\DelegatingLoader (nicolas-grekas)
+ * bug #24219 [Console] Preserving line breaks between sentences according to the exception message (yceruto)
+ * bug #23722 [Form] Fixed GroupSequence with "constraints" option (HeahDude)
+ * bug #22321 [Filesystem] Fixed makePathRelative (ausi)
+ * bug #23473 [Filesystem] mirror - fix copying content with same name as source/target. (gitlost)
+ * bug #24162 [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces (fabpot)
+ * bug #24141 [DomCrawler] Fix conversion to int on GetPhpFiles (MaraBlaga)
+ * bug #23853 Filtering empty uuids in ORMQueryBuilderLoader. (mlazovla)
+ * bug #24101 [Security] Fix exception when use_referer option is true and referer is not set or empty (linniksa)
+ * bug #24105 [Filesystem] check permissions if dump target dir is missing (xabbuh)
+ * bug #24115 [FrameworkBundle] Get KERNEL_DIR through $_ENV too for KernelTestCase (yceruto)
+ * bug #24041 [ExpressionLanguage] throws an exception on calling uncallable method (fmata)
+ * bug #24096 Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args (chalasr)
+ * bug #23730 Fixed the escaping of back slashes and << in console output (javiereguiluz)
+
 * 2.7.34 (2017-08-28)
 
  * bug #23989 [Debug] Remove false-positive check in DebugClassLoader (nicolas-grekas)

From 4d3f3255dda5465191d8e2d1f5f44276a61baf7c Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 15:51:49 -0700
Subject: [PATCH 1020/1099] update CONTRIBUTORS for 2.7.35

---
 CONTRIBUTORS.md | 99 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 35 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ced9b18126294..450e53dbc0947 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,9 +18,9 @@ Symfony is the result of the work of many people who made the code better
  - Kévin Dunglas (dunglas)
  - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
- - Hugo Hamon (hhamon)
  - Maxime Steinhausser (ogizanagi)
  - Robin Chalas (chalas_r)
+ - Hugo Hamon (hhamon)
  - Abdellatif Ait boudad (aitboudad)
  - Grégoire Pineau (lyrixx)
  - Romain Neutron (romain)
@@ -31,10 +31,10 @@ Symfony is the result of the work of many people who made the code better
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
  - Jeremy Mikola (jmikola)
+ - Roland Franssen (ro0)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
- - Roland Franssen (ro0)
  - Eriksen Costa (eriksencosta)
  - Jules Pietri (heah)
  - Guilhem Niot (energetick)
@@ -47,39 +47,42 @@ Symfony is the result of the work of many people who made the code better
  - Francis Besset (francisbesset)
  - stealth35 ‏ (stealth35)
  - Alexander Mols (asm89)
- - Bulat Shakirzyanov (avalanche123)
  - Iltar van der Berg (kjarli)
+ - Bulat Shakirzyanov (avalanche123)
  - Peter Rehm (rpet)
  - Saša Stamenković (umpirsky)
  - Henrik Bjørnskov (henrikbjorn)
  - Miha Vrhovnik
+ - Matthias Pigulla (mpdude)
  - Diego Saint Esteben (dii3g0)
  - Konstantin Kudryashov (everzet)
- - Matthias Pigulla (mpdude)
  - Bilal Amarni (bamarni)
  - Florin Patan (florinpatan)
- - Gábor Egyed (1ed)
+ - Dany Maillard (maidmaid)
+ - Jérémy DERUSSÉ (jderusse)
  - Kevin Bond (kbond)
- - Andrej Hudec (pulzarraider)
+ - Yonel Ceruto (yonelceruto)
+ - Gábor Egyed (1ed)
  - Pierre du Plessis (pierredup)
+ - Andrej Hudec (pulzarraider)
  - Michel Weimerskirch (mweimerskirch)
  - Eric Clemmons (ericclemmons)
  - Charles Sarrazin (csarrazi)
  - Konstantin Myakshin (koc)
  - Christian Raue
- - Dany Maillard (maidmaid)
+ - Jáchym Toušek (enumag)
  - Arnout Boks (aboks)
- - Jérémy DERUSSÉ (jderusse)
  - Deni
+ - Alexander M. Turek (derrabus)
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
- - Jáchym Toušek (enumag)
  - Titouan Galopin (tgalopin)
  - Douglas Greenshields (shieldo)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
  - Graham Campbell (graham)
+ - Tobias Nyholm (tobias)
  - Daniel Holmes (dholmes)
  - Toni Uebernickel (havvg)
  - Bart van den Burg (burgov)
@@ -87,16 +90,13 @@ Symfony is the result of the work of many people who made the code better
  - Jérôme Tamarelle (gromnan)
  - John Wards (johnwards)
  - Dariusz Ruminski
- - Alexander M. Turek (derrabus)
  - Fran Moreno (franmomu)
+ - Issei Murasawa (issei_m)
  - Antoine Hérault (herzult)
- - Tobias Nyholm (tobias)
  - Paráda József (paradajozsef)
- - Issei Murasawa (issei_m)
  - Arnaud Le Blanc (arnaud-lb)
  - Maxime STEINHAUSSER
  - Michal Piotrowski (eventhorizon)
- - Yonel Ceruto González (yonelceruto)
  - Tim Nagel (merk)
  - Brice BERNARD (brikou)
  - Baptiste Clavié (talus)
@@ -142,6 +142,7 @@ Symfony is the result of the work of many people who made the code better
  - Mikael Pajunen
  - Joel Wurtz (brouznouf)
  - Jérôme Vasseur (jvasseur)
+ - Oleg Voronkovich
  - Grégoire Paris (greg0ire)
  - Philipp Wahala (hifi)
  - Vyacheslav Pavlov
@@ -152,7 +153,6 @@ Symfony is the result of the work of many people who made the code better
  - Rouven Weßling (realityking)
  - Teoh Han Hui (teohhanhui)
  - Clemens Tolboom
- - Oleg Voronkovich
  - Helmer Aaviksoo
  - Lars Strojny (lstrojny)
  - Hiromi Hishida (77web)
@@ -170,10 +170,12 @@ Symfony is the result of the work of many people who made the code better
  - Clément JOBEILI (dator)
  - Possum
  - Dorian Villet (gnutix)
+ - Sergey Linnik (linniksa)
  - Richard Miller (mr_r_miller)
  - Julien Falque (julienfalque)
  - Mario A. Alvarez Garcia (nomack84)
  - Dennis Benkert (denderello)
+ - SpacePossum
  - Benjamin Dulau (dbenjamin)
  - Mathieu Lemoine (lemoinem)
  - Christian Schmidt
@@ -206,19 +208,20 @@ Symfony is the result of the work of many people who made the code better
  - Sven Paulus (subsven)
  - Rui Marinho (ruimarinho)
  - Marek Štípek (maryo)
- - SpacePossum
  - Eugene Wissner
  - Julien Brochet (mewt)
  - Tristan Darricau (nicofuma)
- - Sergey Linnik (linniksa)
  - Michaël Perrin (michael.perrin)
  - Marcel Beerta (mazen)
  - Loïc Faugeron
  - Jannik Zschiesche (apfelbox)
+ - Hidde Wieringa (hiddewie)
  - Marco Pivetta (ocramius)
+ - Rob Frawley 2nd (robfrawley)
  - julien pauli (jpauli)
  - Lorenz Schori
  - Sébastien Lavoie (lavoiesl)
+ - Gregor Harlan (gharlan)
  - Francois Zaninotto
  - Alexander Kotynia (olden)
  - Daniel Tschinder
@@ -262,8 +265,7 @@ Symfony is the result of the work of many people who made the code better
  - Pavel Batanov (scaytrase)
  - Nikita Konstantinov
  - Wodor Wodorski
- - Rob Frawley 2nd (robfrawley)
- - Gregor Harlan (gharlan)
+ - Oskar Stark (oskarstark)
  - Thomas Lallement (raziel057)
  - Giorgio Premi
  - Matthieu Napoli (mnapoli)
@@ -274,11 +276,12 @@ Symfony is the result of the work of many people who made the code better
  - Antonio J. García Lagar (ajgarlag)
  - Kim Hemsø Rasmussen (kimhemsoe)
  - Wouter Van Hecke
+ - Jérôme Parmentier (lctrs)
  - Peter Kruithof (pkruithof)
  - Michael Holm (hollo)
  - Marc Weistroff (futurecat)
  - Christian Schmidt
- - Hidde Wieringa (hiddewie)
+ - Amrouche Hamza
  - Chad Sikorra (chadsikorra)
  - Chris Smith (cs278)
  - Florian Klein (docteurklein)
@@ -315,6 +318,7 @@ Symfony is the result of the work of many people who made the code better
  - Thierry Thuon (lepiaf)
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
+ - Dariusz
  - Gennady Telegin (gtelegin)
  - Ben Davies (bendavies)
  - Erin Millard
@@ -334,7 +338,6 @@ Symfony is the result of the work of many people who made the code better
  - Damien Alexandre (damienalexandre)
  - Felix Labrecque
  - Yaroslav Kiliba
- - Amrouche Hamza
  - Terje Bråten
  - Robbert Klarenbeek (robbertkl)
  - Thomas Calvet (fancyweb)
@@ -344,6 +347,7 @@ Symfony is the result of the work of many people who made the code better
  - David Badura (davidbadura)
  - hossein zolfi (ocean)
  - Clément Gautier (clementgautier)
+ - Sanpi
  - Eduardo Gulias (egulias)
  - giulio de donato (liuggio)
  - ShinDarth
@@ -389,7 +393,6 @@ Symfony is the result of the work of many people who made the code better
  - Karel Souffriau
  - Christophe L. (christophelau)
  - Anthon Pang (robocoder)
- - Jérôme Parmentier (lctrs)
  - Emanuele Gaspari (inmarelibero)
  - Sébastien Santoro (dereckson)
  - Brian King
@@ -397,8 +400,10 @@ Symfony is the result of the work of many people who made the code better
  - Michel Salib (michelsalib)
  - geoffrey
  - Steffen Roßkamp
+ - Alexandru Furculita (afurculita)
  - Valentin Jonovs (valentins-jonovs)
  - Jeanmonod David (jeanmonod)
+ - Christopher Davis (chrisguitarguy)
  - Jan Schumann
  - Niklas Fiekas
  - Markus Bachmann (baachi)
@@ -424,9 +429,11 @@ Symfony is the result of the work of many people who made the code better
  - Dirk Pahl (dirkaholic)
  - cedric lombardot (cedriclombardot)
  - Jonas Flodén (flojon)
+ - Thomas Perez (scullwm)
  - Marcin Sikoń (marphi)
  - Dominik Zogg (dominik.zogg)
  - Marek Pietrzak
+ - Luc Vieillescazes (iamluc)
  - franek (franek)
  - Christian Wahler
  - Gintautas Miselis
@@ -434,8 +441,8 @@ Symfony is the result of the work of many people who made the code better
  - Zander Baldwin
  - Adam Harvey
  - Maxime Veber (nek-)
- - Sanpi
  - Alex Bakhturin
+ - Yanick Witschi (toflar)
  - Alexander Obuhovich (aik099)
  - boombatower
  - Fabrice Bernhard (fabriceb)
@@ -463,6 +470,7 @@ Symfony is the result of the work of many people who made the code better
  - ondrowan
  - Barry vd. Heuvel (barryvdh)
  - Wouter J
+ - Florent Mata
  - Evan S Kaufman (evanskaufman)
  - mcben
  - Jérôme Vieilledent (lolautruche)
@@ -499,7 +507,6 @@ Symfony is the result of the work of many people who made the code better
  - sasezaki
  - Dawid Pakuła (zulusx)
  - Florian Rey (nervo)
- - Oskar Stark (oskarstark)
  - Rodrigo Borrego Bernabé (rodrigobb)
  - MatTheCat
  - Denis Gorbachev (starfall)
@@ -534,13 +541,13 @@ Symfony is the result of the work of many people who made the code better
  - Mantas Var (mvar)
  - Sebastian Krebs
  - Jean-Christophe Cuvelier [Artack]
- - Christopher Davis (chrisguitarguy)
  - alcaeus
  - vitaliytv
  - Sebastian Blum
  - aubx
  - Marvin Butkereit
  - Ricky Su (ricky)
+ - Zan Baldwin
  - Gildas Quéméner (gquemener)
  - Charles-Henri Bruyand
  - Max Rath (drak3)
@@ -579,8 +586,8 @@ Symfony is the result of the work of many people who made the code better
  - Vincent Simonin
  - Alex Bogomazov (alebo)
  - maxime.steinhausser
+ - adev
  - Stefan Warman
- - Thomas Perez (scullwm)
  - Tristan Maindron (tmaindron)
  - Wesley Lancel
  - Ke WANG (yktd26)
@@ -593,7 +600,6 @@ Symfony is the result of the work of many people who made the code better
  - Chris Heng (gigablah)
  - Richard Bradley
  - Ulumuddin Yunus (joenoez)
- - Luc Vieillescazes (iamluc)
  - Johann Saunier (prophet777)
  - Michael Devery (mickadoo)
  - Antoine Corcy
@@ -610,6 +616,7 @@ Symfony is the result of the work of many people who made the code better
  - Cameron Porter
  - Hossein Bukhamsin
  - Oliver Hoff
+ - Martin Auswöger
  - Disparity
  - origaminal
  - Matteo Beccati (matteobeccati)
@@ -625,6 +632,7 @@ Symfony is the result of the work of many people who made the code better
  - Tiago Brito (blackmx)
  - Richard van den Brand (ricbra)
  - develop
+ - VJ
  - ReenExe
  - Mark Sonnabaum
  - Richard Quadling
@@ -645,6 +653,7 @@ Symfony is the result of the work of many people who made the code better
  - Baldur Rensch (brensch)
  - Vladyslav Petrovych
  - Alex Xandra Albert Sim
+ - Craig Duncan (duncan3dc)
  - Carson Full
  - Trent Steel (trsteel88)
  - Yuen-Chi Lian
@@ -700,7 +709,6 @@ Symfony is the result of the work of many people who made the code better
  - Jan Prieser
  - Adrien Lucas (adrienlucas)
  - Zhuravlev Alexander (scif)
- - Yanick Witschi (toflar)
  - James Michael DuPont
  - Tom Klingenberg
  - Christopher Hall (mythmakr)
@@ -725,6 +733,7 @@ Symfony is the result of the work of many people who made the code better
  - Dmitry Parnas (parnas)
  - Paul LE CORRE
  - DQNEO
+ - Shawn Iwinski
  - Emanuele Iannone
  - Tony Malzhacker
  - Mathieu MARCHOIS
@@ -741,6 +750,7 @@ Symfony is the result of the work of many people who made the code better
  - Aleksey Podskrebyshev
  - Calin Mihai Pristavu
  - David Marín Carreño (davefx)
+ - Fabien LUCAS (flucas2)
  - Jörn Lang (j.lang)
  - Omar Yepez (oyepez003)
  - mwsaz
@@ -804,7 +814,6 @@ Symfony is the result of the work of many people who made the code better
  - stefan.r
  - Valérian Galliat
  - Rikijs Murgs
- - Alexandru Furculita (afurculita)
  - Ben Ramsey (ramsey)
  - Christian Jul Jensen
  - Alexandre GESLIN (alexandregeslin)
@@ -838,6 +847,7 @@ Symfony is the result of the work of many people who made the code better
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
  - Danilo Silva
+ - Arnaud PETITPAS (apetitpa)
  - Zachary Tong (polyfractal)
  - Hryhorii Hrebiniuk
  - Dennis Fridrich (dfridrich)
@@ -864,6 +874,8 @@ Symfony is the result of the work of many people who made the code better
  - Israel J. Carberry
  - Bob van de Vijver
  - Christian Neff
+ - Oliver Hoff
+ - Ole Rößner (basster)
  - Per Sandström (per)
  - Goran Juric
  - Laurent Ghirardotti (laurentg)
@@ -876,6 +888,7 @@ Symfony is the result of the work of many people who made the code better
  - Ville Mattila
  - ilyes kooli
  - gr1ev0us
+ - mlazovla
  - Boris Vujicic (boris.vujicic)
  - Max Beutel
  - Antanas Arvasevicius
@@ -895,6 +908,7 @@ Symfony is the result of the work of many people who made the code better
  - Martijn Evers
  - Benjamin Paap (benjaminpaap)
  - Christian
+ - Denis Golubovskiy (bukashk0zzz)
  - Sergii Smertin (nfx)
  - hugofonseca (fonsecas72)
  - Martynas Narbutas
@@ -956,6 +970,7 @@ Symfony is the result of the work of many people who made the code better
  - Yannick
  - spdionis
  - rchoquet
+ - gitlost
  - Taras Girnyk
  - Eduardo García Sanz (coma)
  - James Gilliland
@@ -963,10 +978,12 @@ Symfony is the result of the work of many people who made the code better
  - Rhodri Pugh (rodnaph)
  - David de Boer (ddeboer)
  - Klaus Purer
+ - arnaud (arnooo999)
  - Gilles Doge (gido)
  - abulford
  - Philipp Kretzschmar
  - antograssiot
+ - Ilya Vertakov
  - Brooks Boyd
  - Roger Webb
  - Dmitriy Simushev
@@ -1006,13 +1023,13 @@ Symfony is the result of the work of many people who made the code better
  - Jeroen van den Enden (stoefke)
  - Jelte Steijaert (jelte)
  - Quique Porta (quiqueporta)
+ - stoccc
  - Tomasz Szymczyk (karion)
  - Xavier Coureau
  - ConneXNL
  - Aharon Perkel
  - matze
  - Abdul.Mohsen B. A. A
- - Martin Auswöger
  - BenoÃ®t Burnichon
  - pthompson
  - Malaney J. Hill
@@ -1036,6 +1053,7 @@ Symfony is the result of the work of many people who made the code better
  - Marc J. Schmidt (marcjs)
  - Marco Jantke
  - Saem Ghani
+ - Clément LEFEBVRE
  - Conrad Kleinespel
  - Sebastian Utz
  - Adrien Gallou (agallou)
@@ -1053,6 +1071,7 @@ Symfony is the result of the work of many people who made the code better
  - Cédric Lahouste (rapotor)
  - Samuel Vogel (samuelvogel)
  - Berat Doğan
+ - Guillaume LECERF
  - Juanmi Rodriguez Cerón
  - Andy Raines
  - Anthony Ferrara
@@ -1084,7 +1103,6 @@ Symfony is the result of the work of many people who made the code better
  - Alberto Pirovano (geezmo)
  - Pete Mitchell (peterjmit)
  - Tom Corrigan (tomcorrigan)
- - adev
  - Luis Galeas
  - Martin Pärtel
  - Patrick Daley (padrig)
@@ -1115,12 +1133,12 @@ Symfony is the result of the work of many people who made the code better
  - Alexander Schranz
  - Rafał Muszyński (rafmus90)
  - Timothy Anido (xanido)
+ - Mara Blaga
  - Rick Prent
  - skalpa
  - Martin Eckhardt
  - Pieter Jordaan
  - Damien Tournoud
- - Craig Duncan (duncan3dc)
  - Jon Gotlin (jongotlin)
  - Michael Dowling (mtdowling)
  - Karlos Presumido (oneko)
@@ -1136,12 +1154,14 @@ Symfony is the result of the work of many people who made the code better
  - Jānis Lukss
  - rkerner
  - Alex Silcock
+ - Qingshan Luo
  - Matthew J Mucklo
  - fdgdfg (psampaz)
  - Stéphane Seng
  - Maxwell Vandervelde
  - kaywalker
  - Mike Meier
+ - Tim Jabs
  - Sebastian Ionescu
  - Thomas Ploch
  - Simon Neidhold
@@ -1170,6 +1190,7 @@ Symfony is the result of the work of many people who made the code better
  - Zdeněk Drahoš
  - Dan Harper
  - moldcraft
+ - Antoine Bellion (abellion)
  - Ramon Kleiss (akathos)
  - César Suárez (csuarez)
  - Nicolas Badey (nico-b)
@@ -1177,6 +1198,7 @@ Symfony is the result of the work of many people who made the code better
  - Johannes Goslar
  - Geoff
  - georaldc
+ - Maarten de Boer
  - Malte Wunsch
  - wusuopu
  - povilas
@@ -1255,13 +1277,13 @@ Symfony is the result of the work of many people who made the code better
  - Romain Dorgueil
  - Christopher Parotat
  - Grayson Koonce (breerly)
- - Fabien LUCAS (flucas2)
  - Indra Gunawan (indragunawan)
  - Karim Cassam Chenaï (ka)
  - Michal Kurzeja (mkurzeja)
  - Nicolas Bastien (nicolas_bastien)
  - Denis (yethee)
  - Andrew Zhilin (zhil)
+ - Oleksii Zhurbytskyi
  - Andy Stanberry
  - Luiz “Felds” Liscia
  - Thomas Rothe
@@ -1276,7 +1298,6 @@ Symfony is the result of the work of many people who made the code better
  - Koalabaerchen
  - michalmarcinkowski
  - Warwick
- - VJ
  - Chris
  - Florent Olivaud
  - JakeFr
@@ -1343,6 +1364,7 @@ Symfony is the result of the work of many people who made the code better
  - bertillon
  - Bertalan Attila
  - Yannick Bensacq (cibou)
+ - Freek Van der Herten (freekmurze)
  - Gawain Lynch (gawain)
  - Luca Genuzio (genuzio)
  - Hans Nilsson (hansnilsson)
@@ -1365,6 +1387,7 @@ Symfony is the result of the work of many people who made the code better
  - James Hudson
  - Tom Maguire
  - David Zuelke
+ - Oleg Andreyev
  - Pierre Rineau
  - adenkejawen
  - Ari Pringle (apringle)
@@ -1407,6 +1430,7 @@ Symfony is the result of the work of many people who made the code better
  - Dane Powell
  - Gerrit Drost
  - Linnaea Von Lavia
+ - Simon Mönch
  - Javan Eskander
  - Lenar Lõhmus
  - Cristian Gonzalez
@@ -1440,6 +1464,7 @@ Symfony is the result of the work of many people who made the code better
  - Ian Jenkins (jenkoian)
  - Jorge Martin (jorgemartind)
  - Joeri Verdeyen (jverdeyen)
+ - Kevin Verschaeve (keversc)
  - Kevin Herrera (kherge)
  - Luis Ramón López López (lrlopez)
  - Bart Reunes (metalarend)
@@ -1504,13 +1529,14 @@ Symfony is the result of the work of many people who made the code better
  - jc
  - BenjaminBeck
  - Aurelijus Rožėnas
+ - Vladimir Tsykun
  - znerol
  - Christian Eikermann
  - Antonio Angelino
  - Matt Fields
- - Shawn Iwinski
  - Niklas Keller
  - Vladimir Sazhin
+ - Billie Thompson
  - lol768
  - jamogon
  - Vyacheslav Slinko
@@ -1574,7 +1600,6 @@ Symfony is the result of the work of many people who made the code better
  - Matt Janssen
  - Peter Gribanov
  - Ben Johnson
- - Florent Mata
  - kwiateusz
  - David Soria Parra
  - Sergiy Sokolenko
@@ -1594,6 +1619,7 @@ Symfony is the result of the work of many people who made the code better
  - Christian Stocker
  - Dawid Nowak
  - Lesnykh Ilia
+ - darnel
  - Karolis Daužickas
  - Nicolas
  - Sergio Santoro
@@ -1636,6 +1662,7 @@ Symfony is the result of the work of many people who made the code better
  - Fabien D. (fabd)
  - Carsten Eilers (fnc)
  - Sorin Gitlan (forapathy)
+ - Forfarle (forfarle)
  - Yohan Giarelli (frequence-web)
  - Gerry Vandermaesen (gerryvdm)
  - Ghazy Ben Ahmed (ghazy)
@@ -1678,6 +1705,7 @@ Symfony is the result of the work of many people who made the code better
  - Philipp Hoffmann (philipphoffmann)
  - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
+ - Phil Taylor (prazgod)
  - Brayden Williams (redstar504)
  - Rich Sage (richsage)
  - Bart Ruysseveldt (ruyss)
@@ -1689,6 +1717,7 @@ Symfony is the result of the work of many people who made the code better
  - Bruno Ziegler (sfcoder)
  - Andrea Giuliano (shark)
  - Schuyler Jager (sjager)
+ - Pascal Luna (skalpa)
  - Volker (skydiablo)
  - Julien Sanchez (sumbobyboys)
  - Guillermo Gisinger (t3chn0r)

From 2c907d5156cc052357ca2d240153ed81a4a9e83f Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 15:51:51 -0700
Subject: [PATCH 1021/1099] updated VERSION for 2.7.35

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 1bdb89cff749b..3fa96efcb3b78 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.7.35-DEV';
+    const VERSION = '2.7.35';
     const VERSION_ID = 20735;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 7;
     const RELEASE_VERSION = 35;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '05/2018';
     const END_OF_LIFE = '05/2019';

From dd490af864f2077e722bf7d98dd87623af475652 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:05:57 -0700
Subject: [PATCH 1022/1099] bumped Symfony version to 2.7.36

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 3fa96efcb3b78..404fbaaacb609 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.7.35';
-    const VERSION_ID = 20735;
+    const VERSION = '2.7.36-DEV';
+    const VERSION_ID = 20736;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 7;
-    const RELEASE_VERSION = 35;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 36;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '05/2018';
     const END_OF_LIFE = '05/2019';

From f0b32cfd9d63aaab836ad21ed02a5fbdc877f84d Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:23:57 -0700
Subject: [PATCH 1023/1099] updated CHANGELOG for 2.8.28

---
 CHANGELOG-2.8.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGELOG-2.8.md b/CHANGELOG-2.8.md
index abb1235519a77..d1500fd86a157 100644
--- a/CHANGELOG-2.8.md
+++ b/CHANGELOG-2.8.md
@@ -7,6 +7,33 @@ in 2.8 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.8.0...v2.8.1
 
+* 2.8.28 (2017-10-05)
+
+ * bug #24448 [Session] fix MongoDb session handler to gc all expired sessions (Tobion)
+ * bug #24417 [Yaml] parse references on merge keys (xabbuh)
+ * bug #24421 [Config] Fix dumped files invalidation by OPCache (nicolas-grekas)
+ * bug #23980 Tests and fix for issue in array model data in EntityType field with multiple=true (stoccc)
+ * bug #22586 [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible (aaa2000)
+ * bug #24157 [Intl] Fixed support of Locale::getFallback (lyrixx)
+ * bug #24198 [HttpFoundation] Fix file upload multiple with no files (enumag)
+ * bug #24036 [Form] Fix precision of MoneyToLocalizedStringTransformer's divisions and multiplications (Rubinum)
+ * bug #24367 PdoSessionHandler: fix advisory lock for pgsql (Tobion)
+ * bug #24243 HttpCache does not consider ESI resources in HEAD requests (mpdude)
+ * bug #24304 [FrameworkBundle] Fix Routing\DelegatingLoader (nicolas-grekas)
+ * bug #24219 [Console] Preserving line breaks between sentences according to the exception message (yceruto)
+ * bug #23722 [Form] Fixed GroupSequence with "constraints" option (HeahDude)
+ * bug #22321 [Filesystem] Fixed makePathRelative (ausi)
+ * bug #23473 [Filesystem] mirror - fix copying content with same name as source/target. (gitlost)
+ * bug #24162 [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces (fabpot)
+ * bug #24141 [DomCrawler] Fix conversion to int on GetPhpFiles (MaraBlaga)
+ * bug #23853 Filtering empty uuids in ORMQueryBuilderLoader. (mlazovla)
+ * bug #24101 [Security] Fix exception when use_referer option is true and referer is not set or empty (linniksa)
+ * bug #24105 [Filesystem] check permissions if dump target dir is missing (xabbuh)
+ * bug #24115 [FrameworkBundle] Get KERNEL_DIR through $_ENV too for KernelTestCase (yceruto)
+ * bug #24041 [ExpressionLanguage] throws an exception on calling uncallable method (fmata)
+ * bug #24096 Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args (chalasr)
+ * bug #23730 Fixed the escaping of back slashes and << in console output (javiereguiluz)
+
 * 2.8.27 (2017-08-28)
 
  * bug #23989 [Debug] Remove false-positive check in DebugClassLoader (nicolas-grekas)

From ebf0c076fa585daf1c955f60b5d6c9f845881cd4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:24:02 -0700
Subject: [PATCH 1024/1099] updated VERSION for 2.8.28

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 1e9aa3c2bdbfa..4aa404f272735 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.8.28-DEV';
+    const VERSION = '2.8.28';
     const VERSION_ID = 20828;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 8;
     const RELEASE_VERSION = 28;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '11/2018';
     const END_OF_LIFE = '11/2019';

From 81517602fa03e2640781b9c6cc294c60cb5cdfcb Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:35:26 -0700
Subject: [PATCH 1025/1099] bumped Symfony version to 2.8.29

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 4aa404f272735..d5bf812292b7d 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.8.28';
-    const VERSION_ID = 20828;
+    const VERSION = '2.8.29-DEV';
+    const VERSION_ID = 20829;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 8;
-    const RELEASE_VERSION = 28;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 29;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '11/2018';
     const END_OF_LIFE = '11/2019';

From 7a1cb838f93f7efa4cd311cc487df4f9a412f849 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:39:08 -0700
Subject: [PATCH 1026/1099] updated CHANGELOG for 3.3.10

---
 CHANGELOG-3.3.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index 320bf84f1dc7d..7dc9c7050b1f5 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -7,6 +7,44 @@ in 3.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.3.0...v3.3.1
 
+* 3.3.10 (2017-10-05)
+
+ * bug #23906 Added support for guards when advancing workflow from a command (GDIBass)
+ * bug #24448 [Session] fix MongoDb session handler to gc all expired sessions (Tobion)
+ * bug #24431 [FrameworkBundle] Fix bad interface hint in AbstractController (nicolas-grekas)
+ * bug #24419 [Cache] Fix race condition in TagAwareAdapter (nicolas-grekas)
+ * bug #24417 [Yaml] parse references on merge keys (xabbuh)
+ * bug #24416 [Yaml] treat trailing backslashes in multi-line strings (xabbuh)
+ * bug #24421 [Config] Fix dumped files invalidation by OPCache (nicolas-grekas)
+ * bug #24418 [DI] Allow setting any public non-initialized services (nicolas-grekas)
+ * bug #23980 Tests and fix for issue in array model data in EntityType field with multiple=true (stoccc)
+ * bug #22586 [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible (aaa2000)
+ * bug #24157 [Intl] Fixed support of Locale::getFallback (lyrixx)
+ * bug #24198 [HttpFoundation] Fix file upload multiple with no files (enumag)
+ * bug #24379 [PHPUnitBridge] don't remove when set to  empty string (Simperfit)
+ * bug #24036 [Form] Fix precision of MoneyToLocalizedStringTransformer's divisions and multiplications (Rubinum)
+ * bug #24191 [DependencyInjection] include file and line number in deprecation (xabbuh)
+ * bug #24367 PdoSessionHandler: fix advisory lock for pgsql (Tobion)
+ * bug #24189 [Yaml] parse merge keys with PARSE_OBJECT_FOR_MAP flag (xabbuh)
+ * bug #24243 HttpCache does not consider ESI resources in HEAD requests (mpdude)
+ * bug #24237 [WebProfilerBundle] Added missing link to profile token (vtsykun)
+ * bug #24244 TwigBundle exception/deprecation tweaks (ro0NL)
+ * bug #24281 [TwigBundle] Remove profiler related scripting (ro0NL, javiereguiluz)
+ * bug #24251 [PropertyAccess] Set a NullLogger in ApcuAdapter when Apcu is disabled in CLI (iamluc)
+ * bug #24304 [FrameworkBundle] Fix Routing\DelegatingLoader (nicolas-grekas)
+ * bug #24305 [HttpKernel] Make array vs "::" controller definitions consistent (nicolas-grekas)
+ * bug #24255 [TwigBundle] Break long lines in exceptions (kevin-verschaeve)
+ * bug #24219 [Console] Preserving line breaks between sentences according to the exception message (yceruto)
+ * bug #24192 [PhpUnitBridge] do not require an error context (xabbuh)
+ * bug #23722 [Form] Fixed GroupSequence with "constraints" option (HeahDude)
+ * bug #22321 [Filesystem] Fixed makePathRelative (ausi)
+ * bug #24234 [DI] Fix decorated service merge in ResolveInstanceofConditionalsPass (dunglas)
+ * bug #24203 [Security] Preserve URI fragment in HttpUtils::generateUri() (chalasr)
+ * bug #24199 [DI] Fix non-instantiables auto-discovery (nicolas-grekas)
+ * bug #23473 [Filesystem] mirror - fix copying content with same name as source/target. (gitlost)
+ * bug #24177 [FrameworkBundle] Add support to environment variables APP_ENV/DEBUG in KernelTestCase (yceruto)
+ * bug #24162 [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces (fabpot)
+
 * 3.3.9 (2017-09-11)
 
  * bug #24141 [DomCrawler] Fix conversion to int on GetPhpFiles (MaraBlaga)

From 8fc46c7bb331d6aa97c6695c0477b668d6134bec Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 16:40:19 -0700
Subject: [PATCH 1027/1099] updated VERSION for 3.3.10

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index dc74cb0a8adcb..3a29e7b0bb4bd 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,12 +61,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
 
     private $projectDir;
 
-    const VERSION = '3.3.10-DEV';
+    const VERSION = '3.3.10';
     const VERSION_ID = 30310;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 3;
     const RELEASE_VERSION = 10;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '01/2018';
     const END_OF_LIFE = '07/2018';

From bf0e6f6565d4aff7c4a888f3d40c4aabd50bbeee Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Thu, 5 Oct 2017 17:17:10 -0700
Subject: [PATCH 1028/1099] bumped Symfony version to 3.3.11

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 3a29e7b0bb4bd..f40e3bf749b34 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,12 +61,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
 
     private $projectDir;
 
-    const VERSION = '3.3.10';
-    const VERSION_ID = 30310;
+    const VERSION = '3.3.11-DEV';
+    const VERSION_ID = 30311;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 3;
-    const RELEASE_VERSION = 10;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 11;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '01/2018';
     const END_OF_LIFE = '07/2018';

From 53d78570928db0d2934581ee0ef26cdb365f7899 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm 
Date: Thu, 5 Oct 2017 21:36:40 -0400
Subject: [PATCH 1029/1099] Use for=ID on radio/checkbox label.

This is required for some screen reader like Jaws
---
 .../Twig/Resources/views/Form/bootstrap_3_layout.html.twig    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index 3e9f133d37b46..2efc0c4d4a213 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -148,10 +148,14 @@
 {% endblock %}
 
 {% block checkbox_label -%}
+    {%- set label_attr = label_attr|merge({'for': id}) -%}
+
     {{- block('checkbox_radio_label') -}}
 {%- endblock checkbox_label %}
 
 {% block radio_label -%}
+    {%- set label_attr = label_attr|merge({'for': id}) -%}
+
     {{- block('checkbox_radio_label') -}}
 {%- endblock radio_label %}
 

From 9499bc291cc9c18ed59f9c9339d4dd2816d793d9 Mon Sep 17 00:00:00 2001
From: Alain Flaus 
Date: Thu, 13 Jul 2017 12:20:18 +0200
Subject: [PATCH 1030/1099] [Workflow] Added guard 'is_valid()' method support

---
 .../FrameworkExtension.php                    |  1 +
 src/Symfony/Component/Workflow/CHANGELOG.md   |  1 +
 .../EventListener/ExpressionLanguage.php      | 14 +++++++++++++
 .../Workflow/EventListener/GuardListener.php  |  7 ++++++-
 .../Workflow/Exception/RuntimeException.php   | 21 +++++++++++++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Workflow/Exception/RuntimeException.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 90673719814b5..568bb0913ebc7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -752,6 +752,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                     new Reference('security.authorization_checker'),
                     new Reference('security.authentication.trust_resolver'),
                     new Reference('security.role_hierarchy'),
+                    new Reference('validator', ContainerInterface::NULL_ON_INVALID_REFERENCE),
                 ));
 
                 $container->setDefinition(sprintf('%s.listener.guard', $workflowId), $guard);
diff --git a/src/Symfony/Component/Workflow/CHANGELOG.md b/src/Symfony/Component/Workflow/CHANGELOG.md
index 02c04f6dc08f6..328420c6f1e1f 100644
--- a/src/Symfony/Component/Workflow/CHANGELOG.md
+++ b/src/Symfony/Component/Workflow/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Add guard `is_valid()` method support
  * Added support for `Event::getWorkflowName()` for "announce" events.
  * Added `workflow.completed` events which are fired after a transition is completed.
 
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
index 46d5d7520c0fb..df7e21a92855c 100644
--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Workflow\EventListener;
 
 use Symfony\Component\Security\Core\Authorization\ExpressionLanguage as BaseExpressionLanguage;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Workflow\Exception\RuntimeException;
 
 /**
  * Adds some function to the default Symfony Security ExpressionLanguage.
@@ -29,5 +31,17 @@ protected function registerFunctions()
         }, function (array $variables, $attributes, $object = null) {
             return $variables['auth_checker']->isGranted($attributes, $object);
         });
+
+        $this->register('is_valid', function ($object = 'null', $groups = 'null') {
+            return sprintf('0 === count($validator->validate(%s, null, %s))', $object, $groups);
+        }, function (array $variables, $object = null, $groups = null) {
+            if (!$variables['validator'] instanceof ValidatorInterface) {
+                throw new RuntimeException('Validator not defined, did you install the component?');
+            }
+
+            $errors = $variables['validator']->validate($object, null, $groups);
+
+            return 0 === count($errors);
+        });
     }
 }
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
index 20ba04c007fc2..1fa082ac4d1c0 100644
--- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Event\GuardEvent;
 
 /**
@@ -28,8 +29,9 @@ class GuardListener
     private $authenticationChecker;
     private $trustResolver;
     private $roleHierarchy;
+    private $validator;
 
-    public function __construct($configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authenticationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
+    public function __construct($configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authenticationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
     {
         $this->configuration = $configuration;
         $this->expressionLanguage = $expressionLanguage;
@@ -37,6 +39,7 @@ public function __construct($configuration, ExpressionLanguage $expressionLangua
         $this->authenticationChecker = $authenticationChecker;
         $this->trustResolver = $trustResolver;
         $this->roleHierarchy = $roleHierarchy;
+        $this->validator = $validator;
     }
 
     public function onTransition(GuardEvent $event, $eventName)
@@ -72,6 +75,8 @@ private function getVariables(GuardEvent $event)
             'auth_checker' => $this->authenticationChecker,
             // needed for the is_* expression function
             'trust_resolver' => $this->trustResolver,
+            // needed for the is_valid expression function
+            'validator' => $this->validator,
         );
 
         return $variables;
diff --git a/src/Symfony/Component/Workflow/Exception/RuntimeException.php b/src/Symfony/Component/Workflow/Exception/RuntimeException.php
new file mode 100644
index 0000000000000..7e9caf1bf5b1f
--- /dev/null
+++ b/src/Symfony/Component/Workflow/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Workflow\Exception;
+
+/**
+ * Base RuntimeException for the Workflow component.
+ *
+ * @author Alain Flaus 
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}

From 06d81987145eb9136683ae715925d193bfbc2c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= 
Date: Fri, 18 Aug 2017 16:07:04 +0200
Subject: [PATCH 1031/1099] [Workflow] Added tests for the is_valid() guard
 expression

---
 .../Compiler/WorkflowGuardListenerPass.php    | 26 +++---
 .../FrameworkExtension.php                    |  1 +
 .../WorkflowGuardListenerPassTest.php         | 45 +++-------
 src/Symfony/Component/Workflow/CHANGELOG.md   |  2 +-
 .../EventListener/ExpressionLanguage.php      |  2 +-
 .../Tests/EventListener/GuardListenerTest.php | 90 +++++++++++++------
 src/Symfony/Component/Workflow/composer.json  |  3 +-
 7 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
index 349d78cfc4fed..c5498adc4728d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
@@ -17,6 +17,7 @@
 
 /**
  * @author Christian Flothmann 
+ * @author Grégoire Pineau 
  */
 class WorkflowGuardListenerPass implements CompilerPassInterface
 {
@@ -31,20 +32,17 @@ public function process(ContainerBuilder $container)
 
         $container->getParameterBag()->remove('workflow.has_guard_listeners');
 
-        if (!$container->has('security.token_storage')) {
-            throw new LogicException('The "security.token_storage" service is needed to be able to use the workflow guard listener.');
-        }
-
-        if (!$container->has('security.authorization_checker')) {
-            throw new LogicException('The "security.authorization_checker" service is needed to be able to use the workflow guard listener.');
-        }
-
-        if (!$container->has('security.authentication.trust_resolver')) {
-            throw new LogicException('The "security.authentication.trust_resolver" service is needed to be able to use the workflow guard listener.');
-        }
-
-        if (!$container->has('security.role_hierarchy')) {
-            throw new LogicException('The "security.role_hierarchy" service is needed to be able to use the workflow guard listener.');
+        $servicesNeeded = array(
+            'security.token_storage',
+            'security.authorization_checker',
+            'security.authentication.trust_resolver',
+            'security.role_hierarchy',
+        );
+
+        foreach ($servicesNeeded as $service) {
+            if (!$container->has($service)) {
+                throw new LogicException(sprintf('The "%s" service is needed to be able to use the workflow guard listener.', $service));
+            }
         }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 568bb0913ebc7..9bdbb373bb0f9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -85,6 +85,7 @@
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\ObjectInitializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow;
 use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
index fead9e28f26d0..44c87b188fa17 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
@@ -14,12 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
-use Symfony\Component\Workflow\EventListener\GuardListener;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 class WorkflowGuardListenerPassTest extends TestCase
 {
@@ -29,53 +28,37 @@ class WorkflowGuardListenerPassTest extends TestCase
     protected function setUp()
     {
         $this->container = new ContainerBuilder();
-        $this->container->register('foo.listener.guard', GuardListener::class);
-        $this->container->register('bar.listener.guard', GuardListener::class);
         $this->compilerPass = new WorkflowGuardListenerPass();
     }
 
-    public function testListenersAreNotRemovedIfParameterIsNotSet()
+    public function testNoExeptionIfParameterIsNotSet()
     {
         $this->compilerPass->process($this->container);
 
-        $this->assertTrue($this->container->hasDefinition('foo.listener.guard'));
-        $this->assertTrue($this->container->hasDefinition('bar.listener.guard'));
-    }
-
-    public function testParameterIsRemovedWhenThePassIsProcessed()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
-
-        try {
-            $this->compilerPass->process($this->container);
-        } catch (LogicException $e) {
-            // Here, we are not interested in the exception handling. This is tested further down.
-        }
-
         $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
     }
 
-    public function testListenersAreNotRemovedIfAllDependenciesArePresent()
+    public function testNoExeptionIfAllDependenciesArePresent()
     {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
+        $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
         $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
         $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
         $this->container->register('security.role_hierarchy', RoleHierarchy::class);
+        $this->container->register('validator', ValidatorInterface::class);
 
         $this->compilerPass->process($this->container);
 
-        $this->assertTrue($this->container->hasDefinition('foo.listener.guard'));
-        $this->assertTrue($this->container->hasDefinition('bar.listener.guard'));
+        $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
     }
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage The "security.token_storage" service is needed to be able to use the workflow guard listener.
      */
-    public function testListenersAreRemovedIfTheTokenStorageServiceIsNotPresent()
+    public function testExceptionIfTheTokenStorageServiceIsNotPresent()
     {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
+        $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
         $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
         $this->container->register('security.role_hierarchy', RoleHierarchy::class);
@@ -87,9 +70,9 @@ public function testListenersAreRemovedIfTheTokenStorageServiceIsNotPresent()
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage The "security.authorization_checker" service is needed to be able to use the workflow guard listener.
      */
-    public function testListenersAreRemovedIfTheAuthorizationCheckerServiceIsNotPresent()
+    public function testExceptionIfTheAuthorizationCheckerServiceIsNotPresent()
     {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
+        $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
         $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
         $this->container->register('security.role_hierarchy', RoleHierarchy::class);
@@ -101,9 +84,9 @@ public function testListenersAreRemovedIfTheAuthorizationCheckerServiceIsNotPres
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage The "security.authentication.trust_resolver" service is needed to be able to use the workflow guard listener.
      */
-    public function testListenersAreRemovedIfTheAuthenticationTrustResolverServiceIsNotPresent()
+    public function testExceptionIfTheAuthenticationTrustResolverServiceIsNotPresent()
     {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
+        $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
         $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
         $this->container->register('security.role_hierarchy', RoleHierarchy::class);
@@ -115,9 +98,9 @@ public function testListenersAreRemovedIfTheAuthenticationTrustResolverServiceIs
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage The "security.role_hierarchy" service is needed to be able to use the workflow guard listener.
      */
-    public function testListenersAreRemovedIfTheRoleHierarchyServiceIsNotPresent()
+    public function testExceptionIfTheRoleHierarchyServiceIsNotPresent()
     {
-        $this->container->setParameter('workflow.has_guard_listeners', array('foo.listener.guard', 'bar.listener.guard'));
+        $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
         $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
         $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
diff --git a/src/Symfony/Component/Workflow/CHANGELOG.md b/src/Symfony/Component/Workflow/CHANGELOG.md
index 328420c6f1e1f..abbf3238011c1 100644
--- a/src/Symfony/Component/Workflow/CHANGELOG.md
+++ b/src/Symfony/Component/Workflow/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
- * Add guard `is_valid()` method support
+ * Added guard `is_valid()` method support.
  * Added support for `Event::getWorkflowName()` for "announce" events.
  * Added `workflow.completed` events which are fired after a transition is completed.
 
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
index df7e21a92855c..e1bcc7997d317 100644
--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -36,7 +36,7 @@ protected function registerFunctions()
             return sprintf('0 === count($validator->validate(%s, null, %s))', $object, $groups);
         }, function (array $variables, $object = null, $groups = null) {
             if (!$variables['validator'] instanceof ValidatorInterface) {
-                throw new RuntimeException('Validator not defined, did you install the component?');
+                throw new RuntimeException('"is_valid" cannot be used as the Validator component is not installed.');
             }
 
             $errors = $variables['validator']->validate($object, null, $groups);
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
index b46ee9092c573..f532639ae09c5 100644
--- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
+++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\EventListener\ExpressionLanguage;
 use Symfony\Component\Workflow\EventListener\GuardListener;
 use Symfony\Component\Workflow\Event\GuardEvent;
@@ -16,59 +17,85 @@
 
 class GuardListenerTest extends TestCase
 {
-    private $tokenStorage;
+    private $authenticationChecker;
+    private $validator;
     private $listener;
 
     protected function setUp()
     {
         $configuration = array(
-            'event_name_a' => 'true',
-            'event_name_b' => 'false',
+            'test_is_granted' => 'is_granted("something")',
+            'test_is_valid' => 'is_valid(subject)',
         );
-
         $expressionLanguage = new ExpressionLanguage();
-        $this->tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
-        $authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
+        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $token->expects($this->any())->method('getRoles')->willReturn(array(new Role('ROLE_USER')));
+        $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
+        $tokenStorage->expects($this->any())->method('getToken')->willReturn($token);
+        $this->authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
         $trustResolver = $this->getMockBuilder(AuthenticationTrustResolverInterface::class)->getMock();
-
-        $this->listener = new GuardListener($configuration, $expressionLanguage, $this->tokenStorage, $authenticationChecker, $trustResolver);
+        $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
+        $this->listener = new GuardListener($configuration, $expressionLanguage, $tokenStorage, $this->authenticationChecker, $trustResolver, null, $this->validator);
     }
 
     protected function tearDown()
     {
+        $this->authenticationChecker = null;
+        $this->validator = null;
         $this->listener = null;
     }
 
     public function testWithNotSupportedEvent()
     {
         $event = $this->createEvent();
-        $this->configureTokenStorage(false);
+        $this->configureAuthenticationChecker(false);
+        $this->configureValidator(false);
 
         $this->listener->onTransition($event, 'not supported');
 
         $this->assertFalse($event->isBlocked());
     }
 
-    public function testWithSupportedEventAndReject()
+    public function testWithSecuritySupportedEventAndReject()
     {
         $event = $this->createEvent();
-        $this->configureTokenStorage(true);
+        $this->configureAuthenticationChecker(true, false);
 
-        $this->listener->onTransition($event, 'event_name_a');
+        $this->listener->onTransition($event, 'test_is_granted');
+
+        $this->assertTrue($event->isBlocked());
+    }
+
+    public function testWithSecuritySupportedEventAndAccept()
+    {
+        $event = $this->createEvent();
+        $this->configureAuthenticationChecker(true, true);
+
+        $this->listener->onTransition($event, 'test_is_granted');
 
         $this->assertFalse($event->isBlocked());
     }
 
-    public function testWithSupportedEventAndAccept()
+    public function testWithValidatorSupportedEventAndReject()
     {
         $event = $this->createEvent();
-        $this->configureTokenStorage(true);
+        $this->configureValidator(true, false);
 
-        $this->listener->onTransition($event, 'event_name_b');
+        $this->listener->onTransition($event, 'test_is_valid');
 
         $this->assertTrue($event->isBlocked());
     }
 
+    public function testWithValidatorSupportedEventAndAccept()
+    {
+        $event = $this->createEvent();
+        $this->configureValidator(true, true);
+
+        $this->listener->onTransition($event, 'test_is_valid');
+
+        $this->assertFalse($event->isBlocked());
+    }
+
     private function createEvent()
     {
         $subject = new \stdClass();
@@ -78,28 +105,39 @@ private function createEvent()
         return new GuardEvent($subject, $subject->marking, $transition);
     }
 
-    private function configureTokenStorage($hasUser)
+    private function configureAuthenticationChecker($isUsed, $granted = true)
     {
-        if (!$hasUser) {
-            $this->tokenStorage
+        if (!$isUsed) {
+            $this->authenticationChecker
                 ->expects($this->never())
-                ->method('getToken')
+                ->method('isGranted')
             ;
 
             return;
         }
 
-        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
-        $token
+        $this->authenticationChecker
             ->expects($this->once())
-            ->method('getRoles')
-            ->willReturn(array(new Role('ROLE_ADMIN')))
+            ->method('isGranted')
+            ->willReturn($granted)
         ;
+    }
+
+    private function configureValidator($isUsed, $valid = true)
+    {
+        if (!$isUsed) {
+            $this->validator
+                ->expects($this->never())
+                ->method('validate')
+            ;
+
+            return;
+        }
 
-        $this->tokenStorage
+        $this->validator
             ->expects($this->once())
-            ->method('getToken')
-            ->willReturn($token)
+            ->method('validate')
+            ->willReturn($valid ? array() : array('a violation'))
         ;
     }
 }
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json
index 9a472dec60e34..1ff206983b822 100644
--- a/src/Symfony/Component/Workflow/composer.json
+++ b/src/Symfony/Component/Workflow/composer.json
@@ -28,7 +28,8 @@
         "symfony/dependency-injection": "~2.8|~3.0|~4.0",
         "symfony/event-dispatcher": "~2.1|~3.0|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "symfony/security-core": "~2.8|~3.0|~4.0"
+        "symfony/security-core": "~2.8|~3.0|~4.0",
+        "symfony/validator": "~2.8|~3.4|~4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Workflow\\": "" }

From ce10f356a3882f362da703eec3be83cb55263879 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 6 Oct 2017 14:26:09 +0200
Subject: [PATCH 1032/1099] parse references on merge keys with objects

---
 src/Symfony/Component/Yaml/Parser.php         |  5 ++++
 .../Component/Yaml/Tests/ParserTest.php       | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index f3f168fee5338..5093d7cd1297f 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -332,6 +332,11 @@ private function doParse($value, $flags)
                         $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $flags);
                         if ('<<' === $key) {
                             $this->refs[$refMatches['ref']] = $value;
+
+                            if (Yaml::PARSE_OBJECT_FOR_MAP & $flags && $value instanceof \stdClass) {
+                                $value = (array) $value;
+                            }
+
                             $data += $value;
                         } elseif ($allowOverwrite || !isset($data[$key])) {
                             // Spec: Keys MUST be unique; first one wins.
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 44b48674241ad..6cae75ae6ebbc 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1941,6 +1941,34 @@ public function testParseReferencesOnMergeKeys()
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
+
+    public function testParseReferencesOnMergeKeysWithMappingsParsedAsObjects()
+    {
+        $yaml = << (object) array(
+                'a' => 'foo',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+            'mergekeyderef' => (object) array(
+                'd' => 'quux',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+        );
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
 }
 
 class B

From 45dd40cde8fa19a568f40026ea55987d78037531 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Thu, 28 Sep 2017 18:40:37 +0200
Subject: [PATCH 1033/1099] remove deprecated features

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |  3 ++
 .../DependencyInjection/MainConfiguration.php |  4 +-
 .../DependencyInjection/SecurityExtension.php | 11 +---
 .../SecurityExtensionTest.php                 | 54 +------------------
 .../DependencyInjection/CHANGELOG.md          | 43 +++++++++++++++
 .../Compiler/AutowirePass.php                 | 45 ----------------
 .../Loader/YamlFileLoader.php                 |  8 ---
 .../Tests/Compiler/AutowirePassTest.php       | 39 ++------------
 src/Symfony/Component/Filesystem/CHANGELOG.md |  1 +
 .../Exception/InvalidArgumentException.php    | 19 +++++++
 .../Component/Filesystem/Filesystem.php       |  9 +++-
 .../Filesystem/Tests/FilesystemTest.php       | 32 ++++-------
 .../Component/HttpKernel/Tests/KernelTest.php |  1 -
 .../Routing/Loader/YamlFileLoader.php         |  8 ---
 .../Http/Firewall/ContextListener.php         | 14 ++---
 .../Tests/Firewall/ContextListenerTest.php    | 18 +------
 .../Translation/Loader/YamlFileLoader.php     |  8 ---
 .../Mapping/Loader/YamlFileLoader.php         |  8 ---
 18 files changed, 97 insertions(+), 228 deletions(-)
 create mode 100644 src/Symfony/Component/Filesystem/Exception/InvalidArgumentException.php

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 698d54011000d..1789357b85162 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -14,6 +14,9 @@ CHANGELOG
  * removed command `init:acl` along with `InitAclCommand` class
  * removed `acl` configuration key and related services, use symfony/acl-bundle instead
  * removed auto picking the first registered provider when no configured provider on a firewall and ambiguous
+ * the firewall option `logout_on_user_change` is now always true, which will trigger a logout if the user changes
+   between requests
+ * the `switch_user.stateless` firewall option is `true` for stateless firewalls
 
 3.4.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index c0527dc716069..716d05a43d30b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -202,8 +202,8 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
             ->booleanNode('stateless')->defaultFalse()->end()
             ->scalarNode('context')->cannotBeEmpty()->end()
             ->booleanNode('logout_on_user_change')
-                ->defaultFalse()
-                ->info('When true, it will trigger a logout for the user if something has changed. This will be the default behavior as of Syfmony 4.0.')
+                ->defaultTrue()
+                ->info('When true, it will trigger a logout for the user if something has changed.')
             ->end()
             ->arrayNode('logout')
                 ->treatTrueLike(array())
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 2b886d93a998a..0f1e21a5af740 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -188,10 +188,6 @@ private function createFirewalls($config, ContainerBuilder $container)
                 $customUserChecker = true;
             }
 
-            if (!isset($firewall['logout_on_user_change']) || !$firewall['logout_on_user_change']) {
-                @trigger_error('Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.', E_USER_DEPRECATED);
-            }
-
             $contextListenerDefinition->addMethodCall('setLogoutOnUserChange', array($firewall['logout_on_user_change']));
 
             $configId = 'security.firewall.map.config.'.$name;
@@ -610,11 +606,6 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv
     {
         $userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
 
-        // in 4.0, ignore the `switch_user.stateless` key if $stateless is `true`
-        if ($stateless && false === $config['stateless']) {
-            @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), E_USER_DEPRECATED);
-        }
-
         $switchUserListenerId = 'security.authentication.switchuser_listener.'.$id;
         $listener = $container->setDefinition($switchUserListenerId, new ChildDefinition('security.authentication.switchuser_listener'));
         $listener->replaceArgument(1, new Reference($userProvider));
@@ -622,7 +613,7 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv
         $listener->replaceArgument(3, $id);
         $listener->replaceArgument(6, $config['parameter']);
         $listener->replaceArgument(7, $config['role']);
-        $listener->replaceArgument(9, $config['stateless']);
+        $listener->replaceArgument(9, $stateless ?: $config['stateless']);
 
         return $switchUserListenerId;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 18821f9aedd36..71171ae4f5d7f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -123,35 +123,6 @@ public function testDisableRoleHierarchyVoter()
         $this->assertFalse($container->hasDefinition('security.access.role_hierarchy_voter'));
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.
-     */
-    public function testDeprecationForUserLogout()
-    {
-        $container = $this->getRawContainer();
-
-        $container->loadFromExtension('security', array(
-            'providers' => array(
-                'default' => array('id' => 'foo'),
-            ),
-
-            'firewalls' => array(
-                'some_firewall' => array(
-                    'pattern' => '/.*',
-                    'http_basic' => null,
-                    'logout_on_user_change' => false,
-                ),
-            ),
-        ));
-
-        $container->compile();
-    }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation Firewall "some_firewall" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall's "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.
-     */
     public function testSwitchUserNotStatelessOnStatelessFirewall()
     {
         $container = $this->getRawContainer();
@@ -172,31 +143,8 @@ public function testSwitchUserNotStatelessOnStatelessFirewall()
         ));
 
         $container->compile();
-    }
 
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Not configuring explicitly the provider on "default" firewall is ambiguous as there is more than one registered provider.
-     */
-    public function testDeprecationForAmbiguousProvider()
-    {
-        $container = $this->getRawContainer();
-
-        $container->loadFromExtension('security', array(
-            'providers' => array(
-                'first' => array('id' => 'foo'),
-                'second' => array('id' => 'bar'),
-            ),
-
-            'firewalls' => array(
-                'default' => array(
-                    'http_basic' => null,
-                    'logout_on_user_change' => true,
-                ),
-            ),
-        ));
-
-        $container->compile();
+        $this->assertTrue($container->getDefinition('security.authentication.switchuser_listener.some_firewall')->getArgument(9));
     }
 
     protected function getRawContainer()
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index ca437e2cf6701..43a41fa621c88 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,49 @@ CHANGELOG
 4.0.0
 -----
 
+ * Relying on service auto-registration while autowiring is not supported anymore.
+   Explicitly inject your dependencies or create services whose ids are
+   their fully-qualified class name.
+
+   Before:
+
+   ```php
+   namespace App\Controller;
+
+   use App\Mailer;
+
+   class DefaultController
+   {
+       public function __construct(Mailer $mailer) {
+           // ...
+       }
+
+       // ...
+   }
+   ```
+   ```yml
+   services:
+       App\Controller\DefaultController:
+           autowire: true
+   ```
+
+   After:
+
+   ```php
+   // same PHP code
+   ```
+   ```yml
+   services:
+       App\Controller\DefaultController:
+           autowire: true
+
+       # or
+       # App\Controller\DefaultController:
+       #     arguments: { $mailer: "@App\Mailer" }
+
+       App\Mailer:
+           autowire: true
+    ```
  * removed autowiring services based on the types they implement
  * added a third `$methodName` argument to the `getProxyFactoryCode()` method
    of the `DumperInterface`
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 1b099e0ac8885..ec3baa974057c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -253,8 +253,6 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
         if (isset($this->autowired[$type])) {
             return $this->autowired[$type] ? new TypedReference($this->autowired[$type], $type) : null;
         }
-
-        return $this->createAutowiredDefinition($type);
     }
 
     /**
@@ -325,49 +323,6 @@ private function set($type, $id)
         $this->ambiguousServiceTypes[$type][] = $id;
     }
 
-    /**
-     * Registers a definition for the type if possible or throws an exception.
-     *
-     * @param string $type
-     *
-     * @return TypedReference|null A reference to the registered definition
-     */
-    private function createAutowiredDefinition($type)
-    {
-        if (!($typeHint = $this->container->getReflectionClass($type, false)) || !$typeHint->isInstantiable()) {
-            return;
-        }
-
-        $currentId = $this->currentId;
-        $this->currentId = $type;
-        $this->autowired[$type] = $argumentId = sprintf('autowired.%s', $type);
-        $argumentDefinition = new Definition($type);
-        $argumentDefinition->setPublic(false);
-        $argumentDefinition->setAutowired(true);
-
-        try {
-            $originalThrowSetting = $this->throwOnAutowiringException;
-            $this->throwOnAutowiringException = true;
-            $this->processValue($argumentDefinition, true);
-            $this->container->setDefinition($argumentId, $argumentDefinition);
-        } catch (AutowiringFailedException $e) {
-            $this->autowired[$type] = false;
-            $this->lastFailure = $e->getMessage();
-            $this->container->log($this, $this->lastFailure);
-
-            return;
-        } finally {
-            $this->throwOnAutowiringException = $originalThrowSetting;
-            $this->currentId = $currentId;
-        }
-
-        @trigger_error(sprintf('Relying on service auto-registration for type "%s" is deprecated since version 3.4 and won\'t be supported in 4.0. Create a service named "%s" instead.', $type, $type), E_USER_DEPRECATED);
-
-        $this->container->log($this, sprintf('Type "%s" has been auto-registered for service "%s".', $type, $this->currentId));
-
-        return new TypedReference($argumentId, $type);
-    }
-
     private function createTypeNotFoundMessage(TypedReference $reference, $label)
     {
         if (!$r = $this->container->getReflectionClass($type = $reference->getType(), false)) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 39e2c9ca5b269..d3b261d57b177 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -636,18 +636,10 @@ protected function loadFile($file)
             $this->yamlParser = new YamlParser();
         }
 
-        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($file, &$prevErrorHandler) {
-            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$file.'"$0', $message) : $message;
-
-            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
-        });
-
         try {
             $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
         } catch (ParseException $e) {
             throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
-        } finally {
-            restore_error_handler();
         }
 
         return $this->validate($configuration, $file);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index c47d813220973..d28a5e613930a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -247,11 +247,10 @@ public function testWithTypeSet()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\Lille" is deprecated since version 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\Lille" instead.
-     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas" is deprecated since version 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas" instead.
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessage Cannot autowire service "coop_tilleuls": argument "$j" of method "Symfony\Component\DependencyInjection\Tests\Compiler\LesTilleuls::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas" but no such service exists.
      */
-    public function testCreateDefinition()
+    public function testServicesAreNotAutoCreated()
     {
         $container = new ContainerBuilder();
 
@@ -260,19 +259,6 @@ public function testCreateDefinition()
 
         $pass = new AutowirePass();
         $pass->process($container);
-
-        $this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());
-        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
-        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
-
-        $dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
-        $this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
-        $this->assertFalse($dunglasDefinition->isPublic());
-        $this->assertCount(1, $dunglasDefinition->getArguments());
-        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille', $dunglasDefinition->getArgument(0));
-
-        $lilleDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille');
-        $this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
     }
 
     public function testResolveParameter()
@@ -563,25 +549,6 @@ public function testExplicitMethodInjection()
         );
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\A" is deprecated since version 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\A" instead.
-     */
-    public function testTypedReference()
-    {
-        $container = new ContainerBuilder();
-
-        $container
-            ->register('bar', Bar::class)
-            ->setProperty('a', array(new TypedReference(A::class, A::class, Bar::class)))
-        ;
-
-        $pass = new AutowirePass();
-        $pass->process($container);
-
-        $this->assertSame(A::class, $container->getDefinition('autowired.'.A::class)->getClass());
-    }
-
     public function getCreateResourceTests()
     {
         return array(
diff --git a/src/Symfony/Component/Filesystem/CHANGELOG.md b/src/Symfony/Component/Filesystem/CHANGELOG.md
index 901d18a3e5cdc..9f1f817e753dd 100644
--- a/src/Symfony/Component/Filesystem/CHANGELOG.md
+++ b/src/Symfony/Component/Filesystem/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * removed `LockHandler`
+ * Support for passing relative paths to `Filesystem::makePathRelative()` has been removed.
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/Filesystem/Exception/InvalidArgumentException.php b/src/Symfony/Component/Filesystem/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000..abadc20029763
--- /dev/null
+++ b/src/Symfony/Component/Filesystem/Exception/InvalidArgumentException.php
@@ -0,0 +1,19 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Exception;
+
+/**
+ * @author Christian Flothmann 
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 3a8cae3eacb75..cacda17f899c5 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Filesystem;
 
+use Symfony\Component\Filesystem\Exception\InvalidArgumentException;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Exception\FileNotFoundException;
 
@@ -450,8 +451,12 @@ public function readlink($path, $canonicalize = false)
      */
     public function makePathRelative($endPath, $startPath)
     {
-        if (!$this->isAbsolutePath($endPath) || !$this->isAbsolutePath($startPath)) {
-            @trigger_error(sprintf('Support for passing relative paths to %s() is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        if (!$this->isAbsolutePath($startPath)) {
+            throw new InvalidArgumentException(sprintf('The start path "%s" is not absolute.', $startPath));
+        }
+
+        if (!$this->isAbsolutePath($endPath)) {
+            throw new InvalidArgumentException(sprintf('The end path "%s" is not absolute.', $endPath));
         }
 
         // Normalize separators on Windows
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index c72b9a2c4c9a6..4733660a38a2d 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1141,33 +1141,21 @@ public function providePathsForMakePathRelative()
     }
 
     /**
-     * @group legacy
-     * @dataProvider provideLegacyPathsForMakePathRelativeWithRelativePaths
-     * @expectedDeprecation Support for passing relative paths to Symfony\Component\Filesystem\Filesystem::makePathRelative() is deprecated since version 3.4 and will be removed in 4.0.
+     * @expectedException \Symfony\Component\Filesystem\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The start path "var/lib/symfony/src/Symfony/Component" is not absolute.
      */
-    public function testMakePathRelativeWithRelativePaths($endPath, $startPath, $expectedPath)
+    public function testMakePathRelativeWithRelativeStartPath()
     {
-        $path = $this->filesystem->makePathRelative($endPath, $startPath);
-
-        $this->assertEquals($expectedPath, $path);
+        $this->assertSame('../../../', $this->filesystem->makePathRelative('/var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component'));
     }
 
-    public function provideLegacyPathsForMakePathRelativeWithRelativePaths()
+    /**
+     * @expectedException \Symfony\Component\Filesystem\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The end path "var/lib/symfony/" is not absolute.
+     */
+    public function testMakePathRelativeWithRelativeEndPath()
     {
-        return array(
-            array('usr/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
-            array('aa/bb', 'aa/cc', '../bb/'),
-            array('aa/cc', 'bb/cc', '../../aa/cc/'),
-            array('aa/bb', 'aa/./cc', '../bb/'),
-            array('aa/./bb', 'aa/cc', '../bb/'),
-            array('aa/./bb', 'aa/./cc', '../bb/'),
-            array('../../', '../../', './'),
-            array('../aa/bb/', 'aa/bb/', '../../../aa/bb/'),
-            array('../../../', '../../', '../'),
-            array('', '', './'),
-            array('', 'aa/', '../'),
-            array('aa/', '', 'aa/'),
-        );
+        $this->assertSame('../../../', $this->filesystem->makePathRelative('var/lib/symfony/', '/var/lib/symfony/src/Symfony/Component'));
     }
 
     public function testMirrorCopiesFilesAndDirectoriesRecursively()
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 352e71f4bdc2d..5b259e7ff66eb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -415,7 +415,6 @@ public function testLocateResourceOnDirectories()
     }
 
     /**
-     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Trying to register two bundles with the same name "DuplicateName"
      */
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index 037d581d05eab..f3072c927b73e 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -57,18 +57,10 @@ public function load($file, $type = null)
             $this->yamlParser = new YamlParser();
         }
 
-        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($file, &$prevErrorHandler) {
-            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$file.'"$0', $message) : $message;
-
-            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
-        });
-
         try {
             $parsedConfig = $this->yamlParser->parseFile($path);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
-        } finally {
-            restore_error_handler();
         }
 
         $collection = new RouteCollection();
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index 553246ed8f0cf..7c762032aa151 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -43,7 +43,7 @@ class ContextListener implements ListenerInterface
     private $dispatcher;
     private $registered;
     private $trustResolver;
-    private $logoutOnUserChange = false;
+    private $logoutOnUserChange = true;
 
     /**
      * @param TokenStorageInterface                     $tokenStorage
@@ -74,7 +74,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
      */
     public function setLogoutOnUserChange($logoutOnUserChange)
     {
-        $this->logoutOnUserChange = (bool) $logoutOnUserChange;
+        // no-op, method to be deprecated in 4.1
     }
 
     /**
@@ -183,15 +183,11 @@ protected function refreshUser(TokenInterface $token)
 
                 // tokens can be deauthenticated if the user has been changed.
                 if (!$token->isAuthenticated()) {
-                    if ($this->logoutOnUserChange) {
-                        if (null !== $this->logger) {
-                            $this->logger->debug('Token was deauthenticated after trying to refresh it.', array('username' => $refreshedUser->getUsername(), 'provider' => get_class($provider)));
-                        }
-
-                        return null;
+                    if (null !== $this->logger) {
+                        $this->logger->debug('Token was deauthenticated after trying to refresh it.', array('username' => $refreshedUser->getUsername(), 'provider' => get_class($provider)));
                     }
 
-                    @trigger_error('Refreshing a deauthenticated user is deprecated as of 3.4 and will trigger a logout in 4.0.', E_USER_DEPRECATED);
+                    return null;
                 }
 
                 if (null !== $this->logger) {
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index d27569fa3a0ba..bb80cc25ab017 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -249,24 +249,11 @@ public function testHandleRemovesTokenIfNoPreviousSessionWasFound()
         $listener->handle($event);
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Refreshing a deauthenticated user is deprecated as of 3.4 and will trigger a logout in 4.0.
-     */
-    public function testIfTokenIsDeauthenticatedTriggersDeprecations()
-    {
-        $tokenStorage = new TokenStorage();
-        $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)));
-
-        $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
-    }
-
     public function testIfTokenIsDeauthenticated()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)), null, true);
+        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)));
 
         $this->assertNull($tokenStorage->getToken());
     }
@@ -342,7 +329,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
         return $session;
     }
 
-    private function handleEventWithPreviousSession(TokenStorageInterface $tokenStorage, $userProviders, UserInterface $user = null, $logoutOnUserChange = false)
+    private function handleEventWithPreviousSession(TokenStorageInterface $tokenStorage, $userProviders, UserInterface $user = null)
     {
         $user = $user ?: new User('foo', 'bar');
         $session = new Session(new MockArraySessionStorage());
@@ -353,7 +340,6 @@ private function handleEventWithPreviousSession(TokenStorageInterface $tokenStor
         $request->cookies->set('MOCKSESSID', true);
 
         $listener = new ContextListener($tokenStorage, $userProviders, 'context_key');
-        $listener->setLogoutOnUserChange($logoutOnUserChange);
         $listener->handle(new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 }
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
index 07914f263155c..874fa3a8943e8 100644
--- a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -38,18 +38,10 @@ protected function loadResource($resource)
             $this->yamlParser = new YamlParser();
         }
 
-        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($resource, &$prevErrorHandler) {
-            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$resource.'"$0', $message) : $message;
-
-            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
-        });
-
         try {
             $messages = $this->yamlParser->parseFile($resource);
         } catch (ParseException $e) {
             throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
-        } finally {
-            restore_error_handler();
         }
 
         return $messages;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index a213b292acaae..e5e84c38c35dd 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -115,18 +115,10 @@ protected function parseNodes(array $nodes)
      */
     private function parseFile($path)
     {
-        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($path, &$prevErrorHandler) {
-            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$path.'"$0', $message) : $message;
-
-            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
-        });
-
         try {
             $classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
-        } finally {
-            restore_error_handler();
         }
 
         // empty file

From 33d2aa538248424aec9266cd9274f0670d18e749 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 6 Oct 2017 14:19:42 +0200
Subject: [PATCH 1034/1099] [Yaml] initialize inline line numbers

Without this change, tests from `InlineTest` cannot be executed
standalone as the parsed line number would never be initialized.
---
 src/Symfony/Component/Yaml/Tests/InlineTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 0b5c6cc4bcfe1..815c694b37abb 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -20,7 +20,7 @@ class InlineTest extends TestCase
 {
     protected function setUp()
     {
-        Inline::initialize(0);
+        Inline::initialize(0, 0);
     }
 
     /**

From 3702e5ff37bbacf85151541d16d79e532acb6303 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 6 Oct 2017 17:17:51 +0200
Subject: [PATCH 1035/1099] remove unused fixtures file

---
 .../Tests/Fixtures/php/services31.php         | 71 -------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php
deleted file mode 100644
index 51d9626372ca4..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php
+++ /dev/null
@@ -1,71 +0,0 @@
-services = array();
-        $this->methodMap = array(
-            'bar' => 'getBarService',
-            'foo' => 'getFooService',
-        );
-
-        $this->aliases = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function compile()
-    {
-        throw new LogicException('You cannot compile a dumped container that was already compiled.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isCompiled()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFrozen()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return true;
-    }
-
-    /**
-     * Gets the 'foo' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\Container31\Foo A Symfony\Component\DependencyInjection\Tests\Fixtures\Container31\Foo instance
-     */
-    protected function getFooService()
-    {
-        return $this->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\Container31\Foo();
-    }
-}

From b43bdf398de2eee50b98aeab03ee66a63bd5830c Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Fri, 6 Oct 2017 08:49:22 -0700
Subject: [PATCH 1036/1099] fixed CS

---
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 9bdbb373bb0f9..568bb0913ebc7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -85,7 +85,6 @@
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\ObjectInitializerInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow;
 use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand;

From ade7c905899439f86f98ad7d659432e41b205fdc Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 6 Oct 2017 18:17:48 +0200
Subject: [PATCH 1037/1099] drop non-existent working directory support

---
 src/Symfony/Component/Process/CHANGELOG.md    |  2 ++
 src/Symfony/Component/Process/Process.php     |  6 +----
 .../Component/Process/Tests/ProcessTest.php   | 24 +------------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md
index a9f9173580afe..726a24c61423c 100644
--- a/src/Symfony/Component/Process/CHANGELOG.md
+++ b/src/Symfony/Component/Process/CHANGELOG.md
@@ -15,6 +15,8 @@ CHANGELOG
  * support for passing `proc_open()` options has been removed
  * removed the `ProcessBuilder` class, use the `Process` class instead
  * removed the `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class
+ * passing a not existing working directory to the constructor of the `Symfony\Component\Process\Process` class is not
+   supported anymore
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index a9c63e9be11bb..7c5e4a5a338aa 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -297,11 +297,7 @@ public function start(callable $callback = null, array $env = array())
         }
 
         if (!is_dir($this->cwd)) {
-            if ('\\' === DIRECTORY_SEPARATOR) {
-                throw new RuntimeException('The provided cwd does not exist.');
-            }
-
-            @trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+            throw new RuntimeException('The provided cwd does not exist.');
         }
 
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, null, $options);
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 06ab288e6af34..8d490f361a216 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -47,34 +47,12 @@ protected function tearDown()
         }
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.
-     */
-    public function testInvalidCwd()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Windows handles this automatically.');
-        }
-
-        // Check that it works fine if the CWD exists
-        $cmd = new Process('echo test', __DIR__);
-        $cmd->run();
-
-        $cmd = new Process('echo test', __DIR__.'/notfound/');
-        $cmd->run();
-    }
-
     /**
      * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      * @expectedExceptionMessage The provided cwd does not exist.
      */
-    public function testInvalidCwdOnWindows()
+    public function testInvalidCwd()
     {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Unix handles this automatically.');
-        }
-
         try {
             // Check that it works fine if the CWD exists
             $cmd = new Process('echo test', __DIR__);

From e5d0934b87ee4d7bb5fe8948e19a4849dbadcb30 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 6 Oct 2017 19:34:39 +0200
Subject: [PATCH 1038/1099] [DI] Turn private defs to non-public ones before
 removing passes

---
 .../Compiler/PassConfig.php                   |  6 +++
 .../Compiler/ResolveChildDefinitionsPass.php  | 23 -----------
 .../Compiler/ResolvePrivatesPass.php          | 40 +++++++++++++++++++
 .../ResolveChildDefinitionsPassTest.php       | 20 ----------
 .../Compiler/ResolvePrivatesPassTest.php      | 39 ++++++++++++++++++
 5 files changed, 85 insertions(+), 43 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/ResolvePrivatesPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolvePrivatesPassTest.php

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 6c0448ecb4e81..bfae5ae6d6770 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -71,6 +71,12 @@ public function __construct()
             new CheckArgumentsValidityPass(false),
         ));
 
+        $this->beforeRemovingPasses = array(
+            -100 => array(
+                new ResolvePrivatesPass(),
+            ),
+        );
+
         $this->removingPasses = array(array(
             new RemovePrivateAliasesPass(),
             new ReplaceAliasByActualDefinitionPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index 460fb55e472be..a124e472aca81 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -26,28 +25,6 @@
  */
 class ResolveChildDefinitionsPass extends AbstractRecursivePass
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        parent::process($container);
-
-        foreach ($container->getDefinitions() as $definition) {
-            if ($definition->isPrivate()) {
-                $definition->setPublic(false);
-                $definition->setPrivate(true);
-            }
-        }
-
-        foreach ($container->getAliases() as $alias) {
-            if ($alias->isPrivate()) {
-                $alias->setPublic(false);
-                $alias->setPrivate(true);
-            }
-        }
-    }
-
     protected function processValue($value, $isRoot = false)
     {
         if (!$value instanceof Definition) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolvePrivatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolvePrivatesPass.php
new file mode 100644
index 0000000000000..1bd993458a40e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolvePrivatesPass.php
@@ -0,0 +1,40 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Nicolas Grekas 
+ */
+class ResolvePrivatesPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        foreach ($container->getDefinitions() as $id => $definition) {
+            if ($definition->isPrivate()) {
+                $definition->setPublic(false);
+                $definition->setPrivate(true);
+            }
+        }
+
+        foreach ($container->getAliases() as $id => $alias) {
+            if ($alias->isPrivate()) {
+                $alias->setPublic(false);
+                $alias->setPrivate(true);
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index c8135b965e80d..23a1915fd777c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -397,26 +397,6 @@ public function testSetAutoconfiguredOnServiceIsParent()
         $this->assertFalse($container->getDefinition('child1')->isAutoconfigured());
     }
 
-    public function testPrivateHasHigherPrecedenceThanPublic()
-    {
-        $container = new ContainerBuilder();
-
-        $container->register('foo', 'stdClass')
-            ->setPublic(true)
-            ->setPrivate(true)
-        ;
-
-        $container->setAlias('bar', 'foo')
-            ->setPublic(false)
-            ->setPrivate(false)
-        ;
-
-        $this->process($container);
-
-        $this->assertFalse($container->getDefinition('foo')->isPublic());
-        $this->assertFalse($container->getAlias('bar')->isPublic());
-    }
-
     /**
      * @group legacy
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolvePrivatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolvePrivatesPassTest.php
new file mode 100644
index 0000000000000..89af24f2c9c8e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolvePrivatesPassTest.php
@@ -0,0 +1,39 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolvePrivatesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolvePrivatesPassTest extends TestCase
+{
+    public function testPrivateHasHigherPrecedenceThanPublic()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setPrivate(true)
+        ;
+
+        $container->setAlias('bar', 'foo')
+            ->setPublic(false)
+            ->setPrivate(false)
+        ;
+
+        (new ResolvePrivatesPass())->process($container);
+
+        $this->assertFalse($container->getDefinition('foo')->isPublic());
+        $this->assertFalse($container->getAlias('bar')->isPublic());
+    }
+}

From fe7f26d4f32afe6c05dcd67ffd094158020cfdcd Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sat, 7 Oct 2017 23:38:34 +0200
Subject: [PATCH 1039/1099] [DI] Throw accurate failures when accessing removed
 services

---
 .../DependencyInjection/Container.php         | 50 +++++++++-----
 .../DependencyInjection/ContainerBuilder.php  | 28 ++++++--
 .../DependencyInjection/Dumper/PhpDumper.php  | 65 +++++++++++++++++++
 .../Exception/ServiceNotFoundException.php    |  6 +-
 .../Tests/ContainerTest.php                   | 18 ++++-
 .../Tests/Dumper/PhpDumperTest.php            | 46 ++++---------
 .../Tests/Fixtures/config/services9.php       |  6 +-
 .../Tests/Fixtures/containers/container9.php  |  4 +-
 .../Tests/Fixtures/php/services1-1.php        |  8 +++
 .../Tests/Fixtures/php/services1.php          |  8 +++
 .../Tests/Fixtures/php/services10.php         |  8 +++
 .../Tests/Fixtures/php/services12.php         |  8 +++
 .../Tests/Fixtures/php/services13.php         |  9 +++
 .../Tests/Fixtures/php/services19.php         |  8 +++
 .../Tests/Fixtures/php/services24.php         |  8 +++
 .../Tests/Fixtures/php/services26.php         |  8 +++
 .../Tests/Fixtures/php/services33.php         |  8 +++
 .../Tests/Fixtures/php/services8.php          |  8 +++
 .../Tests/Fixtures/php/services9.php          |  3 +
 .../Tests/Fixtures/php/services9_as_files.txt | 21 ++++++
 .../Tests/Fixtures/php/services9_compiled.php | 17 +++++
 .../Fixtures/php/services_array_params.php    |  8 +++
 .../Fixtures/php/services_base64_env.php      |  8 +++
 .../Fixtures/php/services_legacy_privates.php | 11 ++++
 .../Tests/Fixtures/php/services_locator.php   | 11 ++++
 .../Fixtures/php/services_private_frozen.php  |  8 +++
 .../php/services_private_in_expression.php    |  9 +++
 .../Tests/Fixtures/php/services_rot13_env.php |  8 +++
 .../Fixtures/php/services_subscriber.php      |  9 +++
 .../php/services_uninitialized_ref.php        |  9 +++
 .../Tests/Fixtures/xml/services6.xml          |  4 +-
 .../Tests/Fixtures/yaml/services6.yml         | 12 ++--
 .../Tests/Fixtures/yaml/services9.yml         | 12 ++--
 33 files changed, 377 insertions(+), 77 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 8e33a3260feeb..754cfb7568c24 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -50,6 +50,7 @@ class Container implements ResettableContainerInterface
     protected $aliases = array();
     protected $loading = array();
     protected $resolving = array();
+    protected $syntheticIds = array();
 
     /**
      * @internal
@@ -179,31 +180,34 @@ public function set($id, $service)
             throw new InvalidArgumentException('You cannot set service "service_container".');
         }
 
-        if (isset($this->aliases[$id])) {
-            unset($this->aliases[$id]);
-        }
-
-        $wasSet = isset($this->services[$id]);
-        $this->services[$id] = $service;
-
-        if (null === $service) {
-            unset($this->services[$id]);
-        }
-
-        if (isset($this->privates[$id])) {
-            if (null === $service) {
+        if (isset($this->privates[$id]) || !(isset($this->fileMap[$id]) || isset($this->methodMap[$id]))) {
+            if (isset($this->syntheticIds[$id]) || (!isset($this->privates[$id]) && !isset($this->getRemovedIds()[$id]))) {
+                // no-op
+            } elseif (null === $service) {
                 @trigger_error(sprintf('The "%s" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);
                 unset($this->privates[$id]);
             } else {
                 @trigger_error(sprintf('The "%s" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             }
-        } elseif ($wasSet && (isset($this->fileMap[$id]) || isset($this->methodMap[$id]))) {
+        } elseif (isset($this->services[$id])) {
             if (null === $service) {
                 @trigger_error(sprintf('The "%s" service is already initialized, unsetting it is deprecated since Symfony 3.3 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             } else {
                 @trigger_error(sprintf('The "%s" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.', $id), E_USER_DEPRECATED);
             }
         }
+
+        if (isset($this->aliases[$id])) {
+            unset($this->aliases[$id]);
+        }
+
+        if (null === $service) {
+            unset($this->services[$id]);
+
+            return;
+        }
+
+        $this->services[$id] = $service;
     }
 
     /**
@@ -275,7 +279,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         // calling $this->normalizeId($id) unless necessary.
         for ($i = 2;;) {
             if (isset($this->privates[$id])) {
-                @trigger_error(sprintf('The "%s" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.', $id), E_USER_DEPRECATED);
             }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
@@ -325,6 +329,12 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             if (!$id) {
                 throw new ServiceNotFoundException($id);
             }
+            if (isset($this->syntheticIds[$id])) {
+                throw new ServiceNotFoundException($id, null, null, array(), sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
+            }
+            if (isset($this->getRemovedIds()[$id])) {
+                throw new ServiceNotFoundException($id, null, null, array(), sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
+            }
 
             $alternatives = array();
             foreach ($this->getServiceIds() as $knownId) {
@@ -397,6 +407,16 @@ public function getServiceIds()
         return array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services)));
     }
 
+    /**
+     * Gets service ids that existed at compile time.
+     *
+     * @return array
+     */
+    public function getRemovedIds()
+    {
+        return array();
+    }
+
     /**
      * Camelizes a string.
      *
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index d46da389f05b4..17098f1e51452 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -121,6 +121,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
     private $autoconfiguredInstanceof = array();
 
+    private $removedIds = array();
+
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
         parent::__construct($parameterBag);
@@ -517,7 +519,7 @@ public function set($id, $service)
             throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
         }
 
-        unset($this->definitions[$id], $this->aliasDefinitions[$id]);
+        unset($this->definitions[$id], $this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         parent::set($id, $service);
     }
@@ -529,7 +531,10 @@ public function set($id, $service)
      */
     public function removeDefinition($id)
     {
-        unset($this->definitions[$this->normalizeId($id)]);
+        if (isset($this->definitions[$id = $this->normalizeId($id)])) {
+            unset($this->definitions[$id]);
+            $this->removedIds[$id] = true;
+        }
     }
 
     /**
@@ -793,6 +798,16 @@ public function getServiceIds()
         return array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds()));
     }
 
+    /**
+     * Gets removed service or alias ids.
+     *
+     * @return array
+     */
+    public function getRemovedIds()
+    {
+        return $this->removedIds;
+    }
+
     /**
      * Adds the service aliases.
      *
@@ -841,7 +856,7 @@ public function setAlias($alias, $id)
             throw new InvalidArgumentException(sprintf('An alias can not reference itself, got a circular reference on "%s".', $alias));
         }
 
-        unset($this->definitions[$alias]);
+        unset($this->definitions[$alias], $this->removedIds[$alias]);
 
         return $this->aliasDefinitions[$alias] = $id;
     }
@@ -853,7 +868,10 @@ public function setAlias($alias, $id)
      */
     public function removeAlias($alias)
     {
-        unset($this->aliasDefinitions[$this->normalizeId($alias)]);
+        if (isset($this->aliasDefinitions[$alias = $this->normalizeId($alias)])) {
+            unset($this->aliasDefinitions[$alias]);
+            $this->removedIds[$alias] = true;
+        }
     }
 
     /**
@@ -981,7 +999,7 @@ public function setDefinition($id, Definition $definition)
 
         $id = $this->normalizeId($id);
 
-        unset($this->aliasDefinitions[$id]);
+        unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         return $this->definitions[$id] = $definition;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index c8a4d5cd3af68..f12d813890615 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -172,6 +172,16 @@ public function dump(array $options = array())
 
 EOF;
             $files = array();
+
+            if ($ids = array_keys($this->container->getRemovedIds())) {
+                sort($ids);
+                $c = "export($id)." => true,\n";
+                }
+                $files['removed-ids.php'] = $c .= ");\n";
+            }
+
             foreach ($this->generateServiceFiles() as $file => $c) {
                 $files[$file] = $fileStart.$c;
             }
@@ -888,6 +898,7 @@ public function __construct()
         }
 
         $code .= $this->addNormalizedIds();
+        $code .= $this->addSyntheticIds();
         $code .= $this->addMethodMap();
         $code .= $this->asFiles ? $this->addFileMap() : '';
         $code .= $this->addPrivateServices();
@@ -896,6 +907,8 @@ public function __construct()
     }
 
 EOF;
+        $code .= $this->addRemovedIds();
+
         if ($this->container->isCompiled()) {
             $code .= <<normalizedIds = array(\n".$code."        );\n" : '';
     }
 
+    /**
+     * Adds the syntheticIds definition.
+     *
+     * @return string
+     */
+    private function addSyntheticIds()
+    {
+        $code = '';
+        $definitions = $this->container->getDefinitions();
+        ksort($definitions);
+        foreach ($definitions as $id => $definition) {
+            if ($definition->isSynthetic() && 'service_container' !== $id) {
+                $code .= '            '.$this->export($id)." => true,\n";
+            }
+        }
+
+        return $code ? "        \$this->syntheticIds = array(\n{$code}        );\n" : '';
+    }
+
+    /**
+     * Adds the removedIds definition.
+     *
+     * @return string
+     */
+    private function addRemovedIds()
+    {
+        if (!$ids = $this->container->getRemovedIds()) {
+            return '';
+        }
+        if ($this->asFiles) {
+            $code = "require __DIR__.'/removed-ids.php'";
+        } else {
+            $code = '';
+            $ids = array_keys($ids);
+            sort($ids);
+            foreach ($ids as $id) {
+                $code .= '            '.$this->export($id)." => true,\n";
+            }
+
+            $code = "array(\n{$code}        )";
+        }
+
+        return <<get('request');
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
+     * @expectedExceptionMessage The "inlined" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.
+     */
+    public function testGetRemovedServiceThrows()
+    {
+        require_once __DIR__.'/Fixtures/php/services9_compiled.php';
+
+        $container = new \ProjectServiceContainer();
+        $container->get('inlined');
+    }
+
     public function testHas()
     {
         $sc = new ProjectServiceContainer();
@@ -505,7 +517,7 @@ public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
 
     /**
      * @group legacy
-     * @expectedDeprecation The "internal" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "internal" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
      */
     public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index bda74490c9382..014ce3c16f885 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -287,37 +287,17 @@ public function testFrozenContainerWithoutAliases()
 
     /**
      * @group legacy
-     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
+     * @expectedDeprecation The "decorator_service" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
      */
     public function testOverrideServiceWhenUsingADumpedContainer()
     {
-        require_once self::$fixturesPath.'/php/services9.php';
-        require_once self::$fixturesPath.'/includes/foo.php';
+        require_once self::$fixturesPath.'/php/services9_compiled.php';
 
         $container = new \ProjectServiceContainer();
-        $container->setParameter('foo_bar', 'foo_bar');
-        $container->get('bar');
-        $container->set('bar', $bar = new \stdClass());
-
-        $this->assertSame($bar, $container->get('bar'), '->set() overrides an already defined service');
-    }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
-     */
-    public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFromAnotherOne()
-    {
-        require_once self::$fixturesPath.'/php/services9.php';
-        require_once self::$fixturesPath.'/includes/foo.php';
-        require_once self::$fixturesPath.'/includes/classes.php';
-
-        $container = new \ProjectServiceContainer();
-        $container->setParameter('foo_bar', 'foo_bar');
-        $container->get('bar');
-        $container->set('bar', $bar = new \stdClass());
+        $container->get('decorator_service');
+        $container->set('decorator_service', $decorator = new \stdClass());
 
-        $this->assertSame($bar, $container->get('foo')->bar, '->set() overrides an already defined service');
+        $this->assertSame($decorator, $container->get('decorator_service'), '->set() overrides an already defined service');
     }
 
     /**
@@ -799,14 +779,14 @@ public function testDumpHandlesLiteralClassWithRootNamespace()
 
     /**
      * @group legacy
-     * @expectedDeprecation The "private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "decorated_private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "decorated_private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "private_not_inlined" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "private_not_removed" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "private_child" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
-     * @expectedDeprecation The "private_parent" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop getting services directly from the container and use dependency injection instead.
+     * @expectedDeprecation The "private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_not_inlined" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_not_removed" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_child" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_parent" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
      */
     public function testLegacyPrivateServices()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
index 3f4d5f15ea71a..b013e5126d3b6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
@@ -40,9 +40,6 @@
         ->args(array(ref('deprecated_service')))
         ->share(false);
 
-    $s->alias('alias_for_foo', 'foo')->private()->public();
-    $s->alias('alias_for_alias', ref('alias_for_foo'));
-
     $s->set('method_call1', 'Bar\FooClass')
         ->file(realpath(__DIR__.'/../includes/foo.php'))
         ->call('setBar', array(ref('foo')))
@@ -125,4 +122,7 @@
     $s->set('tagged_iterator', 'Bar')
         ->public()
         ->args(array(tagged('foo')));
+
+    $s->alias('alias_for_foo', 'foo')->private()->public();
+    $s->alias('alias_for_alias', ref('alias_for_foo'));
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 452dab6d806b6..21d35611c33ae 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -48,8 +48,6 @@
     'foo_class' => 'Bar\FooClass',
     'foo' => 'bar',
 ));
-$container->setAlias('alias_for_foo', 'foo')->setPublic(true);
-$container->setAlias('alias_for_alias', 'alias_for_foo')->setPublic(true);
 $container
     ->register('method_call1', 'Bar\FooClass')
     ->setFile(realpath(__DIR__.'/../includes/foo.php'))
@@ -172,5 +170,7 @@
     ->addArgument(new TaggedIteratorArgument('foo'))
     ->setPublic(true)
 ;
+$container->setAlias('alias_for_foo', 'foo')->setPublic(true);
+$container->setAlias('alias_for_alias', 'alias_for_foo')->setPublic(true);
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index e696dec6aedb4..349358c384549 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -28,6 +28,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index c339856f0276b..8d7aab16c77b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -26,6 +26,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index 219cf3431b573..bfd6587a4eb33 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -31,6 +31,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 2bd134a9f8400..c5c434ec7d7c1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -35,6 +35,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index 4cc353ca278de..577e0221d0185 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -29,6 +29,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'foo' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index 0a6b97e65ded6..0b2682420ff53 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -30,6 +30,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 7546b1765a658..02a7a1b0c2657 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -29,6 +29,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index 7dc51d12afed1..6519a9dff76a4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -35,6 +35,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index e36cdcaedb918..1a8b3f0c5215d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -34,6 +34,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index 357b8aa697560..8db48ade93bb9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -28,6 +28,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
index b05b886871ab1..30b94d456ef6f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -26,6 +26,9 @@ public function __construct()
             'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
             'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
         );
+        $this->syntheticIds = array(
+            'request' => true,
+        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'baz' => 'getBazService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 3795ade4806e6..83074c984e382 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -1,5 +1,18 @@
 Array
 (
+    [Container%s/removed-ids.php] =>  true,
+    'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+    'configurator_service' => true,
+    'configurator_service_simple' => true,
+    'decorated.pif-pouf' => true,
+    'decorator_service.inner' => true,
+    'inlined' => true,
+    'new_factory' => true,
+);
+
     [Container%s/getBarService.php] => parameters = $this->getDefaultParameters();
 
         $this->services = array();
+        $this->syntheticIds = array(
+            'request' => true,
+        );
         $this->methodMap = array(
             'foo_bar' => 'getFooBarService',
         );
@@ -322,6 +338,11 @@ class Container%s extends Container
         );
     }
 
+    public function getRemovedIds()
+    {
+        return require __DIR__.'/removed-ids.php';
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 7ec609ca5e6cb..403eb12954fe1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -24,6 +24,9 @@ public function __construct()
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
+        $this->syntheticIds = array(
+            'request' => true,
+        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'baz' => 'getBazService',
@@ -58,6 +61,20 @@ public function __construct()
         );
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'configurator_service' => true,
+            'configurator_service_simple' => true,
+            'decorated.pif-pouf' => true,
+            'decorator_service.inner' => true,
+            'inlined' => true,
+            'new_factory' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index e5159861b4708..65e6b61e34e57 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -35,6 +35,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 8513e25d2e085..d796c0dae676f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -28,6 +28,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
index fad546d7fc348..f8c33ae59966a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -55,6 +55,17 @@ public function __construct()
         );
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'foo' => true,
+            'private_alias_decorator.inner' => true,
+            'private_decorator.inner' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index 74e2a8ce094a2..339076ea3bea2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -40,6 +40,17 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'translator.loader_1_locator' => true,
+            'translator.loader_2_locator' => true,
+            'translator.loader_3_locator' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index c7ea243ae81a0..59857ecac3ef8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -34,6 +34,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index 8269736c0b8df..70af6ce7e3661 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -33,6 +33,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'private_bar' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 3b26928577247..d888187bf534b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -35,6 +35,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index a4ab454e3efc0..76d87489a98b6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -38,6 +38,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'service_locator.jmktfsv' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index c47e7c15d1291..df5a40c839749 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -35,6 +35,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    public function getRemovedIds()
+    {
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'foo2' => true,
+        );
+    }
+
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
index 5134ff7671f11..cffd5df6059ac 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
@@ -43,8 +43,6 @@
         
       
     
-    
-    
     
     
     
@@ -61,5 +59,7 @@
     
       
     
+    
+    
   
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
index bfc995d44e450..1ee6c6ec740eb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -17,16 +17,10 @@ services:
         class: FooClass
         calls:
             - [ setBar, [ foo, '@foo', [true, false] ] ]
-    alias_for_foo: '@foo'
-    another_alias_for_foo:
-        alias: foo
-        public: false
     request:
         class: Request
         synthetic: true
         lazy: true
-    another_third_alias_for_foo:
-        alias: foo
     decorator_service:
         decorates: decorated
     decorator_service_with_name:
@@ -41,3 +35,9 @@ services:
     new_factory3: { class: FooBarClass, factory: [BazClass, getInstance]}
     new_factory4: { class: BazClass, factory: [~, getInstance]}
     Acme\WithShortCutArgs: [foo, '@baz']
+    alias_for_foo: '@foo'
+    another_alias_for_foo:
+        alias: foo
+        public: false
+    another_third_alias_for_foo:
+        alias: foo
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index cf713d189e57e..2501ddcc1b5c9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -139,12 +139,6 @@ services:
         class: LazyContext
         arguments: [!iterator ['@foo.baz', '@?invalid'], !iterator []]
         public: true
-    alias_for_foo:
-        alias: 'foo'
-        public: true
-    alias_for_alias:
-        alias: 'foo'
-        public: true
     tagged_iterator_foo:
         class: Bar
         tags:
@@ -161,3 +155,9 @@ services:
     Symfony\Component\DependencyInjection\ContainerInterface:
         alias: service_container
         public: false
+    alias_for_foo:
+        alias: 'foo'
+        public: true
+    alias_for_alias:
+        alias: 'foo'
+        public: true

From 79978dba0511b8df48a5d63b44619548f6319a7c Mon Sep 17 00:00:00 2001
From: 243083df <243083df@dispostable.com>
Date: Sun, 8 Oct 2017 02:59:09 +0400
Subject: [PATCH 1040/1099] Replace function chain to a single call.

---
 src/Symfony/Component/HttpFoundation/HeaderBag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index e0b51ad125609..d0789be295400 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -46,7 +46,7 @@ public function __toString()
         $max = max(array_map('strlen', array_keys($headers))) + 1;
         $content = '';
         foreach ($headers as $name => $values) {
-            $name = implode('-', array_map('ucfirst', explode('-', $name)));
+            $name = ucwords($name, '-');
             foreach ($values as $value) {
                 $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
             }

From dca930f5792a3e69a4312d486454b5b1c246a033 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 8 Oct 2017 11:22:26 +0200
Subject: [PATCH 1041/1099] [DI] Remove colon from env placeholders

---
 .../ParameterBag/EnvPlaceholderParameterBag.php                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
index e0fe4c7cdfc57..ddc7e84fa636e 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -48,7 +48,7 @@ public function get($name)
             }
 
             $uniqueName = md5($name.uniqid(mt_rand(), true));
-            $placeholder = sprintf('env_%s_%s', $env, $uniqueName);
+            $placeholder = sprintf('env_%s_%s', str_replace(':', '_', $env), $uniqueName);
             $this->envPlaceholders[$env][$placeholder] = $placeholder;
 
             return $placeholder;

From 214105647180dd640a4c207afcaea670198848ef Mon Sep 17 00:00:00 2001
From: Samuel ROZE 
Date: Fri, 6 Oct 2017 09:50:51 +0100
Subject: [PATCH 1042/1099] Escape command usage when displaying it in the text
 descriptor

---
 src/Symfony/Component/Console/Descriptor/TextDescriptor.php | 2 +-
 src/Symfony/Component/Console/Tests/Fixtures/command_2.txt  | 6 +++---
 .../Component/Console/Tests/Fixtures/command_mbstring.txt   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 5b82b3deefa8e..249eb9cb840aa 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -143,7 +143,7 @@ protected function describeCommand(Command $command, array $options = array())
         $this->writeText('Usage:', $options);
         foreach (array_merge(array($command->getSynopsis(true)), $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
-            $this->writeText('  '.$usage, $options);
+            $this->writeText('  '.OutputFormatter::escape($usage), $options);
         }
         $this->writeText("\n");
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
index cad9cb45f2c8b..2864c7bdc33ec 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
@@ -1,7 +1,7 @@
 Usage:
-  descriptor:command2 [options] [--] 
-  descriptor:command2 -o|--option_name 
-  descriptor:command2 
+  descriptor:command2 [options] [--] \
+  descriptor:command2 -o|--option_name \
+  descriptor:command2 \
 
 Arguments:
   argument_name      
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.txt
index 969a0652420b2..cde457dcab863 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.txt
@@ -1,7 +1,7 @@
 Usage:
-  descriptor:åèä [options] [--] 
-  descriptor:åèä -o|--option_name 
-  descriptor:åèä 
+  descriptor:åèä [options] [--] \
+  descriptor:åèä -o|--option_name \
+  descriptor:åèä \
 
 Arguments:
   argument_åèä   

From 042eac4624f24b38edfa4d93c4e9e075a74cd3e9 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 6 Oct 2017 13:28:39 +0200
Subject: [PATCH 1043/1099] [Form] fix parsing invalid floating point numbers

---
 .../PercentToLocalizedStringTransformer.php   | 33 ++++++++-
 ...ercentToLocalizedStringTransformerTest.php | 70 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index ad8baeb7c9b25..fdb142f84e761 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -116,6 +116,7 @@ public function reverseTransform($value)
             return;
         }
 
+        $position = 0;
         $formatter = $this->getNumberFormatter();
         $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
         $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
@@ -129,18 +130,44 @@ public function reverseTransform($value)
             $value = str_replace(',', $decSep, $value);
         }
 
+        if (false !== strpos($value, $decSep)) {
+            $type = \NumberFormatter::TYPE_DOUBLE;
+        } else {
+            $type = \PHP_INT_SIZE === 8 ? \NumberFormatter::TYPE_INT64 : \NumberFormatter::TYPE_INT32;
+        }
+
         // replace normal spaces so that the formatter can read them
-        $value = $formatter->parse(str_replace(' ', "\xc2\xa0", $value));
+        $result = $formatter->parse(str_replace(' ', "\xc2\xa0", $value), $type, $position);
 
         if (intl_is_failure($formatter->getErrorCode())) {
             throw new TransformationFailedException($formatter->getErrorMessage());
         }
 
         if (self::FRACTIONAL == $this->type) {
-            $value /= 100;
+            $result /= 100;
         }
 
-        return $value;
+        if (\function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value, null, true)) {
+            $length = mb_strlen($value, $encoding);
+            $remainder = mb_substr($value, $position, $length, $encoding);
+        } else {
+            $length = \strlen($value);
+            $remainder = substr($value, $position, $length);
+        }
+
+        // After parsing, position holds the index of the character where the
+        // parsing stopped
+        if ($position < $length) {
+            // Check if there are unrecognized characters at the end of the
+            // number (excluding whitespace characters)
+            $remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0");
+
+            if ('' !== $remainder) {
+                throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s"', $remainder));
+            }
+        }
+
+        return $result;
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
index 24cef424d1c3e..3467e891c9bdd 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -141,10 +141,10 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
      */
     public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
     {
-        // Since we test against "de_AT", we need the full implementation
+        // Since we test against "de_DE", we need the full implementation
         IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
-        \Locale::setDefault('de_AT');
+        \Locale::setDefault('de_DE');
 
         $transformer = new PercentToLocalizedStringTransformer(1, 'integer');
 
@@ -236,4 +236,70 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
         $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
         $this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
     }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     */
+    public function testReverseTransformDisallowsLeadingExtraCharacters()
+    {
+        $transformer = new PercentToLocalizedStringTransformer();
+
+        $transformer->reverseTransform('foo123');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     * @expectedExceptionMessage The number contains unrecognized characters: "foo3"
+     */
+    public function testReverseTransformDisallowsCenteredExtraCharacters()
+    {
+        $transformer = new PercentToLocalizedStringTransformer();
+
+        $transformer->reverseTransform('12foo3');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
+     * @requires extension mbstring
+     */
+    public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
+    {
+        // Since we test against other locales, we need the full implementation
+        IntlTestHelper::requireFullIntl($this, false);
+
+        \Locale::setDefault('ru');
+
+        $transformer = new PercentToLocalizedStringTransformer();
+
+        $transformer->reverseTransform("12\xc2\xa0345,67foo8");
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     * @expectedExceptionMessage The number contains unrecognized characters: "foo"
+     */
+    public function testReverseTransformDisallowsTrailingExtraCharacters()
+    {
+        $transformer = new PercentToLocalizedStringTransformer();
+
+        $transformer->reverseTransform('123foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     * @expectedExceptionMessage The number contains unrecognized characters: "foo"
+     * @requires extension mbstring
+     */
+    public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
+    {
+        // Since we test against other locales, we need the full implementation
+        IntlTestHelper::requireFullIntl($this, false);
+
+        \Locale::setDefault('ru');
+
+        $transformer = new PercentToLocalizedStringTransformer();
+
+        $transformer->reverseTransform("12\xc2\xa0345,678foo");
+    }
 }

From 427212d8699c067480da164682e8b1e49215c3fb Mon Sep 17 00:00:00 2001
From: Samuel ROZE 
Date: Sat, 7 Oct 2017 16:55:15 +0100
Subject: [PATCH 1044/1099] Clarify the exceptions are going to be rendered
 just after

---
 src/Symfony/Bundle/FrameworkBundle/Console/Application.php      | 2 +-
 .../Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index d53ee24d1fa88..892bdf90fea59 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -190,7 +190,7 @@ private function renderRegistrationErrors(InputInterface $input, OutputInterface
             $output = $output->getErrorOutput();
         }
 
-        (new SymfonyStyle($input, $output))->warning('Some commands could not be registered.');
+        (new SymfonyStyle($input, $output))->warning('Some commands could not be registered:');
 
         foreach ($this->registrationErrors as $error) {
             $this->doRenderException($error, $output);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
index 9396b68212d9d..d06e98be77706 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -160,7 +160,7 @@ public function testRunOnlyWarnsOnUnregistrableCommand()
         $output = $tester->getDisplay();
 
         $this->assertSame(0, $tester->getStatusCode());
-        $this->assertContains('Some commands could not be registered.', $output);
+        $this->assertContains('Some commands could not be registered:', $output);
         $this->assertContains('throwing', $output);
         $this->assertContains('fine', $output);
     }

From 1f76a70b6f2cd597e922250b12cb8f89ca67d53b Mon Sep 17 00:00:00 2001
From: Christian Schmidt 
Date: Sun, 8 Oct 2017 16:27:20 +0200
Subject: [PATCH 1045/1099] [HttpFoundation] Combine Cache-Control headers

---
 src/Symfony/Component/HttpFoundation/HeaderBag.php    |  2 +-
 .../HttpFoundation/Tests/ResponseHeaderBagTest.php    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index a824ed8649268..a797d7a2e68f7 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -146,7 +146,7 @@ public function set($key, $values, $replace = true)
         }
 
         if ('cache-control' === $key) {
-            $this->cacheControl = $this->parseCacheControl($values[0]);
+            $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
index debcdc1faf16d..c55a7f6a51d40 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -110,6 +110,17 @@ public function testCacheControlHeader()
         $bag = new ResponseHeaderBag();
         $bag->set('Last-Modified', 'abcde');
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', array('public', 'must-revalidate'));
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', 'public');
+        $bag->set('Cache-Control', 'must-revalidate', false);
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
     }
 
     public function testToStringIncludesCookieHeaders()

From d90e7212ea359d57b904b5fbf22c9199ddc762d9 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 8 Oct 2017 16:29:36 +0200
Subject: [PATCH 1046/1099] [DI] Exclude inline services declared in XML from
 autowiring candidates

---
 .../DependencyInjection/Compiler/AutowirePass.php  |  2 +-
 .../DependencyInjection/Loader/XmlFileLoader.php   |  2 +-
 .../Tests/Compiler/AutowirePassTest.php            | 14 ++++++++++++++
 .../Fixtures/xml/services_inline_not_candidate.xml | 11 +++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index b7bcb1309c1f9..98293a3198223 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -345,7 +345,7 @@ private function populateAvailableType($id, Definition $definition)
             unset($this->ambiguousServiceTypes[$type]);
         }
 
-        if ($definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
+        if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) || $definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
             return;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index e5a43e391d20d..c5ff57e97a843 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -412,7 +412,7 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
             foreach ($nodes as $node) {
                 if ($services = $this->getChildren($node, 'service')) {
                     // give it a unique name
-                    $id = sprintf('%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $node->getAttribute('class')).$suffix);
+                    $id = sprintf('%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $services[0]->getAttribute('class')).'~'.$suffix);
                     $node->setAttribute('id', $id);
                     $node->setAttribute('service', $id);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 2c68eb3d4c94f..a4a1cdb9b2511 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -12,11 +12,13 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -869,4 +871,16 @@ public function testExceptionWhenAliasDoesNotExist()
         $pass = new AutowirePass();
         $pass->process($container);
     }
+
+    public function testInlineServicesAreNotCandidates()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Fixtures/xml')));
+        $loader->load('services_inline_not_candidate.xml');
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertSame(array(), $container->getDefinition('autowired')->getArguments());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml
new file mode 100644
index 0000000000000..72560585396af
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml
@@ -0,0 +1,11 @@
+
+
+  
+    
+      
+        
+      
+    
+    
+  
+

From dbc9a44333d34d9262c7f2cefa2c756fa1cc3da8 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 9 Oct 2017 11:21:24 +0200
Subject: [PATCH 1047/1099] [HttpFoundation] Add missing session.lazy_write
 config option

---
 .../HttpFoundation/Session/Storage/NativeSessionStorage.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 5888323bd7c30..9bf438c159136 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -76,6 +76,7 @@ class NativeSessionStorage implements SessionStorageInterface
      * gc_probability, "1"
      * hash_bits_per_character, "4"
      * hash_function, "0"
+     * lazy_write, "1"
      * name, "PHPSESSID"
      * referer_check, ""
      * serialize_handler, "php"
@@ -337,7 +338,7 @@ public function setOptions(array $options)
             'cookie_lifetime', 'cookie_path', 'cookie_secure',
             'entropy_file', 'entropy_length', 'gc_divisor',
             'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character',
-            'hash_function', 'name', 'referer_check',
+            'hash_function', 'lazy_write', 'name', 'referer_check',
             'serialize_handler', 'use_strict_mode', 'use_cookies',
             'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled',
             'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',

From f09f0ae7bafcc6bb0af2ca67adf2d6439e1bdf72 Mon Sep 17 00:00:00 2001
From: 243083df <243083df@dispostable.com>
Date: Mon, 9 Oct 2017 13:31:38 +0400
Subject: [PATCH 1048/1099] Remove unnecessary condition;

---
 src/Symfony/Component/HttpKernel/HttpKernel.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 394147fc3fdc5..0ea5bf376c4d2 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -157,9 +157,7 @@ private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)
 
             if ($event->hasResponse()) {
                 $response = $event->getResponse();
-            }
-
-            if (!$response instanceof Response) {
+            } else {
                 $msg = sprintf('The controller must return a response (%s given).', $this->varToString($response));
 
                 // the user may have forgotten to return something

From e229dd03021b35c4288f01a72f1955218e68abc8 Mon Sep 17 00:00:00 2001
From: Amrouche Hamza 
Date: Sat, 29 Jul 2017 11:14:02 +0200
Subject: [PATCH 1049/1099] Fix PHP 7.2 support

---
 .github/build-packages.php                    |  1 -
 .travis.yml                                   |  8 ++--
 .../LegacyDefaultCsrfProviderTest.php         |  6 ++-
 .../Session/Storage/NativeSessionStorage.php  | 18 ++++++---
 .../Storage/Handler/PdoSessionHandlerTest.php | 38 +++++++++++++++++++
 .../Storage/NativeSessionStorageTest.php      |  2 +-
 .../EventListener/LocaleListenerTest.php      |  6 ++-
 .../EventListener/TestSessionListenerTest.php |  2 +-
 .../NativeSessionTokenStorageTest.php         |  6 ++-
 9 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/.github/build-packages.php b/.github/build-packages.php
index 56112b753ad32..3d186e927c097 100644
--- a/.github/build-packages.php
+++ b/.github/build-packages.php
@@ -9,7 +9,6 @@
 $dirs = $_SERVER['argv'];
 array_shift($dirs);
 $mergeBase = trim(shell_exec(sprintf('git merge-base %s HEAD', array_shift($dirs))));
-
 $packages = array();
 $flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
 
diff --git a/.travis.yml b/.travis.yml
index e01ab63ab3227..8409baaf05cc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
         - php: 7.0
           env: deps=high
         - php: 7.1
-          env: deps=low
+        - php: 7.2
     fast_finish: true
 
 cache:
@@ -137,7 +137,7 @@ install:
           export SYMFONY_DEPRECATIONS_HELPER=weak &&
           cp composer.json composer.json.orig &&
           echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
-          php .github/build-packages.php HEAD^ $COMPONENTS &&
+          (php .github/build-packages.php HEAD^ $COMPONENTS) &&
           mv composer.json composer.json.phpunit &&
           mv composer.json.orig composer.json
       fi
@@ -176,9 +176,9 @@ install:
           if [[ $skip ]]; then
               echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
           elif [[ $deps = high ]]; then
-              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
+              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ($COMPOSER_UP) && $PHPUNIT_X$LEGACY'"
           elif [[ $deps = low ]]; then
-              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'"
+              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ($COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
           elif [[ $PHP = hhvm* ]]; then
               $PHPUNIT --exclude-group benchmark,intl-data
           else
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
index 824e81c553032..c22bd46a7bdf7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -25,8 +25,10 @@ class LegacyDefaultCsrfProviderTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        ini_set('session.save_handler', 'files');
-        ini_set('session.save_path', sys_get_temp_dir());
+        if (\PHP_VERSION_ID < 70200) {
+            ini_set('session.save_handler', 'files');
+            ini_set('session.save_path', sys_get_temp_dir());
+        }
     }
 
     protected function setUp()
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 5888323bd7c30..1ee6d3f34e531 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -101,8 +101,12 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
-        session_cache_limiter(''); // disable by default because it's managed by HeaderBag (if used)
-        ini_set('session.use_cookies', 1);
+        if (empty($options)) {
+            $options += array('cache_limiter' => 'public');
+        }
+        if (1 !== (int) ini_get('session.use_cookies')) {
+            ini_set('session.use_cookies', 1);
+        }
 
         if (\PHP_VERSION_ID >= 50400) {
             session_register_shutdown();
@@ -345,9 +349,11 @@ public function setOptions(array $options)
             'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags',
         ));
 
-        foreach ($options as $key => $value) {
-            if (isset($validOptions[$key])) {
-                ini_set('session.'.$key, $value);
+        if (PHP_VERSION_ID < 70200 || !headers_sent()) {
+            foreach ($options as $key => $value) {
+                if (isset($validOptions[$key])) {
+                    ini_set('session.'.$key, $value);
+                }
             }
         }
     }
@@ -392,7 +398,7 @@ public function setSaveHandler($saveHandler = null)
         }
         $this->saveHandler = $saveHandler;
 
-        if ($this->saveHandler instanceof \SessionHandlerInterface) {
+        if ($this->saveHandler instanceof \SessionHandlerInterface && false === headers_sent()) {
             if (\PHP_VERSION_ID >= 50400) {
                 session_set_save_handler($this->saveHandler, false);
             } else {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index a47120f1807e2..88509b11b95d7 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -271,6 +271,10 @@ public function testSessionDestroy()
 
     public function testSessionGC()
     {
+        if (\PHP_VERSION_ID >= 70200) {
+            $this->markTestSkipped('PHP version is 7.2');
+        }
+
         $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
         $pdo = $this->getMemorySqlitePdo();
         $storage = new PdoSessionHandler($pdo);
@@ -282,10 +286,12 @@ public function testSessionGC()
 
         $storage->open('', 'sid');
         $storage->read('gc_id');
+        // IN 7.2 this does not work
         ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
         $storage->write('gc_id', 'data');
         $storage->close();
         $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
+        $storage->destroy('gc_id');
 
         $storage->open('', 'sid');
         $data = $storage->read('gc_id');
@@ -293,7 +299,39 @@ public function testSessionGC()
         $storage->close();
 
         ini_set('session.gc_maxlifetime', $previousLifeTime);
+        $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
+        $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
+    }
+
+    public function testSessionGC72()
+    {
+        if (\PHP_VERSION_ID <= 70200) {
+            $this->markTestSkipped('PHP version is  not 7.2');
+        }
+
+        $previousLifeTime = false === headers_sent() && ini_set('session.gc_maxlifetime', 1000);
+        $pdo = $this->getMemorySqlitePdo();
+        $storage = new PdoSessionHandler($pdo);
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $storage->read('gc_id');
+        false === headers_sent() && ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
+        $storage->write('gc_id', 'data');
+        $storage->close();
+        $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
+        true === headers_sent() && $storage->destroy('gc_id');
+
+        $storage->open('', 'sid');
+        $data = $storage->read('gc_id');
+        $storage->gc(-1);
+        $storage->close();
 
+        false === headers_sent() && ini_set('session.gc_maxlifetime', $previousLifeTime);
         $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
         $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 20f9ca060bc3c..d5281c644d003 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -152,7 +152,7 @@ public function testDefaultSessionCacheLimiter()
     {
         $this->iniSet('session.cache_limiter', 'nocache');
 
-        $storage = new NativeSessionStorage();
+        $storage = new NativeSessionStorage(array('cache_limiter' => ''));
         $this->assertEquals('', ini_get('session.cache_limiter'));
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index b6977ea88b6de..24f9038f35ed5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -38,7 +38,11 @@ public function testDefaultLocaleWithoutSession()
     public function testLocaleFromRequestAttribute()
     {
         $request = Request::create('/');
-        session_name('foo');
+
+        if (PHP_VERSION_ID < 70200 || !headers_sent()) {
+            session_name('foo');
+        }
+
         $request->cookies->set('foo', 'value');
 
         $request->attributes->set('_locale', 'es');
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
index 52794e0272832..63d5338182854 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -63,7 +63,7 @@ public function testDoesNotDeleteCookieIfUsingSessionLifetime()
         $this->sessionHasBeenStarted();
 
         $params = session_get_cookie_params();
-        session_set_cookie_params(0, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+        // session_set_cookie_params(0, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
 
         $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
         $cookies = $response->headers->getCookies();
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index ea20cff5291ff..869f14f82ec76 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -31,8 +31,10 @@ class NativeSessionTokenStorageTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        ini_set('session.save_handler', 'files');
-        ini_set('session.save_path', sys_get_temp_dir());
+        if (\PHP_VERSION_ID < 70200) {
+            ini_set('session.save_handler', 'files');
+            ini_set('session.save_path', sys_get_temp_dir());
+        }
 
         parent::setUpBeforeClass();
     }

From e07c2f17b6bfc749f02f16895531557603cb22ca Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 9 Oct 2017 16:32:35 +0200
Subject: [PATCH 1050/1099] [Bridge\PhpUnit] Fix infinite loop when running
 isolated method

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 869e8dc0d52b5..56aed0cb58b14 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -81,6 +81,11 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
 
 define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
 require PHPUNIT_COMPOSER_INSTALL;
+if (class_exists('PHPUnit_Util_Blacklist')) {
+    PHPUnit_Util_Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+} else {
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+}
 Symfony\Bridge\PhpUnit\TextUI\Command::main();
 
 EOPHP

From 9d9d596524e5fed6fb75adfab1bb275dffca2074 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 9 Oct 2017 17:25:01 +0200
Subject: [PATCH 1051/1099] [Bridge\PhpUnit] Fix infinite loop when running
 isolated method (bis)

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 56aed0cb58b14..beba0450aa4cd 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -81,11 +81,18 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
 
 define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
 require PHPUNIT_COMPOSER_INSTALL;
+
+if (!class_exists('SymfonyBlacklistPhpunit', false)) {
+    class SymfonyBlacklistPhpunit {}
+}
 if (class_exists('PHPUnit_Util_Blacklist')) {
-    PHPUnit_Util_Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 } else {
-    PHPUnit\Util\Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 }
+
 Symfony\Bridge\PhpUnit\TextUI\Command::main();
 
 EOPHP
@@ -204,6 +211,9 @@ if ($components) {
         }
     }
 } elseif (!isset($argv[1]) || 'install' !== $argv[1] || file_exists('install')) {
+    if (!class_exists('SymfonyBlacklistSimplePhpunit', false)) {
+        class SymfonyBlacklistSimplePhpunit {}
+    }
     array_splice($argv, 1, 0, array('--colors=always'));
     $_SERVER['argv'] = $argv;
     $_SERVER['argc'] = ++$argc;

From 9b6b3c0304965e31faee3d75dffd45034cf6700a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 9 Oct 2017 17:28:48 +0200
Subject: [PATCH 1052/1099] bug #24499 [Bridge\PhpUnit] Fix infinite loop when
 running isolated method (bis) (nicolas-grekas)

This PR was merged into the 4.0-dev branch.

Discussion
----------

[Bridge\PhpUnit] Fix infinite loop when running isolated method (bis)

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

The blacklisting system is a bit rigid, so let's work around it.

Commits
-------

9d9d596 [Bridge\PhpUnit] Fix infinite loop when running isolated method (bis)
---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 56aed0cb58b14..beba0450aa4cd 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -81,11 +81,18 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
 
 define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
 require PHPUNIT_COMPOSER_INSTALL;
+
+if (!class_exists('SymfonyBlacklistPhpunit', false)) {
+    class SymfonyBlacklistPhpunit {}
+}
 if (class_exists('PHPUnit_Util_Blacklist')) {
-    PHPUnit_Util_Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 } else {
-    PHPUnit\Util\Blacklist::$blacklistedClassNames['\PHPUnit\Framework\TestCase'] = 3;
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 }
+
 Symfony\Bridge\PhpUnit\TextUI\Command::main();
 
 EOPHP
@@ -204,6 +211,9 @@ if ($components) {
         }
     }
 } elseif (!isset($argv[1]) || 'install' !== $argv[1] || file_exists('install')) {
+    if (!class_exists('SymfonyBlacklistSimplePhpunit', false)) {
+        class SymfonyBlacklistSimplePhpunit {}
+    }
     array_splice($argv, 1, 0, array('--colors=always'));
     $_SERVER['argv'] = $argv;
     $_SERVER['argc'] = ++$argc;

From 91c9287c556ffe43e890c55ef2e030f940e67d00 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Sun, 8 Oct 2017 15:44:15 +0200
Subject: [PATCH 1053/1099] [DI] Prefixed env vars and load time inlining are
 incompatible

---
 .../MergeExtensionConfigurationPass.php       | 27 +++++++++++++++++++
 .../Compiler/RegisterEnvVarProcessorsPass.php | 18 ++++++-------
 .../MergeExtensionConfigurationPassTest.php   | 21 +++++++++++++++
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index af3a6baf0b898..1518952d7a7ee 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -164,4 +165,30 @@ public function compile($resolveEnvPlaceholders = false)
     {
         throw new LogicException(sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null)
+    {
+        if (true !== $format || !\is_string($value)) {
+            return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
+        }
+
+        $bag = $this->getParameterBag();
+        $value = $bag->resolveValue($value);
+
+        foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
+            if (false === strpos($env, ':')) {
+                continue;
+            }
+            foreach ($placeholders as $placeholder) {
+                if (false !== stripos($value, $placeholder)) {
+                    throw new RuntimeException(sprintf('Using a cast in "env(%s)" is incompatible with resolution at compile time in "%s". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.', $env, $this->extensionClass));
+                }
+            }
+        }
+
+        return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
index 68f2f9a41c134..38349f06569a6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -34,16 +34,14 @@ public function process(ContainerBuilder $container)
         $types = array();
         $processors = array();
         foreach ($container->findTaggedServiceIds('container.env_var_processor') as $id => $tags) {
-            foreach ($tags as $attr) {
-                if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
-                    throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
-                } elseif (!$r->isSubclassOf(EnvVarProcessorInterface::class)) {
-                    throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EnvVarProcessorInterface::class));
-                }
-                foreach ($class::getProvidedTypes() as $prefix => $type) {
-                    $processors[$prefix] = new ServiceClosureArgument(new Reference($id));
-                    $types[$prefix] = self::validateProvidedTypes($type, $class);
-                }
+            if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
+                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+            } elseif (!$r->isSubclassOf(EnvVarProcessorInterface::class)) {
+                throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EnvVarProcessorInterface::class));
+            }
+            foreach ($class::getProvidedTypes() as $prefix => $type) {
+                $processors[$prefix] = new ServiceClosureArgument(new Reference($id));
+                $types[$prefix] = self::validateProvidedTypes($type, $class);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index 57bb634f4bff0..b64aa7778cbe8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -101,6 +101,19 @@ public function testOverriddenEnvsAreMerged()
         $this->assertSame(array('BAZ', 'FOO'), array_keys($container->getParameterBag()->getEnvPlaceholders()));
         $this->assertSame(array('BAZ' => 1, 'FOO' => 0), $container->getEnvCounters());
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Using a cast in "env(int:FOO)" is incompatible with resolution at compile time in "Symfony\Component\DependencyInjection\Tests\Compiler\BarExtension". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.
+     */
+    public function testProcessedEnvsAreIncompatibleWithResolve()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new BarExtension());
+        $container->prependExtensionConfig('bar', array());
+
+        (new MergeExtensionConfigurationPass())->process($container);
+    }
 }
 
 class FooConfiguration implements ConfigurationInterface
@@ -142,3 +155,11 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 }
+
+class BarExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $container->resolveEnvPlaceholders('%env(int:FOO)%', true);
+    }
+}

From fdf285b5c9a85b2cbd9d569ed1682bf7f12e014a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Mon, 9 Oct 2017 12:39:15 +0200
Subject: [PATCH 1054/1099] Fix 7.2 compat layer

---
 .github/build-packages.php                    |  1 +
 .travis.yml                                   |  9 ++--
 .../Bridge/Twig/Tests/AppVariableTest.php     |  3 ++
 src/Symfony/Bridge/Twig/composer.json         |  1 +
 .../CacheClearCommandTest.php                 |  2 +-
 .../Tests/Controller/ControllerTest.php       |  3 ++
 .../Bundle/FrameworkBundle/composer.json      |  2 +-
 .../Debug/Tests/ErrorHandlerTest.php          |  4 +-
 .../Debug/Tests/Fixtures/Throwing.php         |  4 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |  3 ++
 .../LegacyDefaultCsrfProviderTest.php         |  8 ----
 .../Session/Storage/NativeSessionStorage.php  | 33 +++++++++------
 .../Storage/Handler/PdoSessionHandlerTest.php | 41 ++-----------------
 .../Storage/NativeSessionStorageTest.php      |  2 +-
 .../EventListener/LocaleListenerTest.php      |  7 +---
 .../EventListener/TestSessionListenerTest.php |  3 +-
 .../Component/HttpKernel/composer.json        |  2 +-
 .../Routing/Tests/Fixtures/validresource.php  |  3 ++
 .../NativeSessionTokenStorageTest.php         | 10 -----
 19 files changed, 55 insertions(+), 86 deletions(-)

diff --git a/.github/build-packages.php b/.github/build-packages.php
index 3d186e927c097..56112b753ad32 100644
--- a/.github/build-packages.php
+++ b/.github/build-packages.php
@@ -9,6 +9,7 @@
 $dirs = $_SERVER['argv'];
 array_shift($dirs);
 $mergeBase = trim(shell_exec(sprintf('git merge-base %s HEAD', array_shift($dirs))));
+
 $packages = array();
 $flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
 
diff --git a/.travis.yml b/.travis.yml
index 8409baaf05cc4..e34ba5a8bcaaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,10 @@ matrix:
         - php: 5.5
         - php: 5.6
         - php: 7.0
-          env: deps=high
         - php: 7.1
+          env: deps=high
         - php: 7.2
+          env: deps=low
     fast_finish: true
 
 cache:
@@ -137,7 +138,7 @@ install:
           export SYMFONY_DEPRECATIONS_HELPER=weak &&
           cp composer.json composer.json.orig &&
           echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
-          (php .github/build-packages.php HEAD^ $COMPONENTS) &&
+          php .github/build-packages.php HEAD^ $COMPONENTS &&
           mv composer.json composer.json.phpunit &&
           mv composer.json.orig composer.json
       fi
@@ -176,9 +177,9 @@ install:
           if [[ $skip ]]; then
               echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
           elif [[ $deps = high ]]; then
-              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ($COMPOSER_UP) && $PHPUNIT_X$LEGACY'"
+              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
           elif [[ $deps = low ]]; then
-              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ($COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
+              echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'"
           elif [[ $PHP = hhvm* ]]; then
               $PHPUNIT --exclude-group benchmark,intl-data
           else
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index 9abb0e3b6ea78..b9aa168fd763d 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -44,6 +44,9 @@ public function testEnvironment()
         $this->assertEquals('dev', $this->appVariable->getEnvironment());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetSession()
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 9610edc8085b5..04e3819176844 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -23,6 +23,7 @@
         "symfony/asset": "~2.7",
         "symfony/finder": "~2.3",
         "symfony/form": "~2.7.30|^2.8.23",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index f1140e86bb378..a25aa8e637e44 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -55,7 +55,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
         $finder = new Finder();
         $metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
         // simply check that cache is warmed up
-        $this->assertGreaterThanOrEqual(1, count($metaFiles));
+        $this->assertNotEmpty($metaFiles);
         foreach ($metaFiles as $file) {
             $configCache = new ConfigCache(substr($file, 0, -5), true);
             $this->assertTrue(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
index d7f40a24d8b4a..cb813c61d62ac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -143,6 +143,9 @@ public function testRedirectToRoute()
         $this->assertSame(302, $response->getStatusCode());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testAddFlash()
     {
         $flashBag = new FlashBag();
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 76648774f3baa..ed611114fe2aa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -23,7 +23,7 @@
         "symfony/config": "~2.4",
         "symfony/event-dispatcher": "~2.5",
         "symfony/finder": "^2.0.5",
-        "symfony/http-foundation": "~2.7",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/http-kernel": "~2.7.29|^2.8.22",
         "symfony/filesystem": "~2.3",
         "symfony/routing": "~2.7.24|^2.8.17",
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index 898a985a29e2f..fd9ac577ee73a 100644
--- a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -79,7 +79,9 @@ public function testNotice()
             $this->assertEquals(E_NOTICE, $exception->getSeverity());
             $this->assertEquals(__FILE__, $exception->getFile());
             $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
-            $this->assertArrayHasKey('foobar', $exception->getContext());
+            if (\PHP_VERSION_ID < 70200) {
+                $this->assertArrayHasKey('foobar', $exception->getContext());
+            }
 
             $trace = $exception->getTrace();
             $this->assertEquals(__FILE__, $trace[0]['file']);
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php b/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php
index 21e0aba17d358..d338ca9d5752b 100644
--- a/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php
+++ b/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php
@@ -1,3 +1,5 @@
 markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');
         }
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');
+        }
 
         require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
index c22bd46a7bdf7..8cca486369ec0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -23,14 +23,6 @@ class LegacyDefaultCsrfProviderTest extends TestCase
 {
     protected $provider;
 
-    public static function setUpBeforeClass()
-    {
-        if (\PHP_VERSION_ID < 70200) {
-            ini_set('session.save_handler', 'files');
-            ini_set('session.save_path', sys_get_temp_dir());
-        }
-    }
-
     protected function setUp()
     {
         $this->provider = new DefaultCsrfProvider('SECRET');
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 1ee6d3f34e531..09cb242f92c2d 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -101,12 +101,11 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
-        if (empty($options)) {
-            $options += array('cache_limiter' => 'public');
-        }
-        if (1 !== (int) ini_get('session.use_cookies')) {
-            ini_set('session.use_cookies', 1);
-        }
+        $options += array(
+            // disable by default because it's managed by HeaderBag (if used)
+            'cache_limiter' => '',
+            'use_cookies' => 1,
+        );
 
         if (\PHP_VERSION_ID >= 50400) {
             session_register_shutdown();
@@ -212,6 +211,10 @@ public function regenerate($destroy = false, $lifetime = null)
             return false;
         }
 
+        if (headers_sent()) {
+            return false;
+        }
+
         if (null !== $lifetime) {
             ini_set('session.cookie_lifetime', $lifetime);
         }
@@ -336,6 +339,10 @@ public function isStarted()
      */
     public function setOptions(array $options)
     {
+        if (headers_sent()) {
+            return;
+        }
+
         $validOptions = array_flip(array(
             'cache_limiter', 'cookie_domain', 'cookie_httponly',
             'cookie_lifetime', 'cookie_path', 'cookie_secure',
@@ -349,11 +356,9 @@ public function setOptions(array $options)
             'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags',
         ));
 
-        if (PHP_VERSION_ID < 70200 || !headers_sent()) {
-            foreach ($options as $key => $value) {
-                if (isset($validOptions[$key])) {
-                    ini_set('session.'.$key, $value);
-                }
+        foreach ($options as $key => $value) {
+            if (isset($validOptions[$key])) {
+                ini_set('session.'.$key, $value);
             }
         }
     }
@@ -389,6 +394,10 @@ public function setSaveHandler($saveHandler = null)
             throw new \InvalidArgumentException('Must be instance of AbstractProxy or NativeSessionHandler; implement \SessionHandlerInterface; or be null.');
         }
 
+        if (headers_sent($file, $line)) {
+            throw new \RuntimeException(sprintf('Failed to set the session handler because headers have already been sent by "%s" at line %d.', $file, $line));
+        }
+
         // Wrap $saveHandler in proxy and prevent double wrapping of proxy
         if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
             $saveHandler = new SessionHandlerProxy($saveHandler);
@@ -398,7 +407,7 @@ public function setSaveHandler($saveHandler = null)
         }
         $this->saveHandler = $saveHandler;
 
-        if ($this->saveHandler instanceof \SessionHandlerInterface && false === headers_sent()) {
+        if ($this->saveHandler instanceof \SessionHandlerInterface) {
             if (\PHP_VERSION_ID >= 50400) {
                 session_set_save_handler($this->saveHandler, false);
             } else {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 88509b11b95d7..a9884c1c92ea3 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -269,12 +269,11 @@ public function testSessionDestroy()
         $this->assertSame('', $data, 'Destroyed session returns empty string');
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testSessionGC()
     {
-        if (\PHP_VERSION_ID >= 70200) {
-            $this->markTestSkipped('PHP version is 7.2');
-        }
-
         $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
         $pdo = $this->getMemorySqlitePdo();
         $storage = new PdoSessionHandler($pdo);
@@ -286,12 +285,10 @@ public function testSessionGC()
 
         $storage->open('', 'sid');
         $storage->read('gc_id');
-        // IN 7.2 this does not work
         ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
         $storage->write('gc_id', 'data');
         $storage->close();
         $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
-        $storage->destroy('gc_id');
 
         $storage->open('', 'sid');
         $data = $storage->read('gc_id');
@@ -299,39 +296,7 @@ public function testSessionGC()
         $storage->close();
 
         ini_set('session.gc_maxlifetime', $previousLifeTime);
-        $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
-        $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
-    }
-
-    public function testSessionGC72()
-    {
-        if (\PHP_VERSION_ID <= 70200) {
-            $this->markTestSkipped('PHP version is  not 7.2');
-        }
-
-        $previousLifeTime = false === headers_sent() && ini_set('session.gc_maxlifetime', 1000);
-        $pdo = $this->getMemorySqlitePdo();
-        $storage = new PdoSessionHandler($pdo);
-
-        $storage->open('', 'sid');
-        $storage->read('id');
-        $storage->write('id', 'data');
-        $storage->close();
-
-        $storage->open('', 'sid');
-        $storage->read('gc_id');
-        false === headers_sent() && ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
-        $storage->write('gc_id', 'data');
-        $storage->close();
-        $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
-        true === headers_sent() && $storage->destroy('gc_id');
-
-        $storage->open('', 'sid');
-        $data = $storage->read('gc_id');
-        $storage->gc(-1);
-        $storage->close();
 
-        false === headers_sent() && ini_set('session.gc_maxlifetime', $previousLifeTime);
         $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
         $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index d5281c644d003..20f9ca060bc3c 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -152,7 +152,7 @@ public function testDefaultSessionCacheLimiter()
     {
         $this->iniSet('session.cache_limiter', 'nocache');
 
-        $storage = new NativeSessionStorage(array('cache_limiter' => ''));
+        $storage = new NativeSessionStorage();
         $this->assertEquals('', ini_get('session.cache_limiter'));
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index 24f9038f35ed5..1898ee0863a4b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -38,12 +38,7 @@ public function testDefaultLocaleWithoutSession()
     public function testLocaleFromRequestAttribute()
     {
         $request = Request::create('/');
-
-        if (PHP_VERSION_ID < 70200 || !headers_sent()) {
-            session_name('foo');
-        }
-
-        $request->cookies->set('foo', 'value');
+        $request->cookies->set(session_name(), 'value');
 
         $request->attributes->set('_locale', 'es');
         $listener = new LocaleListener('fr', null, $this->requestStack);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
index 63d5338182854..47ee153342df5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -62,8 +62,7 @@ public function testDoesNotDeleteCookieIfUsingSessionLifetime()
     {
         $this->sessionHasBeenStarted();
 
-        $params = session_get_cookie_params();
-        // session_set_cookie_params(0, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+        @ini_set('session.cookie_lifetime', 0);
 
         $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
         $cookies = $response->headers->getCookies();
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 6b6ec3f17b886..1b6b096a8a61f 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/event-dispatcher": "^2.6.7",
-        "symfony/http-foundation": "~2.7.20|^2.8.13",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/debug": "^2.6.2",
         "psr/log": "~1.0"
     },
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
index 482c80b29e919..f59a234d6589a 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
@@ -1,5 +1,8 @@
 import('validpattern.php');
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index 869f14f82ec76..d7931c09b2099 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -29,16 +29,6 @@ class NativeSessionTokenStorageTest extends TestCase
      */
     private $storage;
 
-    public static function setUpBeforeClass()
-    {
-        if (\PHP_VERSION_ID < 70200) {
-            ini_set('session.save_handler', 'files');
-            ini_set('session.save_path', sys_get_temp_dir());
-        }
-
-        parent::setUpBeforeClass();
-    }
-
     protected function setUp()
     {
         $_SESSION = array();

From 8ad32f0ef56b13fb7930fea9dcface331f6ded22 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 10 Oct 2017 10:04:23 +0200
Subject: [PATCH 1055/1099] never match invalid IP addresses

---
 .../Component/HttpFoundation/IpUtils.php        |  4 ++++
 .../HttpFoundation/Tests/IpUtilsTest.php        | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
index dc6d3ec818a32..3bb33140f5055 100644
--- a/src/Symfony/Component/HttpFoundation/IpUtils.php
+++ b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -87,6 +87,10 @@ public static function checkIp4($requestIp, $ip)
             $netmask = 32;
         }
 
+        if (false === ip2long($address)) {
+            return self::$checkedIps[$cacheKey] = false;
+        }
+
         return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
index 297ee3d8d3542..54cbb5c20672d 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -82,4 +82,21 @@ public function testAnIpv6WithOptionDisabledIpv6()
 
         IpUtils::checkIp('2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65');
     }
+
+    /**
+     * @dataProvider invalidIpAddressData
+     */
+    public function testInvalidIpAddressesDoNotMatch($requestIp, $proxyIp)
+    {
+        $this->assertFalse(IpUtils::checkIp4($requestIp, $proxyIp));
+    }
+
+    public function invalidIpAddressData()
+    {
+        return array(
+            'invalid proxy wildcard' => array('192.168.20.13', '*'),
+            'invalid proxy missing netmask' => array('192.168.20.13', '0.0.0.0'),
+            'invalid request IP with invalid proxy wildcard' => array('0.0.0.0', '*'),
+        );
+    }
 }

From e71c4f71f54f30f32b49d45948055d30178f2b5d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 12:05:53 +0200
Subject: [PATCH 1056/1099] fix merge

---
 .../Tests/Compiler/OptionalServiceClass.php                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
index 7e9238f22301b..33372695903e9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
@@ -13,6 +13,8 @@
 
 use Symfony\Bug\NotExistClass;
 
-class OptionalServiceClass extends NotExistClass
-{
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class OptionalServiceClass extends NotExistClass
+    {
+    }
 }

From 2ee6fd54e19437fb8893e10f7a8c43f1709c6512 Mon Sep 17 00:00:00 2001
From: Pierre du Plessis 
Date: Sun, 1 Oct 2017 10:07:08 +0200
Subject: [PATCH 1057/1099] [FORM] Prevent forms from extending itself as a
 parent

---
 src/Symfony/Component/Form/FormRegistry.php   | 32 ++++++++++++-----
 .../Tests/Fixtures/FormWithSameParentType.php | 22 ++++++++++++
 .../Tests/Fixtures/RecursiveFormTypeBar.php   | 22 ++++++++++++
 .../Tests/Fixtures/RecursiveFormTypeBaz.php   | 22 ++++++++++++
 .../Tests/Fixtures/RecursiveFormTypeFoo.php   | 22 ++++++++++++
 .../Component/Form/Tests/FormRegistryTest.php | 34 +++++++++++++++++++
 6 files changed, 145 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/FormWithSameParentType.php
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBar.php
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBaz.php
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeFoo.php

diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
index 6e00755378f5a..c81d45957b008 100644
--- a/src/Symfony/Component/Form/FormRegistry.php
+++ b/src/Symfony/Component/Form/FormRegistry.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form;
 
 use Symfony\Component\Form\Exception\ExceptionInterface;
+use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 
@@ -44,6 +45,8 @@ class FormRegistry implements FormRegistryInterface
      */
     private $resolvedTypeFactory;
 
+    private $checkedTypes = array();
+
     /**
      * @param FormExtensionInterface[]         $extensions          An array of FormExtensionInterface
      * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory The factory for resolved form types
@@ -106,18 +109,29 @@ private function resolveType(FormTypeInterface $type)
         $parentType = $type->getParent();
         $fqcn = get_class($type);
 
-        foreach ($this->extensions as $extension) {
-            $typeExtensions = array_merge(
+        if (isset($this->checkedTypes[$fqcn])) {
+            $types = implode(' > ', array_merge(array_keys($this->checkedTypes), array($fqcn)));
+            throw new LogicException(sprintf('Circular reference detected for form "%s" (%s).', $fqcn, $types));
+        }
+
+        $this->checkedTypes[$fqcn] = true;
+
+        try {
+            foreach ($this->extensions as $extension) {
+                $typeExtensions = array_merge(
+                    $typeExtensions,
+                    $extension->getTypeExtensions($fqcn)
+                );
+            }
+
+            return $this->resolvedTypeFactory->createResolvedType(
+                $type,
                 $typeExtensions,
-                $extension->getTypeExtensions($fqcn)
+                $parentType ? $this->getType($parentType) : null
             );
+        } finally {
+            unset($this->checkedTypes[$fqcn]);
         }
-
-        return $this->resolvedTypeFactory->createResolvedType(
-            $type,
-            $typeExtensions,
-            $parentType ? $this->getType($parentType) : null
-        );
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FormWithSameParentType.php b/src/Symfony/Component/Form/Tests/Fixtures/FormWithSameParentType.php
new file mode 100644
index 0000000000000..098f9a2a2b708
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FormWithSameParentType.php
@@ -0,0 +1,22 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class FormWithSameParentType extends AbstractType
+{
+    public function getParent()
+    {
+        return self::class;
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBar.php b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBar.php
new file mode 100644
index 0000000000000..a7b0d4df35b00
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBar.php
@@ -0,0 +1,22 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class RecursiveFormTypeBar extends AbstractType
+{
+    public function getParent()
+    {
+        return RecursiveFormTypeBaz::class;
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBaz.php b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBaz.php
new file mode 100644
index 0000000000000..63f62e757f93e
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeBaz.php
@@ -0,0 +1,22 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class RecursiveFormTypeBaz extends AbstractType
+{
+    public function getParent()
+    {
+        return RecursiveFormTypeFoo::class;
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeFoo.php b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeFoo.php
new file mode 100644
index 0000000000000..a41f63ee0b9cb
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/RecursiveFormTypeFoo.php
@@ -0,0 +1,22 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class RecursiveFormTypeFoo extends AbstractType
+{
+    public function getParent()
+    {
+        return RecursiveFormTypeBar::class;
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
index 5deddff422b42..4fbcb4339a1a1 100644
--- a/src/Symfony/Component/Form/Tests/FormRegistryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -16,6 +16,10 @@
 use Symfony\Component\Form\FormTypeGuesserChain;
 use Symfony\Component\Form\ResolvedFormType;
 use Symfony\Component\Form\ResolvedFormTypeFactoryInterface;
+use Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType;
+use Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar;
+use Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz;
+use Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo;
 use Symfony\Component\Form\Tests\Fixtures\FooSubType;
 use Symfony\Component\Form\Tests\Fixtures\FooType;
 use Symfony\Component\Form\Tests\Fixtures\FooTypeBarExtension;
@@ -156,6 +160,36 @@ public function testGetTypeConnectsParent()
         $this->assertSame($resolvedType, $this->registry->getType(get_class($type)));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\LogicException
+     * @expectedExceptionMessage Circular reference detected for form "Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType" (Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType > Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType).
+     */
+    public function testFormCannotHaveItselfAsAParent()
+    {
+        $type = new FormWithSameParentType();
+
+        $this->extension2->addType($type);
+
+        $this->registry->getType(FormWithSameParentType::class);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\LogicException
+     * @expectedExceptionMessage Circular reference detected for form "Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo" (Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo).
+     */
+    public function testRecursiveFormDependencies()
+    {
+        $foo = new RecursiveFormTypeFoo();
+        $bar = new RecursiveFormTypeBar();
+        $baz = new RecursiveFormTypeBaz();
+
+        $this->extension2->addType($foo);
+        $this->extension2->addType($bar);
+        $this->extension2->addType($baz);
+
+        $this->registry->getType(RecursiveFormTypeFoo::class);
+    }
+
     /**
      * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
      */

From 6595615255847fdc88243e38e730e473b13ef4b6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 12:32:49 +0200
Subject: [PATCH 1058/1099] fix merge

---
 src/Symfony/Bridge/Twig/Tests/AppVariableTest.php         | 6 ++++++
 .../FrameworkBundle/Tests/Fixtures/Validation/Article.php | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index accbf1c682ee8..9071a3e4f779f 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -168,6 +168,9 @@ public function testGetFlashesWithNoRequest()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashesWithNoSessionStarted()
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
@@ -178,6 +181,9 @@ public function testGetFlashesWithNoSessionStarted()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashes()
     {
         $flashMessages = $this->setFlashMessages();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
index a1ecee6d0b375..5f28d0648f388 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
@@ -2,7 +2,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
 
-class Article implements NotExistingInterface
-{
-    public $category;
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class Article implements NotExistingInterface
+    {
+        public $category;
+    }
 }

From 9719fba0ab5f1abcfd21af0a3702c1e24903d8c3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 12:34:18 +0200
Subject: [PATCH 1059/1099] fix merge

---
 src/Symfony/Component/Config/Tests/Fixtures/BadParent.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php b/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php
index 68d7296ed8696..3f9720bb8a962 100644
--- a/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php
+++ b/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Component\Config\Tests\Fixtures;
 
-class BadParent extends MissingParent
-{
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class BadParent extends MissingParent
+    {
+    }
 }

From d762dd1dc6a45ec0c0a0638242ca96f6dd5fcb33 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 10 Oct 2017 12:58:54 +0200
Subject: [PATCH 1060/1099] remove deprecated features

---
 src/Symfony/Bridge/Monolog/Logger.php                     | 2 +-
 src/Symfony/Component/EventDispatcher/CHANGELOG.md        | 1 +
 .../Debug/TraceableEventDispatcherInterface.php           | 7 +++++--
 .../HttpKernel/DataCollector/DataCollectorInterface.php   | 7 +++++--
 .../HttpKernel/DataCollector/EventDataCollector.php       | 7 -------
 .../HttpKernel/DataCollector/LoggerDataCollector.php      | 6 +-----
 .../Component/HttpKernel/Log/DebugLoggerInterface.php     | 7 +++++--
 src/Symfony/Component/HttpKernel/Profiler/Profiler.php    | 8 --------
 8 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
index 7cd75c5ec11ca..d4771f2894d89 100644
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@@ -50,7 +50,7 @@ public function countErrors()
      */
     public function clear()
     {
-        if (($logger = $this->getDebugLogger()) && method_exists($logger, 'clear')) {
+        if ($logger = $this->getDebugLogger()) {
             $logger->clear();
         }
     }
diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
index cde9a680a53fa..e570303e742cc 100644
--- a/src/Symfony/Component/EventDispatcher/CHANGELOG.md
+++ b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * removed the `ContainerAwareEventDispatcher` class
+ * added the `reset()` method to the `TraceableEventDispatcherInterface`
 
 3.4.0
 -----
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
index f0212753be591..4adbe9693a787 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
@@ -15,8 +15,6 @@
 
 /**
  * @author Fabien Potencier 
- *
- * @method reset() Resets the trace.
  */
 interface TraceableEventDispatcherInterface extends EventDispatcherInterface
 {
@@ -33,4 +31,9 @@ public function getCalledListeners();
      * @return array An array of not called listeners
      */
     public function getNotCalledListeners();
+
+    /**
+     * Resets the trace.
+     */
+    public function reset();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
index c0a0c0a982b3b..9e76a99fc52ff 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
@@ -18,8 +18,6 @@
  * DataCollectorInterface.
  *
  * @author Fabien Potencier 
- *
- * @method reset() Resets this data collector to its initial state.
  */
 interface DataCollectorInterface
 {
@@ -38,4 +36,9 @@ public function collect(Request $request, Response $response, \Exception $except
      * @return string The collector name
      */
     public function getName();
+
+    /**
+     * Resets this data collector to its initial state.
+     */
+    public function reset();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index ab44405edb2e7..e82a1fc19bb09 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -27,9 +27,6 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function __construct(EventDispatcherInterface $dispatcher = null)
     {
-        if ($dispatcher instanceof TraceableEventDispatcherInterface && !method_exists($dispatcher, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', TraceableEventDispatcherInterface::class, \get_class($dispatcher)), E_USER_DEPRECATED);
-        }
         $this->dispatcher = $dispatcher;
     }
 
@@ -49,10 +46,6 @@ public function reset()
         $this->data = array();
 
         if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
-            if (!method_exists($this->dispatcher, 'reset')) {
-                return; // @deprecated
-            }
-
             $this->dispatcher->reset();
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index ee645d53e8fdb..f1df6e2d7e0eb 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -29,10 +29,6 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
     public function __construct($logger = null, $containerPathPrefix = null)
     {
         if (null !== $logger && $logger instanceof DebugLoggerInterface) {
-            if (!method_exists($logger, 'clear')) {
-                @trigger_error(sprintf('Implementing "%s" without the "clear()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DebugLoggerInterface::class, \get_class($logger)), E_USER_DEPRECATED);
-            }
-
             $this->logger = $logger;
         }
 
@@ -52,7 +48,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        if ($this->logger && method_exists($this->logger, 'clear')) {
+        if ($this->logger instanceof DebugLoggerInterface) {
             $this->logger->clear();
         }
         $this->data = array();
diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
index f0606d3b0e5ee..1d955c48296ae 100644
--- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
+++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -15,8 +15,6 @@
  * DebugLoggerInterface.
  *
  * @author Fabien Potencier 
- *
- * @method clear() Removes all log records.
  */
 interface DebugLoggerInterface
 {
@@ -37,4 +35,9 @@ public function getLogs();
      * @return int The number of errors
      */
     public function countErrors();
+
+    /**
+     * Removes all log records.
+     */
+    public function clear();
 }
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index 85a71641be6fe..c99e7113fc88f 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -198,10 +198,6 @@ public function collect(Request $request, Response $response, \Exception $except
     public function reset()
     {
         foreach ($this->collectors as $collector) {
-            if (!method_exists($collector, 'reset')) {
-                continue;
-            }
-
             $collector->reset();
         }
         $this->enabled = $this->initiallyEnabled;
@@ -237,10 +233,6 @@ public function set(array $collectors = array())
      */
     public function add(DataCollectorInterface $collector)
     {
-        if (!method_exists($collector, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since version 3.4 and will be unsupported in 4.0 for class "%s".', DataCollectorInterface::class, \get_class($collector)), E_USER_DEPRECATED);
-        }
-
         $this->collectors[$collector->getName()] = $collector;
     }
 

From 48eb43daede6dcfd4fddea0f5fa96538e9e2180b Mon Sep 17 00:00:00 2001
From: Pierre du Plessis 
Date: Tue, 10 Oct 2017 13:00:46 +0200
Subject: [PATCH 1061/1099] [Form] Fix error message in circular reference
 dependencies check

---
 src/Symfony/Component/Form/FormRegistry.php           | 2 +-
 src/Symfony/Component/Form/Tests/FormRegistryTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
index c81d45957b008..7d08d690dffba 100644
--- a/src/Symfony/Component/Form/FormRegistry.php
+++ b/src/Symfony/Component/Form/FormRegistry.php
@@ -111,7 +111,7 @@ private function resolveType(FormTypeInterface $type)
 
         if (isset($this->checkedTypes[$fqcn])) {
             $types = implode(' > ', array_merge(array_keys($this->checkedTypes), array($fqcn)));
-            throw new LogicException(sprintf('Circular reference detected for form "%s" (%s).', $fqcn, $types));
+            throw new LogicException(sprintf('Circular reference detected for form type "%s" (%s).', $fqcn, $types));
         }
 
         $this->checkedTypes[$fqcn] = true;
diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
index 4fbcb4339a1a1..b304eaed40fb9 100644
--- a/src/Symfony/Component/Form/Tests/FormRegistryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -162,7 +162,7 @@ public function testGetTypeConnectsParent()
 
     /**
      * @expectedException \Symfony\Component\Form\Exception\LogicException
-     * @expectedExceptionMessage Circular reference detected for form "Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType" (Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType > Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType).
+     * @expectedExceptionMessage Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType" (Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType > Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType).
      */
     public function testFormCannotHaveItselfAsAParent()
     {
@@ -175,7 +175,7 @@ public function testFormCannotHaveItselfAsAParent()
 
     /**
      * @expectedException \Symfony\Component\Form\Exception\LogicException
-     * @expectedExceptionMessage Circular reference detected for form "Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo" (Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo).
+     * @expectedExceptionMessage Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo" (Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo).
      */
     public function testRecursiveFormDependencies()
     {

From 2d2022cc11968065787aced6108d0e6f37642d4d Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 10 Oct 2017 15:22:55 +0200
Subject: [PATCH 1062/1099] fix PHP 7.2 compatibility

* the `phpdocumentor/type-resolver` package was not PHP 7.2 compatible
  before release 0.2.1 (see see phpDocumentor/TypeResolver@e224fb2)
* the validator must not call `get_class()` if no object but a class
  name was passed to the `validatePropertyValue()` method
---
 composer.json                                                 | 2 +-
 src/Symfony/Bundle/FrameworkBundle/composer.json              | 2 +-
 src/Symfony/Component/PropertyInfo/composer.json              | 2 +-
 src/Symfony/Component/Serializer/composer.json                | 1 +
 .../Validator/Validator/RecursiveContextualValidator.php      | 4 +++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index d55f29f6aaa8a..f27e19e242468 100644
--- a/composer.json
+++ b/composer.json
@@ -103,7 +103,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.2.0",
+        "phpdocumentor/type-resolver": "<0.2.1",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "provide": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index cdf6e4d2b8c94..f4ebfe5104b42 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -61,7 +61,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
-        "phpdocumentor/type-resolver": "<0.2.0",
+        "phpdocumentor/type-resolver": "<0.2.1",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/asset": "<3.3",
         "symfony/console": "<3.3",
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
index d068a5ff6a3c3..f9e029e50465c 100644
--- a/src/Symfony/Component/PropertyInfo/composer.json
+++ b/src/Symfony/Component/PropertyInfo/composer.json
@@ -35,7 +35,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.2.0",
+        "phpdocumentor/type-resolver": "<0.2.1",
         "symfony/dependency-injection": "<3.3"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index e4ee63a730bc0..e1d6ded4aa2ed 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -31,6 +31,7 @@
         "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },
     "conflict": {
+        "phpdocumentor/type-resolver": "<0.2.1",
         "symfony/dependency-injection": "<3.2",
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
         "symfony/property-info": "<3.1",
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 838d12b4033fd..3b55ab3db1944 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -261,11 +261,13 @@ public function validatePropertyValue($objectOrClass, $propertyName, $value, $gr
 
         if (is_object($objectOrClass)) {
             $object = $objectOrClass;
+            $class = get_class($object);
             $cacheKey = spl_object_hash($objectOrClass);
             $propertyPath = PropertyPath::append($this->defaultPropertyPath, $propertyName);
         } else {
             // $objectOrClass contains a class name
             $object = null;
+            $class = $objectOrClass;
             $cacheKey = null;
             $propertyPath = $this->defaultPropertyPath;
         }
@@ -280,7 +282,7 @@ public function validatePropertyValue($objectOrClass, $propertyName, $value, $gr
             $this->validateGenericNode(
                 $value,
                 $object,
-                $cacheKey.':'.get_class($object).':'.$propertyName,
+                $cacheKey.':'.$class.':'.$propertyName,
                 $propertyMetadata,
                 $propertyPath,
                 $groups,

From a00862425765f583a60feb28b26ab5cb1b94b6da Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 10 Oct 2017 14:22:51 +0200
Subject: [PATCH 1063/1099] fix deps

---
 src/Symfony/Bundle/TwigBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 3d5fff2779a10..96d6ee24c7839 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -33,7 +33,7 @@
         "symfony/routing": "~2.8|~3.0|~4.0",
         "symfony/templating": "~2.8|~3.0|~4.0",
         "symfony/yaml": "~2.8|~3.0|~4.0",
-        "symfony/framework-bundle": "^3.3|~4.0",
+        "symfony/framework-bundle": "^3.3.11|~4.0",
         "symfony/web-link": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"

From 7a5985526fd909ae0601fe8e03f98aa7d21bc08d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 19:08:27 +0200
Subject: [PATCH 1064/1099] Skip tests affected by PHP bug 75354

---
 .../Component/VarDumper/Tests/Caster/DateCasterTest.php   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
index 0130882bd925c..ee0413beb33fb 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
@@ -102,6 +102,10 @@ public function provideDateTimes()
      */
     public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
     {
+        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.');
+        }
+
         $interval = $this->createInterval($intervalSpec, $ms, $invert);
 
         $xDump = <<= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.');
+        }
+
         $interval = $this->createInterval($intervalSpec, $ms, $invert);
 
         $xDump = <<
Date: Tue, 10 Oct 2017 19:19:34 +0200
Subject: [PATCH 1065/1099] fix

---
 .../Component/VarDumper/Tests/Caster/DateCasterTest.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
index ee0413beb33fb..1967d360e9385 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
@@ -102,8 +102,8 @@ public function provideDateTimes()
      */
     public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
     {
-        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) {
-            $this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.');
+        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
         }
 
         $interval = $this->createInterval($intervalSpec, $ms, $invert);
@@ -122,8 +122,8 @@ public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
      */
     public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert, $expected)
     {
-        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) {
-            $this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.');
+        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
         }
 
         $interval = $this->createInterval($intervalSpec, $ms, $invert);

From 2e3d422c4df5fbf1ca700ec5b808b4faffe2d8d7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 19:27:52 +0200
Subject: [PATCH 1066/1099] fix (ter)

---
 .../Component/VarDumper/Tests/Caster/DateCasterTest.php       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
index 1967d360e9385..49d054b5199ad 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
@@ -142,6 +142,10 @@ public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert,
      */
     public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeconds)
     {
+        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
+        }
+
         $interval = $this->createInterval($intervalSpec, $ms, $invert);
         $stub = new Stub();
 

From a3b136a93832879f1fc6df5e287a094604998da1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 22:05:27 +0200
Subject: [PATCH 1067/1099] dont use 7.2, it breaks for now

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b8b7e886f93c1..ae93184f54fe9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
         - php: 7.1.3
         - php: 7.1
           env: deps=high
-        - php: 7.2
+        - php: 7.1
           env: deps=low
     fast_finish: true
 

From cd602d691a558f7f71f6aeaca0acbfc5f6b98e5b Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Tue, 10 Oct 2017 13:14:08 +0200
Subject: [PATCH 1068/1099] implement reset() in DumpDataCollector

---
 .../HttpKernel/DataCollector/DumpDataCollector.php     | 10 ++++++++++
 .../HttpKernel/DataCollector/TimeDataCollector.php     |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index b50386cb961c9..f9730b1485045 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -164,6 +164,16 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    public function reset()
+    {
+        $this->stopwatch->reset();
+        $this->data = array();
+        $this->dataCount = 0;
+        $this->isCollected = false;
+        $this->clonesCount = 0;
+        $this->clonesIndex = 0;
+    }
+
     public function serialize()
     {
         if ($this->clonesCount !== $this->clonesIndex) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index 6588304935d3d..e489d77598620 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * TimeDataCollector.
@@ -25,7 +26,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
     protected $kernel;
     protected $stopwatch;
 
-    public function __construct(KernelInterface $kernel = null, $stopwatch = null)
+    public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
     {
         $this->kernel = $kernel;
         $this->stopwatch = $stopwatch;
@@ -55,6 +56,10 @@ public function collect(Request $request, Response $response, \Exception $except
     public function reset()
     {
         $this->data = array();
+
+        if (null !== $this->stopwatch) {
+            $this->stopwatch->reset();
+        }
     }
 
     /**

From 2c9c3d80cf4b5b69453927041b2ed9030a9982c4 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Wed, 11 Oct 2017 09:38:40 +0200
Subject: [PATCH 1069/1099] replace parameters in dummy identity translator

---
 src/Symfony/Bridge/Twig/Extension/TranslationExtension.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
index a748e1ed72e7b..01d0f6c6442e3 100644
--- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -95,7 +95,7 @@ public function getTranslationNodeVisitor()
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
         if (null === $this->translator) {
-            return $message;
+            return strtr($message, $arguments);
         }
 
         return $this->translator->trans($message, $arguments, $domain, $locale);
@@ -104,7 +104,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
         if (null === $this->translator) {
-            return $message;
+            return strtr($message, $arguments);
         }
 
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);

From 5ecafc5e25aa073f6cf109a6b87453689369c4a4 Mon Sep 17 00:00:00 2001
From: Ivo Bathke 
Date: Mon, 25 Sep 2017 18:15:09 +0200
Subject: [PATCH 1070/1099] added ability to handle parent classes for
 PropertyNormalizer

---
 .../Normalizer/PropertyNormalizer.php         | 42 +++++++++++++++----
 .../Tests/Fixtures/GroupDummyChild.php        | 33 +++++++++++++++
 .../Normalizer/PropertyNormalizerTest.php     | 34 ++++++++++++++-
 3 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php

diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 2d96608ff2400..2921e5baf9532 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -79,7 +79,7 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
         }
 
         try {
-            $reflectionProperty = new \ReflectionProperty(is_string($classOrObject) ? $classOrObject : get_class($classOrObject), $attribute);
+            $reflectionProperty = $this->getReflectionProperty($classOrObject, $attribute);
             if ($reflectionProperty->isStatic()) {
                 return false;
             }
@@ -98,13 +98,15 @@ protected function extractAttributes($object, $format = null, array $context = a
         $reflectionObject = new \ReflectionObject($object);
         $attributes = array();
 
-        foreach ($reflectionObject->getProperties() as $property) {
-            if (!$this->isAllowedAttribute($object, $property->name)) {
-                continue;
-            }
+        do {
+            foreach ($reflectionObject->getProperties() as $property) {
+                if (!$this->isAllowedAttribute($reflectionObject->getName(), $property->name)) {
+                    continue;
+                }
 
-            $attributes[] = $property->name;
-        }
+                $attributes[] = $property->name;
+            }
+        } while ($reflectionObject = $reflectionObject->getParentClass());
 
         return $attributes;
     }
@@ -115,7 +117,7 @@ protected function extractAttributes($object, $format = null, array $context = a
     protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
     {
         try {
-            $reflectionProperty = new \ReflectionProperty(get_class($object), $attribute);
+            $reflectionProperty = $this->getReflectionProperty($object, $attribute);
         } catch (\ReflectionException $reflectionException) {
             return;
         }
@@ -134,7 +136,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array
     protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
     {
         try {
-            $reflectionProperty = new \ReflectionProperty(get_class($object), $attribute);
+            $reflectionProperty = $this->getReflectionProperty($object, $attribute);
         } catch (\ReflectionException $reflectionException) {
             return;
         }
@@ -150,4 +152,26 @@ protected function setAttributeValue($object, $attribute, $value, $format = null
 
         $reflectionProperty->setValue($object, $value);
     }
+
+    /**
+     * @param string|object $classOrObject
+     * @param string        $attribute
+     *
+     * @return \ReflectionProperty
+     *
+     * @throws \ReflectionException
+     */
+    private function getReflectionProperty($classOrObject, $attribute)
+    {
+        $reflectionClass = new \ReflectionClass($classOrObject);
+        while (true) {
+            try {
+                return $reflectionClass->getProperty($attribute);
+            } catch (\ReflectionException $e) {
+                if (!$reflectionClass = $reflectionClass->getParentClass()) {
+                    throw $e;
+                }
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php b/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php
new file mode 100644
index 0000000000000..fa72160ec657f
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php
@@ -0,0 +1,33 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+class GroupDummyChild extends GroupDummy
+{
+    private $baz;
+
+    /**
+     * @return mixed
+     */
+    public function getBaz()
+    {
+        return $this->baz;
+    }
+
+    /**
+     * @param mixed $baz
+     */
+    public function setBaz($baz)
+    {
+        $this->baz = $baz;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 73b5f689c1d90..954de0b03e323 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\GroupDummyChild;
 use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\PropertyCircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\PropertySiblingHolder;
@@ -65,6 +66,35 @@ public function testDenormalize()
         $this->assertEquals('bar', $obj->getBar());
     }
 
+    public function testNormalizeWithParentClass()
+    {
+        $group = new GroupDummyChild();
+        $group->setBaz('baz');
+        $group->setFoo('foo');
+        $group->setBar('bar');
+        $group->setKevin('Kevin');
+        $group->setCoopTilleuls('coop');
+        $this->assertEquals(
+            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin',
+                  'coopTilleuls' => 'coop', 'fooBar' => null, 'symfony' => null, 'baz' => 'baz', ),
+            $this->normalizer->normalize($group, 'any')
+        );
+    }
+
+    public function testDenormalizeWithParentClass()
+    {
+        $obj = $this->normalizer->denormalize(
+            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'baz' => 'baz'),
+            GroupDummyChild::class,
+            'any'
+        );
+        $this->assertEquals('foo', $obj->getFoo());
+        $this->assertEquals('bar', $obj->getBar());
+        $this->assertEquals('Kevin', $obj->getKevin());
+        $this->assertEquals('baz', $obj->getBaz());
+        $this->assertNull($obj->getSymfony());
+    }
+
     public function testConstructorDenormalize()
     {
         $obj = $this->normalizer->denormalize(
@@ -147,12 +177,14 @@ public function testGroupsNormalize()
             'bar' => 'bar',
         ), $this->normalizer->normalize($obj, null, array(PropertyNormalizer::GROUPS => array('c'))));
 
-        // The PropertyNormalizer is not able to hydrate properties from parent classes
+        // The PropertyNormalizer is also able to hydrate properties from parent classes
         $this->assertEquals(array(
             'symfony' => 'symfony',
             'foo' => 'foo',
             'fooBar' => 'fooBar',
             'bar' => 'bar',
+            'kevin' => 'kevin',
+            'coopTilleuls' => 'coopTilleuls',
         ), $this->normalizer->normalize($obj, null, array(PropertyNormalizer::GROUPS => array('a', 'c'))));
     }
 

From c6ed0e4f86a0cda30f906237e7032ce978e40b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= 
Date: Thu, 12 Oct 2017 09:08:46 +0200
Subject: [PATCH 1071/1099] [Translation] minor: remove unused variable in test

---
 src/Symfony/Component/Translation/Tests/TranslatorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 960d8f4d3c549..6047cf7c3c834 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -25,7 +25,7 @@ class TranslatorTest extends TestCase
      */
     public function testConstructorInvalidLocale($locale)
     {
-        $translator = new Translator($locale, new MessageSelector());
+        new Translator($locale, new MessageSelector());
     }
 
     /**

From 345f2fc60e54f2429b6b862a9336edaaadd3a184 Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener 
Date: Thu, 12 Oct 2017 14:28:41 +0300
Subject: [PATCH 1072/1099] [DI] Fix possible incorrect php-code when dumped
 strings contains newlines

---
 .../Component/DependencyInjection/Dumper/PhpDumper.php     | 7 +++++++
 .../DependencyInjection/Tests/Dumper/PhpDumperTest.php     | 1 +
 .../DependencyInjection/Tests/Fixtures/php/services10.php  | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 5a0f89c8b4018..01d9ca7192d2f 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1574,6 +1574,13 @@ private function export($value)
             return $dirname;
         }
 
+        if (is_string($value) && false !== strpos($value, "\n")) {
+            $cleanParts = explode("\n", $value);
+            $cleanParts = array_map(function ($part) { return var_export($part, true); }, $cleanParts);
+
+            return implode('."\n".', $cleanParts);
+        }
+
         return var_export($value, true);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index e238649361a3f..57f8a47a907aa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -55,6 +55,7 @@ public function testDumpOptimizationString()
             'optimize concatenation with empty string' => 'string1%empty_value%string2',
             'optimize concatenation from the start' => '%empty_value%start',
             'optimize concatenation at the end' => 'end%empty_value%',
+            'new line' => "string with \nnew line",
         ));
 
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index a674eae8b49d3..6538f0ae53dfa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -56,7 +56,7 @@ public function isFrozen()
      */
     protected function getTestService()
     {
-        return $this->services['test'] = new \stdClass(array('only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end'));
+        return $this->services['test'] = new \stdClass(array('only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line'));
     }
 
     /**

From d066a238607e86e882ec8e80786bc722c3f0f9c9 Mon Sep 17 00:00:00 2001
From: Pierre du Plessis 
Date: Thu, 8 Jun 2017 22:30:26 +0200
Subject: [PATCH 1073/1099] Support array of types in allowed type

---
 .../Component/OptionsResolver/CHANGELOG.md    |  1 +
 .../OptionsResolver/OptionsResolver.php       | 85 +++++++++++++++----
 .../Tests/OptionsResolverTest.php             | 85 +++++++++++++++++++
 3 files changed, 156 insertions(+), 15 deletions(-)

diff --git a/src/Symfony/Component/OptionsResolver/CHANGELOG.md b/src/Symfony/Component/OptionsResolver/CHANGELOG.md
index d19116f37c280..c8f0244602195 100644
--- a/src/Symfony/Component/OptionsResolver/CHANGELOG.md
+++ b/src/Symfony/Component/OptionsResolver/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `OptionsResolverIntrospector` to inspect options definitions inside an `OptionsResolver` instance
+ * added array of types support in allowed types (e.g int[])
 
 2.6.0
 -----
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 32ac5663fdcb1..fb1ec60980b62 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -792,21 +792,12 @@ public function offsetGet($option)
         // Validate the type of the resolved option
         if (isset($this->allowedTypes[$option])) {
             $valid = false;
+            $invalidTypes = array();
 
             foreach ($this->allowedTypes[$option] as $type) {
                 $type = isset(self::$typeAliases[$type]) ? self::$typeAliases[$type] : $type;
 
-                if (function_exists($isFunction = 'is_'.$type)) {
-                    if ($isFunction($value)) {
-                        $valid = true;
-                        break;
-                    }
-
-                    continue;
-                }
-
-                if ($value instanceof $type) {
-                    $valid = true;
+                if ($valid = $this->verifyTypes($type, $value, $invalidTypes)) {
                     break;
                 }
             }
@@ -818,7 +809,7 @@ public function offsetGet($option)
                     $option,
                     $this->formatValue($value),
                     implode('" or "', $this->allowedTypes[$option]),
-                    $this->formatTypeOf($value)
+                    implode('|', array_keys($invalidTypes))
                 ));
             }
         }
@@ -895,6 +886,45 @@ public function offsetGet($option)
         return $value;
     }
 
+    /**
+     * @param string $type
+     * @param mixed  $value
+     * @param array  &$invalidTypes
+     *
+     * @return bool
+     */
+    private function verifyTypes($type, $value, array &$invalidTypes)
+    {
+        if ('[]' === substr($type, -2) && is_array($value)) {
+            $originalType = $type;
+            $type = substr($type, 0, -2);
+            $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array
+                $value,
+                function ($value) use ($type) {
+                    return (function_exists($isFunction = 'is_'.$type) && !$isFunction($value)) || !$value instanceof $type;
+                }
+            );
+
+            if (!$invalidValues) {
+                return true;
+            }
+
+            $invalidTypes[$this->formatTypeOf($value, $originalType)] = true;
+
+            return false;
+        }
+
+        if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type) {
+            return true;
+        }
+
+        if (!$invalidTypes) {
+            $invalidTypes[$this->formatTypeOf($value, null)] = true;
+        }
+
+        return false;
+    }
+
     /**
      * Returns whether a resolved option with the given name exists.
      *
@@ -963,13 +993,38 @@ public function count()
      * parameters should usually not be included in messages aimed at
      * non-technical people.
      *
-     * @param mixed $value The value to return the type of
+     * @param mixed  $value The value to return the type of
+     * @param string $type
      *
      * @return string The type of the value
      */
-    private function formatTypeOf($value)
+    private function formatTypeOf($value, $type)
     {
-        return is_object($value) ? get_class($value) : gettype($value);
+        $suffix = '';
+
+        if ('[]' === substr($type, -2)) {
+            $suffix = '[]';
+            $type = substr($type, 0, -2);
+            while ('[]' === substr($type, -2)) {
+                $type = substr($type, 0, -2);
+                $value = array_shift($value);
+                if (!is_array($value)) {
+                    break;
+                }
+                $suffix .= '[]';
+            }
+
+            if (is_array($value)) {
+                $subTypes = array();
+                foreach ($value as $val) {
+                    $subTypes[$this->formatTypeOf($val, null)] = true;
+                }
+
+                return implode('|', array_keys($subTypes)).$suffix;
+            }
+        }
+
+        return (is_object($value) ? get_class($value) : gettype($value)).$suffix;
     }
 
     /**
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index d09dece33cc8b..b95e039dc32cf 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -500,6 +500,65 @@ public function testFailIfSetAllowedTypesFromLazyOption()
         $this->resolver->resolve();
     }
 
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "DateTime[]".
+     */
+    public function testResolveFailsIfInvalidTypedArray()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'int[]');
+
+        $this->resolver->resolve(array('foo' => array(new \DateTime())));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value "bar" is expected to be of type "int[]", but is of type "string".
+     */
+    public function testResolveFailsWithNonArray()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'int[]');
+
+        $this->resolver->resolve(array('foo' => 'bar'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "integer|stdClass|array|DateTime[]".
+     */
+    public function testResolveFailsIfTypedArrayContainsInvalidTypes()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'int[]');
+        $values = range(1, 5);
+        $values[] = new \stdClass();
+        $values[] = array();
+        $values[] = new \DateTime();
+        $values[] = 123;
+
+        $this->resolver->resolve(array('foo' => $values));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[][]", but is of type "double[][]".
+     */
+    public function testResolveFailsWithCorrectLevelsButWrongScalar()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'int[][]');
+
+        $this->resolver->resolve(
+            array(
+                'foo' => array(
+                    array(1.2),
+                ),
+            )
+        );
+    }
+
     /**
      * @dataProvider provideInvalidTypes
      */
@@ -568,6 +627,32 @@ public function testResolveSucceedsIfInstanceOfClass()
         $this->assertNotEmpty($this->resolver->resolve());
     }
 
+    public function testResolveSucceedsIfTypedArray()
+    {
+        $this->resolver->setDefault('foo', null);
+        $this->resolver->setAllowedTypes('foo', array('null', 'DateTime[]'));
+
+        $data = array(
+            'foo' => array(
+                new \DateTime(),
+                new \DateTime(),
+            ),
+        );
+        $result = $this->resolver->resolve($data);
+        $this->assertEquals($data, $result);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testResolveFailsIfNotInstanceOfClass()
+    {
+        $this->resolver->setDefault('foo', 'bar');
+        $this->resolver->setAllowedTypes('foo', '\stdClass');
+
+        $this->resolver->resolve();
+    }
+
     ////////////////////////////////////////////////////////////////////////////
     // addAllowedTypes()
     ////////////////////////////////////////////////////////////////////////////

From f15da8075f0f8325d1f680aacf4c013861e4c535 Mon Sep 17 00:00:00 2001
From: den 
Date: Thu, 12 Oct 2017 20:40:40 +0300
Subject: [PATCH 1074/1099] Fix LogLevel::DEBUG as min level

---
 src/Symfony/Component/HttpKernel/Log/Logger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
index c43936ed40943..8facb03c5a29d 100644
--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -39,7 +39,7 @@ class Logger extends AbstractLogger
 
     public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
     {
-        if (!$minLevel) {
+        if (null === $minLevel) {
             $minLevel = LogLevel::WARNING;
 
             if (isset($_SERVER['SHELL_VERBOSITY'])) {

From 9efb76572ae71d3bee17efeb39f0451760bf31db Mon Sep 17 00:00:00 2001
From: loru88 
Date: Wed, 11 Oct 2017 16:39:25 +0200
Subject: [PATCH 1075/1099] [Validator] added magic method __isset()  to File
 Constraint class

---
 src/Symfony/Component/Validator/Constraints/File.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index 7756978b35216..54e7351562c9d 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -88,6 +88,15 @@ public function __get($option)
         return parent::__get($option);
     }
 
+    public function __isset($option)
+    {
+        if ('maxSize' === $option) {
+            return true;
+        }
+
+        return parent::__isset($option);
+    }
+
     private function normalizeBinaryFormat($maxSize)
     {
         $sizeInt = (int) $maxSize;

From e0d8ce4403ec8c2d1089189800c288f82ae6fcd8 Mon Sep 17 00:00:00 2001
From: den 
Date: Thu, 12 Oct 2017 20:40:40 +0300
Subject: [PATCH 1076/1099] Fix LogLevel::DEBUG as min level

---
 src/Symfony/Component/HttpKernel/Log/Logger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
index c43936ed40943..8facb03c5a29d 100644
--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -39,7 +39,7 @@ class Logger extends AbstractLogger
 
     public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
     {
-        if (!$minLevel) {
+        if (null === $minLevel) {
             $minLevel = LogLevel::WARNING;
 
             if (isset($_SERVER['SHELL_VERBOSITY'])) {

From ff379efb59de25bcdb88225f7389013fecf54b17 Mon Sep 17 00:00:00 2001
From: Paul Mitchum 
Date: Fri, 2 Jun 2017 12:44:10 -0700
Subject: [PATCH 1077/1099] [Bridge\PhpUnit] Handle deprecations triggered in
 separate processes

---
 .../PhpUnit/DeprecationErrorHandler.php       | 14 +++++
 .../Legacy/SymfonyTestsListenerTrait.php      | 59 ++++++++++++++-----
 .../PhpUnit/Tests/ProcessIsolationTest.php    | 23 ++++++++
 src/Symfony/Bridge/PhpUnit/bootstrap.php      |  4 ++
 4 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index 0f54a52bb8cab..a7dbc08e0c6c2 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -238,6 +238,20 @@ public static function register($mode = 0)
         }
     }
 
+    public static function collectDeprecations($outputFile)
+    {
+        $deprecations = array();
+        $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, &$previousErrorHandler) {
+            if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
+                return $previousErrorHandler ? $previousErrorHandler($type, $msg, $file, $line, $context) : false;
+            }
+            $deprecations[] = array(error_reporting(), $msg);
+        });
+        register_shutdown_function(function () use ($outputFile, &$deprecations) {
+            file_put_contents($outputFile, serialize($deprecations));
+        });
+    }
+
     private static function hasColorSupport()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index b561c8f2f53a5..166c44a3f8f2c 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -39,6 +39,7 @@ class SymfonyTestsListenerTrait
     private $testsWithWarnings;
     private $reportUselessTests;
     private $error;
+    private $runsInSeparateProcess = false;
 
     /**
      * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive)
@@ -183,6 +184,12 @@ public function startTest($test)
                 $this->reportUselessTests = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything();
             }
 
+            // This event is triggered before the test is re-run in isolation
+            if ($this->willBeIsolated($test)) {
+                $this->runsInSeparateProcess = tempnam(sys_get_temp_dir(), 'deprec');
+                putenv('SYMFONY_DEPRECATIONS_SERIALIZE='.$this->runsInSeparateProcess);
+            }
+
             if (class_exists('PHPUnit_Util_Blacklist', false)) {
                 $Test = 'PHPUnit_Util_Test';
                 $AssertionFailedError = 'PHPUnit_Framework_AssertionFailedError';
@@ -192,12 +199,14 @@ public function startTest($test)
             }
             $groups = $Test::getGroups(get_class($test), $test->getName(false));
 
-            if (in_array('time-sensitive', $groups, true)) {
-                ClockMock::register(get_class($test));
-                ClockMock::withClockMock(true);
-            }
-            if (in_array('dns-sensitive', $groups, true)) {
-                DnsMock::register(get_class($test));
+            if (!$this->runsInSeparateProcess) {
+                if (in_array('time-sensitive', $groups, true)) {
+                    ClockMock::register(get_class($test));
+                    ClockMock::withClockMock(true);
+                }
+                if (in_array('dns-sensitive', $groups, true)) {
+                    DnsMock::register(get_class($test));
+                }
             }
 
             $annotations = $Test::parseTestMethodAnnotations(get_class($test), $test->getName(false));
@@ -245,15 +254,20 @@ public function endTest($test, $time)
             $this->reportUselessTests = null;
         }
 
-        $errored = false;
+        if ($errored = null !== $this->error) {
+            $test->getTestResultObject()->addError($test, $this->error, 0);
+            $this->error = null;
+        }
 
-        if (null !== $this->error) {
-            if ($BaseTestRunner::STATUS_PASSED === $test->getStatus()) {
-                $test->getTestResultObject()->addError($test, $this->error, 0);
-                $errored = true;
+        if ($this->runsInSeparateProcess) {
+            foreach (unserialize(file_get_contents($this->runsInSeparateProcess)) as $deprecation) {
+                if ($deprecation[0]) {
+                    trigger_error($deprecation[1], E_USER_DEPRECATED);
+                } else {
+                    @trigger_error($deprecation[1], E_USER_DEPRECATED);
+                }
             }
-
-            $this->error = null;
+            $this->runsInSeparateProcess = false;
         }
 
         if ($this->expectedDeprecations) {
@@ -277,7 +291,7 @@ public function endTest($test, $time)
             $this->expectedDeprecations = $this->gatheredDeprecations = array();
             $this->previousErrorHandler = null;
         }
-        if (-2 < $this->state && ($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)) {
+        if (!$this->runsInSeparateProcess && -2 < $this->state && ($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)) {
             if (in_array('time-sensitive', $groups, true)) {
                 ClockMock::withClockMock(false);
             }
@@ -315,4 +329,21 @@ public function handleError($type, $msg, $file, $line, $context = array())
         }
         $this->gatheredDeprecations[] = $msg;
     }
+
+    /**
+     * @param Test $test
+     *
+     * @return bool
+     */
+    private function willBeIsolated($test)
+    {
+        if ($test->isInIsolation()) {
+            return false;
+        }
+
+        $r = new \ReflectionProperty($test, 'runTestInSeparateProcess');
+        $r->setAccessible(true);
+
+        return $r->getValue($test);
+    }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
new file mode 100644
index 0000000000000..d8677097e5c26
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -0,0 +1,23 @@
+
Date: Fri, 13 Oct 2017 15:21:24 +0200
Subject: [PATCH 1078/1099] [BrowserKit] Handle deprecations triggered in
 insulated requests

---
 src/Symfony/Component/BrowserKit/Client.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 2f2b08d81894d..fb7a254e2c56d 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -343,9 +343,23 @@ public function request($method, $uri, array $parameters = array(), array $files
      */
     protected function doRequestInProcess($request)
     {
+        $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
+        putenv('SYMFONY_DEPRECATIONS_SERIALIZE='.$deprecationsFile);
         $process = new PhpProcess($this->getScript($request), null, null);
         $process->run();
 
+        if (file_exists($deprecationsFile)) {
+            $deprecations = file_get_contents($deprecationsFile);
+            unlink($deprecationsFile);
+            foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
+                if ($deprecation[0]) {
+                    trigger_error($deprecation[1], E_USER_DEPRECATED);
+                } else {
+                    @trigger_error($deprecation[1], E_USER_DEPRECATED);
+                }
+            }
+        }
+
         if (!$process->isSuccessful() || !preg_match('/^O\:\d+\:/', $process->getOutput())) {
             throw new \RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT: %s', $process->getOutput(), $process->getErrorOutput()));
         }

From ee70361e53eabf3ca86ab1de28506bd7af5e608b Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Thu, 12 Oct 2017 18:51:51 -0400
Subject: [PATCH 1079/1099] [Form] Fix 5.5 compatibility for ResizeFormListener

---
 .../Core/EventListener/ResizeFormListener.php |  4 +-
 .../EventListener/ResizeFormListenerTest.php  | 47 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 402a1f07253ed..8ce2d2e0655d5 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -149,12 +149,12 @@ public function onSubmit(FormEvent $event)
             throw new UnexpectedTypeException($data, 'array or (\Traversable and \ArrayAccess)');
         }
 
-        if ($entryFilter = $this->deleteEmpty) {
+        if ($this->deleteEmpty) {
             $previousData = $form->getData();
             /** @var FormInterface $child */
             foreach ($form as $name => $child) {
                 $isNew = !isset($previousData[$name]);
-                $isEmpty = is_callable($entryFilter) ? $entryFilter($child->getData()) : $child->isEmpty();
+                $isEmpty = is_callable($this->deleteEmpty) ? call_user_func($this->deleteEmpty, $child->getData()) : $child->isEmpty();
 
                 // $isNew can only be true if allowAdd is true, so we don't
                 // need to check allowAdd again
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index 281581bcffc1c..017c1bdc040c9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -275,4 +275,51 @@ public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
         $this->assertArrayNotHasKey(0, $event->getData());
         $this->assertArrayNotHasKey(2, $event->getData());
     }
+
+    public function testOnSubmitDeleteEmptyNotCompoundEntriesIfAllowDelete()
+    {
+        $this->form->setData(array('0' => 'first', '1' => 'second'));
+        $this->form->add($this->getForm('0'));
+        $this->form->add($this->getForm('1'));
+
+        $data = array(0 => 'first', 1 => '');
+        foreach ($data as $child => $dat) {
+            $this->form->get($child)->setData($dat);
+        }
+        $event = new FormEvent($this->form, $data);
+        $listener = new ResizeFormListener('text', array(), false, true, true);
+        $listener->onSubmit($event);
+
+        $this->assertEquals(array(0 => 'first'), $event->getData());
+    }
+
+    public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
+    {
+        $this->form->setData(array('0' => array('name' => 'John'), '1' => array('name' => 'Jane')));
+        $form1 = $this->getBuilder('0')
+            ->setCompound(true)
+            ->setDataMapper($this->getDataMapper())
+            ->getForm();
+        $form1->add($this->getForm('name'));
+        $form2 = $this->getBuilder('1')
+            ->setCompound(true)
+            ->setDataMapper($this->getDataMapper())
+            ->getForm();
+        $form2->add($this->getForm('name'));
+        $this->form->add($form1);
+        $this->form->add($form2);
+
+        $data = array('0' => array('name' => 'John'), '1' => array('name' => ''));
+        foreach ($data as $child => $dat) {
+            $this->form->get($child)->setData($dat);
+        }
+        $event = new FormEvent($this->form, $data);
+        $callback = function ($data) {
+            return '' === $data['name'];
+        };
+        $listener = new ResizeFormListener('text', array(), false, true, $callback);
+        $listener->onSubmit($event);
+
+        $this->assertEquals(array('0' => array('name' => 'John')), $event->getData());
+    }
 }

From 4a2f608f1efeeab84086c70d846799a3db6b60f8 Mon Sep 17 00:00:00 2001
From: David Maicher 
Date: Thu, 12 Oct 2017 14:26:49 +0200
Subject: [PATCH 1080/1099] [TwigBridge] fix BC for FormExtension if renderer
 is FormRenderer

---
 .../Bridge/Twig/Extension/FormExtension.php   |  4 +-
 .../Tests/Extension/FormExtensionTest.php     | 76 +++++++++++++++++++
 src/Symfony/Bridge/Twig/composer.json         |  1 +
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php

diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index 945cd0bc37b1a..d21601af76e7f 100644
--- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -54,7 +54,7 @@ public function initRuntime(Environment $environment)
     {
         if ($this->renderer instanceof TwigRendererInterface) {
             $this->renderer->setEnvironment($environment);
-        } elseif (null !== $this->renderer) {
+        } elseif (is_array($this->renderer)) {
             $this->renderer[2] = $environment;
         }
     }
@@ -118,7 +118,7 @@ public function __get($name)
 
             if (is_array($this->renderer)) {
                 $renderer = $this->renderer[0]->get($this->renderer[1]);
-                if (isset($this->renderer[2])) {
+                if (isset($this->renderer[2]) && $renderer instanceof TwigRendererInterface) {
                     $renderer->setEnvironment($this->renderer[2]);
                 }
                 $this->renderer = $renderer;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php
new file mode 100644
index 0000000000000..a4d7350716e64
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php
@@ -0,0 +1,76 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Form\FormRendererInterface;
+use Twig\Environment;
+
+/**
+ * @group legacy
+ */
+class FormExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider rendererDataProvider
+     */
+    public function testInitRuntimeAndAccessRenderer($rendererConstructor, $expectedAccessedRenderer)
+    {
+        $extension = new FormExtension($rendererConstructor);
+        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
+        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
+    }
+
+    /**
+     * @dataProvider rendererDataProvider
+     */
+    public function testAccessRendererAndInitRuntime($rendererConstructor, $expectedAccessedRenderer)
+    {
+        $extension = new FormExtension($rendererConstructor);
+        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
+        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
+    }
+
+    public function rendererDataProvider()
+    {
+        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
+        $twigRenderer->expects($this->once())
+            ->method('setEnvironment');
+
+        yield array($twigRenderer, $twigRenderer);
+
+        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
+        $twigRenderer->expects($this->once())
+            ->method('setEnvironment');
+
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $container->expects($this->once())
+            ->method('get')
+            ->with('service_id')
+            ->willReturn($twigRenderer);
+
+        yield array(array($container, 'service_id'), $twigRenderer);
+
+        $formRenderer = $this->getMockBuilder(FormRendererInterface::class)->getMock();
+
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $container->expects($this->once())
+            ->method('get')
+            ->with('service_id')
+            ->willReturn($formRenderer);
+
+        yield array(array($container, 'service_id'), $formRenderer);
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index e7e7e4889fc23..33ac7d5849c7c 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -22,6 +22,7 @@
     "require-dev": {
         "fig/link-util": "^1.0",
         "symfony/asset": "~2.8|~3.0|~4.0",
+        "symfony/dependency-injection": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/form": "~3.4|~4.0",
         "symfony/http-foundation": "^3.3.11|~4.0",

From 2f5a0bd72f8f606230aac3920ed810f206884ad9 Mon Sep 17 00:00:00 2001
From: Christian Flothmann 
Date: Fri, 13 Oct 2017 16:04:01 +0200
Subject: [PATCH 1081/1099] fix serialized deprecations handling

---
 .../Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 166c44a3f8f2c..4d9b48dfc7e56 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -260,7 +260,9 @@ public function endTest($test, $time)
         }
 
         if ($this->runsInSeparateProcess) {
-            foreach (unserialize(file_get_contents($this->runsInSeparateProcess)) as $deprecation) {
+            $deprecations = file_get_contents($this->runsInSeparateProcess);
+            unlink($this->runsInSeparateProcess);
+            foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
                 if ($deprecation[0]) {
                     trigger_error($deprecation[1], E_USER_DEPRECATED);
                 } else {

From e0681f99552cab9c8035efd54c5f6496d918c22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= 
Date: Tue, 2 May 2017 12:14:20 +0200
Subject: [PATCH 1082/1099] [Form] [TwigBridge] Added option to disable usage
 of default themes when rendering a form

---
 src/Symfony/Bridge/Twig/CHANGELOG.md          |  1 +
 .../Bridge/Twig/Form/TwigRendererEngine.php   |  8 +++---
 .../Bridge/Twig/Node/FormThemeNode.php        |  6 +++--
 ...xtensionBootstrap3HorizontalLayoutTest.php |  4 +--
 .../FormExtensionBootstrap3LayoutTest.php     |  4 +--
 ...xtensionBootstrap4HorizontalLayoutTest.php |  4 +--
 .../FormExtensionBootstrap4LayoutTest.php     |  4 +--
 .../Extension/FormExtensionDivLayoutTest.php  |  4 +--
 .../FormExtensionTableLayoutTest.php          |  4 +--
 .../Bridge/Twig/Tests/Node/FormThemeTest.php  | 25 +++++++++++++++++--
 .../TokenParser/FormThemeTokenParserTest.php  | 15 +++++++++++
 .../Twig/TokenParser/FormThemeTokenParser.php |  7 +++++-
 .../Templating/Helper/FormHelper.php          |  9 ++++---
 .../Helper/FormHelperDivLayoutTest.php        |  4 +--
 .../Helper/FormHelperTableLayoutTest.php      |  4 +--
 .../Component/Form/AbstractRendererEngine.php | 10 +++++++-
 src/Symfony/Component/Form/CHANGELOG.md       |  2 ++
 .../Templating/TemplatingRendererEngine.php   |  8 +++---
 src/Symfony/Component/Form/FormRenderer.php   |  5 ++--
 .../Form/FormRendererEngineInterface.php      | 10 +++++---
 .../Component/Form/FormRendererInterface.php  | 10 +++++---
 .../Form/Tests/AbstractLayoutTest.php         |  2 +-
 22 files changed, 107 insertions(+), 43 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
index 397134150c318..8d5d6f56b6771 100644
--- a/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added an `only` keyword to `form_theme` tag to disable usage of default themes when rendering a form
  * deprecated `Symfony\Bridge\Twig\Form\TwigRenderer`
  * deprecated `DebugCommand::set/getTwigEnvironment`. Pass an instance of
    `Twig\Environment` as first argument  of the constructor instead
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
index 7e375f45e2996..59120ee552d78 100644
--- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
+++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -124,9 +124,11 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
 
         // Check the default themes once we reach the root view without success
         if (!$view->parent) {
-            for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
-                $this->loadResourcesFromTheme($cacheKey, $this->defaultThemes[$i]);
-                // CONTINUE LOADING (see doc comment)
+            if (!isset($this->useDefaultThemes[$cacheKey]) || $this->useDefaultThemes[$cacheKey]) {
+                for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
+                    $this->loadResourcesFromTheme($cacheKey, $this->defaultThemes[$i]);
+                    // CONTINUE LOADING (see doc comment)
+                }
             }
         }
 
diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
index a66a13adc0287..8fcd9380a620a 100644
--- a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
+++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -22,9 +22,9 @@
  */
 class FormThemeNode extends Node
 {
-    public function __construct(Node $form, Node $resources, $lineno, $tag = null)
+    public function __construct(Node $form, Node $resources, $lineno, $tag = null, $only = false)
     {
-        parent::__construct(array('form' => $form, 'resources' => $resources), array(), $lineno, $tag);
+        parent::__construct(array('form' => $form, 'resources' => $resources), array('only' => (bool) $only), $lineno, $tag);
     }
 
     public function compile(Compiler $compiler)
@@ -44,6 +44,8 @@ public function compile(Compiler $compiler)
             ->subcompile($this->getNode('form'))
             ->raw(', ')
             ->subcompile($this->getNode('resources'))
+            ->raw(', ')
+            ->raw(false === $this->getAttribute('only') ? 'true' : 'false')
             ->raw(");\n");
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index 5625b09411ff6..e5ee8903efe4a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -99,8 +99,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index 68f42a411a576..5e872b83eb67d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -119,8 +119,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
index d7afc2cf26238..063edd889aed4 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -100,8 +100,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
index 0dfa1ebadbe39..d3822ee77796a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -122,8 +122,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index f65cdea0253c8..75d6f1e0504b8 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -193,9 +193,9 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 
     public static function themeBlockInheritanceProvider()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index 594084787fff2..5119480d90e4c 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -120,8 +120,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
index 05d6507fd7438..7ad445f02e6e5 100644
--- a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -39,6 +39,7 @@ public function testConstructor()
 
         $this->assertEquals($form, $node->getNode('form'));
         $this->assertEquals($resources, $node->getNode('resources'));
+        $this->assertFalse($node->getAttribute('only'));
     }
 
     public function testCompile()
@@ -60,7 +61,17 @@ public function testCompile()
 
         $this->assertEquals(
             sprintf(
-                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"), true);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+
+        $node = new FormThemeNode($form, $resources, 0, null, true);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"), false);',
                 $this->getVariableGetter('form')
              ),
             trim($compiler->compile($node)->getSource())
@@ -72,7 +83,17 @@ public function testCompile()
 
         $this->assertEquals(
             sprintf(
-                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, "tpl1");',
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, "tpl1", true);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+
+        $node = new FormThemeNode($form, $resources, 0, null, true);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, "tpl1", false);',
                 $this->getVariableGetter('form')
              ),
             trim($compiler->compile($node)->getSource())
diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
index 0972b15e23fdc..cd9a34cab67b9 100644
--- a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -100,6 +100,21 @@ public function getTestsForFormTheme()
                     'form_theme'
                 ),
             ),
+            array(
+                '{% form_theme form with ["tpl1", "tpl2"] only %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression(array(
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                        new ConstantExpression(1, 1),
+                        new ConstantExpression('tpl2', 1),
+                    ), 1),
+                    1,
+                    'form_theme',
+                    true
+                ),
+            ),
         );
     }
 }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
index 12c2541851e63..3ead804e7e6ca 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
@@ -37,10 +37,15 @@ public function parse(Token $token)
         $stream = $this->parser->getStream();
 
         $form = $this->parser->getExpressionParser()->parseExpression();
+        $only = false;
 
         if ($this->parser->getStream()->test(Token::NAME_TYPE, 'with')) {
             $this->parser->getStream()->next();
             $resources = $this->parser->getExpressionParser()->parseExpression();
+
+            if ($this->parser->getStream()->nextIf(Token::NAME_TYPE, 'only')) {
+                $only = true;
+            }
         } else {
             $resources = new ArrayExpression(array(), $stream->getCurrent()->getLine());
             do {
@@ -50,7 +55,7 @@ public function parse(Token $token)
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return new FormThemeNode($form, $resources, $lineno, $this->getTag());
+        return new FormThemeNode($form, $resources, $lineno, $this->getTag(), $only);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index 7c695d8df3b09..f7c2b2c6986bb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -49,12 +49,13 @@ public function getName()
      *
      * The theme format is ":".
      *
-     * @param FormView     $view   A FormView instance
-     * @param string|array $themes A theme or an array of theme
+     * @param FormView     $view             A FormView instance
+     * @param string|array $themes           A theme or an array of theme
+     * @param bool         $useDefaultThemes If true, will use default themes defined in the renderer
      */
-    public function setTheme(FormView $view, $themes)
+    public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
     {
-        $this->renderer->setTheme($view, $themes);
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
index 74bdd81604d4e..b86d54b78cdb4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -121,9 +121,9 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->engine->get('form')->end($view, $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->engine->get('form')->setTheme($view, $themes);
+        $this->engine->get('form')->setTheme($view, $themes, $useDefaultThemes);
     }
 
     public static function themeBlockInheritanceProvider()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
index 1e67134c8cb27..8dd6fffa79f41 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -122,8 +122,8 @@ protected function renderEnd(FormView $view, array $vars = array())
         return (string) $this->engine->get('form')->end($view, $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
     {
-        $this->engine->get('form')->setTheme($view, $themes);
+        $this->engine->get('form')->setTheme($view, $themes, $useDefaultThemes);
     }
 }
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index 7519011225282..ab39f1fed309b 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -33,6 +33,11 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
      */
     protected $themes = array();
 
+    /**
+     * @var array
+     */
+    protected $useDefaultThemes = array();
+
     /**
      * @var array
      */
@@ -57,13 +62,16 @@ public function __construct(array $defaultThemes = array())
     /**
      * {@inheritdoc}
      */
-    public function setTheme(FormView $view, $themes)
+    public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */)
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
         // Do not cast, as casting turns objects into arrays of properties
         $this->themes[$cacheKey] = is_array($themes) ? $themes : array($themes);
 
+        $args = func_get_args();
+        $this->useDefaultThemes[$cacheKey] = isset($args[2]) ? (bool) $args[2] : true;
+
         // Unset instead of resetting to an empty array, in order to allow
         // implementations (like TwigRendererEngine) to check whether $cacheKey
         // is set at all.
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 62c52a897d3f2..19105b9e4db98 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -7,6 +7,8 @@ CHANGELOG
  * added `DebugCommand`
  * deprecated `ChoiceLoaderInterface` implementation in `TimezoneType`
  * added options "input" and "regions" to `TimezoneType`
+ * added an option to ``Symfony\Component\Form\FormRendererEngineInterface::setTheme()`` and
+   ``Symfony\Component\Form\FormRendererInterface::setTheme()`` to disable usage of default themes when rendering a form
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
index 72b0a4f3dfa3a..16249c6067e81 100644
--- a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
+++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
@@ -72,9 +72,11 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
 
         // Check the default themes once we reach the root form without success
         if (!$view->parent) {
-            for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
-                if ($this->loadResourceFromTheme($cacheKey, $blockName, $this->defaultThemes[$i])) {
-                    return true;
+            if (!isset($this->useDefaultThemes[$cacheKey]) || $this->useDefaultThemes[$cacheKey]) {
+                for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
+                    if ($this->loadResourceFromTheme($cacheKey, $blockName, $this->defaultThemes[$i])) {
+                        return true;
+                    }
                 }
             }
         }
diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
index 8234b45f94437..c8a9d1812eb8b 100644
--- a/src/Symfony/Component/Form/FormRenderer.php
+++ b/src/Symfony/Component/Form/FormRenderer.php
@@ -70,9 +70,10 @@ public function getEngine()
     /**
      * {@inheritdoc}
      */
-    public function setTheme(FormView $view, $themes)
+    public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */)
     {
-        $this->engine->setTheme($view, $themes);
+        $args = func_get_args();
+        $this->engine->setTheme($view, $themes, isset($args[2]) ? (bool) $args[2] : true);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index 9d116b8608846..dcc15b6a2450f 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -21,11 +21,13 @@ interface FormRendererEngineInterface
     /**
      * Sets the theme(s) to be used for rendering a view and its children.
      *
-     * @param FormView $view   The view to assign the theme(s) to
-     * @param mixed    $themes The theme(s). The type of these themes
-     *                         is open to the implementation.
+     * @param FormView $view             The view to assign the theme(s) to
+     * @param mixed    $themes           The theme(s). The type of these themes
+     *                                   is open to the implementation.
+     * @param bool     $useDefaultThemes If true, will use default themes specified
+     *                                   in the engine, will be added to the interface in 4.0
      */
-    public function setTheme(FormView $view, $themes);
+    public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */);
 
     /**
      * Returns the resource for a block name.
diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php
index 34c7822455c19..33530aeb82c47 100644
--- a/src/Symfony/Component/Form/FormRendererInterface.php
+++ b/src/Symfony/Component/Form/FormRendererInterface.php
@@ -28,11 +28,13 @@ public function getEngine();
     /**
      * Sets the theme(s) to be used for rendering a view and its children.
      *
-     * @param FormView $view   The view to assign the theme(s) to
-     * @param mixed    $themes The theme(s). The type of these themes
-     *                         is open to the implementation.
+     * @param FormView $view             The view to assign the theme(s) to
+     * @param mixed    $themes           The theme(s). The type of these themes
+     *                                   is open to the implementation.
+     * @param bool     $useDefaultThemes If true, will use default themes specified
+     *                                   in the renderer, will be added to the interface in 4.0
      */
-    public function setTheme(FormView $view, $themes);
+    public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */);
 
     /**
      * Renders a named block of the form theme.
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 98d2d48cbe360..4f2afa6644226 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -125,7 +125,7 @@ abstract protected function renderStart(FormView $view, array $vars = array());
 
     abstract protected function renderEnd(FormView $view, array $vars = array());
 
-    abstract protected function setTheme(FormView $view, array $themes);
+    abstract protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true);
 
     public function testLabel()
     {

From 7ba7550dfb3924c20691b4b9709c096cc5e316f0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 13 Oct 2017 18:39:56 +0200
Subject: [PATCH 1083/1099] Fix phpunit bridge

---
 src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php | 1 +
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
index d8677097e5c26..7d4cffa719db1 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -19,5 +19,6 @@ class ProcessIsolationTest extends TestCase
     public function testIsolation()
     {
         @trigger_error('Test abc', E_USER_DEPRECATED);
+        $test->addToAssertionCount(1);
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index beba0450aa4cd..52d10d4bce6a8 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -68,7 +68,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
-    passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");
+    passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
     $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));

From 9de153b3303bad12392e00d343987363e50e6c9e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 13 Oct 2017 18:48:45 +0200
Subject: [PATCH 1084/1099] Fix phpunit bridge (bis)

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 52d10d4bce6a8..277bb73753580 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -70,7 +70,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     }
     passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
-    putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
+    putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {

From a522f5e855014c8118ed3ac061f91f74de6b5096 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Fri, 13 Oct 2017 18:55:35 +0200
Subject: [PATCH 1085/1099] Fix phpunit bridge (ter)

---
 src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
index 7d4cffa719db1..0cfbe515ee9e4 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -19,6 +19,6 @@ class ProcessIsolationTest extends TestCase
     public function testIsolation()
     {
         @trigger_error('Test abc', E_USER_DEPRECATED);
-        $test->addToAssertionCount(1);
+        $this->addToAssertionCount(1);
     }
 }

From 8fcbc5572b0a20fc3ef4980e49c499d27b10eda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= 
Date: Thu, 12 Oct 2017 09:04:00 +0200
Subject: [PATCH 1086/1099] [Console] Sync ConsoleLogger::interpolate with the
 one in HttpKernel

---
 .../Console/Logger/ConsoleLogger.php          | 20 +++++++++++++------
 .../Tests/Logger/ConsoleLoggerTest.php        |  4 +---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index d7bcdfad003f5..ee2e1857545d6 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -121,15 +121,23 @@ public function hasErrored()
      */
     private function interpolate($message, array $context)
     {
-        // build a replacement array with braces around the context keys
-        $replace = array();
+        if (false === strpos($message, '{')) {
+            return $message;
+        }
+
+        $replacements = array();
         foreach ($context as $key => $val) {
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-                $replace[sprintf('{%s}', $key)] = $val;
+            if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
+                $replacements["{{$key}}"] = $val;
+            } elseif ($val instanceof \DateTimeInterface) {
+                $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);
+            } elseif (\is_object($val)) {
+                $replacements["{{$key}}"] = '[object '.\get_class($val).']';
+            } else {
+                $replacements["{{$key}}"] = '['.\gettype($val).']';
             }
         }
 
-        // interpolate replacement values into the message and return
-        return strtr($message, $replace);
+        return strtr($message, $replacements);
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php b/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
index 342992982aa50..734a153e8ab59 100644
--- a/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
+++ b/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
@@ -166,9 +166,7 @@ public function testObjectCastToString()
         } else {
             $dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', array('__toString'));
         }
-        $dummy->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('DUMMY'));
+        $dummy->method('__toString')->will($this->returnValue('DUMMY'));
 
         $this->getLogger()->warning($dummy);
 

From 16f728117876258a52f664daad156bc11382f9a9 Mon Sep 17 00:00:00 2001
From: endroid 
Date: Sat, 14 Oct 2017 00:01:11 +0000
Subject: [PATCH 1087/1099] [Routing] Ensure uniqueness without repeated check

---
 src/Symfony/Component/Routing/RouteCollection.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index f8b18084be126..c6229cfde2dee 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -128,7 +128,9 @@ public function addCollection(RouteCollection $collection)
             $this->routes[$name] = $route;
         }
 
-        $this->resources = array_merge($this->resources, $collection->getResources());
+        foreach ($collection->getResources() as $resource) {
+            $this->addResource($resource);
+        }
     }
 
     /**
@@ -262,16 +264,21 @@ public function setMethods($methods)
      */
     public function getResources()
     {
-        return array_unique($this->resources);
+        return array_values($this->resources);
     }
 
     /**
-     * Adds a resource for this collection.
+     * Adds a resource for this collection. If the resource already exists
+     * it is not added.
      *
      * @param ResourceInterface $resource A resource instance
      */
     public function addResource(ResourceInterface $resource)
     {
-        $this->resources[] = $resource;
+        $key = (string) $resource;
+
+        if (!isset($this->resources[$key])) {
+            $this->resources[$key] = $resource;
+        }
     }
 }

From 347939c9b3202ec55fcfa545bfdefd18e414789f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas 
Date: Tue, 10 Oct 2017 11:13:08 +0200
Subject: [PATCH 1088/1099] [HttpFoundation] Make sessions secure and lazy

---
 UPGRADE-3.4.md                                |  13 +-
 UPGRADE-4.0.md                                |  11 +-
 composer.json                                 |   2 +-
 .../Bundle/FrameworkBundle/CHANGELOG.md       |   1 +
 .../DependencyInjection/Configuration.php     |   7 +-
 .../FrameworkExtension.php                    |   9 +-
 .../Resources/config/session.xml              |  12 +-
 .../DependencyInjection/ConfigurationTest.php |   1 +
 .../Component/HttpFoundation/CHANGELOG.md     |   5 +-
 .../Handler/AbstractSessionHandler.php        | 165 +++++++++++++++
 .../Handler/MemcachedSessionHandler.php       |  18 +-
 .../Storage/Handler/MongoDbSessionHandler.php |  45 +++--
 .../Storage/Handler/NativeSessionHandler.php  |   6 +-
 .../Storage/Handler/NullSessionHandler.php    |  20 +-
 .../Storage/Handler/PdoSessionHandler.php     |  44 +++-
 .../Storage/Handler/StrictSessionHandler.php  |  89 +++++++++
 .../Handler/WriteCheckSessionHandler.php      |   4 +
 .../Session/Storage/NativeSessionStorage.php  |  44 ++--
 .../Session/Storage/Proxy/AbstractProxy.php   |   4 -
 .../Storage/Proxy/SessionHandlerProxy.php     |   4 -
 .../Handler/AbstractSessionHandlerTest.php    |  61 ++++++
 .../Storage/Handler/Fixtures/common.inc       | 152 ++++++++++++++
 .../Handler/Fixtures/empty_destroys.expected  |  17 ++
 .../Handler/Fixtures/empty_destroys.php       |   8 +
 .../Handler/Fixtures/read_only.expected       |  14 ++
 .../Storage/Handler/Fixtures/read_only.php    |   8 +
 .../Handler/Fixtures/regenerate.expected      |  24 +++
 .../Storage/Handler/Fixtures/regenerate.php   |  10 +
 .../Storage/Handler/Fixtures/storage.expected |  20 ++
 .../Storage/Handler/Fixtures/storage.php      |  24 +++
 .../Handler/Fixtures/with_cookie.expected     |  15 ++
 .../Storage/Handler/Fixtures/with_cookie.php  |   8 +
 .../Handler/NativeSessionHandlerTest.php      |   3 +
 .../Storage/Handler/PdoSessionHandlerTest.php |   3 +
 .../Handler/StrictSessionHandlerTest.php      | 189 ++++++++++++++++++
 .../Handler/WriteCheckSessionHandlerTest.php  |   2 +
 .../Storage/NativeSessionStorageTest.php      |   8 +-
 .../Storage/Proxy/AbstractProxyTest.php       |   2 -
 .../Storage/Proxy/SessionHandlerProxyTest.php |   1 -
 .../Component/HttpFoundation/composer.json    |   3 +-
 .../NativeSessionTokenStorage.php             |  12 +-
 41 files changed, 984 insertions(+), 104 deletions(-)
 create mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/common.inc
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/read_only.expected
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php

diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 5ef2448bf27a7..1b9a40c452dde 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -126,6 +126,8 @@ Form
 FrameworkBundle
 ---------------
 
+ * The `session.use_strict_mode` option has been deprecated and is enabled by default.
+
  * The `cache:clear` command doesn't clear "app" PSR-6 cache pools anymore,
    but still clears "system" ones.
    Use the `cache:pool:clear` command to clear "app" pools instead.
@@ -235,18 +237,13 @@ HttpFoundation
  * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`
    class has been deprecated and will be removed in 4.0. Use the `\SessionHandler` class instead.
 
- * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy` class has been
-   deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler` class has been
+   deprecated and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or
+   extend `AbstractSessionHandler` instead.
 
  * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` class has been
    deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
 
- * The `Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy` class has been
-   deprecated and will be removed in 4.0. Use your `\SessionHandlerInterface` implementation directly.
-
- * `NativeSessionStorage::setSaveHandler()` now takes an instance of `\SessionHandlerInterface` as argument.
-   Not passing it is deprecated and will throw a `TypeError` in 4.0.
-
  * Using `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` with the legacy mongo extension
    has been deprecated and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index b2854c5925494..77959fa48bab1 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -329,6 +329,8 @@ Form
 FrameworkBundle
 ---------------
 
+ * The `session.use_strict_mode` option has been removed and strict mode is always enabled.
+
  * The `validator.mapping.cache.doctrine.apc` service has been removed.
 
  * The "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies" parameter have been removed. Use the `Request::setTrustedProxies()` method in your front controller instead.
@@ -542,12 +544,11 @@ HttpFoundation
  * The ability to check only for cacheable HTTP methods using `Request::isMethodSafe()` is
    not supported anymore, use `Request::isMethodCacheable()` instead.
 
- * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler`,
-   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy`,
-   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` and
-   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy` classes have been removed.
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler` class has been
+   removed. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.
 
- * `NativeSessionStorage::setSaveHandler()` now requires an instance of `\SessionHandlerInterface` as argument.
+ * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler` and
+   `Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy` classes have been removed.
 
  * The `Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler` does not work with the legacy
    mongo extension anymore. It requires mongodb/mongodb package and ext-mongodb.
diff --git a/composer.json b/composer.json
index 3d96b012ce0b9..5b8e7985aae34 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php56": "~1.0",
-        "symfony/polyfill-php70": "~1.0",
+        "symfony/polyfill-php70": "~1.6",
         "symfony/polyfill-util": "~1.0"
     },
     "replace": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 49fd03165a5b7..db3d480b3e6c1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Session `use_strict_mode` is now enabled by default and the corresponding option has been deprecated
  * Made the `cache:clear` command to *not* clear "app" PSR-6 cache pools anymore,
    but to still clear "system" ones; use the `cache:pool:clear` command to clear "app" pools instead
  * Always register a minimalist logger that writes in `stderr`
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 4d5af046cbec2..14c61e1395323 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -462,11 +462,14 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('gc_divisor')->end()
                         ->scalarNode('gc_probability')->defaultValue(1)->end()
                         ->scalarNode('gc_maxlifetime')->end()
-                        ->booleanNode('use_strict_mode')->end()
+                        ->booleanNode('use_strict_mode')
+                            ->defaultTrue()
+                            ->setDeprecated('The "%path%.%node%" option is enabled by default and deprecated since Symfony 3.4. It will be always enabled in 4.0.')
+                        ->end()
                         ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
                         ->integerNode('metadata_update_threshold')
                             ->defaultValue('0')
-                            ->info('seconds to wait between 2 session metadata updates, it will also prevent the session handler to write if the session has not changed')
+                            ->info('seconds to wait between 2 session metadata updates')
                         ->end()
                     ->end()
                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 568bb0913ebc7..5eb3c24dff08f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -916,14 +916,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
             $container->getDefinition('session.storage.native')->replaceArgument(1, null);
             $container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
         } else {
-            $handlerId = $config['handler_id'];
-
-            if ($config['metadata_update_threshold'] > 0) {
-                $container->getDefinition('session.handler.write_check')->addArgument(new Reference($handlerId));
-                $handlerId = 'session.handler.write_check';
-            }
-
-            $container->setAlias('session.handler', $handlerId)->setPrivate(true);
+            $container->setAlias('session.handler', $config['handler_id'])->setPrivate(true);
         }
 
         $container->setParameter('session.save_path', $config['save_path']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 335c14a8a6611..ce7a3dd7eee7d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -48,11 +48,17 @@
             
         
 
-        
-            %session.save_path%
+        
+            
+                
+                    %session.save_path%
+                
+            
         
 
-        
+        
+            The "%service_id%" service is deprecated since Symfony 3.4 and will be removed in 4.0. Use the `session.lazy_write` ini setting instead.
+        
 
         
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index e6e83d40b538d..80f54afd20cad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -301,6 +301,7 @@ protected static function getBundleDefaultConfig()
                 'gc_probability' => 1,
                 'save_path' => '%kernel.cache_dir%/sessions',
                 'metadata_update_threshold' => '0',
+                'use_strict_mode' => true,
             ),
             'request' => array(
                 'enabled' => false,
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 83a3c8e32eaf6..ee5b6cecf2e85 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -4,8 +4,9 @@ CHANGELOG
 3.4.0
 -----
 
- * deprecated the `NativeSessionHandler` class,
- * deprecated the `AbstractProxy`, `NativeProxy` and `SessionHandlerProxy` classes,
+ * implemented PHP 7.0's `SessionUpdateTimestampHandlerInterface` with a new
+   `AbstractSessionHandler` base class and a new `StrictSessionHandler` wrapper
+ * deprecated the `WriteCheckSessionHandler`, `NativeSessionHandler` and `NativeProxy` classes
  * deprecated setting session save handlers that do not implement `\SessionHandlerInterface` in `NativeSessionStorage::setSaveHandler()`
  * deprecated using `MongoDbSessionHandler` with the legacy mongo extension; use it with the mongodb/mongodb package and ext-mongodb instead
  * deprecated `MemcacheSessionHandler`; use `MemcachedSessionHandler` instead
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
new file mode 100644
index 0000000000000..c20a23b20e5d9
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -0,0 +1,165 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
+
+/**
+ * This abstract session handler provides a generic implementation
+ * of the PHP 7.0 SessionUpdateTimestampHandlerInterface,
+ * enabling strict and lazy session handling.
+ *
+ * @author Nicolas Grekas 
+ */
+abstract class AbstractSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
+{
+    private $sessionName;
+    private $prefetchId;
+    private $prefetchData;
+    private $newSessionId;
+    private $igbinaryEmptyData;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function open($savePath, $sessionName)
+    {
+        $this->sessionName = $sessionName;
+
+        return true;
+    }
+
+    /**
+     * @param string $sessionId
+     *
+     * @return string
+     */
+    abstract protected function doRead($sessionId);
+
+    /**
+     * @param string $sessionId
+     * @param string $data
+     *
+     * @return bool
+     */
+    abstract protected function doWrite($sessionId, $data);
+
+    /**
+     * @param string $sessionId
+     *
+     * @return bool
+     */
+    abstract protected function doDestroy($sessionId);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validateId($sessionId)
+    {
+        $this->prefetchData = $this->read($sessionId);
+        $this->prefetchId = $sessionId;
+
+        return '' !== $this->prefetchData;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($sessionId)
+    {
+        if (null !== $this->prefetchId) {
+            $prefetchId = $this->prefetchId;
+            $prefetchData = $this->prefetchData;
+            $this->prefetchId = $this->prefetchData = null;
+
+            if ($prefetchId === $sessionId || '' === $prefetchData) {
+                $this->newSessionId = '' === $prefetchData ? $sessionId : null;
+
+                return $prefetchData;
+            }
+        }
+
+        $data = $this->doRead($sessionId);
+        $this->newSessionId = '' === $data ? $sessionId : null;
+        if (\PHP_VERSION_ID < 70000) {
+            $this->prefetchData = $data;
+        }
+
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($sessionId, $data)
+    {
+        if (\PHP_VERSION_ID < 70000 && $this->prefetchData) {
+            $readData = $this->prefetchData;
+            $this->prefetchData = null;
+
+            if ($readData === $data) {
+                return $this->updateTimestamp($sessionId, $data);
+            }
+        }
+        if (null === $this->igbinaryEmptyData) {
+            // see https://github.com/igbinary/igbinary/issues/146
+            $this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize(array()) : '';
+        }
+        if ('' === $data || $this->igbinaryEmptyData === $data) {
+            return $this->destroy($sessionId);
+        }
+        $this->newSessionId = null;
+
+        return $this->doWrite($sessionId, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        if (\PHP_VERSION_ID < 70000) {
+            $this->prefetchData = null;
+        }
+        if (!headers_sent() && ini_get('session.use_cookies')) {
+            if (!$this->sessionName) {
+                throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', get_class($this)));
+            }
+            $sessionCookie = sprintf(' %s=', urlencode($this->sessionName));
+            $sessionCookieWithId = sprintf('%s%s;', $sessionCookie, urlencode($sessionId));
+            $sessionCookieFound = false;
+            $otherCookies = array();
+            foreach (headers_list() as $h) {
+                if (0 !== stripos($h, 'Set-Cookie:')) {
+                    continue;
+                }
+                if (11 === strpos($h, $sessionCookie, 11)) {
+                    $sessionCookieFound = true;
+
+                    if (11 !== strpos($h, $sessionCookieWithId, 11)) {
+                        $otherCookies[] = $h;
+                    }
+                } else {
+                    $otherCookies[] = $h;
+                }
+            }
+            if ($sessionCookieFound) {
+                header_remove('Set-Cookie');
+                foreach ($otherCookies as $h) {
+                    header('Set-Cookie:'.$h, false);
+                }
+            } else {
+                setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
+            }
+        }
+
+        return $this->newSessionId === $sessionId || $this->doDestroy($sessionId);
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 3bbde5420d16a..a31642cc83524 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -19,7 +19,7 @@
  *
  * @author Drak 
  */
-class MemcachedSessionHandler implements \SessionHandlerInterface
+class MemcachedSessionHandler extends AbstractSessionHandler
 {
     /**
      * @var \Memcached Memcached driver
@@ -39,7 +39,7 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
     /**
      * List of available options:
      *  * prefix: The prefix to use for the memcached keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
+     *  * expiretime: The time to live in seconds.
      *
      * @param \Memcached $memcached A \Memcached instance
      * @param array      $options   An associative array of Memcached options
@@ -63,7 +63,7 @@ public function __construct(\Memcached $memcached, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function open($savePath, $sessionName)
+    public function close()
     {
         return true;
     }
@@ -71,23 +71,23 @@ public function open($savePath, $sessionName)
     /**
      * {@inheritdoc}
      */
-    public function close()
+    protected function doRead($sessionId)
     {
-        return true;
+        return $this->memcached->get($this->prefix.$sessionId) ?: '';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function read($sessionId)
+    public function updateTimestamp($sessionId, $data)
     {
-        return $this->memcached->get($this->prefix.$sessionId) ?: '';
+        return $this->memcached->touch($this->prefix.$sessionId, time() + $this->ttl);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function write($sessionId, $data)
+    protected function doWrite($sessionId, $data)
     {
         return $this->memcached->set($this->prefix.$sessionId, $data, time() + $this->ttl);
     }
@@ -95,7 +95,7 @@ public function write($sessionId, $data)
     /**
      * {@inheritdoc}
      */
-    public function destroy($sessionId)
+    protected function doDestroy($sessionId)
     {
         $result = $this->memcached->delete($this->prefix.$sessionId);
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index d532fb92c6c26..7d770421c55ef 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -19,7 +19,7 @@
  * @see https://packagist.org/packages/mongodb/mongodb
  * @see http://php.net/manual/en/set.mongodb.php
  */
-class MongoDbSessionHandler implements \SessionHandlerInterface
+class MongoDbSessionHandler extends AbstractSessionHandler
 {
     /**
      * @var \Mongo|\MongoClient|\MongoDB\Client
@@ -43,7 +43,7 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
      *  * id_field: The field name for storing the session id [default: _id]
      *  * data_field: The field name for storing the session data [default: data]
      *  * time_field: The field name for storing the timestamp [default: time]
-     *  * expiry_field: The field name for storing the expiry-timestamp [default: expires_at]
+     *  * expiry_field: The field name for storing the expiry-timestamp [default: expires_at].
      *
      * It is strongly recommended to put an index on the `expiry_field` for
      * garbage-collection. Alternatively it's possible to automatically expire
@@ -92,14 +92,6 @@ public function __construct($mongo, array $options)
         ), $options);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -111,7 +103,7 @@ public function close()
     /**
      * {@inheritdoc}
      */
-    public function destroy($sessionId)
+    protected function doDestroy($sessionId)
     {
         $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
 
@@ -139,7 +131,7 @@ public function gc($maxlifetime)
     /**
      * {@inheritdoc}
      */
-    public function write($sessionId, $data)
+    protected function doWrite($sessionId, $data)
     {
         $expiry = $this->createDateTime(time() + (int) ini_get('session.gc_maxlifetime'));
 
@@ -171,7 +163,34 @@ public function write($sessionId, $data)
     /**
      * {@inheritdoc}
      */
-    public function read($sessionId)
+    public function updateTimestamp($sessionId, $data)
+    {
+        $expiry = $this->createDateTime(time() + (int) ini_get('session.gc_maxlifetime'));
+
+        if ($this->mongo instanceof \MongoDB\Client) {
+            $methodName = 'updateOne';
+            $options = array();
+        } else {
+            $methodName = 'update';
+            $options = array('multiple' => false);
+        }
+
+        $this->getCollection()->$methodName(
+            array($this->options['id_field'] => $sessionId),
+            array('$set' => array(
+                $this->options['time_field'] => $this->createDateTime(),
+                $this->options['expiry_field'] => $expiry,
+            )),
+            $options
+        );
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doRead($sessionId)
     {
         $dbData = $this->getCollection()->findOne(array(
             $this->options['id_field'] => $sessionId,
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
index daa7dbd15b7c8..9ea4629ca16b3 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
-@trigger_error('The '.__NAMESPACE__.'\NativeSessionHandler class is deprecated since version 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.', E_USER_DEPRECATED);
-
 /**
  * @deprecated since version 3.4, to be removed in 4.0. Use \SessionHandler instead.
  * @see http://php.net/sessionhandler
  */
 class NativeSessionHandler extends \SessionHandler
 {
+    public function __construct()
+    {
+        @trigger_error('The '.__NAMESPACE__.'\NativeSessionHandler class is deprecated since version 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.', E_USER_DEPRECATED);
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
index 981d96d93a978..8d193155b090f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
@@ -16,12 +16,12 @@
  *
  * @author Drak 
  */
-class NullSessionHandler implements \SessionHandlerInterface
+class NullSessionHandler extends AbstractSessionHandler
 {
     /**
      * {@inheritdoc}
      */
-    public function open($savePath, $sessionName)
+    public function close()
     {
         return true;
     }
@@ -29,7 +29,7 @@ public function open($savePath, $sessionName)
     /**
      * {@inheritdoc}
      */
-    public function close()
+    public function validateId($sessionId)
     {
         return true;
     }
@@ -37,7 +37,7 @@ public function close()
     /**
      * {@inheritdoc}
      */
-    public function read($sessionId)
+    protected function doRead($sessionId)
     {
         return '';
     }
@@ -45,7 +45,15 @@ public function read($sessionId)
     /**
      * {@inheritdoc}
      */
-    public function write($sessionId, $data)
+    public function updateTimestamp($sessionId, $data)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doWrite($sessionId, $data)
     {
         return true;
     }
@@ -53,7 +61,7 @@ public function write($sessionId, $data)
     /**
      * {@inheritdoc}
      */
-    public function destroy($sessionId)
+    protected function doDestroy($sessionId)
     {
         return true;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 5cdac639399f0..19bf6e9bcaeef 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -38,7 +38,7 @@
  * @author Michael Williams 
  * @author Tobias Schultze 
  */
-class PdoSessionHandler implements \SessionHandlerInterface
+class PdoSessionHandler extends AbstractSessionHandler
 {
     /**
      * No locking is done. This means sessions are prone to loss of data due to
@@ -260,11 +260,13 @@ public function isSessionExpired()
      */
     public function open($savePath, $sessionName)
     {
+        $this->sessionExpired = false;
+
         if (null === $this->pdo) {
             $this->connect($this->dsn ?: $savePath);
         }
 
-        return true;
+        return parent::open($savePath, $sessionName);
     }
 
     /**
@@ -273,7 +275,7 @@ public function open($savePath, $sessionName)
     public function read($sessionId)
     {
         try {
-            return $this->doRead($sessionId);
+            return parent::read($sessionId);
         } catch (\PDOException $e) {
             $this->rollback();
 
@@ -296,7 +298,7 @@ public function gc($maxlifetime)
     /**
      * {@inheritdoc}
      */
-    public function destroy($sessionId)
+    protected function doDestroy($sessionId)
     {
         // delete the record associated with this id
         $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
@@ -317,7 +319,7 @@ public function destroy($sessionId)
     /**
      * {@inheritdoc}
      */
-    public function write($sessionId, $data)
+    protected function doWrite($sessionId, $data)
     {
         $maxlifetime = (int) ini_get('session.gc_maxlifetime');
 
@@ -372,6 +374,30 @@ public function write($sessionId, $data)
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        $maxlifetime = (int) ini_get('session.gc_maxlifetime');
+
+        try {
+            $updateStmt = $this->pdo->prepare(
+                "UPDATE $this->table SET $this->lifetimeCol = :lifetime, $this->timeCol = :time WHERE $this->idCol = :id"
+            );
+            $updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+            $updateStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
+            $updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
+            $updateStmt->execute();
+        } catch (\PDOException $e) {
+            $this->rollback();
+
+            throw $e;
+        }
+
+        return true;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -491,10 +517,8 @@ private function rollback()
      *
      * @return string The session data
      */
-    private function doRead($sessionId)
+    protected function doRead($sessionId)
     {
-        $this->sessionExpired = false;
-
         if (self::LOCK_ADVISORY === $this->lockMode) {
             $this->unlockStatements[] = $this->doAdvisoryLock($sessionId);
         }
@@ -517,7 +541,9 @@ private function doRead($sessionId)
                 return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
             }
 
-            if (self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
+            if (!ini_get('session.use_strict_mode') && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
+                // In strict mode, session fixation is not possible: new sessions always start with a unique
+                // random id, so that concurrency is not possible and this code path can be skipped.
                 // Exclusive-reading of non-existent rows does not block, so we need to do an insert to block
                 // until other connections to the session are committed.
                 try {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
new file mode 100644
index 0000000000000..1bad0641e81b1
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
@@ -0,0 +1,89 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
+
+/**
+ * Adds basic `SessionUpdateTimestampHandlerInterface` behaviors to another `SessionHandlerInterface`.
+ *
+ * @author Nicolas Grekas 
+ */
+class StrictSessionHandler extends AbstractSessionHandler
+{
+    private $handler;
+
+    public function __construct(\SessionHandlerInterface $handler)
+    {
+        if ($handler instanceof \SessionUpdateTimestampHandlerInterface) {
+            throw new \LogicException(sprintf('"%s" is already an instance of "SessionUpdateTimestampHandlerInterface", you cannot wrap it with "%s".', get_class($handler), self::class));
+        }
+
+        $this->handler = $handler;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function open($savePath, $sessionName)
+    {
+        parent::open($savePath, $sessionName);
+
+        return $this->handler->open($savePath, $sessionName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doRead($sessionId)
+    {
+        return $this->handler->read($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        return $this->write($sessionId, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doWrite($sessionId, $data)
+    {
+        return $this->handler->write($sessionId, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDestroy($sessionId)
+    {
+        return $this->handler->destroy($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        return $this->handler->close();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function gc($maxlifetime)
+    {
+        return $this->handler->gc($maxlifetime);
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php
index d49c36cae5876..638a633076e38 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php
@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
+@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.', WriteCheckSessionHandler::class), E_USER_DEPRECATED);
+
 /**
  * Wraps another SessionHandlerInterface to only write the session when it has been modified.
  *
  * @author Adrien Brault 
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.
  */
 class WriteCheckSessionHandler implements \SessionHandlerInterface
 {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 623d38721bcf9..092d21830d732 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
-use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
@@ -26,7 +26,7 @@ class NativeSessionStorage implements SessionStorageInterface
     /**
      * @var SessionBagInterface[]
      */
-    protected $bags;
+    protected $bags = array();
 
     /**
      * @var bool
@@ -100,9 +100,9 @@ class NativeSessionStorage implements SessionStorageInterface
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
         $options += array(
-            // disable by default because it's managed by HeaderBag (if used)
-            'cache_limiter' => '',
+            'cache_limiter' => 'private_no_expire',
             'use_cookies' => 1,
+            'lazy_write' => 1,
         );
 
         session_register_shutdown();
@@ -217,15 +217,31 @@ public function regenerate($destroy = false, $lifetime = null)
      */
     public function save()
     {
+        $session = $_SESSION;
+
+        foreach ($this->bags as $bag) {
+            if (empty($_SESSION[$key = $bag->getStorageKey()])) {
+                unset($_SESSION[$key]);
+            }
+        }
+        if (array($key = $this->metadataBag->getStorageKey()) === array_keys($_SESSION)) {
+            unset($_SESSION[$key]);
+        }
+
         // Register custom error handler to catch a possible failure warning during session write
-        set_error_handler(function ($errno, $errstr, $errfile, $errline, $errcontext) {
-            throw new ContextErrorException($errstr, $errno, E_WARNING, $errfile, $errline, $errcontext);
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            throw new \ErrorException($errstr, $errno, E_WARNING, $errfile, $errline);
         }, E_WARNING);
 
         try {
+            $e = null;
             session_write_close();
+        } catch (\ErrorException $e) {
+        } finally {
             restore_error_handler();
-        } catch (ContextErrorException $e) {
+            $_SESSION = $session;
+        }
+        if (null !== $e) {
             // The default PHP error message is not very helpful, as it does not give any information on the current save handler.
             // Therefore, we catch this error and trigger a warning with a better error message
             $handler = $this->getSaveHandler();
@@ -233,7 +249,6 @@ public function save()
                 $handler = $handler->getHandler();
             }
 
-            restore_error_handler();
             trigger_error(sprintf('session_write_close(): Failed to write session data with %s handler', get_class($handler)), E_USER_WARNING);
         }
 
@@ -386,13 +401,6 @@ public function setSaveHandler($saveHandler = null)
             throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');
         }
 
-        if ($saveHandler instanceof AbstractProxy) {
-            @trigger_error(
-                'Using session save handlers that are instances of AbstractProxy is deprecated since version 3.4 and will be removed in 4.0.',
-                E_USER_DEPRECATED
-            );
-        }
-
         if (headers_sent($file, $line)) {
             throw new \RuntimeException(sprintf('Failed to set the session handler because headers have already been sent by "%s" at line %d.', $file, $line));
         }
@@ -401,11 +409,13 @@ public function setSaveHandler($saveHandler = null)
         if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
             $saveHandler = new SessionHandlerProxy($saveHandler);
         } elseif (!$saveHandler instanceof AbstractProxy) {
-            $saveHandler = new SessionHandlerProxy(new \SessionHandler());
+            $saveHandler = new SessionHandlerProxy(new StrictSessionHandler(new \SessionHandler()));
         }
         $this->saveHandler = $saveHandler;
 
-        if ($this->saveHandler instanceof \SessionHandlerInterface) {
+        if ($this->saveHandler instanceof SessionHandlerProxy) {
+            session_set_save_handler($this->saveHandler->getHandler(), false);
+        } elseif ($this->saveHandler instanceof \SessionHandlerInterface) {
             session_set_save_handler($this->saveHandler, false);
         }
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
index c1c8b9b1f7dd2..09c92483c7575 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
@@ -11,11 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
-@trigger_error('The '.__NAMESPACE__.'\AbstractProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
 /**
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
  * @author Drak 
  */
 abstract class AbstractProxy
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
index d6adef82dbf65..359bb877b5e30 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -11,11 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
-@trigger_error('The '.__NAMESPACE__.'\SessionHandlerProxy class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
 /**
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
  * @author Drak 
  */
 class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
new file mode 100644
index 0000000000000..3ac081e3884c1
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -0,0 +1,61 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @requires PHP 7.0
+ */
+class AbstractSessionHandlerTest extends TestCase
+{
+    private static $server;
+
+    public static function setUpBeforeClass()
+    {
+        $spec = array(
+            1 => array('file', '/dev/null', 'w'),
+            2 => array('file', '/dev/null', 'w'),
+        );
+        if (!self::$server = @proc_open('exec php -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
+            self::markTestSkipped('PHP server unable to start.');
+        }
+        sleep(1);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        if (self::$server) {
+            proc_terminate(self::$server);
+            proc_close(self::$server);
+        }
+    }
+
+    /**
+     * @dataProvider provideSession
+     */
+    public function testSession($fixture)
+    {
+        $context = array('http' => array('header' => "Cookie: sid=123abc\r\n"));
+        $context = stream_context_create($context);
+        $result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
+
+        $this->assertStringEqualsFile(__DIR__.sprintf('/Fixtures/%s.expected', $fixture), $result);
+    }
+
+    public function provideSession()
+    {
+        foreach (glob(__DIR__.'/Fixtures/*.php') as $file) {
+            yield array(pathinfo($file, PATHINFO_FILENAME));
+        }
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/common.inc b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/common.inc
new file mode 100644
index 0000000000000..5c183acfff324
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/common.inc
@@ -0,0 +1,152 @@
+data = $data;
+    }
+
+    public function open($path, $name)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::open($path, $name);
+    }
+
+    public function validateId($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::validateId($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::read($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($sessionId, $data)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::write($sessionId, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::destroy($sessionId);
+    }
+
+    public function close()
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    public function gc($maxLifetime)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    protected function doRead($sessionId)
+    {
+        echo __FUNCTION__.': ', $this->data, "\n";
+
+        return $this->data;
+    }
+
+    protected function doWrite($sessionId, $data)
+    {
+        echo __FUNCTION__.': ', $data, "\n";
+
+        return true;
+    }
+
+    protected function doDestroy($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
new file mode 100644
index 0000000000000..1720bf0558386
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
@@ -0,0 +1,17 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+write
+destroy
+doDestroy
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: private, max-age=10800
+    [2] => Set-Cookie: sid=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; secure; HttpOnly
+)
+shutdown
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
new file mode 100644
index 0000000000000..3cfc1250adad1
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
@@ -0,0 +1,8 @@
+ Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: private, max-age=10800
+)
+shutdown
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/read_only.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
new file mode 100644
index 0000000000000..3e62fb9ecbbdd
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
@@ -0,0 +1,8 @@
+ Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: private, max-age=10800
+    [2] => Set-Cookie: sid=random_session_id; path=/; secure; HttpOnly
+)
+shutdown
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
new file mode 100644
index 0000000000000..a0f635c8712ec
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
@@ -0,0 +1,10 @@
+ bar
+)
+$_SESSION is not empty
+write
+destroy
+close
+$_SESSION is not empty
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: private, max-age=10800
+)
+shutdown
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
new file mode 100644
index 0000000000000..96dca3c2c0006
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
@@ -0,0 +1,24 @@
+setSaveHandler(new TestSessionHandler());
+$flash = new FlashBag();
+$storage->registerBag($flash);
+$storage->start();
+
+$flash->add('foo', 'bar');
+
+print_r($flash->get('foo'));
+echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
+echo "\n";
+
+$storage->save();
+
+echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
+
+ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
new file mode 100644
index 0000000000000..47ae4da82449d
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
@@ -0,0 +1,15 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+updateTimestamp
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: private, max-age=10800
+    [2] => Set-Cookie: abc=def
+)
+shutdown
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
new file mode 100644
index 0000000000000..ffb5b20a3774e
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
@@ -0,0 +1,8 @@
+markTestSkipped('PHPUnit_MockObject cannot mock the PDOStatement class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
         }
+        if (ini_get('session.use_strict_mode')) {
+            $this->markTestSkipped('Strict mode needs no locking for new sessions.');
+        }
 
         $pdo = new MockPdo('pgsql');
         $selectStmt = $this->getMockBuilder('PDOStatement')->getMock();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
new file mode 100644
index 0000000000000..9d2c1949f3d72
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
@@ -0,0 +1,189 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\AbstractSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
+
+class StrictSessionHandlerTest extends TestCase
+{
+    public function testOpen()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('open')
+            ->with('path', 'name')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertInstanceof('SessionUpdateTimestampHandlerInterface', $proxy);
+        $this->assertInstanceof(AbstractSessionHandler::class, $proxy);
+        $this->assertTrue($proxy->open('path', 'name'));
+    }
+
+    public function testCloseSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('close')
+            ->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->close());
+    }
+
+    public function testValidateIdOK()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id'));
+    }
+
+    public function testValidateIdKO()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertFalse($proxy->validateId('id'));
+    }
+
+    public function testRead()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('data', $proxy->read('id'));
+    }
+
+    public function testReadWithValidateIdOK()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id'));
+        $this->assertSame('data', $proxy->read('id'));
+    }
+
+    public function testReadWithValidateIdMismatch()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->exactly(2))->method('read')
+            ->withConsecutive(array('id1'), array('id2'))
+            ->will($this->onConsecutiveCalls('data1', 'data2'));
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id1'));
+        $this->assertSame('data2', $proxy->read('id2'));
+    }
+
+    public function testUpdateTimestamp()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->updateTimestamp('id', 'data'));
+    }
+
+    public function testWrite()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->write('id', 'data'));
+    }
+
+    public function testWriteEmptyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->never())->method('write');
+        $handler->expects($this->never())->method('destroy');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertFalse($proxy->validateId('id'));
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', ''));
+    }
+
+    public function testWriteEmptyExistingSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $handler->expects($this->never())->method('write');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('data', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', ''));
+    }
+
+    public function testDestroy()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('destroy')
+            ->with('id')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testDestroyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->never())->method('destroy');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testDestroyNonEmptyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $handler->expects($this->once())->method('destroy')
+            ->with('id')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', 'data'));
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testGc()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('gc')
+            ->with(123)->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->gc(123));
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
index 5e41a4743edd5..898a7d11a5ae2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @author Adrien Brault 
+ *
+ * @group legacy
  */
 class WriteCheckSessionHandlerTest extends TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 818c63a9d2ae2..93de175fd3c67 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
@@ -152,7 +152,7 @@ public function testDefaultSessionCacheLimiter()
         $this->iniSet('session.cache_limiter', 'nocache');
 
         $storage = new NativeSessionStorage();
-        $this->assertEquals('', ini_get('session.cache_limiter'));
+        $this->assertEquals('private_no_expire', ini_get('session.cache_limiter'));
     }
 
     public function testExplicitSessionCacheLimiter()
@@ -201,9 +201,9 @@ public function testSetSaveHandler()
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
         $storage->setSaveHandler(null);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
-        $storage->setSaveHandler(new SessionHandlerProxy(new NativeSessionHandler()));
+        $storage->setSaveHandler(new SessionHandlerProxy(new NativeFileSessionHandler()));
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
-        $storage->setSaveHandler(new NativeSessionHandler());
+        $storage->setSaveHandler(new NativeFileSessionHandler());
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
         $storage->setSaveHandler(new SessionHandlerProxy(new NullSessionHandler()));
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
index f2be722c8f522..cbb291f19fc3f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -18,8 +18,6 @@
 /**
  * Test class for AbstractProxy.
  *
- * @group legacy
- *
  * @author Drak 
  */
 class AbstractProxyTest extends TestCase
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index fdd1dae254198..682825356a724 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -21,7 +21,6 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
- * @group legacy
  */
 class SessionHandlerProxyTest extends TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 4f13511e9ac7a..f6c6f2e623fe6 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": "^5.5.9|>=7.0.8",
-        "symfony/polyfill-mbstring": "~1.1"
+        "symfony/polyfill-mbstring": "~1.1",
+        "symfony/polyfill-php70": "~1.6"
     },
     "require-dev": {
         "symfony/expression-language": "~2.8|~3.0|~4.0"
diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
index 5ce2774114737..d441ba6ed3d02 100644
--- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
+++ b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -97,12 +97,18 @@ public function removeToken($tokenId)
             $this->startSession();
         }
 
-        $token = isset($_SESSION[$this->namespace][$tokenId])
-            ? (string) $_SESSION[$this->namespace][$tokenId]
-            : null;
+        if (!isset($_SESSION[$this->namespace][$tokenId])) {
+            return;
+        }
+
+        $token = (string) $_SESSION[$this->namespace][$tokenId];
 
         unset($_SESSION[$this->namespace][$tokenId]);
 
+        if (!$_SESSION[$this->namespace]) {
+            unset($_SESSION[$this->namespace]);
+        }
+
         return $token;
     }
 

From 41df5123497be20155b615e44edbbb08c4f14129 Mon Sep 17 00:00:00 2001
From: Ryan Weaver 
Date: Mon, 16 Oct 2017 20:25:51 -0400
Subject: [PATCH 1089/1099] Adding a new debug:autowiring command

---
 .../Command/DebugAutowiringCommand.php        | 97 +++++++++++++++++++
 .../Resources/config/console.xml              |  4 +
 .../Functional/DebugAutowiringCommandTest.php | 63 ++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
new file mode 100644
index 0000000000000..23d688495db74
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -0,0 +1,97 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Command;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * A console command for autowiring information.
+ *
+ * @author Ryan Weaver 
+ *
+ * @internal
+ */
+class DebugAutowiringCommand extends ContainerDebugCommand
+{
+    protected static $defaultName = 'debug:autowiring';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this
+            ->setDefinition(array(
+                new InputArgument('search', InputArgument::OPTIONAL, 'A search filter'),
+            ))
+            ->setDescription('Lists classes/interfaces you can use for autowiring')
+            ->setHelp(<<<'EOF'
+The %command.name% command displays all classes and interfaces that
+you can use as type-hints for autowiring:
+
+  php %command.full_name%
+
+You can also pass a search term to filter the list:
+
+  php %command.full_name% log
+
+EOF
+            )
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+        $errorIo = $io->getErrorStyle();
+
+        $builder = $this->getContainerBuilder();
+        $serviceIds = $builder->getServiceIds();
+        $serviceIds = array_filter($serviceIds, array($this, 'filterToServiceTypes'));
+
+        if ($search = $input->getArgument('search')) {
+            $serviceIds = array_filter($serviceIds, function ($serviceId) use ($search) {
+                return false !== stripos($serviceId, $search);
+            });
+
+            if (empty($serviceIds)) {
+                $errorIo->error(sprintf('No autowirable classes or interfaces found matching "%s"', $search));
+
+                return 1;
+            }
+        }
+
+        asort($serviceIds);
+
+        $io->title('Autowirable Services');
+        $io->text('The following classes & interfaces can be used as type-hints when autowiring:');
+        if ($search) {
+            $io->text(sprintf('(only showing classes/interfaces matching %s)', $search));
+        }
+        $io->newLine();
+        $tableRows = array();
+        foreach ($serviceIds as $serviceId) {
+            $tableRows[] = array(sprintf('%s', $serviceId));
+            if ($builder->hasAlias($serviceId)) {
+                $tableRows[] = array(sprintf('    alias to %s', $builder->getAlias($serviceId)));
+            }
+        }
+
+        $io->table(array(), $tableRows);
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
index 7dc4ea6d2fbae..cebf6014f0462 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -55,6 +55,10 @@
             
         
 
+        
+            
+        
+
         
             
             
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
new file mode 100644
index 0000000000000..0b7f9290a50bb
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -0,0 +1,63 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\ApplicationTester;
+
+/**
+ * @group functional
+ */
+class DebugAutowiringCommandTest extends WebTestCase
+{
+    public function testBasicFunctionality()
+    {
+        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'debug:autowiring'));
+
+        $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertContains('alias to http_kernel', $tester->getDisplay());
+    }
+
+    public function testSearchArgument()
+    {
+        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'debug:autowiring', 'search' => 'kern'));
+
+        $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertNotContains('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
+    }
+
+    public function testSearchNoResults()
+    {
+        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'debug:autowiring', 'search' => 'foo_fake'), array('capture_stderr_separately' => true));
+
+        $this->assertContains('No autowirable classes or interfaces found matching "foo_fake"', $tester->getErrorOutput());
+        $this->assertEquals(1, $tester->getStatusCode());
+    }
+}

From 454f65a77d707cc31c08d1417f27247b23bd0e89 Mon Sep 17 00:00:00 2001
From: Ryan Weaver 
Date: Tue, 17 Oct 2017 00:33:38 -0400
Subject: [PATCH 1090/1099] adding AdapterInterface alias for cache.app

---
 src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index b4d23a576ed0f..9466d992c0fa4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -111,5 +111,6 @@
         
         
         
+        
     
 

From 921a8794c60678c08c10bb5bd51298de50edff96 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet 
Date: Tue, 17 Oct 2017 16:03:36 +0200
Subject: [PATCH 1091/1099] Add extra autowiring aliases

This adds autowiring for RequestContextAwareInterface for the routing layer
and for AuthenticationManagerInterface in the security layer.
---
 src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml | 1 +
 src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 94579d93b5019..f515d33c0c311 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -85,6 +85,7 @@
         
         
         
+        
 
         
             %router.request_context.base_url%
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 0225df0ee47ae..4ebbbb85421df 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -52,6 +52,7 @@
                 
             
         
+        
 
         
             %security.authentication.trust_resolver.anonymous_class%

From a1df9af20f50762007a64ca75601bf9f5f85f675 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto 
Date: Wed, 18 Oct 2017 01:29:21 -0400
Subject: [PATCH 1092/1099] don't bind scalar values to controller method
 arguments

---
 .../RegisterControllerArgumentLocatorsPass.php   |  5 +++++
 ...egisterControllerArgumentLocatorsPassTest.php | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index 6a9f0586f7b77..985dfb71d7064 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -135,6 +135,11 @@ public function process(ContainerBuilder $container)
                         $binding = $bindings[$bindingName];
 
                         list($bindingValue, $bindingId) = $binding->getValues();
+
+                        if (!$bindingValue instanceof Reference) {
+                            continue;
+                        }
+
                         $binding->setValues(array($bindingValue, $bindingId, true));
                         $args[$p->name] = $bindingValue;
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 0e524b92d8873..4016deb4ab294 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -310,6 +310,22 @@ public function provideBindings()
     {
         return array(array(ControllerDummy::class), array('$bar'));
     }
+
+    public function testDoNotBindScalarValueToControllerArgument()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->setBindings(array('$someArg' => '%foo%'))
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty($locator);
+    }
 }
 
 class RegisterTestController

From 5c366092f3f21263cad2f1ff8859254b96cefc3d Mon Sep 17 00:00:00 2001
From: David Maicher 
Date: Wed, 18 Oct 2017 12:06:44 +0200
Subject: [PATCH 1093/1099] [TwigBridge] fix merge of 3.4 into master

---
 .../Tests/Extension/FormExtensionTest.php     | 76 -------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php
deleted file mode 100644
index a4d7350716e64..0000000000000
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\Twig\Tests\Extension;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Twig\Extension\FormExtension;
-use Symfony\Bridge\Twig\Form\TwigRendererInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Form\FormRendererInterface;
-use Twig\Environment;
-
-/**
- * @group legacy
- */
-class FormExtensionTest extends TestCase
-{
-    /**
-     * @dataProvider rendererDataProvider
-     */
-    public function testInitRuntimeAndAccessRenderer($rendererConstructor, $expectedAccessedRenderer)
-    {
-        $extension = new FormExtension($rendererConstructor);
-        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
-        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
-    }
-
-    /**
-     * @dataProvider rendererDataProvider
-     */
-    public function testAccessRendererAndInitRuntime($rendererConstructor, $expectedAccessedRenderer)
-    {
-        $extension = new FormExtension($rendererConstructor);
-        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
-        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
-    }
-
-    public function rendererDataProvider()
-    {
-        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
-        $twigRenderer->expects($this->once())
-            ->method('setEnvironment');
-
-        yield array($twigRenderer, $twigRenderer);
-
-        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
-        $twigRenderer->expects($this->once())
-            ->method('setEnvironment');
-
-        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
-        $container->expects($this->once())
-            ->method('get')
-            ->with('service_id')
-            ->willReturn($twigRenderer);
-
-        yield array(array($container, 'service_id'), $twigRenderer);
-
-        $formRenderer = $this->getMockBuilder(FormRendererInterface::class)->getMock();
-
-        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
-        $container->expects($this->once())
-            ->method('get')
-            ->with('service_id')
-            ->willReturn($formRenderer);
-
-        yield array(array($container, 'service_id'), $formRenderer);
-    }
-}

From 6a6256c6a8bb6b5734c7ff491c5be0e291bcae2a Mon Sep 17 00:00:00 2001
From: Robin Chalas 
Date: Wed, 18 Oct 2017 11:36:53 +0200
Subject: [PATCH 1094/1099] Do not process bindings in AbstractRecursivePass

---
 .../Compiler/AbstractRecursivePass.php            |  1 -
 ...xceptionOnInvalidReferenceBehaviorPassTest.php | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index 765b5752da173..cbe9b30468f51 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -67,7 +67,6 @@ protected function processValue($value, $isRoot = false)
             $value->setArguments($this->processValue($value->getArguments()));
             $value->setProperties($this->processValue($value->getProperties()));
             $value->setMethodCalls($this->processValue($value->getMethodCalls()));
-            $value->setBindings($this->processValue($value->getBindings()));
 
             $changes = $value->getChanges();
             if (isset($changes['factory'])) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
index dc20b39bc4dca..ac002d834d1c5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
 use Symfony\Component\DependencyInjection\Reference;
@@ -88,6 +89,20 @@ public function testProcessThrowsExceptionOnNonSharedUninitializedReference()
         $this->process($container);
     }
 
+    public function testProcessDefinitionWithBindings()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('b')
+            ->setBindings(array(new BoundArgument(new Reference('a'))))
+        ;
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     private function process(ContainerBuilder $container)
     {
         $pass = new CheckExceptionOnInvalidReferenceBehaviorPass();

From a024e80f1cc45731e509d65f0bc5dedfeb015dd2 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 18 Oct 2017 14:45:28 -0700
Subject: [PATCH 1095/1099] updated CHANGELOG for 3.4.0-BETA1

---
 CHANGELOG-3.4.md | 217 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 CHANGELOG-3.4.md

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
new file mode 100644
index 0000000000000..2790538d54831
--- /dev/null
+++ b/CHANGELOG-3.4.md
@@ -0,0 +1,217 @@
+CHANGELOG for 3.4.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 3.4 minor versions.
+
+To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.4.0...v3.4.1
+
+* 3.4.0-BETA1 (2017-10-18)
+
+ * feature #24583 Adding a new debug:autowiring command (weaverryan)
+ * feature #24523 [HttpFoundation] Make sessions secure and lazy (nicolas-grekas)
+ * feature #22610 [Form] [TwigBridge] Added option to disable usage of default themes when rendering a form (emodric)
+ * feature #23112 [OptionsResolver] Support array of types in allowed type (pierredup)
+ * feature #24321 added ability to handle parent classes for PropertyNormalizer (ivoba)
+ * feature #24505 [HttpKernel] implement reset() in DumpDataCollector (xabbuh)
+ * feature #24425 [Console][HttpKernel] Handle new SHELL_VERBOSITY env var, also configures the default logger (nicolas-grekas)
+ * feature #24387 [FORM] Prevent forms from extending itself as a parent (pierredup)
+ * feature #24484 [DI] Throw accurate failures when accessing removed services (nicolas-grekas)
+ * feature #24208 [Form] Display option definition from a given form type (yceruto, ogizanagi)
+ * feature #23499 [Workflow] add guard is_valid() method support (alain-flaus, lyrixx)
+ * feature #24388 [Security] Look at headers for switch_user username (chalasr)
+ * feature #23708 Added deprecation to cwd not existing Fixes #18249 (alexbowers)
+ * feature #24443 [Session] deprecate MemcacheSessionHandler (Tobion)
+ * feature #24409 [Bridge\Doctrine][FrameworkBundle] Deprecate some remaining uses of ContainerAwareTrait (nicolas-grekas)
+ * feature #24438 [Session][VarDumper] Deprecate accepting legacy mongo extension (Tobion)
+ * feature #24389 [DoctrineBridge] Deprecate dbal session handler (Tobion)
+ * feature #16835 [Security] Add Guard authenticator  method (Amo, chalasr)
+ * feature #24289 [FrameworkBundle][HttpKernel] Reset profiler (derrabus)
+ * feature #24144 [FrameworkBundle] Expose dotenv in bin/console about (ro0NL)
+ * feature #24403 [FrameworkBundle][Routing] Show welcome message if no routes are configured (yceruto)
+ * feature #22679 [Form] Add tel and color types (apetitpa)
+ * feature #23845 [Validator] Add unique entity violation cause (Ilya Vertakov)
+ * feature #22132 [Lock] Automaticaly release lock when user forget it (jderusse)
+ * feature #21751 Bootstrap4 support for Twig form theme (hiddewie, javiereguiluz)
+ * feature #24383 [FrameworkBundle] Don't clear app pools on cache:clear (nicolas-grekas)
+ * feature #24148 [Form] Hide label button when its setted to false (TeLiXj)
+ * feature #24378 [SecurityBundle] Deprecate auto picking the first provider (ogizanagi)
+ * feature #24260 [Security] Add impersonation support for stateless authentication (chalasr)
+ * feature #24300 [HttpKernel][FrameworkBundle] Add a minimalist default PSR-3 logger (dunglas)
+ * feature #21604 [Security] Argon2i Password Encoder (zanbaldwin)
+ * feature #24372 [DowCrawler] Default to UTF-8 when possible (nicolas-grekas)
+ * feature #24264 [TwigBundle] Improve the overriding of bundle templates (yceruto)
+ * feature #24197 [Translation] 	Moved PhpExtractor and PhpStringTokenParser to Translation component (Nyholm)
+ * feature #24362 [HttpKernel] Deprecate some compiler passes in favor of tagged iterator args (nicolas-grekas)
+ * feature #21027 [Asset] Provide default context (ro0NL)
+ * feature #22200 [DI] Reference tagged services in config (ro0NL)
+ * feature #24337 Adding a shortcuts for the main security functionality (weaverryan, javiereguiluz)
+ * feature #24358 [TwigBundle] register an identity translator as fallback (xabbuh)
+ * feature #24357 [Yaml] include file and line no in deprecation message (xabbuh)
+ * feature #24330 [FrameworkBundle] register class metadata factory alias (xabbuh)
+ * feature #24349 [SecurityBundle] Add missing AclSchemaListener deprecation (ogizanagi)
+ * feature #24202 [Filesystem] deprecate relative paths in makePathRelative() (xabbuh)
+ * feature #21716 [Serializer] Add Support for `object_to_populate` in CustomNormalizer (chrisguitarguy)
+ * feature #21960 Remove Validator\TypeTestCase and add validator logic to base TypeTestCase (pierredup)
+ * feature #22113 [Lock] Include lock component in framework bundle (jderusse)
+ * feature #24236 [WebProfilerBundle] Render file links for twig templates (ro0NL)
+ * feature #21239 [Serializer] throw more specific exceptions (xabbuh)
+ * feature #24256 CsvEncoder handling variable structures and custom header order (Oliver Hoff)
+ * feature #23471 [Finder] Add a method to check if any results were found (duncan3dc)
+ * feature #23149 [PhpUnitBridge] Added a CoverageListener to enhance the code coverage report (lyrixx)
+ * feature #24318 [SecurityBundle] Deprecate ACL related code (chalasr)
+ * feature #24335 [Security][SecurityBundle] Deprecate the HTTP digest auth (ogizanagi)
+ * feature #21951 [Security][Firewall] Passing the newly generated security token to the event during user switching (klandaika)
+ * feature #23485 [Config] extracted the xml parsing from XmlUtils::loadFile into XmlUtils::parse (Basster)
+ * feature #22890 [HttpKernel] Add ability to configure catching exceptions for Client (kbond)
+ * feature #24239 [HttpFoundation] Deprecate compatibility with PHP <5.4 sessions (afurculita)
+ * feature #23882 [Security] Deprecated not being logged out after user change (iltar)
+ * feature #24200 Added an alias for FlashBagInterface in config (tifabien)
+ * feature #24295 [DI][DX] Throw exception on some ContainerBuilder methods used from extensions (ogizanagi)
+ * feature #24253 [Yaml] support parsing files (xabbuh)
+ * feature #24290 Adding Definition::addError() and a compiler pass to throw errors as exceptions (weaverryan)
+ * feature #24301 [DI] Add AutowireRequiredMethodsPass to fix bindings for `@required` methods (nicolas-grekas)
+ * feature #24226 [Cache] Add ResettableInterface to allow resetting any pool's local state (nicolas-grekas)
+ * feature #24303 [FrameworkBundle] allow forms without translations and validator (xabbuh)
+ * feature #24291 [SecurityBundle] Reset the authentication token between requests (derrabus)
+ * feature #24280 [VarDumper] Make `dump()` a little bit more easier to use (freekmurze)
+ * feature #24277 [Serializer] Getter for extra attributes in ExtraAttributesException (mdeboer)
+ * feature #24257 [HttpKernel][DI] Enable Kernel to implement CompilerPassInterface (nicolas-grekas)
+ * feature #23834 [DI] Add "PHP fluent format" for configuring the container (nicolas-grekas)
+ * feature #24180 [Routing] Add PHP fluent DSL for configuring routes (nicolas-grekas)
+ * feature #24232 [Bridge\Doctrine] Add "DoctrineType::reset()" method (nicolas-grekas)
+ * feature #24238 [DI] Turn services and aliases private by default, with BC layer (nicolas-grekas)
+ * feature #23648 [Form] Add input  + regions options to TimezoneType (ro0NL)
+ * feature #24185 [Form] Display general forms information on debug:form (yceruto)
+ * feature #23747 [Serializer][FrameworkBundle] Add a DateInterval normalizer (Lctrs)
+ * feature #24193 [FrameworkBundle] Reset stopwatch between requests (derrabus)
+ * feature #24160 [HttpKernel] Deprecate bundle inheritance (fabpot)
+ * feature #24155 [FrameworkBundle][HttpKernel] Add DI tag for resettable services (derrabus)
+ * feature #23625 Feature #23583  Add current and fallback locales in WDT / Profiler (nemoneph)
+ * feature #24179 [TwigBundle] Add default templates directory and option to configure it (yceruto)
+ * feature #24104 Make as many services private as possible (nicolas-grekas)
+ * feature #18314 [Translation] added support for adding custom message formatter (aitboudad)
+ * feature #24158 deprecated profiler.matcher configuration (fabpot)
+ * feature #24131 [Console] Do not display short exception trace for common console exceptions (yceruto)
+ * feature #24080 Deprecated the web_profiler.position option (javiereguiluz)
+ * feature #24114 [SecurityBundle] Throw a meaningful exception when an undefined user provider is used inside a firewall (chalasr)
+ * feature #24122 [DI] rename ResolveDefinitionTemplatesPass to ResolveChildDefinitionsPass (nicolas-grekas)
+ * feature #23901 [DI] Allow processing env vars (nicolas-grekas)
+ * feature #24093 [FrameworkBundle] be able to enable workflow support explicitly (xabbuh)
+ * feature #24064 [TwigBridge] Show Twig's loader paths on debug:twig command (yceruto)
+ * feature #23978 [Cache] Use options from Memcached DSN (Bukashk0zzz)
+ * feature #24075 Implemented PruneableInterface on TagAwareAdapter (Toflar)
+ * feature #21414 [Console] Display file and line on Exception (arno14)
+ * feature #24068 [HttpKernel] Deprecate EnvParametersResource (ro0NL)
+ * feature #22542 [Lock] Check TTL expiration in lock acquisition (jderusse)
+ * feature #24031 [Routing] Add the possibility to define a prefix for all routes of a controller (fabpot)
+ * feature #23967 [VarDumper] add force-collapse/expand + use it for traces (nicolas-grekas)
+ * feature #24033 [DI] Add ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE (nicolas-grekas)
+ * feature #24026 [Security] add impersonator_user to "User was reloaded" log message (gharlan)
+ * feature #23603 [Cache] Add (pdo|chain) cache (adapter|simple) prune method (robfrawley)
+ * feature #23694 [Form] Add debug:form command (yceruto)
+ * feature #24028 [Yaml] mark some classes as final (xabbuh)
+ * feature #22543 [Lock] Expose an expiringDate and isExpired method in Lock (jderusse)
+ * feature #23667 [Translation] Create an TranslationReaderInterface and move TranslationLoader to TranslationComponent (Nyholm)
+ * feature #24024 [config] Add ability to deprecate a node (sanpii)
+ * feature #23668 [VarDumper] Add period caster (maidmaid)
+ * feature #23991 [DI] Improve psr4-based service discovery (alternative implementation) (kbond)
+ * feature #23947 [Translation] Adding the ability do load  in xliff2.0 (Nyholm)
+ * feature #23887 [Console] Allow commands to provide a default name for compile time registration (chalasr, nicolas-grekas)
+ * feature #23874 [DI] Case sensitive parameter names (ro0NL)
+ * feature #23936 Remove some sf2 references (fabpot)
+ * feature #23680 [Webprofiler] Added blocks that allows extension of the profiler page. (Nyholm)
+ * feature #23665 Create an interface for TranslationWriter (Nyholm)
+ * feature #23890 [Translation] Adding the ability do dump  in xliff2.0 (Nyholm)
+ * feature #23862 [SecurityBundle] resolve class name parameter inside AddSecurityVotersPass (pjarmalavicius)
+ * feature #23915 [DI] Allow get available services from service locator (Koc)
+ * feature #23792 [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup (nicolas-grekas)
+ * feature #23227 Add support for "controller" keyword for configuring routes controllers (voronkovich)
+ * feature #23869 [Console] Made console command shortcuts case insensitive (thanosp)
+ * feature #23855 [DI] Allow dumping inline services in Yaml (nicolas-grekas)
+ * feature #23836 [FrameworkBundle] Catch Fatal errors in commands registration (chalasr)
+ * feature #23805 [HttpKernel] Deprecated commands auto-registration (GuilhemN)
+ * feature #23816 [Debug] Detect internal and deprecated methods (GuilhemN)
+ * feature #23812 [FrameworkBundle] Allow micro kernel to subscribe events easily (ogizanagi)
+ * feature #22187 [DependencyInjection] Support local binding (GuilhemN)
+ * feature #23741 [DI] Generate one file per service factory (nicolas-grekas)
+ * feature #23807 [Debug] Trigger a deprecation when using an internal class/trait/interface (GuilhemN)
+ * feature #22587 [Workflow] Add transition completed event (izzyp)
+ * feature #23624 [FrameworkBundle] Commands as a service (ro0NL)
+ * feature #21111 [Validator] add groups support to the Valid constraint (xabbuh)
+ * feature #20361 [Config] Enable cannotBeEmpty along with requiresAtLeastOneElement (ro0NL)
+ * feature #23712 [DependencyInjection] Deprecate autowiring service auto-registration (GuilhemN)
+ * feature #23719 Autoconfigure instances of ArgumentValueResolverInterface (BPScott)
+ * feature #23706 [Webprofiler] Improve sql explain table display (mimol91)
+ * feature #23724 [Lock] Deprecate Filesystem/LockHandler (jderusse)
+ * feature #23593 [Workflow] Adding workflow name to the announce event (Nyholm)
+ * feature #20496 [Form] Allow pass filter callback to delete_empty option. (Koc)
+ * feature #23451 [Cache] Add (filesystem|phpfiles) cache (adapter|simple) prune method and prune command (robfrawley)
+ * feature #23519 [TwigBundle] Commands as a service (ro0NL)
+ * feature #23591 [VarDumper] Add time zone caster (maidmaid)
+ * feature #23510 [Console] Add a factory command loader for standalone application with lazy-loading needs (ogizanagi)
+ * feature #23357 [VarDumper] Add interval caster (maidmaid)
+ * feature #23550 [DebugBundle] Added min_depth to Configuration (james-johnston-thumbtack)
+ * feature #23570 [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface (nicolas-grekas)
+ * feature #23437 [TwigBridge] deprecate TwigRenderer (Tobion)
+ * feature #23515 [VarDumper] Added setMinDepth to VarCloner (james-johnston-thumbtack)
+ * feature #23404 [Serializer] AbstractObjectNormalizer: Allow to disable type enforcement (ogizanagi)
+ * feature #21086 [MonologBridge] Add TokenProcessor (maidmaid)
+ * feature #22576 [Validator] Allow to use a property path to get value to compare in comparison constraints (ogizanagi)
+ * feature #22689 [DoctrineBridge] Add support for doctrin/dbal v2.6 types (jvasseur)
+ * feature #22734 [Console] Add support for command lazy-loading (chalasr)
+ * feature #19034 [Security] make it possible to configure a custom access decision manager service (xabbuh)
+ * feature #23037 [TwigBundle] Added a RuntimeExtensionInterface to take advantage of autoconfigure (lyrixx)
+ * feature #22176 [DI] Allow imports in string format for YAML (ro0NL)
+ * feature #23295 [Security] Lazy load user providers (chalasr)
+ * feature #23440 [Routing] Add matched and default parameters to redirect responses (artursvonda, Tobion)
+ * feature #22832 [Debug] Deprecate support for stacked errors (mbabker)
+ * feature #21469 [HttpFoundation] Find the original request protocol version (thewilkybarkid)
+ * feature #23431 [Validator] Add min/max amount of pixels to Image constraint (akeeman)
+ * feature #23223 Add support for microseconds in Stopwatch (javiereguiluz)
+ * feature #22341 [BrowserKit] Emulate back/forward browser navigation (e-moe)
+ * feature #22619 [FrameworkBundle][Translation] Move translation compiler pass (lepiaf)
+ * feature #22620 [FrameworkBundle][HttpKernel] Move httpkernel pass (lepiaf)
+ * feature #23337 [Component][Serializer][Normalizer] : Deal it with Has Method for the Normalizer/Denormalizer (jordscream)
+ * feature #22588 [VarDumper] Add filter in VarDumperTestTrait (maidmaid)
+ * feature #23288 [Yaml] deprecate the !str tag (xabbuh)
+ * feature #23039 [Validator] Support for parsing PHP constants in yaml loader (mimol91)
+ * feature #22431 [VarDumper] Add date caster (maidmaid)
+ * feature #23285 [Stopwatch] Add a reset method (jmgq)
+ * feature #23320 [WebServer] Allow * to bind all interfaces (as INADDR_ANY) (jpauli, fabpot)
+ * feature #23272 [FrameworkBundle] disable unusable fragment renderers (xabbuh)
+ * feature #23332 [Yaml] fix the displayed line number (fabpot, xabbuh)
+ * feature #23026 [SecurityBundle] Add user impersonation info and exit action to the profiler (yceruto)
+ * feature #22932 [HttpFoundation] Adds support for the immutable directive in the cache-control header (twoleds)
+ * feature #22554 [Profiler][Validator] Add a validator panel in profiler (ogizanagi)
+ * feature #22124 Shift responsibility for keeping Date header to ResponseHeaderBag (mpdude)
+ * feature #23122 Xml encoder optional type cast (ragboyjr)
+ * feature #23207 [FrameworkBundle] Allow .yaml file extension everywhere (ogizanagi)
+ * feature #23076 [Validator] Adds support to check specific DNS record type for URL (iisisrael)
+ * feature #22629 [Security] Trigger a deprecation when a voter is missing the VoterInterface (iltar)
+ * feature #22636 [Routing] Expose request in route conditions, if needed and possible (ro0NL)
+ * feature #22909 [Yaml] Deprecate using the non-specific tag (GuilhemN)
+ * feature #23042 Consistent error handling in remember me services (lstrojny)
+ * feature #22444 [Serializer] DateTimeNormalizer: allow to provide timezone (ogizanagi)
+ * feature #23143 [DI] Reference instead of inline for array-params (nicolas-grekas)
+ * feature #23154 [WebProfilerBundle] Sticky ajax window (ro0NL)
+ * feature #23161 [FrameworkBundle] Deprecate useless --no-prefix option (chalasr)
+ * feature #23105 [SecurityBundle][Profiler] Give info about called security listeners in profiler (chalasr)
+ * feature #23148 [FrameworkBundle] drop hard dependency on the Stopwatch component (xabbuh)
+ * feature #23131 [FrameworkBundle] Remove dependency on Doctrine cache (fabpot)
+ * feature #23114 [SecurityBundle] Lazy load security listeners (chalasr)
+ * feature #23111 [Process] Deprecate ProcessBuilder (nicolas-grekas)
+ * feature #22675 [FrameworkBundle] KernelTestCase: deprecate not using KERNEL_CLASS (ogizanagi)
+ * feature #22917 [VarDumper] Cycle prev/next searching in HTML dumps (ro0NL)
+ * feature #23044 Automatically enable the routing annotation loader (GuilhemN)
+ * feature #22696 [PropertyInfo] Made ReflectionExtractor's prefix lists instance variables (neemzy)
+ * feature #23035  Deprecate passing a concrete service in optional cache warmers (romainneutron)
+ * feature #23036  Implement ServiceSubscriberInterface in optional cache warmers (romainneutron)
+ * feature #23022 [Di] Remove closure-proxy arguments (nicolas-grekas)
+ * feature #22903 [DI] Deprecate XML services without ID (ro0NL)
+ * feature #22597 [Lock] Re-add the Lock component in 3.4 (jderusse)
+ * feature #22803 [DI] Deprecate Container::initialized() for privates (ro0NL)
+ * feature #22828 [Finder] Deprecate FilterIterator (ogizanagi)
+ * feature #22826 [Validator] improve strict option value deprecation (xabbuh)
+

From c000b454c8d44ef6aaed8fb1b991d91a4d29f522 Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 18 Oct 2017 14:45:50 -0700
Subject: [PATCH 1096/1099] updated VERSION for 3.4.0-BETA1

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 6f4f2b72b63b7..af68d7c39a814 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -65,12 +65,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $projectDir;
     private $warmupDir;
 
-    const VERSION = '3.4.0-DEV';
+    const VERSION = '3.4.0-BETA1';
     const VERSION_ID = 30400;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = 'BETA1';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';

From d484f7282a25572a0f1045dcccf7c79260b6fe2e Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 18 Oct 2017 15:39:44 -0700
Subject: [PATCH 1097/1099] bumped Symfony version to 3.4.0

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index af68d7c39a814..6f4f2b72b63b7 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -65,12 +65,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $projectDir;
     private $warmupDir;
 
-    const VERSION = '3.4.0-BETA1';
+    const VERSION = '3.4.0-DEV';
     const VERSION_ID = 30400;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'BETA1';
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';

From d2bd342949f1b7d632f64925154a3d02aa6fcfbf Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 18 Oct 2017 18:36:29 -0700
Subject: [PATCH 1098/1099] updated CHANGELOG for 4.0.0-BETA1

---
 CHANGELOG-4.0.md | 304 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 304 insertions(+)
 create mode 100644 CHANGELOG-4.0.md

diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
new file mode 100644
index 0000000000000..6bd14a10e3ba7
--- /dev/null
+++ b/CHANGELOG-4.0.md
@@ -0,0 +1,304 @@
+CHANGELOG for 4.0.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 4.0 minor versions.
+
+To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.0.0...v4.0.1
+
+* 4.0.0-BETA1 (2017-10-19)
+
+ * feature #24583 Adding a new debug:autowiring command (weaverryan)
+ * feature #24523 [HttpFoundation] Make sessions secure and lazy (nicolas-grekas)
+ * feature #22610 [Form] [TwigBridge] Added option to disable usage of default themes when rendering a form (emodric)
+ * feature #23112 [OptionsResolver] Support array of types in allowed type (pierredup)
+ * feature #24321 added ability to handle parent classes for PropertyNormalizer (ivoba)
+ * feature #24505 [HttpKernel] implement reset() in DumpDataCollector (xabbuh)
+ * feature #24425 [Console][HttpKernel] Handle new SHELL_VERBOSITY env var, also configures the default logger (nicolas-grekas)
+ * feature #24503 [MonologBridge][EventDispatcher][HttpKernel] remove deprecated features (xabbuh)
+ * feature #24387 [FORM] Prevent forms from extending itself as a parent (pierredup)
+ * feature #24484 [DI] Throw accurate failures when accessing removed services (nicolas-grekas)
+ * feature #24208 [Form] Display option definition from a given form type (yceruto, ogizanagi)
+ * feature #22228 [HttpKernel] minor: add ability to construct with headers on http exceptions (gsdevme)
+ * feature #24467 [Process] drop non-existent working directory support (xabbuh)
+ * feature #23499 [Workflow] add guard is_valid() method support (alain-flaus, lyrixx)
+ * feature #24364 [DependencyInjection][Filesystem][Security][SecurityBundle] remove deprecated features (xabbuh)
+ * feature #24441 [Bridge\Doctrine][FrameworkBundle] Remove legacy uses of ContainerAwareInterface (nicolas-grekas)
+ * feature #24388 [Security] Look at headers for switch_user username (chalasr)
+ * feature #24447 [Session] remove deprecated session handlers (Tobion)
+ * feature #24446 [Security] Remove GuardAuthenticatorInterface (chalasr)
+ * feature #23708 Added deprecation to cwd not existing Fixes #18249 (alexbowers)
+ * feature #24443 [Session] deprecate MemcacheSessionHandler (Tobion)
+ * feature #24409 [Bridge\Doctrine][FrameworkBundle] Deprecate some remaining uses of ContainerAwareTrait (nicolas-grekas)
+ * feature #24438 [Session][VarDumper] Deprecate accepting legacy mongo extension (Tobion)
+ * feature #24389 [DoctrineBridge] Deprecate dbal session handler (Tobion)
+ * feature #16835 [Security] Add Guard authenticator  method (Amo, chalasr)
+ * feature #24289 [FrameworkBundle][HttpKernel] Reset profiler (derrabus)
+ * feature #24144 [FrameworkBundle] Expose dotenv in bin/console about (ro0NL)
+ * feature #24403 [FrameworkBundle][Routing] Show welcome message if no routes are configured (yceruto)
+ * feature #24398 [DI] Remove AutowireExceptionPass (ogizanagi)
+ * feature #22679 [Form] Add tel and color types (apetitpa)
+ * feature #23845 [Validator] Add unique entity violation cause (Ilya Vertakov)
+ * feature #22132 [Lock] Automaticaly release lock when user forget it (jderusse)
+ * feature #21751 Bootstrap4 support for Twig form theme (hiddewie, javiereguiluz)
+ * feature #24383 [FrameworkBundle] Don't clear app pools on cache:clear (nicolas-grekas)
+ * feature #24148 [Form] Hide label button when its setted to false (TeLiXj)
+ * feature #24380 [SecurityBundle] Remove auto picking the first provider (ogizanagi)
+ * feature #24378 [SecurityBundle] Deprecate auto picking the first provider (ogizanagi)
+ * feature #24260 [Security] Add impersonation support for stateless authentication (chalasr)
+ * feature #24300 [HttpKernel][FrameworkBundle] Add a minimalist default PSR-3 logger (dunglas)
+ * feature #21604 [Security] Argon2i Password Encoder (zanbaldwin)
+ * feature #24372 [DowCrawler] Default to UTF-8 when possible (nicolas-grekas)
+ * feature #24264 [TwigBundle] Improve the overriding of bundle templates (yceruto)
+ * feature #24197 [Translation] 	Moved PhpExtractor and PhpStringTokenParser to Translation component (Nyholm)
+ * feature #24362 [HttpKernel] Deprecate some compiler passes in favor of tagged iterator args (nicolas-grekas)
+ * feature #21027 [Asset] Provide default context (ro0NL)
+ * feature #22200 [DI] Reference tagged services in config (ro0NL)
+ * feature #24337 Adding a shortcuts for the main security functionality (weaverryan, javiereguiluz)
+ * feature #24358 [TwigBundle] register an identity translator as fallback (xabbuh)
+ * feature #24357 [Yaml] include file and line no in deprecation message (xabbuh)
+ * feature #24330 [FrameworkBundle] register class metadata factory alias (xabbuh)
+ * feature #24348 [SecurityBundle] Remove remaining ACL stuff from SecurityBundle (ogizanagi)
+ * feature #24349 [SecurityBundle] Add missing AclSchemaListener deprecation (ogizanagi)
+ * feature #24202 [Filesystem] deprecate relative paths in makePathRelative() (xabbuh)
+ * feature #21716 [Serializer] Add Support for `object_to_populate` in CustomNormalizer (chrisguitarguy)
+ * feature #21960 Remove Validator\TypeTestCase and add validator logic to base TypeTestCase (pierredup)
+ * feature #24338 [HttpFoundation] Removed compatibility layer for PHP <5.4 sessions (afurculita)
+ * feature #22113 [Lock] Include lock component in framework bundle (jderusse)
+ * feature #24236 [WebProfilerBundle] Render file links for twig templates (ro0NL)
+ * feature #21239 [Serializer] throw more specific exceptions (xabbuh)
+ * feature #24341 [SecurityBundle] Remove ACL related code (chalasr)
+ * feature #24256 CsvEncoder handling variable structures and custom header order (Oliver Hoff)
+ * feature #23471 [Finder] Add a method to check if any results were found (duncan3dc)
+ * feature #23149 [PhpUnitBridge] Added a CoverageListener to enhance the code coverage report (lyrixx)
+ * feature #24161 [HttpKernel] Remove bundle inheritance (fabpot)
+ * feature #24318 [SecurityBundle] Deprecate ACL related code (chalasr)
+ * feature #24335 [Security][SecurityBundle] Deprecate the HTTP digest auth (ogizanagi)
+ * feature #21951 [Security][Firewall] Passing the newly generated security token to the event during user switching (klandaika)
+ * feature #23485 [Config] extracted the xml parsing from XmlUtils::loadFile into XmlUtils::parse (Basster)
+ * feature #22890 [HttpKernel] Add ability to configure catching exceptions for Client (kbond)
+ * feature #24239 [HttpFoundation] Deprecate compatibility with PHP <5.4 sessions (afurculita)
+ * feature #23882 [Security] Deprecated not being logged out after user change (iltar)
+ * feature #24200 Added an alias for FlashBagInterface in config (tifabien)
+ * feature #24295 [DI][DX] Throw exception on some ContainerBuilder methods used from extensions (ogizanagi)
+ * feature #24253 [Yaml] support parsing files (xabbuh)
+ * feature #24290 Adding Definition::addError() and a compiler pass to throw errors as exceptions (weaverryan)
+ * feature #24301 [DI] Add AutowireRequiredMethodsPass to fix bindings for `@required` methods (nicolas-grekas)
+ * feature #24226 [Cache] Add ResettableInterface to allow resetting any pool's local state (nicolas-grekas)
+ * feature #24303 [FrameworkBundle] allow forms without translations and validator (xabbuh)
+ * feature #24291 [SecurityBundle] Reset the authentication token between requests (derrabus)
+ * feature #24280 [VarDumper] Make `dump()` a little bit more easier to use (freekmurze)
+ * feature #24277 [Serializer] Getter for extra attributes in ExtraAttributesException (mdeboer)
+ * feature #24257 [HttpKernel][DI] Enable Kernel to implement CompilerPassInterface (nicolas-grekas)
+ * feature #23834 [DI] Add "PHP fluent format" for configuring the container (nicolas-grekas)
+ * feature #24180 [Routing] Add PHP fluent DSL for configuring routes (nicolas-grekas)
+ * feature #24232 [Bridge\Doctrine] Add "DoctrineType::reset()" method (nicolas-grekas)
+ * feature #24238 [DI] Turn services and aliases private by default, with BC layer (nicolas-grekas)
+ * feature #24242 [Form] Remove deprecated ChoiceLoaderInterface implementation in TimezoneType (ogizanagi)
+ * feature #23648 [Form] Add input  + regions options to TimezoneType (ro0NL)
+ * feature #24185 [Form] Display general forms information on debug:form (yceruto)
+ * feature #23747 [Serializer][FrameworkBundle] Add a DateInterval normalizer (Lctrs)
+ * feature #24193 [FrameworkBundle] Reset stopwatch between requests (derrabus)
+ * feature #24160 [HttpKernel] Deprecate bundle inheritance (fabpot)
+ * feature #24159 Remove the profiler.matcher configuration (fabpot)
+ * feature #24155 [FrameworkBundle][HttpKernel] Add DI tag for resettable services (derrabus)
+ * feature #23625 Feature #23583  Add current and fallback locales in WDT / Profiler (nemoneph)
+ * feature #24179 [TwigBundle] Add default templates directory and option to configure it (yceruto)
+ * feature #24176 [Translation] drop MessageSelector support in the Translator (xabbuh)
+ * feature #24104 Make as many services private as possible (nicolas-grekas)
+ * feature #18314 [Translation] added support for adding custom message formatter (aitboudad)
+ * feature #24158 deprecated profiler.matcher configuration (fabpot)
+ * feature #23728 [WebProfilerBundle] Removed the deprecated web_profiler.position option (javiereguiluz)
+ * feature #24131 [Console] Do not display short exception trace for common console exceptions (yceruto)
+ * feature #24080 Deprecated the web_profiler.position option (javiereguiluz)
+ * feature #24114 [SecurityBundle] Throw a meaningful exception when an undefined user provider is used inside a firewall (chalasr)
+ * feature #24122 [DI] rename ResolveDefinitionTemplatesPass to ResolveChildDefinitionsPass (nicolas-grekas)
+ * feature #23901 [DI] Allow processing env vars (nicolas-grekas)
+ * feature #24093 [FrameworkBundle] be able to enable workflow support explicitly (xabbuh)
+ * feature #24064 [TwigBridge] Show Twig's loader paths on debug:twig command (yceruto)
+ * feature #23978 [Cache] Use options from Memcached DSN (Bukashk0zzz)
+ * feature #24067 [HttpKernel] Dont register env parameter resource (ro0NL)
+ * feature #24075 Implemented PruneableInterface on TagAwareAdapter (Toflar)
+ * feature #23262 Add scalar typehints/return types (chalasr, xabbuh)
+ * feature #21414 [Console] Display file and line on Exception (arno14)
+ * feature #24068 [HttpKernel] Deprecate EnvParametersResource (ro0NL)
+ * feature #22542 [Lock] Check TTL expiration in lock acquisition (jderusse)
+ * feature #24031 [Routing] Add the possibility to define a prefix for all routes of a controller (fabpot)
+ * feature #24052 [DI] Remove case insensitive parameter names (ro0NL)
+ * feature #23967 [VarDumper] add force-collapse/expand + use it for traces (nicolas-grekas)
+ * feature #24033 [DI] Add ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE (nicolas-grekas)
+ * feature #24026 [Security] add impersonator_user to "User was reloaded" log message (gharlan)
+ * feature #24014 [Translator] Remove deprecated feature (maidmaid)
+ * feature #23603 [Cache] Add (pdo|chain) cache (adapter|simple) prune method (robfrawley)
+ * feature #23694 [Form] Add debug:form command (yceruto)
+ * feature #24028 [Yaml] mark some classes as final (xabbuh)
+ * feature #22543 [Lock] Expose an expiringDate and isExpired method in Lock (jderusse)
+ * feature #23667 [Translation] Create an TranslationReaderInterface and move TranslationLoader to TranslationComponent (Nyholm)
+ * feature #24024 [config] Add ability to deprecate a node (sanpii)
+ * feature #23668 [VarDumper] Add period caster (maidmaid)
+ * feature #23991 [DI] Improve psr4-based service discovery (alternative implementation) (kbond)
+ * feature #22382 [config] Add abbitily to deprecate a node (Nyholm, fabpot, sanpii)
+ * feature #23947 [Translation] Adding the ability do load  in xliff2.0 (Nyholm)
+ * feature #23887 [Console] Allow commands to provide a default name for compile time registration (chalasr, nicolas-grekas)
+ * feature #23874 [DI] Case sensitive parameter names (ro0NL)
+ * feature #23936 Remove some sf2 references (fabpot)
+ * feature #23680 [Webprofiler] Added blocks that allows extension of the profiler page. (Nyholm)
+ * feature #23665 Create an interface for TranslationWriter (Nyholm)
+ * feature #23890 [Translation] Adding the ability do dump  in xliff2.0 (Nyholm)
+ * feature #23862 [SecurityBundle] resolve class name parameter inside AddSecurityVotersPass (pjarmalavicius)
+ * feature #23915 [DI] Allow get available services from service locator (Koc)
+ * feature #23792 [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup (nicolas-grekas)
+ * feature #23227 Add support for "controller" keyword for configuring routes controllers (voronkovich)
+ * feature #23815 [FrameworkBundle][SecurityBundle][TwigBundle][Yaml] remove deprecated code (xabbuh)
+ * feature #23857 [HttpKernel] Remove convention based commands registration (chalasr)
+ * feature #23869 [Console] Made console command shortcuts case insensitive (thanosp)
+ * feature #23855 [DI] Allow dumping inline services in Yaml (nicolas-grekas)
+ * feature #23836 [FrameworkBundle] Catch Fatal errors in commands registration (chalasr)
+ * feature #23805 [HttpKernel] Deprecated commands auto-registration (GuilhemN)
+ * feature #23816 [Debug] Detect internal and deprecated methods (GuilhemN)
+ * feature #23812 [FrameworkBundle] Allow micro kernel to subscribe events easily (ogizanagi)
+ * feature #22187 [DependencyInjection] Support local binding (GuilhemN)
+ * feature #23741 [DI] Generate one file per service factory (nicolas-grekas)
+ * feature #23807 [Debug] Trigger a deprecation when using an internal class/trait/interface (GuilhemN)
+ * feature #22587 [Workflow] Add transition completed event (izzyp)
+ * feature #23624 [FrameworkBundle] Commands as a service (ro0NL)
+ * feature #21111 [Validator] add groups support to the Valid constraint (xabbuh)
+ * feature #20361 [Config] Enable cannotBeEmpty along with requiresAtLeastOneElement (ro0NL)
+ * feature #23790 [Yaml] remove legacy php/const and php/object tag support (xabbuh)
+ * feature #23754 [Lock] Remove Filesystem\LockHandler (jderusse)
+ * feature #23712 [DependencyInjection] Deprecate autowiring service auto-registration (GuilhemN)
+ * feature #23719 Autoconfigure instances of ArgumentValueResolverInterface (BPScott)
+ * feature #23706 [Webprofiler] Improve sql explain table display (mimol91)
+ * feature #23709 [VarDumper] Make dump() variadic (chalasr)
+ * feature #23724 [Lock] Deprecate Filesystem/LockHandler (jderusse)
+ * feature #23593 [Workflow] Adding workflow name to the announce event (Nyholm)
+ * feature #20496 [Form] Allow pass filter callback to delete_empty option. (Koc)
+ * feature #23451 [Cache] Add (filesystem|phpfiles) cache (adapter|simple) prune method and prune command (robfrawley)
+ * feature #23519 [TwigBundle] Commands as a service (ro0NL)
+ * feature #23591 [VarDumper] Add time zone caster (maidmaid)
+ * feature #23614 [VarDumper] Remove low PHP version and hhvm compat in interval caster (maidmaid)
+ * feature #22317 [Console] Make SymfonyQuestionHelper::ask optional by default (ro0NL)
+ * feature #23510 [Console] Add a factory command loader for standalone application with lazy-loading needs (ogizanagi)
+ * feature #23357 [VarDumper] Add interval caster (maidmaid)
+ * feature #23550 [DebugBundle] Added min_depth to Configuration (james-johnston-thumbtack)
+ * feature #23561 [DI] Optimize use of private and pre-defined services (nicolas-grekas)
+ * feature #23569 Remove last legacy codes (nicolas-grekas)
+ * feature #23570 [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface (nicolas-grekas)
+ * feature #22783 [TwigBridge] remove deprecated features (xabbuh)
+ * feature #23437 [TwigBridge] deprecate TwigRenderer (Tobion)
+ * feature #22801 [DI] Removed deprecated setting private/pre-defined services (ro0NL)
+ * feature #23515 [VarDumper] Added setMinDepth to VarCloner (james-johnston-thumbtack)
+ * feature #23484 [DI] Remove remaining deprecated features (nicolas-grekas)
+ * feature #23404 [Serializer] AbstractObjectNormalizer: Allow to disable type enforcement (ogizanagi)
+ * feature #23380 [Process] Remove enhanced sigchild compatibility (maidmaid)
+ * feature #21086 [MonologBridge] Add TokenProcessor (maidmaid)
+ * feature #22576 [Validator] Allow to use a property path to get value to compare in comparison constraints (ogizanagi)
+ * feature #22689 [DoctrineBridge] Add support for doctrin/dbal v2.6 types (jvasseur)
+ * feature #22734 [Console] Add support for command lazy-loading (chalasr)
+ * feature #19034 [Security] make it possible to configure a custom access decision manager service (xabbuh)
+ * feature #23037 [TwigBundle] Added a RuntimeExtensionInterface to take advantage of autoconfigure (lyrixx)
+ * feature #22811 [DI] Remove deprecated case insensitive service ids (ro0NL)
+ * feature #22176 [DI] Allow imports in string format for YAML (ro0NL)
+ * feature #23295 [Security] Lazy load user providers (chalasr)
+ * feature #23440 [Routing] Add matched and default parameters to redirect responses (artursvonda, Tobion)
+ * feature #22804 [Debug] Removed ContextErrorException (mbabker)
+ * feature #22762 [Yaml] Support tagged scalars (GuilhemN)
+ * feature #22832 [Debug] Deprecate support for stacked errors (mbabker)
+ * feature #21469 [HttpFoundation] Find the original request protocol version (thewilkybarkid)
+ * feature #23431 [Validator] Add min/max amount of pixels to Image constraint (akeeman)
+ * feature #23223 Add support for microseconds in Stopwatch (javiereguiluz)
+ * feature #22341 [BrowserKit] Emulate back/forward browser navigation (e-moe)
+ * feature #22619 [FrameworkBundle][Translation] Move translation compiler pass (lepiaf)
+ * feature #22620 [FrameworkBundle][HttpKernel] Move httpkernel pass (lepiaf)
+ * feature #23402 [Ldap] Remove the RenameEntryInterface interface (maidmaid)
+ * feature #23337 [Component][Serializer][Normalizer] : Deal it with Has Method for the Normalizer/Denormalizer (jordscream)
+ * feature #23391 [Validator] Remove support of boolean value for the checkDNS option (maidmaid)
+ * feature #23376 [Process] Remove enhanced Windows compatibility (maidmaid)
+ * feature #22588 [VarDumper] Add filter in VarDumperTestTrait (maidmaid)
+ * feature #23288 [Yaml] deprecate the !str tag (xabbuh)
+ * feature #23039 [Validator] Support for parsing PHP constants in yaml loader (mimol91)
+ * feature #22431 [VarDumper] Add date caster (maidmaid)
+ * feature #23285 [Stopwatch] Add a reset method (jmgq)
+ * feature #23320 [WebServer] Allow * to bind all interfaces (as INADDR_ANY) (jpauli, fabpot)
+ * feature #23272 [FrameworkBundle] disable unusable fragment renderers (xabbuh)
+ * feature #23332 [Yaml] fix the displayed line number (fabpot, xabbuh)
+ * feature #23324 [Security] remove support for defining voters that don't implement VoterInterface. (hhamon)
+ * feature #23294 [Yaml][Lint] Add line numbers to JSON output. (WybrenKoelmans)
+ * feature #22836 [Process] remove deprecated features (xabbuh)
+ * feature #23286 [Yaml] remove deprecated unspecific tag behavior (xabbuh)
+ * feature #23026 [SecurityBundle] Add user impersonation info and exit action to the profiler (yceruto)
+ * feature #22863 [HttpFoundation] remove deprecated features (xabbuh)
+ * feature #22932 [HttpFoundation] Adds support for the immutable directive in the cache-control header (twoleds)
+ * feature #22554 [Profiler][Validator] Add a validator panel in profiler (ogizanagi)
+ * feature #22124 Shift responsibility for keeping Date header to ResponseHeaderBag (mpdude)
+ * feature #23122 Xml encoder optional type cast (ragboyjr)
+ * feature #23207 [FrameworkBundle] Allow .yaml file extension everywhere (ogizanagi)
+ * feature #23076 [Validator] Adds support to check specific DNS record type for URL (iisisrael)
+ * feature #22629 [Security] Trigger a deprecation when a voter is missing the VoterInterface (iltar)
+ * feature #22636 [Routing] Expose request in route conditions, if needed and possible (ro0NL)
+ * feature #22909 [Yaml] Deprecate using the non-specific tag (GuilhemN)
+ * feature #23184 [HttpFoundation] Remove obsolete ini settings for sessions (fabpot)
+ * feature #23042 Consistent error handling in remember me services (lstrojny)
+ * feature #22444 [Serializer] DateTimeNormalizer: allow to provide timezone (ogizanagi)
+ * feature #23143 [DI] Reference instead of inline for array-params (nicolas-grekas)
+ * feature #23154 [WebProfilerBundle] Sticky ajax window (ro0NL)
+ * feature #23161 [FrameworkBundle] Deprecate useless --no-prefix option (chalasr)
+ * feature #23169 [FrameworkBundle] Remove KernelTestCase deprecated code (ogizanagi)
+ * feature #23105 [SecurityBundle][Profiler] Give info about called security listeners in profiler (chalasr)
+ * feature #23148 [FrameworkBundle] drop hard dependency on the Stopwatch component (xabbuh)
+ * feature #23131 [FrameworkBundle] Remove dependency on Doctrine cache (fabpot)
+ * feature #23114 [SecurityBundle] Lazy load security listeners (chalasr)
+ * feature #23111 [Process] Deprecate ProcessBuilder (nicolas-grekas)
+ * feature #22675 [FrameworkBundle] KernelTestCase: deprecate not using KERNEL_CLASS (ogizanagi)
+ * feature #22917 [VarDumper] Cycle prev/next searching in HTML dumps (ro0NL)
+ * feature #23044 Automatically enable the routing annotation loader (GuilhemN)
+ * feature #22696 [PropertyInfo] Made ReflectionExtractor's prefix lists instance variables (neemzy)
+ * feature #23056 [WebProfilerBundle] Remove WebProfilerExtension::dumpValue() (ogizanagi)
+ * feature #23035  Deprecate passing a concrete service in optional cache warmers (romainneutron)
+ * feature #23036  Implement ServiceSubscriberInterface in optional cache warmers (romainneutron)
+ * feature #23046 [Form] Missing deprecated paths removal (ogizanagi)
+ * feature #23022 [Di] Remove closure-proxy arguments (nicolas-grekas)
+ * feature #22758 Remove HHVM support (fabpot)
+ * feature #22743 [Serializer] Remove support for deprecated signatures (dunglas)
+ * feature #22907 [Serializer] remove remaining deprecated features (xabbuh)
+ * feature #22886 [HttpKernel] remove deprecated features (xabbuh)
+ * feature #22906 [Console] remove remaining deprecated features (xabbuh)
+ * feature #22879 [Translation] remove deprecated features (xabbuh)
+ * feature #22880 [Routing] remove deprecated features (xabbuh)
+ * feature #22903 [DI] Deprecate XML services without ID (ro0NL)
+ * feature #22770 [Yaml] remove deprecated features (xabbuh)
+ * feature #22785 [ProxyManagerBridge] remove deprecated features (xabbuh)
+ * feature #22800 [FrameworkBundle] Remove deprecated code (ogizanagi)
+ * feature #22597 [Lock] Re-add the Lock component in 3.4 (jderusse)
+ * feature #22860 [Form] remove deprecated features (xabbuh)
+ * feature #22803 [DI] Deprecate Container::initialized() for privates (ro0NL)
+ * feature #22773 [DependencyInjection] remove deprecated autowiring_types feature (hhamon)
+ * feature #22809 [DI] Remove deprecated generating a dumped container without populating the method map (ro0NL)
+ * feature #22764 [DI] Remove deprecated dumping an uncompiled container (ro0NL)
+ * feature #22820 Remove PHP < 7.1.3 code (ogizanagi)
+ * feature #22763 [DI] Remove deprecated isFrozen() (ro0NL)
+ * feature #22837 [VarDumper] remove deprecated features (xabbuh)
+ * feature #22777 [Console] Remove deprecated console.exception event (mbabker)
+ * feature #22792 [PhpUnitBridge] remove deprecated features (xabbuh)
+ * feature #22821 [Security] remove deprecated features (xabbuh)
+ * feature #22750 [DependencyInjection] remove deprecated code in YamlFileLoader class (hhamon)
+ * feature #22828 [Finder] Deprecate FilterIterator (ogizanagi)
+ * feature #22791 [MonologBridge] remove deprecated features (xabbuh)
+ * feature #22740 [SecurityBundle][Security][Finder] Remove deprecated code paths (ogizanagi)
+ * feature #22823 [PropertyAccess] remove deprecated features (xabbuh)
+ * feature #22826 [Validator] improve strict option value deprecation (xabbuh)
+ * feature #22799 [Console] Remove deprecated features (chalasr)
+ * feature #22786 [ClassLoader][HttpKernel] Remove ClassLoader component & Kernel::loadClassCache (ogizanagi, xabbuh)
+ * feature #22795 [Validator] remove deprecated features (xabbuh)
+ * feature #22784 [DoctrineBridge] remove deprecated features (xabbuh)
+ * feature #22749 Remove deprecated container injections and compiler passes (chalasr)
+ * feature #22796 [EventDispatcher] remove deprecated features (xabbuh)
+ * feature #22797 [Ldap] remove deprecated features (xabbuh)
+ * feature #22794 [ExpressionLanguage] remove deprecated features (xabbuh)
+ * feature #22779 [BC Break] Removed BC layers for ControllerResolver::getArguments() (iltar)
+ * feature #22782 [Debug][VarDumper] Remove the symfony_debug C extension (nicolas-grekas)
+ * feature #22771 [Workflow] Removed deprecated features (lyrixx)
+ * feature #22741 [Serializer] Remove deprecated DoctrineCache support (dunglas)
+ * feature #22733 Bump minimum version to PHP 7.1 for Symfony 4 (fabpot, dunglas, nicolas-grekas)
+

From 748338874c01674ed3522c709f8ce518708f91bd Mon Sep 17 00:00:00 2001
From: Fabien Potencier 
Date: Wed, 18 Oct 2017 18:36:38 -0700
Subject: [PATCH 1099/1099] updated VERSION for 4.0.0-BETA1

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 743c7586ffd9f..26facc144de1c 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,12 +61,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $projectDir;
     private $warmupDir;
 
-    const VERSION = '4.0.0-DEV';
+    const VERSION = '4.0.0-BETA1';
     const VERSION_ID = 40000;
     const MAJOR_VERSION = 4;
     const MINOR_VERSION = 0;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = 'BETA1';
 
     const END_OF_MAINTENANCE = '07/2018';
     const END_OF_LIFE = '01/2019';

Configuration

Listeners

Validator calls

@@ -24,6 +25,7 @@

+ + {{ exception.class|split('\\')|slice(0, -1)|join('\\') }} + {{- exception.class|split('\\')|length > 1 ? '\\' }} + + {{ exception.class|split('\\')|last }} - {{ include('@Twig/images/icon-minus-square-o.svg') }} - {{ include('@Twig/images/icon-plus-square-o.svg') }} -

@@ -13,9 +13,9 @@

{{- exception.message|nl2br|format_file_from_text -}}

+ {{ helper.set_handler(collector.controller) }} +

Request

- {{- child.getcollector('request').identifier -}} + {{ helper.set_handler(child.getcollector('request').controller) }} (token = {{ child.token }})

Translation Messages

Translation Locales

Translation Metrics

Logs {% if logger.counterrors ?? false %}{{ logger.counterrors }}{% endif %}

Welcome to Symfony

What's next?