Replace assertInternalType with actual type checks (deprecated)

Author: MGatner

tests/system/Cache/Handlers/RedisHandlerTest.php

@@ -135,7 +135,7 @@ public function testGetCacheInfo()
 	{
 		$this->redisHandler->save(self::$key1, 'value');
 
-		$this->assertInternalType('array', $this->redisHandler->getCacheInfo());
+		$this->assertIsArray($this->redisHandler->getCacheInfo());
 	}
 
 	public function testGetMetaData()

tests/system/Database/Live/ModelTest.php

@@ -122,7 +122,7 @@ public function testFindRespectsReturnArray()
 		$job = $model->asArray()
 					 ->find(4);
 
-		$this->assertInternalType('array', $job);
+		$this->assertIsArray($job);
 	}
 
 	//--------------------------------------------------------------------
@@ -134,7 +134,7 @@ public function testFindRespectsReturnObject()
 		$job = $model->asObject()
 					 ->find(4);
 
-		$this->assertInternalType('object', $job);
+		$this->assertIsObject($job);
 	}
 
 	//--------------------------------------------------------------------
@@ -662,8 +662,7 @@ public function testSkipValidation()
 			'description' => 'some great marketing stuff',
 		];
 
-		$this->assertInternalType('numeric', $model->skipValidation(true)
-												   ->insert($data));
+		$this->assertIsNumeric($model->skipValidation(true)->insert($data));
 	}
 
 	//--------------------------------------------------------------------

tests/system/EntityTest.php

@@ -277,7 +277,7 @@ public function testCastInteger()
 		$entity = $this->getCastEntity();
 
 		$entity->first = 3.1;
-		$this->assertInternalType('integer', $entity->first);
+		$this->assertIsInt($entity->first);
 		$this->assertEquals(3, $entity->first);
 
 		$entity->first = 3.6;
@@ -289,11 +289,11 @@ public function testCastFloat()
 		$entity = $this->getCastEntity();
 
 		$entity->second = 3;
-		$this->assertInternalType('float', $entity->second);
+		$this->assertIsFloat($entity->second);
 		$this->assertEquals(3.0, $entity->second);
 
 		$entity->second = '3.6';
-		$this->assertInternalType('float', $entity->second);
+		$this->assertIsFloat($entity->second);
 		$this->assertEquals(3.6, $entity->second);
 	}
 
@@ -302,11 +302,11 @@ public function testCastDouble()
 		$entity = $this->getCastEntity();
 
 		$entity->third = 3;
-		$this->assertInternalType('double', $entity->third);
+		$this->assertIsFloat($entity->third);
 		$this->assertSame(3.0, $entity->third);
 
 		$entity->third = '3.6';
-		$this->assertInternalType('double', $entity->third);
+		$this->assertIsFloat($entity->third);
 		$this->assertSame(3.6, $entity->third);
 	}
 
@@ -315,7 +315,7 @@ public function testCastString()
 		$entity = $this->getCastEntity();
 
 		$entity->fourth = 3.1415;
-		$this->assertInternalType('string', $entity->fourth);
+		$this->assertIsString($entity->fourth);
 		$this->assertSame('3.1415', $entity->fourth);
 	}
 
@@ -324,11 +324,11 @@ public function testCastBoolean()
 		$entity = $this->getCastEntity();
 
 		$entity->fifth = 1;
-		$this->assertInternalType('bool', $entity->fifth);
+		$this->assertIsBool($entity->fifth);
 		$this->assertTrue($entity->fifth);
 
 		$entity->fifth = 0;
-		$this->assertInternalType('bool', $entity->fifth);
+		$this->assertIsBool($entity->fifth);
 		$this->assertFalse($entity->fifth);
 	}
 
@@ -339,7 +339,7 @@ public function testCastObject()
 		$data = ['foo' => 'bar'];
 
 		$entity->sixth = $data;
-		$this->assertInternalType('object', $entity->sixth);
+		$this->assertIsObject($entity->sixth);
 		$this->assertEquals((object) $data, $entity->sixth);
 	}
 
@@ -359,7 +359,7 @@ public function testCastTimestamp()
 		$date = 'March 12, 2017';
 
 		$entity->ninth = $date;
-		$this->assertInternalType('integer', $entity->ninth);
+		$this->assertIsInt($entity->ninth);
 		$this->assertEquals(strtotime($date), $entity->ninth);
 	}
 

tests/system/HTTP/CLIRequestTest.php

@@ -376,7 +376,7 @@ public function testFetchGlobalReturnsArrayValues()
 		$result = $this->request->fetchGlobal('post');
 
 		$this->assertEquals($post, $result);
-		$this->assertInternalType('array', $result['ANNOUNCEMENTS']);
+		$this->assertIsArray($result['ANNOUNCEMENTS']);
 		$this->assertCount(2, $result['ANNOUNCEMENTS']);
 	}
 

tests/system/HTTP/RequestTest.php

@@ -183,7 +183,7 @@ public function testFetchGlobalReturnsArrayValues()
 		$result = $this->request->fetchGlobal('post');
 
 		$this->assertEquals($post, $result);
-		$this->assertInternalType('array', $result['ANNOUNCEMENTS']);
+		$this->assertIsArray($result['ANNOUNCEMENTS']);
 		$this->assertCount(2, $result['ANNOUNCEMENTS']);
 	}
 

tests/system/Helpers/TextHelperTest.php

@@ -99,9 +99,9 @@ public function testRandomString()
 		$this->assertEquals(16, strlen(random_string('numeric', 16)));
 		$this->assertEquals(8, strlen(random_string('numeric')));
 
-		$this->assertInternalType('string', random_string('basic'));
+		$this->assertIsString(random_string('basic'));
 		$this->assertEquals(16, strlen($random = random_string('crypto', 16)));
-		$this->assertInternalType('string', $random);
+		$this->assertIsString($random);
 
 		$this->assertEquals(32, strlen($random = random_string('md5')));
 		$this->assertEquals(40, strlen($random = random_string('sha1')));

tests/system/Router/RouterTest.php

@@ -171,7 +171,7 @@ public function testClosures()
 
 		$expects = $closure(...$router->params());
 
-		$this->assertInternalType('callable', $router->controllerName());
+		$this->assertIsCallable($router->controllerName());
 		$this->assertEquals($expects, '123-alpha');
 	}