[tests] 🆙 Replace assertInternalType() assertion with specialized ones

sebastianbergmann/phpunit#3368
nelson6e65 · Jan 16, 2019 · 0a806b2 · 0a806b2
1 parent 6fa7d56
commit 0a806b2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/tests/Helpers/IComparableTester.php b/tests/Helpers/IComparableTester.php
@@ -81,7 +81,7 @@ public function testIComparableCompareToMethod($expected, IComparable $left, $ri
         );
 
         if ($expected === 0) {
-            $this->assertInternalType('integer', $actual, $message);
+            $this->assertIsInt($actual, $message);
             $this->assertEquals(0, $actual, $message);
         } else {
             if ($expected === null) {
@@ -95,7 +95,7 @@ public function testIComparableCompareToMethod($expected, IComparable $left, $ri
                     $major = $actual;
                 }
 
-                $this->assertInternalType('integer', $actual, $message);
+                $this->assertIsInt($actual, $message);
                 $this->assertGreaterThan($minor, $major, $message);
                 $this->assertLessThan($major, $minor, $message);
             }

diff --git a/tests/Helpers/IComparerTester.php b/tests/Helpers/IComparerTester.php
@@ -92,7 +92,7 @@ public function testCompareMethod($expected, $left, $right) : void
         );
 
         if ($expected === 0) {
-            $this->assertInternalType('integer', $actual, $message);
+            $this->assertIsInt($actual, $message);
             $this->assertEquals(0, $actual, $message);
         } else {
             if ($expected === null) {
@@ -106,7 +106,7 @@ public function testCompareMethod($expected, $left, $right) : void
                     $major = $actual;
                 }
 
-                $this->assertInternalType('integer', $actual, $message);
+                $this->assertIsInt($actual, $message);
                 $this->assertGreaterThan($minor, $major, $message);
                 $this->assertLessThan($major, $minor, $message);
             }

diff --git a/tests/Helpers/IEquatableTester.php b/tests/Helpers/IEquatableTester.php
@@ -82,7 +82,7 @@ public function testIEquatableEqualsMethod($expected, IEquatable $left, $right)
             ]
         );
 
-        $this->assertInternalType('boolean', $actual, $message);
+        $this->assertIsBool($actual, $message);
 
         if (!is_bool($expected)) {
             throw new InvalidArgumentException(Text::format(

diff --git a/tests/TestCase/TypeTest.php b/tests/TestCase/TypeTest.php
@@ -214,8 +214,8 @@ public function testGetInterfaces($obj, array $interfaces) : void
         $reflections = $type->getInterfaces(true);
         $strings     = $type->getInterfaces();
 
-        $this->assertInternalType('array', $reflections);
-        $this->assertInternalType('array', $strings);
+        $this->assertIsArray($reflections);
+        $this->assertIsArray($strings);
 
         $this->assertCount(count($interfaces), $reflections);
         $this->assertCount(count($interfaces), $strings);
@@ -247,8 +247,8 @@ public function testGetExplicitTraitsInClass($obj, array $traits) : void
         $reflections = $type->getTraits(true);
         $strings     = $type->getTraits();
 
-        $this->assertInternalType('array', $reflections);
-        $this->assertInternalType('array', $strings);
+        $this->assertIsArray($reflections);
+        $this->assertIsArray($strings);
 
         $this->assertEquals(count($strings), count($reflections), 'Not same count for strings and reflections');
         $this->assertCount(count($traits), $reflections);
@@ -281,8 +281,8 @@ public function testGetAllRecursiveTraitsInClass($obj, array $traits) : void
         $reflections = $type->getTraits(true, true);
         $strings     = $type->getTraits(false, true);
 
-        $this->assertInternalType('array', $reflections);
-        $this->assertInternalType('array', $strings);
+        $this->assertIsArray($reflections);
+        $this->assertIsArray($strings);
 
         $this->assertEquals(count($strings), count($reflections), 'Not same count for strings and reflections');
         $this->assertCount(count($traits), $reflections);
@@ -317,7 +317,7 @@ public function testCanCheckIfTypeHasProperty($obj, string $name) : void
 
         $actual = $type->hasProperty($name);
 
-        $this->assertInternalType('bool', $actual, 'This method must return a boolean');
+        $this->assertIsBool($actual, 'This method must return a boolean');
 
         $this->assertTrue($actual);
     }
@@ -341,7 +341,7 @@ public function testCanCheckIfTypeHasNotProperty($obj, string $name) : void
 
         $actual = $type->hasProperty($name);
 
-        $this->assertInternalType('bool', $actual, 'This method must return a boolean');
+        $this->assertIsBool($actual, 'This method must return a boolean');
 
         $this->assertFalse($actual);
     }

diff --git a/tests/TestCase/VersionComponentTest.php b/tests/TestCase/VersionComponentTest.php
@@ -106,7 +106,7 @@ public function testCanCheckIfVersionComponentIsInDefaultOrNullState(
 
         foreach ($actuals as $method => $actual) {
             // Pre-tests for returning type
-            $this->assertInternalType('boolean', $actual, $messages[$method].' # Should return a boolean #');
+            $this->assertIsBool($actual, $messages[$method].' # Should return a boolean #');
         }
 
         // Pre-tests for different values

diff --git a/tests/TestCase/VersionTest.php b/tests/TestCase/VersionTest.php
@@ -72,7 +72,7 @@ public function testIsValid(bool $expected, Version $version) : void
             ]
         );
 
-        $this->assertInternalType('boolean', $actual, $message.' # Should return a boolean #');
+        $this->assertIsBool($actual, $message.' # Should return a boolean #');
 
         if ($expected === true) {
             $this->assertTrue($actual, $message);