Skip to content

Commit 4ab47b4

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: (43 commits) [AssetMapper] Fix entrypoint scripts are not preloaded Fix typo in method resolvePackages Make FormPerformanceTestCase compatible with PHPUnit 10 Avoid calling getInvocationCount() [AssetMapper] Always downloading vendor files [Security] Fix resetting traceable listeners [HttpClient] Fix type error with http_version 1.1 [DependencyInjection] Add tests for `AutowireLocator`/`AutowireIterator` [DependencyInjection] Add `#[AutowireIterator]` attribute and improve `#[AutowireLocator]` Update documentation link Fix typo that causes unit test to fail Fix CS [AssetMapper] Add audit command [Mailer] Use idn encoded address otherwise Brevo throws an error [Messenger] Resend failed retries back to failure transport [FrameworkBundle] Fix call to invalid method in NotificationAssertionsTrait [Validator] Add missing italian translations [Notifier] Fix failing testcase Fix order array sum normalizedData and nestedData Add test for 0 and '0' in PeriodicalTrigger Fix '0' case error and remove duplicate code ...
2 parents 97c2fbf + 92d470e commit 4ab47b4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Definition/Builder/TreeBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
*/
2121
class TreeBuilder implements NodeParentInterface
2222
{
23-
protected NodeInterface $tree;
24-
protected NodeDefinition $root;
23+
protected ?NodeInterface $tree = null;
24+
protected ?NodeDefinition $root = null;
2525

2626
public function __construct(string $name, string $type = 'array', NodeBuilder $builder = null)
2727
{
@@ -50,7 +50,7 @@ public function buildTree(): NodeInterface
5050
public function setPathSeparator(string $separator): void
5151
{
5252
// unset last built as changing path separator changes all nodes
53-
unset($this->tree);
53+
$this->tree = null;
5454

5555
$this->root->setPathSeparator($separator);
5656
}

0 commit comments

Comments
 (0)