Fix static analysis

mongodb · Nov 29, 2024 · 000e12d · 000e12d
1 parent c83e779
commit 000e12d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/generator/src/OperatorClassGenerator.php b/generator/src/OperatorClassGenerator.php
@@ -22,7 +22,6 @@
 use function interface_exists;
 use function rtrim;
 use function sprintf;
-use function var_export;
 
 /**
  * Generates a value object class for stages and operators.

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -160,4 +160,7 @@
     <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
         <exclude-pattern>/tests/SpecTests/*/Prose*</exclude-pattern>
     </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint.UselessDocComment">
+        <exclude-pattern>src/Builder/Type/OperatorInterface.php</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -69,6 +69,12 @@
       <code><![CDATA[$val]]></code>
       <code><![CDATA[$val]]></code>
     </MixedAssignment>
+    <MixedInferredReturnType>
+      <code><![CDATA[stdClass]]></code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement>
+      <code><![CDATA[$result]]></code>
+    </MixedReturnStatement>
   </file>
   <file src="src/Builder/Encoder/OutputWindowEncoder.php">
     <MixedArgument>
@@ -168,7 +174,26 @@
       <code><![CDATA[stdClass]]></code>
     </TooManyTemplateParams>
   </file>
+  <file src="src/Builder/Type/CombinedFieldQuery.php">
+    <MixedArgument>
+      <code><![CDATA[$operator]]></code>
+      <code><![CDATA[$operator]]></code>
+    </MixedArgument>
+    <MixedArrayOffset>
+      <code><![CDATA[$seenOperators[$operator]]]></code>
+    </MixedArrayOffset>
+    <MixedAssignment>
+      <code><![CDATA[$operator]]></code>
+    </MixedAssignment>
+  </file>
   <file src="src/Builder/Type/QueryObject.php">
+    <MixedArgument>
+      <code><![CDATA[$query::NAME]]></code>
+    </MixedArgument>
+    <MixedArrayOffset>
+      <code><![CDATA[$seenQueryOperators[$query::NAME]]]></code>
+      <code><![CDATA[$seenQueryOperators[$query::NAME]]]></code>
+    </MixedArrayOffset>
     <MixedAssignment>
       <code><![CDATA[$queries[$fieldPath]]]></code>
       <code><![CDATA[$query]]></code>
@@ -179,6 +204,11 @@
             is_array($queriesOrArrayOfQueries[0]) &&
             count($queriesOrArrayOfQueries[0]) > 0]]></code>
     </RedundantConditionGivenDocblockType>
+    <UndefinedConstant>
+      <code><![CDATA[$query::NAME]]></code>
+      <code><![CDATA[$query::NAME]]></code>
+      <code><![CDATA[$query::NAME]]></code>
+    </UndefinedConstant>
   </file>
   <file src="src/ChangeStream.php">
     <DeprecatedConstant>

diff --git a/src/Builder/Type/CombinedFieldQuery.php b/src/Builder/Type/CombinedFieldQuery.php
@@ -57,6 +57,7 @@ static function (array $fieldQueries, QueryInterface|FieldQueryInterface|Type|st
         );
 
         // Validate FieldQuery types and non-duplicate operators
+        /** @var array<string, true> $seenOperators */
         $seenOperators = [];
         foreach ($this->fieldQueries as $fieldQuery) {
             if ($fieldQuery instanceof stdClass) {