[Rector] add PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD

rector.php

@@ -42,6 +42,9 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\PHPUnit\Rector\MethodCall\AssertFalseStrposToContainsRector;
+use Rector\PHPUnit\Rector\MethodCall\AssertIssetToSpecificMethodRector;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -53,6 +56,7 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->import(SetList::DEAD_CODE);
     $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
+    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
 
     $parameters = $containerConfigurator->parameters();
 
@@ -109,6 +113,18 @@
 
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
+
+        // $this->assertTrue(isset($bar['foo']))
+        // and $this->assertArrayHasKey('foo', $bar)
+        // or $this->assertObjectHasAttribute('foo', $bar);
+        // are not the same
+        AssertIssetToSpecificMethodRector::class => [
+            __DIR__ . '/tests/system/Entity/EntityTest.php',
+            __DIR__ . '/tests/system/Session/SessionTest.php',
+        ],
+
+        // assertContains() to string can't be used in PHPUnit 9.1
+        AssertFalseStrposToContainsRector::class,
     ]);
 
     // auto import fully qualified class names

tests/system/API/ResponseTraitTest.php

@@ -488,7 +488,7 @@ public function testXMLFormatter()
         $this->formatter = new XMLFormatter();
         $controller      = $this->makeController();
 
-        $this->assertSame('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
+        $this->assertInstanceOf('CodeIgniter\Format\XMLFormatter', $this->formatter);
 
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
         $expected = <<<'EOH'

tests/system/CLI/ConsoleTest.php

@@ -67,7 +67,7 @@ public function testHeader()
         $console = new Console($this->app);
         $console->showHeader();
         $result = CITestStreamFilter::$buffer;
-        $this->assertTrue(strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)) > 0);
+        $this->assertGreaterThan(0, strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)));
     }
 
     public function testNoHeader()

tests/system/CommonSingleServiceTest.php

@@ -34,7 +34,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
         $service1 = single_service($service);
         $service2 = single_service($service);
 
-        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
     }
 
@@ -62,7 +62,7 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
         $service1 = single_service($service, ...$params);
         $service2 = single_service($service, ...$params);
 
-        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
 
         if ($service === 'commands') {
@@ -77,7 +77,7 @@ public function testSingleServiceWithAllParamsSupplied(): void
 
         // Assert that even passing true as last param this will
         // not create a shared instance.
-        $this->assertSame(get_class($cache1), get_class($cache2));
+        $this->assertInstanceOf(get_class($cache1), $cache2);
         $this->assertNotSame($cache1, $cache2);
     }
 

tests/system/Config/ConfigTest.php

@@ -41,7 +41,7 @@ public function testCreateSharedInstance()
         $Config  = Config::get('DocTypes');
         $Config2 = Config::get('Config\\DocTypes');
 
-        $this->assertTrue($Config === $Config2);
+        $this->assertSame($Config2, $Config);
     }
 
     public function testCreateNonConfig()

tests/system/Config/ServicesTest.php

@@ -316,7 +316,7 @@ public function testReset()
         $response2 = service('response');
         $this->assertInstanceOf(MockResponse::class, $response2);
 
-        $this->assertTrue($response !== $response2);
+        $this->assertNotSame($response2, $response);
     }
 
     /**

tests/system/Cookie/CookieTest.php

@@ -268,13 +268,13 @@ public function testArrayAccessOfCookie(): void
     {
         $cookie = new Cookie('cookie', 'monster');
 
-        $this->assertTrue(isset($cookie['expire']));
+        $this->assertArrayHasKey('expire', $cookie);
         $this->assertSame($cookie['expire'], $cookie->getExpiresTimestamp());
-        $this->assertTrue(isset($cookie['httponly']));
+        $this->assertArrayHasKey('httponly', $cookie);
         $this->assertSame($cookie['httponly'], $cookie->isHTTPOnly());
-        $this->assertTrue(isset($cookie['samesite']));
+        $this->assertArrayHasKey('samesite', $cookie);
         $this->assertSame($cookie['samesite'], $cookie->getSameSite());
-        $this->assertTrue(isset($cookie['path']));
+        $this->assertArrayHasKey('path', $cookie);
         $this->assertSame($cookie['path'], $cookie->getPath());
 
         $this->expectException(InvalidArgumentException::class);

tests/system/Database/Live/ConnectTest.php

@@ -103,6 +103,6 @@ public function testConnectWithFailover()
         $db1 = Database::connect($this->tests);
 
         $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
-        $this->assertTrue(count($db1->listTables()) >= 0);
+        $this->assertGreaterThanOrEqual(0, count($db1->listTables()));
     }
 }

tests/system/Database/Live/DbUtilsTest.php

@@ -79,7 +79,7 @@ public function testUtilsListDatabases()
         if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
             $databases = $util->listDatabases();
 
-            $this->assertTrue(in_array($this->db->getDatabase(), $databases, true));
+            $this->assertContains($this->db->getDatabase(), $databases);
         } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');

tests/system/Database/Live/GetTest.php

@@ -78,8 +78,8 @@ public function testGetFieldNames()
     {
         $jobs = $this->db->table('job')->get()->getFieldNames();
 
-        $this->assertTrue(in_array('name', $jobs, true));
-        $this->assertTrue(in_array('description', $jobs, true));
+        $this->assertContains('name', $jobs);
+        $this->assertContains('description', $jobs);
     }
 
     public function testGetFieldData()

tests/system/Database/Live/PretendTest.php

@@ -36,7 +36,7 @@ public function testPretendReturnsQueryObject()
             ->table('user')
             ->get();
 
-        $this->assertFalse($result instanceof Query);
+        $this->assertNotInstanceOf(Query::class, $result);
 
         $result = $this->db->pretend(true)
             ->table('user')

tests/system/Database/Live/SQLite/AlterTableTest.php

@@ -133,9 +133,9 @@ public function testDropColumnSuccess()
 
         $columns = $this->db->getFieldNames('foo');
 
-        $this->assertFalse(in_array('name', $columns, true));
-        $this->assertTrue(in_array('id', $columns, true));
-        $this->assertTrue(in_array('email', $columns, true));
+        $this->assertNotContains('name', $columns);
+        $this->assertContains('id', $columns);
+        $this->assertContains('email', $columns);
     }
 
     public function testDropColumnMaintainsKeys()

tests/system/Filters/FiltersTest.php

@@ -553,7 +553,7 @@ public function testShortCircuit()
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
 
-        $this->assertTrue($response instanceof ResponseInterface);
+        $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame('http://google.com', $response->csp);
     }
 
@@ -737,7 +737,7 @@ public function testAddFilter()
         $filters = $filters->initialize('admin/foo/bar');
         $filters = $filters->getFilters();
 
-        $this->assertTrue(in_array('some_alias', $filters['before'], true));
+        $this->assertContains('some_alias', $filters['before']);
     }
 
     public function testAddFilterSection()
@@ -753,7 +753,7 @@ public function testAddFilterSection()
             ->initialize('admin/foo/bar')
             ->getFilters();
 
-        $this->assertTrue(in_array('another', $list['before'], true));
+        $this->assertContains('another', $list['before']);
     }
 
     public function testInitializeTwice()
@@ -770,7 +770,7 @@ public function testInitializeTwice()
             ->initialize()
             ->getFilters();
 
-        $this->assertTrue(in_array('another', $list['before'], true));
+        $this->assertContains('another', $list['before']);
     }
 
     public function testEnableFilter()
@@ -791,7 +791,7 @@ public function testEnableFilter()
         $filters->enableFilter('google', 'before');
         $filters = $filters->getFilters();
 
-        $this->assertTrue(in_array('google', $filters['before'], true));
+        $this->assertContains('google', $filters['before']);
     }
 
     public function testEnableFilterWithArguments()
@@ -813,7 +813,7 @@ public function testEnableFilterWithArguments()
         $filters->enableFilter('role:admin , super', 'after');
         $found = $filters->getFilters();
 
-        $this->assertTrue(in_array('role', $found['before'], true));
+        $this->assertContains('role', $found['before']);
         $this->assertSame(['admin', 'super'], $filters->getArguments('role'));
         $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments());
 
@@ -845,7 +845,7 @@ public function testEnableFilterWithNoArguments()
         $filters->enableFilter('role', 'after');
         $found = $filters->getFilters();
 
-        $this->assertTrue(in_array('role', $found['before'], true));
+        $this->assertContains('role', $found['before']);
 
         $response = $filters->run('admin/foo/bar', 'before');
 

tests/system/HTTP/IncomingRequestTest.php

@@ -544,8 +544,8 @@ public function testWithFalseBody()
         // Use `false` here to simulate file_get_contents returning a false value
         $request = new IncomingRequest(new App(), new URI(), false, new UserAgent());
 
-        $this->assertTrue($request->getBody() !== false);
-        $this->assertTrue($request->getBody() === null);
+        $this->assertNotFalse($request->getBody());
+        $this->assertNull($request->getBody());
     }
 
     /**

tests/system/HTTP/ResponseTest.php

@@ -63,7 +63,7 @@ public function testConstructWithCSPEnabled()
         $config->CSPEnabled = true;
         $response           = new Response($config);
 
-        $this->assertTrue($response instanceof Response);
+        $this->assertInstanceOf(Response::class, $response);
     }
 
     public function testSetStatusCodeSetsReason()
@@ -327,7 +327,7 @@ public function testJSONWithArray()
         $response->setJSON($body);
 
         $this->assertSame($expected, $response->getJSON());
-        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
+        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/json'));
     }
 
     public function testJSONGetFromNormalBody()
@@ -364,7 +364,7 @@ public function testXMLWithArray()
         $response->setXML($body);
 
         $this->assertSame($expected, $response->getXML());
-        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
+        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/xml'));
     }
 
     public function testXMLGetFromNormalBody()

tests/system/I18n/TimeTest.php

@@ -1023,7 +1023,7 @@ public function testCreateFromInstance()
     {
         $datetime = new DateTime();
         $time     = Time::createFromInstance($datetime);
-        $this->assertTrue($time instanceof Time);
+        $this->assertInstanceOf(Time::class, $time);
         $this->assertTrue($time->sameAs($datetime));
     }
 

tests/system/Images/BaseHandlerTest.php

@@ -58,7 +58,7 @@ protected function setUp(): void
     public function testNew()
     {
         $handler = Services::image('gd', null, false);
-        $this->assertTrue($handler instanceof BaseHandler);
+        $this->assertInstanceOf(BaseHandler::class, $handler);
     }
 
     public function testWithFile()
@@ -68,7 +68,7 @@ public function testWithFile()
         $handler->withFile($path);
 
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
         $this->assertSame(155, $image->origWidth);
         $this->assertSame($path, $image->getPathname());
     }
@@ -104,15 +104,15 @@ public function testFileTypes()
         $handler = Services::image('gd', null, false);
         $handler->withFile($this->start . 'ci-logo.png');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
 
         $handler->withFile($this->start . 'ci-logo.jpeg');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
 
         $handler->withFile($this->start . 'ci-logo.gif');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
     }
 
     // Something handled by our Image

tests/system/Images/ImageMagickHandlerTest.php

@@ -58,8 +58,8 @@ public function testGetVersion()
         // make sure that the call worked
         $this->assertNotFalse($version);
         // we should have a numeric version, greater than 6
-        $this->assertTrue(version_compare($version, '6.0.0') >= 0);
-        $this->assertTrue(version_compare($version, '99.0.0') < 0);
+        $this->assertGreaterThanOrEqual(0, version_compare($version, '6.0.0'));
+        $this->assertLessThan(0, version_compare($version, '99.0.0'));
     }
 
     public function testImageProperties()

tests/system/Language/LanguageTest.php

@@ -165,7 +165,7 @@ public function testLanguageFileLoading()
         $this->lang = new SecondMockLanguage('en');
 
         $this->lang->loadem('More', 'en');
-        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+        $this->assertContains('More', $this->lang->loaded());
 
         $this->lang->loadem('More', 'en');
         $this->assertCount(1, $this->lang->loaded()); // should only be there once
@@ -176,11 +176,11 @@ public function testLanguageFileLoadingReturns()
         $this->lang = new SecondMockLanguage('en');
 
         $result = $this->lang->loadem('More', 'en', true);
-        $this->assertFalse(in_array('More', $this->lang->loaded(), true));
+        $this->assertNotContains('More', $this->lang->loaded());
         $this->assertCount(3, $result);
 
         $result = $this->lang->loadem('More', 'en');
-        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+        $this->assertContains('More', $this->lang->loaded());
         $this->assertCount(1, $this->lang->loaded());
     }
 

tests/system/Log/LoggerTest.php

@@ -203,7 +203,7 @@ public function testLogInterpolatesFileAndLine()
 
         $logs = TestHandler::getLogs();
 
-        $this->assertTrue(strpos($logs[0], $expected) > 1);
+        $this->assertGreaterThan(1, strpos($logs[0], $expected));
     }
 
     public function testLogInterpolatesExceptions()
@@ -222,7 +222,7 @@ public function testLogInterpolatesExceptions()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertTrue(strpos($logs[0], $expected) === 0);
+        $this->assertSame(0, strpos($logs[0], $expected));
     }
 
     public function testEmergencyLogsCorrectly()

tests/system/Models/InsertModelTest.php

@@ -74,7 +74,7 @@ public function testInsertBatchValidationFail(): void
         $this->assertFalse($this->model->insertBatch($jobData));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['description']));
+        $this->assertArrayHasKey('description', $error);
     }
 
     public function testInsertBatchSetsIntTimestamps(): void

tests/system/Models/MiscellaneousModelTest.php

@@ -93,7 +93,7 @@ public function testGetValidationMessagesForReplace(): void
         $this->assertFalse($this->model->replace($jobData));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['description']));
+        $this->assertArrayHasKey('description', $error);
     }
 
     public function testUndefinedTypeInTransformDataToArray(): void

tests/system/Models/UpdateModelTest.php

@@ -153,7 +153,7 @@ public function testUpdateBatchValidationFail(): void
         $this->assertFalse($this->model->updateBatch($data, 'name'));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['country']));
+        $this->assertArrayHasKey('country', $error);
     }
 
     public function testUpdateBatchWithEntity(): void