minor #32857 [PhpUnitBridge] Fix deprecation assertInternalType - 4.3 (jderusse)

nicolas-grekas · nicolas-grekas · commit 1938a54e5135 · 2019-08-01T13:48:52.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [PhpUnitBridge] Fix deprecation assertInternalType - 4.3 | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32844 | License | MIT | Doc PR | NA This PR fixes PhpUnit deprecation : > assertInternalType() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertIsArray(), assertIsBool(), assertIsFloat(), assertIsInt(), assertIsNumeric(), assertIsObject(), assertIsResource(), assertIsString(), assertIsScalar(), assertIsCallable(), or assertIsIterable() instead follow #32846 for 4.3 branch Commits ------- aa58789 Fix assertInternalType deprecation in phpunit 9
diff --git a/src/Symfony/Component/Intl/Tests/CurrenciesTest.php b/src/Symfony/Component/Intl/Tests/CurrenciesTest.php
@@ -11,13 +11,16 @@
 
 namespace Symfony\Component\Intl\Tests;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Currencies;
 
 /**
  * @group intl-data
  */
 class CurrenciesTest extends ResourceBundleTestCase
 {
+    use ForwardCompatTestTrait;
+
     // The below arrays document the state of the ICU data bundled with this package.
 
     private static $currencies = [
@@ -693,7 +696,7 @@ public function testGetFractionDigits($currency)
      */
     public function testGetRoundingIncrement($currency)
     {
-        $this->assertInternalType('numeric', Currencies::getRoundingIncrement($currency));
+        $this->assertIsNumeric(Currencies::getRoundingIncrement($currency));
     }
 
     public function provideCurrenciesWithNumericEquivalent()
diff --git a/src/Symfony/Component/Workflow/Tests/RegistryTest.php b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
@@ -87,7 +87,7 @@ public function testGetWithNoMatch()
     public function testAllWithOneMatchWithSuccess()
     {
         $workflows = $this->registry->all(new Subject1());
-        $this->assertInternalType('array', $workflows);
+        $this->assertIsArray($workflows);
         $this->assertCount(1, $workflows);
         $this->assertInstanceOf(Workflow::class, $workflows[0]);
         $this->assertSame('workflow1', $workflows[0]->getName());
@@ -96,7 +96,7 @@ public function testAllWithOneMatchWithSuccess()
     public function testAllWithMultipleMatchWithSuccess()
     {
         $workflows = $this->registry->all(new Subject2());
-        $this->assertInternalType('array', $workflows);
+        $this->assertIsArray($workflows);
         $this->assertCount(2, $workflows);
         $this->assertInstanceOf(Workflow::class, $workflows[0]);
         $this->assertInstanceOf(Workflow::class, $workflows[1]);
@@ -107,7 +107,7 @@ public function testAllWithMultipleMatchWithSuccess()
     public function testAllWithNoMatch()
     {
         $workflows = $this->registry->all(new \stdClass());
-        $this->assertInternalType('array', $workflows);
+        $this->assertIsArray($workflows);
         $this->assertCount(0, $workflows);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function testGetWithNoMatch()`
`87`	`87`	`public function testAllWithOneMatchWithSuccess()`
`88`	`88`	`{`
`89`	`89`	`$workflows = $this->registry->all(new Subject1());`
`90`		`- $this->assertInternalType('array', $workflows);`
	`90`	`+ $this->assertIsArray($workflows);`
`91`	`91`	`$this->assertCount(1, $workflows);`
`92`	`92`	`$this->assertInstanceOf(Workflow::class, $workflows[0]);`
`93`	`93`	`$this->assertSame('workflow1', $workflows[0]->getName());`
`@@ -96,7 +96,7 @@ public function testAllWithOneMatchWithSuccess()`
`96`	`96`	`public function testAllWithMultipleMatchWithSuccess()`
`97`	`97`	`{`
`98`	`98`	`$workflows = $this->registry->all(new Subject2());`
`99`		`- $this->assertInternalType('array', $workflows);`
	`99`	`+ $this->assertIsArray($workflows);`
`100`	`100`	`$this->assertCount(2, $workflows);`
`101`	`101`	`$this->assertInstanceOf(Workflow::class, $workflows[0]);`
`102`	`102`	`$this->assertInstanceOf(Workflow::class, $workflows[1]);`
`@@ -107,7 +107,7 @@ public function testAllWithMultipleMatchWithSuccess()`
`107`	`107`	`public function testAllWithNoMatch()`
`108`	`108`	`{`
`109`	`109`	`$workflows = $this->registry->all(new \stdClass());`
`110`		`- $this->assertInternalType('array', $workflows);`
	`110`	`+ $this->assertIsArray($workflows);`
`111`	`111`	`$this->assertCount(0, $workflows);`
`112`	`112`	`}`
`113`	`113`