Skip to content

Commit 867a984

Browse files
mad-brillerondrejmirtes
authored andcommitted
Cheap checks first in ObjectType.
1 parent d6c2752 commit 867a984

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/Type/ObjectType.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,7 @@ public function equals(Type $type): bool
421421
}
422422

423423
if ($this->subtractedType === null) {
424-
if ($type->subtractedType === null) {
425-
return true;
426-
}
427-
428-
return false;
424+
return $type->subtractedType === null;
429425
}
430426

431427
if ($type->subtractedType === null) {
@@ -866,7 +862,7 @@ public function getIterableKeyType(): Type
866862
}
867863

868864
$extraOffsetAccessible = $this->isExtraOffsetAccessibleClass()->yes();
869-
if ($this->isInstanceOf(Traversable::class)->yes() && !$extraOffsetAccessible) {
865+
if (!$extraOffsetAccessible && $this->isInstanceOf(Traversable::class)->yes()) {
870866
$isTraversable = true;
871867
$tKey = $this->getTemplateType(Traversable::class, 'TKey');
872868
if (!$tKey instanceof ErrorType) {
@@ -917,7 +913,7 @@ public function getIterableValueType(): Type
917913
}
918914

919915
$extraOffsetAccessible = $this->isExtraOffsetAccessibleClass()->yes();
920-
if ($this->isInstanceOf(Traversable::class)->yes() && !$extraOffsetAccessible) {
916+
if (!$extraOffsetAccessible && $this->isInstanceOf(Traversable::class)->yes()) {
921917
$isTraversable = true;
922918
$tValue = $this->getTemplateType(Traversable::class, 'TValue');
923919
if (!$tValue instanceof ErrorType) {
@@ -1296,7 +1292,7 @@ public function isInstanceOf(string $className): TrinaryLogic
12961292
return TrinaryLogic::createMaybe();
12971293
}
12981294

1299-
if ($classReflection->isSubclassOf($className) || $classReflection->getName() === $className) {
1295+
if ($classReflection->getName() === $className || $classReflection->isSubclassOf($className)) {
13001296
return TrinaryLogic::createYes();
13011297
}
13021298

0 commit comments

Comments
 (0)