Merge branch '9.2'

sebastianbergmann · Jun 5, 2022 · 3d027f8 · 3d027f8
2 parents 3093352 + a25a485
commit 3d027f8
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -24,6 +24,17 @@
       <code>!is_array($linesToBeCovered) &amp;&amp; $linesToBeCovered !== false</code>
     </TypeDoesNotContainType>
   </file>
+  <file src="src/Data/ProcessedCodeCoverageData.php">
+    <PossiblyNullArgument occurrences="1">
+      <code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="1">
+      <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullArrayAssignment occurrences="1">
+      <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
+    </PossiblyNullArrayAssignment>
+  </file>
   <file src="src/Driver/PcovDriver.php">
     <UndefinedConstant occurrences="1">
       <code>inclusive</code>
@@ -36,17 +47,6 @@
       <code>waiting()</code>
     </UndefinedFunction>
   </file>
-  <file src="src/Data/ProcessedCodeCoverageData.php">
-    <PossiblyNullArgument occurrences="1">
-      <code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
-    </PossiblyNullArgument>
-    <PossiblyNullArrayAccess occurrences="1">
-      <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
-    </PossiblyNullArrayAccess>
-    <PossiblyNullArrayAssignment occurrences="1">
-      <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
-    </PossiblyNullArrayAssignment>
-  </file>
   <file src="src/Driver/XdebugDriver.php">
     <UndefinedConstant occurrences="5">
       <code>XDEBUG_CC_BRANCH_CHECK</code>
@@ -196,24 +196,22 @@
     <PossiblyInvalidOperand occurrences="1">
       <code>$parameter-&gt;var-&gt;name</code>
     </PossiblyInvalidOperand>
-    <PossiblyNullReference occurrences="2">
+    <PossiblyNullReference occurrences="4">
+      <code>toString</code>
+      <code>toString</code>
       <code>toString</code>
       <code>toString</code>
     </PossiblyNullReference>
     <PossiblyUndefinedMethod occurrences="1">
       <code>toString</code>
     </PossiblyUndefinedMethod>
-    <RedundantConditionGivenDocblockType occurrences="10">
+    <RedundantConditionGivenDocblockType occurrences="6">
       <code>assert($node-&gt;namespacedName instanceof Name)</code>
       <code>assert($node-&gt;namespacedName instanceof Name)</code>
-      <code>assert($node-&gt;namespacedName instanceof Name)</code>
-      <code>assert($parentNode-&gt;namespacedName instanceof Name)</code>
       <code>assert($parentNode-&gt;namespacedName instanceof Name)</code>
       <code>assert(isset($node-&gt;name))</code>
       <code>assert(isset($node-&gt;namespacedName))</code>
-      <code>assert(isset($node-&gt;namespacedName))</code>
       <code>assert(isset($parameter-&gt;var-&gt;name))</code>
-      <code>assert(isset($parentNode-&gt;namespacedName))</code>
     </RedundantConditionGivenDocblockType>
   </file>
 </files>