10000 Merge branch '4.3' into 4.4 · symfony/symfony@e8975e2 · GitHub
[go: up one dir, main page]

Skip to content

Commit e8975e2

Browse files
Merge branch '4.3' into 4.4
* 4.3: [Serializer] add missing "internal" annotation [DI] Fix suspicious test [SecurityBundle] add missing contraint for symfony/config dep
2 parents 02a792a + 2b8e441 commit e8975e2

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/Symfony/Component/Config/Definition/Exception/TreeWithoutRootNodeException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
/**
1515
* @author Roland Franssen <franssen.roland@gmail.com>
16+
*
17+
* @internal
1618
*/
1719
class TreeWithoutRootNodeException extends \RuntimeException
1820
{

src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,15 @@ public function testEnvWithVariableNode(): void
278278

279279
/**
280280
* @group legacy
281+
* @expectedDeprecation A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.
281282
*/
282283
public function testConfigurationWithoutRootNode(): void
283284
{
284285
$container = new ContainerBuilder();
285286
$container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));
286-
$container->loadFromExtension('env_extension');
287+
$container->loadFromExtension('env_extension', ['foo' => 'bar']);
287288

288-
$this->doProcess($container);
289-
290-
$this->addToAssertionCount(1);
289+
(new ValidateEnvPlaceholdersPass())->process($container);
291290
}
292291

293292
public function testEmptyConfigFromMoreThanOneSource()
@@ -392,7 +391,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
392391
{
393392
public function getConfigTreeBuilder()
394393
{
395-
return new TreeBuilder('env_extension');
394+
return new TreeBuilder();
396395
}
397396
}
398397

src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,8 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str
561561
* {@inheritdoc}
562562
*
563563
* @param string|null $format
564+
*
565+
* @internal
564566
*/
565567
protected function createChildContext(array $parentContext, $attribute/*, ?string $format */)
566568
{

0 commit comments

Comments
 (0)
0