remove always true/false conditions #7229
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
orklah
commented
Dec 27, 2021
| $invalid_iterator_types[] = $iterator_atomic_type->getKey(); | ||
|
|
||
| $value_type = Type::getMixed(); | ||
| } elseif ($iterator_atomic_type instanceof TObject || | ||
| $iterator_atomic_type instanceof TMixed || | ||
| $iterator_atomic_type instanceof TEmpty |
There was a problem hiding this comment.
TEmpty is already covered by Scalar on the previous if
| @@ -188,7 +188,6 @@ public static function analyze( | |||
| if (!$atomic_key_type instanceof TString | |||
| && !$atomic_key_type instanceof TInt | |||
| && !$atomic_key_type instanceof TArrayKey | |||
| && !$atomic_key_type instanceof TMixed | |||
There was a problem hiding this comment.
TMixed is handled above
| @@ -1214,11 +1214,7 @@ private static function analyzeDestructuringAssignment( | |||
| && !$assign_value_type->hasArrayAccessInterface($codebase) | |||
| ) { | |||
| if ($assign_value_type->hasArray()) { | |||
| if (($assign_value_atomic_type instanceof TFalse | |||
There was a problem hiding this comment.
TNull is handled above
| @@ -87,22 +87,6 @@ public static function analyze( | |||
| return; | |||
| } | |||
|
|
|||
| if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BitwiseXor) { | |||
There was a problem hiding this comment.
BitwiseXor is handled above
| @@ -146,25 +130,5 @@ public static function analyze( | |||
|
|
|||
| return; | |||
| } | |||
|
|
|||
| if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BitwiseOr) { | |||
There was a problem hiding this comment.
BitwiseOr is handled above
| @@ -89,9 +89,7 @@ public static function isContainedBy( | |||
| } | |||
|
|
|||
| if ($container_type_part instanceof TNonspecificLiteralString | |||
| && ($input_type_part instanceof TLiteralString | |||
| || $input_type_part instanceof TNonspecificLiteralString | |||
| || $input_type_part instanceof TNonEmptyNonspecificLiteralString) | |||
There was a problem hiding this comment.
TNonEmptyNonspecificLiteralString is a child of TNonspecificLiteralString just above
| @@ -1061,9 +1061,7 @@ private static function scrapeStringProperties( | |||
| } | |||
| } | |||
|
|
|||
| if ($has_non_literal_class_string || | |||
| !$type instanceof TClassString | |||
There was a problem hiding this comment.
$type instanceof TClassString was handled in another branch
| @@ -1079,13 +1077,6 @@ private static function scrapeStringProperties( | |||
| } elseif (get_class($combination->value_types['string']) !== TString::class) { | |||
| if (get_class($type) === TString::class) { | |||
| $combination->value_types['string'] = $type; | |||
| } elseif ($combination->value_types['string'] instanceof TTraitString | |||
| && $type instanceof TClassString | |||
| @@ -732,7 +732,6 @@ private static function getValueForKey( | |||
| if ($existing_key_type_part instanceof TNull) { | |||
| $class_property_type = Type::getNull(); | |||
| } elseif ($existing_key_type_part instanceof TMixed | |||
| || $existing_key_type_part instanceof TTemplateParam | |||
There was a problem hiding this comment.
continued just above
| /** | ||
| * @psalm-suppress TypeDoesNotContainNull PHPUnit 8.2 made it non-nullable again | ||
| */ | ||
| if (null === $name) { |
There was a problem hiding this comment.
non-nullable since 8.2 and Psalm 4 requires PHPunit 9
orklah
added
the
release:internal
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'll explain them in review mode