diff --git a/composer.lock b/composer.lock index b179769100..acd7a6f12a 100644 --- a/composer.lock +++ b/composer.lock @@ -454,12 +454,12 @@ "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "5c4dc472f1fcbe6467bac080d0a3538b2700ee31" + "reference": "6d8c215b0258e0108522f3be375b68a87b05e6b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/5c4dc472f1fcbe6467bac080d0a3538b2700ee31", - "reference": "5c4dc472f1fcbe6467bac080d0a3538b2700ee31", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/6d8c215b0258e0108522f3be375b68a87b05e6b3", + "reference": "6d8c215b0258e0108522f3be375b68a87b05e6b3", "shasum": "" }, "require": { @@ -535,7 +535,7 @@ "type": "other" } ], - "time": "2024-10-26T11:47:59+00:00" + "time": "2024-11-10T04:24:38+00:00" }, { "name": "psr/cache", @@ -4246,23 +4246,23 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -4298,9 +4298,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-11-03T20:11:34+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpmyadmin/coding-standard", diff --git a/src/Display/Results.php b/src/Display/Results.php index b077601f40..2576c5e03f 100644 --- a/src/Display/Results.php +++ b/src/Display/Results.php @@ -3103,9 +3103,9 @@ class Results if ($statement !== null && ! empty($statement->order)) { foreach ($statement->order as $o) { - $sortExpression[] = $o->expr->expr . ' ' . $o->type; + $sortExpression[] = $o->expr->expr . ' ' . $o->type->value; $sortExpressionNoDirection[] = $o->expr->expr; - $sortDirection[] = $o->type; + $sortDirection[] = $o->type->value; } } else { $sortExpression[] = '';