Merge pull request #18721 from kamil-tekiela/TokensList

MauricioFauth · web-flow · commit 89835fbefbf3 · 2023-09-18T00:48:09.000-03:00
Fix TokensList usages
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -8295,11 +8295,6 @@ parameters:
 			count: 1
 			path: src/Controllers/View/CreateController.php
 
-		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$body \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: src/Controllers/View/CreateController.php
-
 		-
 			message: "#^Cannot access offset 'back' on mixed\\.$#"
 			count: 1
@@ -18945,11 +18940,6 @@ parameters:
 			count: 1
 			path: src/Tracking/Tracker.php
 
-		-
-			message: "#^Cannot access property \\$value on PhpMyAdmin\\\\SqlParser\\\\Token\\|string\\.$#"
-			count: 3
-			path: src/Tracking/Tracker.php
-
 		-
 			message: "#^Cannot cast mixed to string\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4422,9 +4422,6 @@
     <DeprecatedMethod>
       <code>Config::getInstance()</code>
     </DeprecatedMethod>
-    <DocblockTypeContradiction>
-      <code><![CDATA[$viewData['as']]]></code>
-    </DocblockTypeContradiction>
     <MixedArgument>
       <code>$db</code>
       <code>$table</code>
@@ -4441,7 +4438,6 @@
       <code>$db</code>
       <code>$table</code>
       <code><![CDATA[$viewData['as']]]></code>
-      <code><![CDATA[$viewData['as']]]></code>
       <code><![CDATA[$viewData['definer']]]></code>
       <code><![CDATA[$viewData['sql_security']]]></code>
       <code><![CDATA[$viewData['with']]]></code>
@@ -4456,9 +4452,6 @@
     <PossiblyUnusedMethod>
       <code>__construct</code>
     </PossiblyUnusedMethod>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[isset($stmt->body)]]></code>
-    </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Controllers/View/OperationsController.php">
     <DeprecatedMethod>
@@ -12475,9 +12468,6 @@
       <code>self::$trackingCache[$dbName][$tableName]</code>
     </MixedReturnStatement>
     <PossiblyInvalidPropertyFetch>
-      <code><![CDATA[$statement->body[2]->value]]></code>
-      <code><![CDATA[$statement->body[3]->value]]></code>
-      <code><![CDATA[$statement->body[4]->value]]></code>
       <code><![CDATA[$statement->into->dest->table]]></code>
     </PossiblyInvalidPropertyFetch>
     <PossiblyNullArrayAccess>
diff --git a/src/Controllers/View/CreateController.php b/src/Controllers/View/CreateController.php
@@ -176,7 +176,7 @@ public function __invoke(ServerRequest $request): void
                 $parser = new Parser($createView);
                 /** @var CreateStatement $stmt */
                 $stmt = $parser->statements[0];
-                $viewData['as'] = isset($stmt->body) ? TokensList::build($stmt->body) : $viewData['as'];
+                $viewData['as'] = TokensList::buildFromArray($stmt->body);
             }
         }
 
diff --git a/src/Database/Routines.php b/src/Database/Routines.php
@@ -438,7 +438,7 @@ public function getDataFromName(string $name, string $type, bool $all = true): a
         $stmt = $parser->statements[0];
 
         // Do not use $routine['ROUTINE_DEFINITION'] because of a MySQL escaping issue: #15370
-        $body = TokensList::build($stmt->body);
+        $body = TokensList::buildFromArray($stmt->body);
         if ($body === '') {
             // Fallback just in case the parser fails
             $body = (string) $routine['ROUTINE_DEFINITION'];
diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php
@@ -2571,13 +2571,7 @@ public function replaceWithAliases(
         ) {
             // Replacing the body.
             /** @infection-ignore-all */
-            for ($i = 0, $count = count((array) $statement->body); $i < $count; ++$i) {
-
-                /**
-                 * Token parsed at this moment.
-                 *
-                 * @var Token $token
-                 */
+            for ($i = 0, $count = count($statement->body); $i < $count; ++$i) {
                 $token = $statement->body[$i];
 
                 // Replacing only symbols (that are not variables) and unknown

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function __invoke(ServerRequest $request): void`
`176`	`176`	`$parser = new Parser($createView);`
`177`	`177`	`/** @var CreateStatement $stmt */`
`178`	`178`	`$stmt = $parser->statements[0];`
`179`		`- $viewData['as'] = isset($stmt->body) ? TokensList::build($stmt->body) : $viewData['as'];`
	`179`	`+ $viewData['as'] = TokensList::buildFromArray($stmt->body);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`