Merge branch '3.4' into 4.3

* 3.4:
  Adopt `@PHPUnit55Migration:risky` rule of php-cs-fixer

Author: nicolas-grekas

Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php

@@ -55,13 +55,15 @@ public function testThrowsConstraintExceptionIfPropertyPath()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "propertyPath" option of the "Symfony\Component\Validator\Constraints\PositiveOrZero" constraint cannot be set.');
+
         return new PositiveOrZero(['propertyPath' => 'field']);
     }
 
     public function testThrowsConstraintExceptionIfValue()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "value" option of the "Symfony\Component\Validator\Constraints\PositiveOrZero" constraint cannot be set.');
+
         return new PositiveOrZero(['value' => 0]);
     }
 

Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php

@@ -53,13 +53,15 @@ public function testThrowsConstraintExceptionIfPropertyPath()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "propertyPath" option of the "Symfony\Component\Validator\Constraints\Positive" constraint cannot be set.');
+
         return new Positive(['propertyPath' => 'field']);
     }
 
     public function testThrowsConstraintExceptionIfValue()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "value" option of the "Symfony\Component\Validator\Constraints\Positive" constraint cannot be set.');
+
         return new Positive(['value' => 0]);
     }
 

Tests/Constraints/LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest.php

@@ -53,13 +53,15 @@ public function testThrowsConstraintExceptionIfPropertyPath()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "propertyPath" option of the "Symfony\Component\Validator\Constraints\NegativeOrZero" constraint cannot be set.');
+
         return new NegativeOrZero(['propertyPath' => 'field']);
     }
 
     public function testThrowsConstraintExceptionIfValue()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "value" option of the "Symfony\Component\Validator\Constraints\NegativeOrZero" constraint cannot be set.');
+
         return new NegativeOrZero(['value' => 0]);
     }
 

Tests/Constraints/LessThanValidatorWithNegativeConstraintTest.php

@@ -53,13 +53,15 @@ public function testThrowsConstraintExceptionIfPropertyPath()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "propertyPath" option of the "Symfony\Component\Validator\Constraints\Negative" constraint cannot be set.');
+
         return new Negative(['propertyPath' => 'field']);
     }
 
     public function testThrowsConstraintExceptionIfValue()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
         $this->expectExceptionMessage('The "value" option of the "Symfony\Component\Validator\Constraints\Negative" constraint cannot be set.');
+
         return new Negative(['value' => 0]);
     }
 

Tests/Resources/TranslationFilesTest.php

@@ -20,11 +20,7 @@ class TranslationFilesTest extends TestCase
      */
     public function testTranslationFileIsValid($filePath)
     {
-        if (class_exists('PHPUnit_Util_XML')) {
-            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
-        } else {
-            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
-        }
+        \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
 
         $this->addToAssertionCount(1);
     }