Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 22c434155df7 · 2019-08-01T11:21:10.000+02:00
* 3.4:
  Fix assertInternalType deprecation in phpunit 9
  Micro-typo fix
diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -1940,7 +1940,7 @@ public function testFilenamesAreParsedAsStringsWithoutFlag()
 
     public function testParseFile()
     {
-        $this->assertInternalType('array', $this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));
+        $this->assertIsArray($this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1940,7 +1940,7 @@ public function testFilenamesAreParsedAsStringsWithoutFlag()`
`1940`	`1940`
`1941`	`1941`	`public function testParseFile()`
`1942`	`1942`	`{`
`1943`		`- $this->assertInternalType('array', $this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));`
	`1943`	`+ $this->assertIsArray($this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));`
`1944`	`1944`	`}`
`1945`	`1945`
`1946`	`1946`	`/**`