Skip to content

Commit c976c11

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: fix merge drop logger mock in favor of using the BufferingLogger catch ValueError thrown on PHP 8 [Yaml Parser] Fix edge cases when parsing multiple documents fix parsing comments not prefixed by a space [Translator] Make sure a null locale is handled properly deal with errors being thrown on PHP 8 [Cache] Allow cache tags to be objects implementing __toString() [HttpKernel] Do not override max_redirects option in HttpClientKernel remove superfluous cast [HttpClient] Support for CURLOPT_LOCALPORT. Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3). Fixed exception message formatting [FrameworkBundle] Fix error in xsd which prevent to register more than one metadata [Console] work around disabled putenv() [PhpUnitBridge] Fix error with ReflectionClass [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm Change 'cache_key' to AbstractRendererEngine::CACHE_KEY_VAR Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
2 parents de00724 + 0dc22bd commit c976c11

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Caster/SplCaster.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool
110110

111111
$a[$prefix.''] = 'The parent constructor was not called: the object is in an invalid state';
112112

113+
return $a;
114+
} catch (\Error $e) {
115+
if ('Object not initialized' !== $e->getMessage()) {
116+
throw $e;
117+
}
118+
119+
$a[$prefix.''] = 'The parent constructor was not called: the object is in an invalid state';
120+
113121
return $a;
114122
}
115123
}

0 commit comments

Comments
 (0)