Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [Process] remove fixing of legacy bug, when PTS functionality is enabled
  DX: re-apply self_accessor and phpdoc_types_order by PHP CS Fixer
  [HttpClient] Psr18Client: parse HTTP Reason Phrase for Response
  fix test
  Fix wrong yaml parse null test
  [AssetMapper] Fixing merge from multiple PR's
  Bump Symfony version to 5.4.31
  Update VERSION for 5.4.30
  Update CONTRIBUTORS for 5.4.30
  Update CHANGELOG for 5.4.30
  Fix wrong merge
  [AssetMapper] Allowing circular references in JavaScriptImportPathCompiler
  [AssetMapper] Fix file deleting errors & remove nullable MappedAsset on JS import
  [Lock] Fix mongodb extension requirement in tests
  [Yaml] Remove dead code
  [AssetMapper] Fix in-file imports to resolve via filesystem
  throw better exception in TranslatableNormalizer, add to changelog
  Passing null to Inline::parse is not allowed
  Fix passing null to trim()
  • Loading branch information
nicolas-grekas committed Oct 29, 2023
2 parents 4ab47b4 + cd23405 commit f87ee68
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Definition/Builder/NodeDefinition.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function attribute(string $key, mixed $value): static
/**
* Returns the parent node.
*
* @return NodeParentInterface|NodeBuilder|NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
* @return NodeParentInterface|NodeBuilder|self|ArrayNodeDefinition|VariableNodeDefinition
*/
public function end(): NodeParentInterface
{
Expand Down

0 comments on commit f87ee68

Please sign in to comment.