Merge branch '6.4' into 7.0

* 6.4:
  fix typo
  remove the WriteConfig class
  DX: PHP CS Fixer - keep Annotation,NamedArgumentConstructor,Target annotations as single group
  do not install FrameworkBundle 6.4
  [Tests] Add `array` return type for provider methods
  [Tests] Move expectException closer to the place of the expectation to avoid false positives

Author: xabbuh

Tests/CssSelectorConverterTest.php

@@ -48,8 +48,7 @@ public function testParseExceptions()
     {
         $this->expectException(ParseException::class);
         $this->expectExceptionMessage('Expected identifier, but <eof at 3> found.');
-        $converter = new CssSelectorConverter();
-        $converter->toXPath('h1:');
+        (new CssSelectorConverter())->toXPath('h1:');
     }
 
     /** @dataProvider getCssToXPathWithoutPrefixTestData */
@@ -60,7 +59,7 @@ public function testCssToXPathWithoutPrefix($css, $xpath)
         $this->assertEquals($xpath, $converter->toXPath($css, ''), '->parse() parses an input string and returns a node');
     }
 
-    public static function getCssToXPathWithoutPrefixTestData()
+    public static function getCssToXPathWithoutPrefixTestData(): array
     {
         return [
             ['h1', 'h1'],

Tests/Parser/TokenStreamTest.php

@@ -54,10 +54,11 @@ public function testGetNextIdentifier()
 
     public function testFailToGetNextIdentifier()
     {
-        $this->expectException(SyntaxErrorException::class);
-
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
+
+        $this->expectException(SyntaxErrorException::class);
+
         $stream->getNextIdentifier();
     }
 
@@ -74,10 +75,11 @@ public function testGetNextIdentifierOrStar()
 
     public function testFailToGetNextIdentifierOrStar()
     {
-        $this->expectException(SyntaxErrorException::class);
-
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
+
+        $this->expectException(SyntaxErrorException::class);
+
         $stream->getNextIdentifierOrStar();
     }
 

Tests/XPath/TranslatorTest.php

@@ -38,56 +38,68 @@ public function testCssToXPath($css, $xpath)
 
     public function testCssToXPathPseudoElement()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->cssToXPath('e::first-line');
     }
 
     public function testGetExtensionNotExistsExtension()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->getExtension('fake');
     }
 
     public function testAddCombinationNotExistsExtension()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $parser = new Parser();
         $xpath = $parser->parse('*')[0];
         $combinedXpath = $parser->parse('*')[0];
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->addCombination('fake', $xpath, $combinedXpath);
     }
 
     public function testAddFunctionNotExistsFunction()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();
         $function = new FunctionNode(new ElementNode(), 'fake');
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->addFunction($xpath, $function);
     }
 
     public function testAddPseudoClassNotExistsClass()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->addPseudoClass($xpath, 'fake');
     }
 
     public function testAddAttributeMatchingClassNotExistsClass()
     {
-        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();
+
+        $this->expectException(ExpressionErrorException::class);
+
         $translator->addAttributeMatching($xpath, '', '', '');
     }