Skip to content

Commit

Permalink
Merge branch '4.4' into 5.1
Browse files Browse the repository at this point in the history
* 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).
  • Loading branch information
xabbuh committed Sep 18, 2020
2 parents de00724 + 0dc22bd commit c976c11
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Caster/SplCaster.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool

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

return $a;
} catch (\Error $e) {
if ('Object not initialized' !== $e->getMessage()) {
throw $e;
}

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

return $a;
}
}
Expand Down

0 comments on commit c976c11

Please sign in to comment.