Skip to content

Commit aa66b3d

Browse files
Merge branch '6.4' into 7.0
* 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()
2 parents 52c14b8 + 8e57d1d commit aa66b3d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ public function setBindings(array $bindings): static
781781
*
782782
* @return $this
783783
*/
784-
public function addError(string|\Closure|Definition $error): static
784+
public function addError(string|\Closure|self $error): static
785785
{
786786
if ($error instanceof self) {
787787
$this->errors = array_merge($this->errors, $error->errors);

0 commit comments

Comments
 (0)