[PHPUnit 10] Rename assertObjectHasAttribute() to assertObjectHasProperty(), add AssertIssetToAssertObjectHasPropertyRector

config/sets/phpunit100.php

@@ -6,7 +6,7 @@
 use Rector\PHPUnit\PHPUnit100\Rector\Class_\AddProphecyTraitRector;
 use Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector;
 use Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector;
-use Rector\PHPUnit\PHPUnit100\Rector\MethodCall\PropertyExistsWithoutAssertRector;
+use Rector\PHPUnit\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector;
 use Rector\PHPUnit\PHPUnit100\Rector\MethodCall\RemoveSetMethodsMethodCallRector;
 use Rector\PHPUnit\Rector\StmtsAwareInterface\WithConsecutiveRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -17,9 +17,9 @@
     $rectorConfig->sets([PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES]);
 
     $rectorConfig->rules([
+        AssertIssetToAssertObjectHasPropertyRector::class,
         StaticDataProviderClassMethodRector::class,
         PublicDataProviderClassMethodRector::class,
-        PropertyExistsWithoutAssertRector::class,
         AddProphecyTraitRector::class,
         WithConsecutiveRector::class,
         RemoveSetMethodsMethodCallRector::class,
@@ -29,6 +29,10 @@
         // https://github.com/sebastianbergmann/phpunit/issues/4087
         new MethodCallRename('PHPUnit\Framework\Assert', 'assertRegExp', 'assertMatchesRegularExpression'),
 
+        // https://github.com/sebastianbergmann/phpunit/issues/5220
+        new MethodCallRename('PHPUnit\Framework\Assert', 'assertObjectHasAttribute', 'assertObjectHasProperty'),
+        new MethodCallRename('PHPUnit\Framework\Assert', 'assertObjectNotHasAttribute', 'assertObjectHasNotProperty'),
+
         new MethodCallRename(
             'PHPUnit\Framework\MockObject\Rule\InvocationOrder',
             'getInvocationCount',

config/sets/phpunit110.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\PHPUnit110\Rector\Class_\NamedArgumentForDataProviderRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rules([NamedArgumentForDataProviderRector::class]);
+};

docs/rector_rules_overview.md

@@ -270,22 +270,37 @@ Turns instanceof comparisons to their method name alternatives in PHPUnit TestCa
 
 <br>
 
-## AssertIssetToSpecificMethodRector
+## AssertIssetToAssertObjectHasPropertyRector
 
-Turns isset comparisons to their method name alternatives in PHPUnit TestCase
+Change `"isset()"` property check, to `assertObjectHasProperty()` method
 
-- class: [`Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector`](../rules/CodeQuality/Rector/MethodCall/AssertIssetToSpecificMethodRector.php)
+- class: [`Rector\PHPUnit\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector`](../rules/PHPUnit100/Rector/MethodCall/AssertIssetToAssertObjectHasPropertyRector.php)
 
 ```diff
--$this->assertTrue(isset($anything->foo));
-+$this->assertObjectHasAttribute("foo", $anything);
+ use PHPUnit\Framework\TestCase;
+
+ final class SomeTest extends TestCase
+ {
+     public function test()
+     {
+         $object = new stdClass();
+-        $this->assertTrue(isset($object->someProperty));
++        $this->assertObjectHasProperty('someProperty', $object);
+     }
+ }
 ```
 
 <br>
 
+## AssertIssetToSpecificMethodRector
+
+Turns `assertTrue()` + `isset()` comparisons to more precise `assertArrayHasKey()` method
+
+- class: [`Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector`](../rules/CodeQuality/Rector/MethodCall/AssertIssetToSpecificMethodRector.php)
+
 ```diff
--$this->assertFalse(isset($anything["foo"]), "message");
-+$this->assertArrayNotHasKey("foo", $anything, "message");
+-$this->assertTrue(isset($anything["foo"]), "message");
++$this->assertArrayHasKey("foo", $anything, "message");
 ```
 
 <br>
@@ -751,21 +766,6 @@ Changes PHPUnit calls from self::assert*() to `$this->assert*()`
 
 <br>
 
-## PropertyExistsWithoutAssertRector
-
-Turns PHPUnit TestCase assertObjectHasAttribute into `property_exists` comparisons
-
-- class: [`Rector\PHPUnit\PHPUnit100\Rector\MethodCall\PropertyExistsWithoutAssertRector`](../rules/PHPUnit100/Rector/MethodCall/PropertyExistsWithoutAssertRector.php)
-
-```diff
--$this->assertClassHasAttribute("property", "Class");
--$this->assertClassNotHasAttribute("property", "Class");
-+$this->assertFalse(property_exists(new Class, "property"));
-+$this->assertTrue(property_exists(new Class, "property"));
-```
-
-<br>
-
 ## PublicDataProviderClassMethodRector
 
 Change data provider methods to public

rules-tests/CodeQuality/Rector/MethodCall/AssertIssetToSpecificMethodRector/Fixture/fixture.php.inc

@@ -6,8 +6,6 @@ final class MyIssetTest extends \PHPUnit\Framework\TestCase
 {
     public function test()
     {
-        $this->assertTrue(isset($node->value1));
-        $this->assertFalse(isset($node->value2), 'message');
         $this->assertTrue(isset($node['value1']), 'message');
         $this->assertFalse(isset($node['value2']));
     }
@@ -23,8 +21,6 @@ final class MyIssetTest extends \PHPUnit\Framework\TestCase
 {
     public function test()
     {
-        $this->assertObjectHasAttribute('value1', $node);
-        $this->assertObjectNotHasAttribute('value2', $node, 'message');
         $this->assertArrayHasKey('value1', $node, 'message');
         $this->assertArrayNotHasKey('value2', $node);
     }

rules-tests/CodeQuality/Rector/MethodCall/AssertIssetToSpecificMethodRector/Fixture/skip_property.php.inc

@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector\Fixture;
+
+final class SkipProperty extends \PHPUnit\Framework\TestCase
+{
+    public function test()
+    {
+        $this->assertTrue(isset($node->value1));
+        $this->assertFalse(isset($node->value2), 'message');
+    }
+}

rules-tests/PHPUnit100/Rector/MethodCall/PropertyExistsWithoutAssertRector/PropertyExistsWithoutAssertRectorTest.php → rules-tests/PHPUnit100/Rector/MethodCall/AssertIssetToAssertObjectHasPropertyRector/AssertIssetToAssertObjectHasPropertyRectorTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\MethodCall\PropertyExistsWithoutAssertRector;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class PropertyExistsWithoutAssertRectorTest extends AbstractRectorTestCase
+final class AssertIssetToAssertObjectHasPropertyRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void

rules-tests/CodeQuality/Rector/MethodCall/AssertIssetToSpecificMethodRector/Fixture/skip_if_magic_method_isset_exists.php.inc → rules-tests/PHPUnit100/Rector/MethodCall/AssertIssetToAssertObjectHasPropertyRector/Fixture/skip_magic_isset.php.inc

@@ -1,20 +1,19 @@
 <?php
 
-namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector\Fixture;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector\Fixture;
 
-final class CustomIsset {
+final class CustomIsset
+{
     public function __isset($property) {
         return false;
     }
 }
 
-final class SkipCustomIsset extends \PHPUnit\Framework\TestCase
+final class SkipMagicIsset extends \PHPUnit\Framework\TestCase
 {
     public function test()
     {
         $foo = new CustomIsset();
         $this->assertTrue(isset($foo->bar));
     }
 }
-
-?>

rules-tests/PHPUnit100/Rector/MethodCall/AssertIssetToAssertObjectHasPropertyRector/Fixture/some_isset_to_property.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SomeIssetToProperty extends TestCase
+{
+    public function test()
+    {
+        $object = new \stdClass();
+        $this->assertTrue(isset($object->someProperty));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SomeIssetToProperty extends TestCase
+{
+    public function test()
+    {
+        $object = new \stdClass();
+        $this->assertObjectHasAttribute('someProperty', $object);
+    }
+}
+
+?>

rules-tests/PHPUnit100/Rector/MethodCall/AssertIssetToAssertObjectHasPropertyRector/config/configured_rule.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector;
+
+return RectorConfig::configure()
+    ->withRules([AssertIssetToAssertObjectHasPropertyRector::class]);