Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit b9919c1e309f · 2017-02-21T09:33:48.000+01:00
* 2.7:
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes
diff --git a/Test/DeprecationErrorHandler.php b/Test/DeprecationErrorHandler.php
@@ -24,7 +24,11 @@ public static function handle($errorNumber, $message, $file, $line, $context)
             return true;
         }
 
-        return \PHPUnit_Util_ErrorHandler::handleError($errorNumber, $message, $file, $line);
+        if (class_exists('PHPUnit_Util_ErrorHandler')) {
+            return \PHPUnit_Util_ErrorHandler::handleError($errorNumber, $message, $file, $line);
+        }
+
+        return \PHPUnit\Util\ErrorHandler::handleError($errorNumber, $message, $file, $line);
     }
 
     public static function handleBC($errorNumber, $message, $file, $line, $context)
diff --git a/Tests/ButtonBuilderTest.php b/Tests/ButtonBuilderTest.php
@@ -53,7 +53,7 @@ public function getInvalidNames()
      */
     public function testInvalidNames($name)
     {
-        $this->setExpectedException(
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
             '\Symfony\Component\Form\Exception\InvalidArgumentException',
             'Buttons cannot have empty names.'
         );
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -190,7 +190,7 @@ public function testTransformWrapsIntlErrors()
 
         // HOW TO REPRODUCE?
 
-        //$this->setExpectedException('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
+        //$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
 
         //$transformer->transform(1.5);
     }
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
@@ -112,7 +112,7 @@ public function testTransformExpectsDateTime()
     {
         $transformer = new DateTimeToStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('1234');
     }
@@ -163,7 +163,7 @@ public function testReverseTransformExpectsString()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform(1234);
     }
@@ -172,7 +172,7 @@ public function testReverseTransformExpectsValidDateString()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-2010-2010');
     }
@@ -181,7 +181,7 @@ public function testReverseTransformWithNonExistingDate()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-04-31');
     }
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
@@ -74,7 +74,7 @@ public function testTransformExpectsDateTime()
     {
         $transformer = new DateTimeToTimestampTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('1234');
     }
@@ -111,7 +111,7 @@ public function testReverseTransformExpectsValidTimestamp()
     {
         $reverseTransformer = new DateTimeToTimestampTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-2010-2010');
     }
diff --git a/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -33,7 +33,7 @@ public function testTransformExpectsNumeric()
     {
         $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('abcd');
     }
@@ -61,7 +61,7 @@ public function testReverseTransformExpectsString()
     {
         $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->reverseTransform(12345);
     }
diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -106,7 +106,7 @@ public function testTransformExpectsNumeric()
     {
         $transformer = new PercentToLocalizedStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('foo');
     }
@@ -115,7 +115,7 @@ public function testReverseTransformExpectsString()
     {
         $transformer = new PercentToLocalizedStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->reverseTransform(1);
     }
diff --git a/Tests/Extension/Core/Type/CollectionTypeTest.php b/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -70,7 +70,7 @@ public function testThrowsExceptionIfObjectIsNotTraversable()
         $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\CollectionType', null, array(
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
         ));
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $form->setData(new \stdClass());
     }
 
diff --git a/Tests/FormBuilderTest.php b/Tests/FormBuilderTest.php
@@ -49,13 +49,13 @@ public function testNoSetName()
 
     public function testAddNameNoStringAndNoInteger()
     {
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $this->builder->add(true);
     }
 
     public function testAddTypeNoString()
     {
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $this->builder->add('foo', 1234);
     }
 
@@ -165,7 +165,13 @@ public function testAddButton()
 
     public function testGetUnknown()
     {
-        $this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
+            $this->expectExceptionMessage('The child with the name "foo" does not exist.');
+        } else {
+            $this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');
+        }
+
         $this->builder->get('foo');
     }
 
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
      */
     public function testTranslationFileIsValid($filePath)
     {
-        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        if (class_exists('PHPUnit_Util_XML')) {
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        } else {
+            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+        }
     }
 
     public function provideTranslationFiles()

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,11 @@ public static function handle($errorNumber, $message, $file, $line, $context)`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`	`26`
`27`		`- return \PHPUnit_Util_ErrorHandler::handleError($errorNumber, $message, $file, $line);`
	`27`	`+ if (class_exists('PHPUnit_Util_ErrorHandler')) {`
	`28`	`+ return \PHPUnit_Util_ErrorHandler::handleError($errorNumber, $message, $file, $line);`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ return \PHPUnit\Util\ErrorHandler::handleError($errorNumber, $message, $file, $line);`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`public static function handleBC($errorNumber, $message, $file, $line, $context)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function getInvalidNames()`
`53`	`53`	`*/`
`54`	`54`	`public function testInvalidNames($name)`
`55`	`55`	`{`
`56`		`- $this->setExpectedException(`
	`56`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(`
`57`	`57`	`'\Symfony\Component\Form\Exception\InvalidArgumentException',`
`58`	`58`	`'Buttons cannot have empty names.'`
`59`	`59`	`);`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public function testTransformWrapsIntlErrors()`
`190`	`190`
`191`	`191`	`// HOW TO REPRODUCE?`
`192`	`192`
`193`		`- //$this->setExpectedException('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');`
	`193`	`+ //$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');`
`194`	`194`
`195`	`195`	`//$transformer->transform(1.5);`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function testTransformExpectsDateTime()`
`112`	`112`	`{`
`113`	`113`	`$transformer = new DateTimeToStringTransformer();`
`114`	`114`
`115`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`115`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`116`	`116`
`117`	`117`	`$transformer->transform('1234');`
`118`	`118`	`}`
`@@ -163,7 +163,7 @@ public function testReverseTransformExpectsString()`
`163`	`163`	`{`
`164`	`164`	`$reverseTransformer = new DateTimeToStringTransformer();`
`165`	`165`
`166`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`166`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`167`	`167`
`168`	`168`	`$reverseTransformer->reverseTransform(1234);`
`169`	`169`	`}`
`@@ -172,7 +172,7 @@ public function testReverseTransformExpectsValidDateString()`
`172`	`172`	`{`
`173`	`173`	`$reverseTransformer = new DateTimeToStringTransformer();`
`174`	`174`
`175`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`175`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`176`	`176`
`177`	`177`	`$reverseTransformer->reverseTransform('2010-2010-2010');`
`178`	`178`	`}`
`@@ -181,7 +181,7 @@ public function testReverseTransformWithNonExistingDate()`
`181`	`181`	`{`
`182`	`182`	`$reverseTransformer = new DateTimeToStringTransformer();`
`183`	`183`
`184`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`184`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`185`	`185`
`186`	`186`	`$reverseTransformer->reverseTransform('2010-04-31');`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function testTransformExpectsDateTime()`
`74`	`74`	`{`
`75`	`75`	`$transformer = new DateTimeToTimestampTransformer();`
`76`	`76`
`77`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`77`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`78`	`78`
`79`	`79`	`$transformer->transform('1234');`
`80`	`80`	`}`
`@@ -111,7 +111,7 @@ public function testReverseTransformExpectsValidTimestamp()`
`111`	`111`	`{`
`112`	`112`	`$reverseTransformer = new DateTimeToTimestampTransformer();`
`113`	`113`
`114`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`114`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`115`	`115`
`116`	`116`	`$reverseTransformer->reverseTransform('2010-2010-2010');`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testTransformExpectsNumeric()`
`33`	`33`	`{`
`34`	`34`	`$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);`
`35`	`35`
`36`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`36`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`37`	`37`
`38`	`38`	`$transformer->transform('abcd');`
`39`	`39`	`}`
`@@ -61,7 +61,7 @@ public function testReverseTransformExpectsString()`
`61`	`61`	`{`
`62`	`62`	`$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);`
`63`	`63`
`64`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`64`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`65`	`65`
`66`	`66`	`$transformer->reverseTransform(12345);`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function testTransformExpectsNumeric()`
`106`	`106`	`{`
`107`	`107`	`$transformer = new PercentToLocalizedStringTransformer();`
`108`	`108`
`109`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`109`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`110`	`110`
`111`	`111`	`$transformer->transform('foo');`
`112`	`112`	`}`
`@@ -115,7 +115,7 @@ public function testReverseTransformExpectsString()`
`115`	`115`	`{`
`116`	`116`	`$transformer = new PercentToLocalizedStringTransformer();`
`117`	`117`
`118`		`- $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');`
	`118`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
`119`	`119`
`120`	`120`	`$transformer->reverseTransform(1);`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function testThrowsExceptionIfObjectIsNotTraversable()`
`70`	`70`	`$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\CollectionType', null, array(`
`71`	`71`	`'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',`
`72`	`72`	`));`
`73`		`- $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`73`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`74`	`74`	`$form->setData(new \stdClass());`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,13 @@ public function testNoSetName()`
`49`	`49`
`50`	`50`	`public function testAddNameNoStringAndNoInteger()`
`51`	`51`	`{`
`52`		`- $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`52`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`53`	`53`	`$this->builder->add(true);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function testAddTypeNoString()`
`57`	`57`	`{`
`58`		`- $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`58`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`59`	`59`	`$this->builder->add('foo', 1234);`
`60`	`60`	`}`
`61`	`61`
`@@ -165,7 +165,13 @@ public function testAddButton()`
`165`	`165`
`166`	`166`	`public function testGetUnknown()`
`167`	`167`	`{`
`168`		`- $this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');`
	`168`	`+ if (method_exists($this, 'expectException')) {`
	`169`	`+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');`
	`170`	`+ $this->expectExceptionMessage('The child with the name "foo" does not exist.');`
	`171`	`+ } else {`
	`172`	`+ $this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');`
	`173`	`+ }`
	`174`	`+`
`169`	`175`	`$this->builder->get('foo');`
`170`	`176`	`}`
`171`	`177`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase`
`20`	`20`	`*/`
`21`	`21`	`public function testTranslationFileIsValid($filePath)`
`22`	`22`	`{`
`23`		`- \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
	`23`	`+ if (class_exists('PHPUnit_Util_XML')) {`
	`24`	`+ \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
	`25`	`+ } else {`
	`26`	`+ \PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
	`27`	`+ }`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`public function provideTranslationFiles()`