Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/Symfony/Component/OptionsResolver/OptionsResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ class OptionsResolver implements Options
*/
private array $nested = [];

/**
* BC layer. Remove in Symfony 8.0.
*
* @var array<string, true>
*/
private array $deprecatedNestedOptions = [];

/**
* The names of required options.
*/
Expand Down Expand Up @@ -222,23 +215,13 @@ public function setDefault(string $option, mixed $value): static
// Make sure the option is processed
unset($this->resolved[$option]);

// BC layer. Remove in Symfony 8.0.
if (isset($this->deprecatedNestedOptions[$option])) {
unset($this->nested[$option]);
}

return $this;
}
}

// This option is not lazy anymore
unset($this->lazy[$option]);

// BC layer. Remove in Symfony 8.0.
if (isset($this->deprecatedNestedOptions[$option])) {
unset($this->nested[$option]);
}

// Yet undefined options can be marked as resolved, because we only need
// to resolve options with lazy closures, normalizers or validation
// rules, none of which can exist for undefined options
Expand Down
Loading