@@ -421,11 +421,7 @@ public function equals(Type $type): bool
421
421
}
422
422
423
423
if ($ this ->subtractedType === null ) {
424
- if ($ type ->subtractedType === null ) {
425
- return true ;
426
- }
427
-
428
- return false ;
424
+ return $ type ->subtractedType === null ;
429
425
}
430
426
431
427
if ($ type ->subtractedType === null ) {
@@ -866,7 +862,7 @@ public function getIterableKeyType(): Type
866
862
}
867
863
868
864
$ extraOffsetAccessible = $ this ->isExtraOffsetAccessibleClass ()->yes ();
869
- if ($ this ->isInstanceOf (Traversable::class)->yes () && ! $ extraOffsetAccessible ) {
865
+ if (! $ extraOffsetAccessible && $ this ->isInstanceOf (Traversable::class)->yes ()) {
870
866
$ isTraversable = true ;
871
867
$ tKey = $ this ->getTemplateType (Traversable::class, 'TKey ' );
872
868
if (!$ tKey instanceof ErrorType) {
@@ -917,7 +913,7 @@ public function getIterableValueType(): Type
917
913
}
918
914
919
915
$ extraOffsetAccessible = $ this ->isExtraOffsetAccessibleClass ()->yes ();
920
- if ($ this ->isInstanceOf (Traversable::class)->yes () && ! $ extraOffsetAccessible ) {
916
+ if (! $ extraOffsetAccessible && $ this ->isInstanceOf (Traversable::class)->yes ()) {
921
917
$ isTraversable = true ;
922
918
$ tValue = $ this ->getTemplateType (Traversable::class, 'TValue ' );
923
919
if (!$ tValue instanceof ErrorType) {
@@ -1296,7 +1292,7 @@ public function isInstanceOf(string $className): TrinaryLogic
1296
1292
return TrinaryLogic::createMaybe ();
1297
1293
}
1298
1294
1299
- if ($ classReflection ->isSubclassOf ( $ className) || $ classReflection ->getName () === $ className ) {
1295
+ if ($ classReflection ->getName () === $ className || $ classReflection ->isSubclassOf ( $ className) ) {
1300
1296
return TrinaryLogic::createYes ();
1301
1297
}
1302
1298
0 commit comments