Merge #570 define context keywords relying on token constants

- Closes #570 Signed-off-by: Maurício Meneghini Fauth <[email protected]>
phpmyadmin · Aug 25, 2024 · 9fa8ca9 · 9fa8ca9
2 parents 6dc815b + 7968818
commit 9fa8ca9
Show file tree

Hide file tree

Showing 49 changed files with 28,983 additions and 8,335 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -19,6 +19,10 @@
         <exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps"/>
     </rule>
 
+    <rule ref="Generic.Files.LineLength.TooLong">
+        <exclude-pattern>src/Contexts/*</exclude-pattern>
+    </rule>
+
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>
     <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
     <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -800,11 +800,6 @@ parameters:
 			count: 1
 			path: src/Tools/ContextGenerator.php
 
-		-
-			message: "#^Offset 'keywords' on array\\{name\\: string, class\\: string, link\\: string, keywords\\: array\\<int, array\\<int, array\\<int, string\\>\\>\\>\\} in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: src/Tools/ContextGenerator.php
-
 		-
 			message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -656,6 +656,9 @@
   <file src="src/Contexts/ContextMySql80300.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
+  <file src="src/Contexts/ContextMySql80400.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
   <file src="src/Lexer.php">
     <LoopInvalidation occurrences="3">
       <code>$this-&gt;last</code>
@@ -1160,15 +1163,6 @@
       <code>is_array($list)</code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="src/Tools/ContextGenerator.php">
-    <PossiblyNullArgument occurrences="1">
-      <code>$options['keywords']</code>
-    </PossiblyNullArgument>
-    <RedundantCondition occurrences="2">
-      <code>++$i !== $count</code>
-      <code>++$i !== $count</code>
-    </RedundantCondition>
-  </file>
   <file src="src/Tools/CustomJsonSerializer.php">
     <MixedAssignment occurrences="2">
       <code>$data[$property]</code>

diff --git a/src/Contexts/ContextMariaDb100000.php b/src/Contexts/ContextMariaDb100000.php
diff --git a/src/Contexts/ContextMariaDb100100.php b/src/Contexts/ContextMariaDb100100.php
diff --git a/src/Contexts/ContextMariaDb100200.php b/src/Contexts/ContextMariaDb100200.php
diff --git a/src/Contexts/ContextMariaDb100300.php b/src/Contexts/ContextMariaDb100300.php
diff --git a/src/Contexts/ContextMariaDb100400.php b/src/Contexts/ContextMariaDb100400.php
diff --git a/src/Contexts/ContextMariaDb100500.php b/src/Contexts/ContextMariaDb100500.php
diff --git a/src/Contexts/ContextMariaDb100600.php b/src/Contexts/ContextMariaDb100600.php
diff --git a/src/Contexts/ContextMariaDb100700.php b/src/Contexts/ContextMariaDb100700.php
diff --git a/src/Contexts/ContextMariaDb100800.php b/src/Contexts/ContextMariaDb100800.php
diff --git a/src/Contexts/ContextMariaDb100900.php b/src/Contexts/ContextMariaDb100900.php
diff --git a/src/Contexts/ContextMariaDb101000.php b/src/Contexts/ContextMariaDb101000.php
diff --git a/src/Contexts/ContextMariaDb101100.php b/src/Contexts/ContextMariaDb101100.php
diff --git a/src/Contexts/ContextMariaDb110000.php b/src/Contexts/ContextMariaDb110000.php
diff --git a/src/Contexts/ContextMariaDb110100.php b/src/Contexts/ContextMariaDb110100.php
diff --git a/src/Contexts/ContextMariaDb110200.php b/src/Contexts/ContextMariaDb110200.php
diff --git a/src/Contexts/ContextMariaDb110300.php b/src/Contexts/ContextMariaDb110300.php
diff --git a/src/Contexts/ContextMariaDb110400.php b/src/Contexts/ContextMariaDb110400.php
diff --git a/src/Contexts/ContextMySql50000.php b/src/Contexts/ContextMySql50000.php
diff --git a/src/Contexts/ContextMySql50100.php b/src/Contexts/ContextMySql50100.php
diff --git a/src/Contexts/ContextMySql50500.php b/src/Contexts/ContextMySql50500.php
diff --git a/src/Contexts/ContextMySql50600.php b/src/Contexts/ContextMySql50600.php
diff --git a/src/Contexts/ContextMySql50700.php b/src/Contexts/ContextMySql50700.php
diff --git a/src/Contexts/ContextMySql80000.php b/src/Contexts/ContextMySql80000.php
diff --git a/src/Contexts/ContextMySql80100.php b/src/Contexts/ContextMySql80100.php
diff --git a/src/Contexts/ContextMySql80200.php b/src/Contexts/ContextMySql80200.php
diff --git a/src/Contexts/ContextMySql80300.php b/src/Contexts/ContextMySql80300.php