Skip to content

Commit 5efffe8

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 60bb70d + 96d3ed6 commit 5efffe8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
5555
*
5656
* @throws ParseException
5757
*/
58-
public static function parse(string $value = null, int $flags = 0, array &$references = []): mixed
58+
public static function parse(string $value, int $flags = 0, array &$references = []): mixed
5959
{
6060
self::initialize($flags);
6161

Tests/InlineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected function setUp(): void
2929
/**
3030
* @dataProvider getTestsForParse
3131
*/
32-
public function testParse($yaml, $value, $flags = 0)
32+
public function testParse(string $yaml, $value, $flags = 0)
3333
{
3434
$this->assertSame($value, Inline::parse($yaml, $flags), sprintf('::parse() converts an inline YAML to a PHP structure (%s)', $yaml));
3535
}

0 commit comments

Comments
 (0)