Merge branch '6.4' into 7.4

* 6.4:
  CS fix

Author: nicolas-grekas

Parser.php

@@ -122,7 +122,7 @@ public function parse(string $value, int $flags = 0): mixed
 
     private function getState(): ParserState
     {
-        return $this->state ?? $this->state = new ParserState();
+        return $this->state ??= new ParserState();
     }
 
     private function doParse(string $value, int $flags): mixed

Tests/ParserTest.php

@@ -3232,7 +3232,7 @@ public function testParseRejectsDocumentsThatExceedTheDefaultNestingDepth()
 
         $yaml = "root:\n";
         for ($i = 1; $i <= Parser::DEFAULT_MAX_NESTING_LEVEL + 1; ++$i) {
-            $yaml .= str_repeat('  ', $i).sprintf("level%d:\n", $i);
+            $yaml .= str_repeat('  ', $i).\sprintf("level%d:\n", $i);
         }
 
         $this->parser->parse($yaml);
@@ -3246,10 +3246,10 @@ public function testParseRejectsDocumentsThatExceedTheConfiguredCollectionAliasL
         $this->expectExceptionMessage('Maximum number of collection aliases');
 
         $yaml = <<<YAML
-a0: &a0 [foo]
-a1: &a1 [*a0, *a0, *a0]
-payload: [*a1, *a1, *a1]
-YAML;
+            a0: &a0 [foo]
+            a1: &a1 [*a0, *a0, *a0]
+            payload: [*a1, *a1, *a1]
+            YAML;
 
         $parser->parse($yaml);
     }
@@ -3262,11 +3262,11 @@ public function testParseCountsTaggedValueCollectionAliases()
         $this->expectExceptionMessage('Maximum number of collection aliases');
 
         $yaml = <<<YAML
-a: &a !my_tag [foo, bar]
-b: *a
-c: *a
-d: *a
-YAML;
+            a: &a !my_tag [foo, bar]
+            b: *a
+            c: *a
+            d: *a
+            YAML;
 
         $parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS);
     }
@@ -3276,12 +3276,12 @@ public function testParseAcceptsScalarAliasesWithoutCountingThem()
         $parser = new Parser(Parser::DEFAULT_MAX_NESTING_LEVEL, 1);
 
         $yaml = <<<YAML
-anchor: &val scalar_value
-a: *val
-b: *val
-c: *val
-d: *val
-YAML;
+            anchor: &val scalar_value
+            a: *val
+            b: *val
+            c: *val
+            d: *val
+            YAML;
 
         $result = $parser->parse($yaml);
 
@@ -3291,11 +3291,11 @@ public function testParseAcceptsScalarAliasesWithoutCountingThem()
 
     public function testParseAcceptsLargeCollectionAliasedOnce()
     {
-        $items = implode(', ', array_map(function ($i) { return "item$i"; }, range(1, 500)));
+        $items = implode(', ', array_map(static fn ($i) => "item$i", range(1, 500)));
         $yaml = <<<YAML
-defaults: &defaults [$items]
-a: *defaults
-YAML;
+            defaults: &defaults [$items]
+            a: *defaults
+            YAML;
 
         $result = $this->parser->parse($yaml);
 
@@ -3308,9 +3308,9 @@ public function testParseRejectsBlockAliasesWhenDisabled()
         $this->expectExceptionMessage('Aliases are disabled');
 
         $yaml = <<<YAML
-defaults: &defaults [foo, bar]
-a: *defaults
-YAML;
+            defaults: &defaults [foo, bar]
+            a: *defaults
+            YAML;
 
         $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_ALIAS);
     }
@@ -3321,16 +3321,16 @@ public function testParseRejectsInlineAliasesWhenDisabled()
         $this->expectExceptionMessage('Aliases are disabled');
 
         $yaml = <<<YAML
-defaults: &defaults [foo, bar]
-a: [*defaults]
-YAML;
+            defaults: &defaults [foo, bar]
+            a: [*defaults]
+            YAML;
 
         $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_ALIAS);
     }
 
     public function testParseHandlesLargeYamlHeaders()
     {
-        $yaml = "%YAML:".str_repeat('1', 100000)."\nfoo: bar\n";
+        $yaml = '%YAML:'.str_repeat('1', 100000)."\nfoo: bar\n";
 
         $this->assertSame(['foo' => 'bar'], $this->parser->parse($yaml));
     }

Tests/YamlTest.php

@@ -55,10 +55,10 @@ public function testParseFileAllowsConfiguringTheMaximumCollectionAliasCount()
         $file = tempnam(sys_get_temp_dir(), 'yaml_');
 
         file_put_contents($file, <<<YAML
-defaults: &defaults [foo, bar]
-copy: *defaults
-YAML
-);
+            defaults: &defaults [foo, bar]
+            copy: *defaults
+            YAML
+        );
 
         $this->expectException(ParseException::class);
         $this->expectExceptionMessage('Maximum number of collection aliases (0) exceeded.');