From 2c00c64304b8230995552b6af6d4c309b5fb0525 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Fri, 16 Dec 2022 19:18:33 +0100
Subject: [PATCH] Bypass bug

---
 psalm-baseline.xml                            | 69 ++-----------------
 .../ArrayMergeReturnTypeProvider.php          |  3 +-
 2 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 81a14de03..b8dacf52d 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@2b0e979ee9434afdeb9dd59a3219bf4029c62dc8">
+<files psalm-version="dev-master@6eb37b9dc2321e4eaade9d3d2dca1aff6f2c0a8f">
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset occurrences="2">
       <code>$comment_block-&gt;tags['variablesfrom'][0]</code>
@@ -390,6 +390,9 @@
     <InvalidArgument occurrences="1">
       <code>$class_strings ?: null</code>
     </InvalidArgument>
+    <RedundantCondition occurrences="2">
+      <code>$is_replace</code>
+    </RedundantCondition>
   </file>
   <file src="src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayReduceReturnTypeProvider.php">
     <PossiblyUndefinedIntArrayOffset occurrences="1">
@@ -593,10 +596,6 @@
     <ImpurePropertyAssignment occurrences="1">
       <code>$key_type-&gt;possibly_undefined</code>
     </ImpurePropertyAssignment>
-    <InvalidPropertyAssignmentValue occurrences="2">
-      <code>$fallback_params</code>
-      <code>$fallback_params</code>
-    </InvalidPropertyAssignmentValue>
     <PossiblyUndefinedIntArrayOffset occurrences="3">
       <code>$this-&gt;properties[0]</code>
       <code>$this-&gt;properties[0]</code>
@@ -705,64 +704,4 @@
       <code>$subNodes['expr']</code>
     </PossiblyUndefinedStringArrayOffset>
   </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$parts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/MatchArm.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$conds</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Name.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>self::prepareName($name)</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$stmts</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
 </files>
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php
index 27b265958..e66ed4a5c 100644
--- a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php
+++ b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php
@@ -22,7 +22,6 @@ use function array_values;
 use function count;
 use function is_string;
 use function max;
-use function substr;
 
 /**
  * @internal
@@ -113,7 +112,7 @@ class ArrayMergeReturnTypeProvider implements FunctionReturnTypeProviderInterfac
                             }
                             if (is_string($key)) {
                                 $all_int_offsets = false;
-                            } else if (!$is_replace) {
+                            } elseif (!$is_replace) {
                                 if ($unpacking_indefinite_number_of_args || $type->possibly_undefined) {
                                     $added_inner_values = true;
                                     $inner_value_types = array_merge(