Visitar URL original
Merge pull request #19175 from MauricioFauth/controller-response · phpmyadmin/phpmyadmin@ff47ba8 · GitHub
Skip to content

Commit ff47ba8

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19175 from MauricioFauth/controller-response
Change InvocableController to always return a Response object
2 parents 2997b52 + 99ad89e commit ff47ba8

217 files changed

Lines changed: 1039 additions & 1099 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/services_controllers.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,10 +1165,7 @@
11651165
],
11661166
Table\Structure\AddKeyController::class => [
11671167
'class' => Table\Structure\AddKeyController::class,
1168-
'arguments' => [
1169-
'$sqlController' => '@' . Sql\SqlController::class,
1170-
'$structureController' => '@' . Table\StructureController::class,
1171-
],
1168+
'arguments' => ['@response', '@' . Table\StructureController::class, '@table_indexes'],
11721169
],
11731170
Table\Structure\BrowseController::class => [
11741171
'class' => Table\Structure\BrowseController::class,

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4880,11 +4880,6 @@ parameters:
48804880
count: 1
48814881
path: src/Controllers/Table/SqlController.php
48824882

4883-
-
4884-
message: "#^Parameter \\#3 \\$selectedColumns of static method PhpMyAdmin\\\\Query\\\\Generator\\:\\:getAddIndexSql\\(\\) expects array\\<string\\>, array given\\.$#"
4885-
count: 1
4886-
path: src/Controllers/Table/Structure/AbstractIndexController.php
4887-
48884883
-
48894884
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
48904885
count: 1

0 commit comments

Comments
 (0)