minor #32858 [PhpUnitBridge] Fix deprecation assertInternalType - 4.4 (jderusse)

nicolas-grekas · nicolas-grekas · commit e7122418e1b6 · 2019-08-01T13:52:20.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] Fix deprecation assertInternalType - 4.4 | Q | A | ------------- | --- | Branch? | 4.4 | 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.4 branch Commits ------- 51ba665 Fix assertInternalType deprecation in phpunit 9
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -11,10 +11,13 @@
 
 namespace Symfony\Component\HttpClient\Tests;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;
 
 abstract class HttpClientTestCase extends BaseHttpClientTestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testToStream()
     {
         $client = $this->getHttpClient(__FUNCTION__);
@@ -28,7 +31,7 @@ public function testToStream()
         $this->assertFalse(feof($stream));
         $this->assertTrue(rewind($stream));
 
-        $this->assertInternalType('array', json_decode(fread($stream, 1024), true));
+        $this->assertIsArray(json_decode(fread($stream, 1024), true));
         $this->assertSame('', fread($stream, 1));
         $this->assertTrue(feof($stream));
     }

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpClient\Tests;`
`13`	`13`
	`14`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`14`	`15`	`use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;`
`15`	`16`
`16`	`17`	`abstract class HttpClientTestCase extends BaseHttpClientTestCase`
`17`	`18`	`{`
	`19`	`+ use ForwardCompatTestTrait;`
	`20`	`+`
`18`	`21`	`public function testToStream()`
`19`	`22`	`{`
`20`	`23`	`$client = $this->getHttpClient(__FUNCTION__);`
`@@ -28,7 +31,7 @@ public function testToStream()`
`28`	`31`	`$this->assertFalse(feof($stream));`
`29`	`32`	`$this->assertTrue(rewind($stream));`
`30`	`33`
`31`		`- $this->assertInternalType('array', json_decode(fread($stream, 1024), true));`
	`34`	`+ $this->assertIsArray(json_decode(fread($stream, 1024), true));`
`32`	`35`	`$this->assertSame('', fread($stream, 1));`
`33`	`36`	`$this->assertTrue(feof($stream));`
`34`	`37`	`}`