Skip to content

Commit b311756

Browse files
authored
[TypeDeclaration] Deprecate BinaryOpNullableToInstanceofRector, fold into ExplicitNullableObjectInstanceRector (#8817)
1 parent 07c2599 commit b311756

26 files changed

Lines changed: 324 additions & 494 deletions
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
7+
function binaryOr(?SomeInstance $someClass)
8+
{
9+
if ($someClass || $someClass->someMethod()) {
10+
return 'yes';
11+
}
12+
13+
return 'no';
14+
}
15+
16+
?>
17+
-----
18+
<?php
19+
20+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
21+
22+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
23+
24+
function binaryOr(?SomeInstance $someClass)
25+
{
26+
if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance || $someClass->someMethod()) {
27+
return 'yes';
28+
}
29+
30+
return 'no';
31+
}
32+
33+
?>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
7+
8+
function bothNegation(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
9+
{
10+
if (! $someClass || ! $someClass2) {
11+
return 'yes';
12+
}
13+
14+
return 'no';
15+
}
16+
17+
?>
18+
-----
19+
<?php
20+
21+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
22+
23+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
24+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
25+
26+
function bothNegation(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
27+
{
28+
if (! $someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance || ! $someClass2 instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2) {
29+
return 'yes';
30+
}
31+
32+
return 'no';
33+
}
34+
35+
?>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
7+
8+
function bothTruthy(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
9+
{
10+
if ($someClass && $someClass2) {
11+
return 'yes';
12+
}
13+
14+
return 'no';
15+
}
16+
17+
?>
18+
-----
19+
<?php
20+
21+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
22+
23+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
24+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
25+
26+
function bothTruthy(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
27+
{
28+
if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance && $someClass2 instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2) {
29+
return 'yes';
30+
}
31+
32+
return 'no';
33+
}
34+
35+
?>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
7+
function otherDirection(?SomeInstance $someClass)
8+
{
9+
if (mt_rand(0,1) && $someClass) {
10+
return $someClass->someMethod();
11+
12+
}
13+
14+
return 'no';
15+
}
16+
17+
?>
18+
-----
19+
<?php
20+
21+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
22+
23+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
24+
25+
function otherDirection(?SomeInstance $someClass)
26+
{
27+
if (mt_rand(0,1) && $someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance) {
28+
return $someClass->someMethod();
29+
30+
}
31+
32+
return 'no';
33+
}
34+
35+
?>

rules-tests/TypeDeclaration/Rector/BooleanAnd/BinaryOpNullableToInstanceofRector/Fixture/skip_assign.php.inc renamed to rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_skip_assign.php.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace Rector\Tests\TypeDeclaration\Rector\BooleanAnd\BinaryOpNullableToInstanceofRector\Fixture;
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
44

5-
use Rector\Tests\TypeDeclaration\Rector\BooleanAnd\BinaryOpNullableToInstanceofRector\Source\SomeInstance;
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
66

77
final class SkipAssign
88
{
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
7+
/**
8+
* @param SomeInstance|null $someClass
9+
*/
10+
function skipBinaryOrPhpdoc($someClass)
11+
{
12+
if ($someClass || $someClass->someMethod()) {
13+
return 'yes';
14+
}
15+
16+
return 'no';
17+
}
18+
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
4+
5+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
6+
7+
function someFunction(?SomeInstance $someClass)
8+
{
9+
if ($someClass && $someClass->someMethod()) {
10+
return 'yes';
11+
}
12+
13+
return 'no';
14+
}
15+
16+
?>
17+
-----
18+
<?php
19+
20+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
21+
22+
use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
23+
24+
function someFunction(?SomeInstance $someClass)
25+
{
26+
if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance && $someClass->someMethod()) {
27+
return 'yes';
28+
}
29+
30+
return 'no';
31+
}
32+
33+
?>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source;
6+
7+
final class SomeInstance
8+
{
9+
public function someMethod(): bool
10+
{
11+
return true;
12+
}
13+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source;
6+
7+
final class SomeInstance2
8+
{
9+
public function someMethod()
10+
{
11+
}
12+
}

‎rules-tests/TypeDeclaration/Rector/BooleanAnd/BinaryOpNullableToInstanceofRector/BinaryOpNullableToInstanceofRectorTest.php‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)