Merge branch 'master' into 6.0.x

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

Author: MauricioFauth

CHANGELOG.md

@@ -5,7 +5,6 @@
 * Add missing return types annotations
 * Improve the WITH statements parser (#363)
 * Add support for passing `Context::SQL_MODE*` constants to `Context::setMode` method
-* Deprecate passing strings to the `Context::setMode` method
 
 ## [5.5.0] - 2021-12-08
 

phpstan-baseline.neon

@@ -30,6 +30,11 @@ parameters:
 			count: 1
 			path: src/Components/AlterOperation.php
 
+		-
+			message: "#^Result of && is always true\\.$#"
+			count: 1
+			path: src/Components/AlterOperation.php
+
 		-
 			message: "#^array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string does not accept PhpMyAdmin\\\\SqlParser\\\\Token\\.$#"
 			count: 3

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
+<files psalm-version="4.19.0@a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599">
   <file src="src/Components/AlterOperation.php">
     <DocblockTypeContradiction occurrences="1">
       <code>$component-&gt;field !== ''</code>
@@ -567,9 +567,9 @@
     <PossiblyNullPropertyAssignmentValue occurrences="1">
       <code>$tmp-&gt;expr</code>
     </PossiblyNullPropertyAssignmentValue>
-    <RedundantCondition occurrences="1">
+    <RedundantConditionGivenDocblockType occurrences="1">
       <code>$token-&gt;value === ','</code>
-    </RedundantCondition>
+    </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Components/UnionKeyword.php">
     <InvalidArgument occurrences="1">
@@ -1275,9 +1275,9 @@
     <PossiblyInvalidIterator occurrences="1">
       <code>$this-&gt;options['formats']</code>
     </PossiblyInvalidIterator>
-    <RedundantCondition occurrences="1">
+    <RedundantConditionGivenDocblockType occurrences="1">
       <code>$curr-&gt;type === Token::TYPE_KEYWORD</code>
-    </RedundantCondition>
+    </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Utils/Misc.php">
     <DocblockTypeContradiction occurrences="1">

src/Context.php

@@ -13,7 +13,6 @@
 use function is_array;
 use function is_int;
 use function is_numeric;
-use function is_string;
 use function str_replace;
 use function str_starts_with;
 use function strlen;
@@ -607,23 +606,20 @@ public static function getMode(): int
     /**
      * Sets the SQL mode.
      *
-     * @param int $mode
-     * @psalm-param 0|positive-int $mode
+     * @param int|string $mode
      *
      * @return void
      */
     public static function setMode($mode = self::SQL_MODE_NONE)
     {
-        /** @var int|string $mode Used to set the old type to $mode for static analysis tools. */
-        $mode = $mode;
-        if (is_int($mode) && $mode >= 1) {
+        if (is_int($mode)) {
             static::$mode = $mode;
 
             return;
         }
 
         static::$mode = self::SQL_MODE_NONE;
-        if (! is_string($mode) || $mode === '') {
+        if ($mode === '') {
             return;
         }
 

tests/Lexer/ContextTest.php

@@ -128,10 +128,6 @@ public function testLoadError(): void
      */
     public function testMode($mode, int $expected): void
     {
-        /**
-         * @psalm-suppress ArgumentTypeCoercion
-         * @phpstan-ignore-next-line
-         */
         Context::setMode($mode);
         $this->assertSame($expected, Context::getMode());
     }
@@ -143,7 +139,6 @@ public function testMode($mode, int $expected): void
     public function providerForTestMode(): array
     {
         return [
-            [-1, Context::SQL_MODE_NONE],
             [0, Context::SQL_MODE_NONE],
             [1, 1],
             ['', Context::SQL_MODE_NONE],
@@ -202,15 +197,8 @@ public function testModeWithCombinedModes(): void
         $this->assertSame(Context::SQL_MODE_NONE, Context::getMode());
     }
 
-    /**
-     * BC tests
-     */
     public function testModeWithString(): void
     {
-        /**
-         * @psalm-suppress InvalidScalarArgument
-         * @phpstan-ignore-next-line
-         */
         Context::setMode('REAL_AS_FLOAT,ANSI_QUOTES,IGNORE_SPACE');
         $this->assertSame(
             Context::SQL_MODE_REAL_AS_FLOAT | Context::SQL_MODE_ANSI_QUOTES | Context::SQL_MODE_IGNORE_SPACE,
@@ -221,17 +209,9 @@ public function testModeWithString(): void
         $this->assertFalse(Context::hasMode(Context::SQL_MODE_REAL_AS_FLOAT | Context::SQL_MODE_ALLOW_INVALID_DATES));
         $this->assertFalse(Context::hasMode(Context::SQL_MODE_ALLOW_INVALID_DATES));
 
-        /**
-         * @psalm-suppress InvalidScalarArgument
-         * @phpstan-ignore-next-line
-         */
         Context::setMode('TRADITIONAL');
         $this->assertSame(Context::SQL_MODE_TRADITIONAL, Context::getMode());
 
-        /**
-         * @psalm-suppress InvalidScalarArgument
-         * @phpstan-ignore-next-line
-         */
         Context::setMode('');
         $this->assertSame(Context::SQL_MODE_NONE, Context::getMode());
     }