used get_debug_type()

src/Framework/Assert.php

@@ -281,10 +281,10 @@ public static function type(string|object $type, mixed $value, ?string $descript
 			'int', 'integer', 'null', 'object', 'resource', 'scalar', 'string', ], true)
 		) {
 			if (!("is_$type")($value)) {
-				self::fail(self::describe(gettype($value) . " should be $type", $description));
+				self::fail(self::describe(get_debug_type($value) . " should be $type", $description));
 			}
 		} elseif (!$value instanceof $type) {
-			$actual = is_object($value) ? $value::class : gettype($value);
+			$actual = get_debug_type($value);
 			$type = is_object($type) ? $type::class : $type;
 			self::fail(self::describe("$actual should be instance of $type", $description));
 		}

src/Framework/TestCase.php

@@ -248,7 +248,7 @@ private function prepareTestData(\ReflectionMethod $method, array $dataprovider)
 
 			foreach ($res as $k => $set) {
 				if (!is_array($set)) {
-					$type = is_object($set) ? $set::class : gettype($set);
+					$type = get_debug_type($set);
 					throw new TestCaseException("Data provider $provider() item '$k' must be an array, $type given.");
 				}
 

tests/Framework/Assert.type.phpt

@@ -12,7 +12,7 @@ $cases = [
 	['STDCLASS', new stdClass],
 	['x', new stdClass, 'stdClass should be instance of x'],
 	['Int', new stdClass, 'stdClass should be instance of Int'],
-	['int', new stdClass, 'object should be int'],
+	['int', new stdClass, 'stdClass should be int'],
 	['array', []],
 	['bool', true],
 	['callable', function () {}],

tests/Framework/Dumper.dumpException.phpt

@@ -19,8 +19,8 @@ $cases = [
 	'Failed: SimpleXMLElement(#%a%) should be truthy' => function () { Assert::truthy(new SimpleXMLElement('<xml></xml>')); },
 	'Failed: stdClass(#%a%) should be stdClass(#%a%)' => function () { Assert::same(new stdClass, new stdClass); },
 	'Failed: null should not be null' => function () { Assert::notSame(null, null); },
-	'Failed: boolean should be instance of x' => function () { Assert::type('x', true); },
-	'Failed: resource should be int' => function () { Assert::type('int', fopen(__FILE__, 'r')); },
+	'Failed: bool should be instance of x' => function () { Assert::type('x', true); },
+	'Failed: resource (stream) should be int' => function () { Assert::type('int', fopen(__FILE__, 'r')); },
 	"Failed: 'Hello\\n\nWorld' should match\n    ... 'Hello'" => function () { Assert::match('%a%', "Hello\nWorld"); },
 	"Failed: '...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' should be \n    ... '...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'" => function () { Assert::same(str_repeat('x', 100), str_repeat('x', 120)); },
 	"Failed: '...xxxxxxxxxxxxxxxxxxxxxxxxxxx****************************************' should be \n    ... '...xxxxxxxxxxxxxxxxxxxxxxxxxxx'" => function () { Assert::same(str_repeat('x', 30), str_repeat('x', 30) . str_repeat('*', 40)); },

tests/Framework/Expect.phpt

@@ -29,7 +29,7 @@ Assert::same("type('string'),match('%d%')", $expectation->dump());
 
 Assert::exception(function () use ($expectation) {
 	$expectation->__invoke(123);
-}, Tester\AssertException::class, 'integer should be string');
+}, Tester\AssertException::class, 'int should be string');
 
 Assert::noError(function () use ($expectation) {
 	$expectation->__invoke('123');
@@ -47,7 +47,7 @@ Assert::same("type('string'),match('%d%')", $expectation->dump());
 
 Assert::exception(function () use ($expectation) {
 	$expectation->__invoke(123);
-}, Tester\AssertException::class, 'integer should be string');
+}, Tester\AssertException::class, 'int should be string');
 
 Assert::noError(function () use ($expectation) {
 	$expectation->__invoke('123');