Skip to content

Commit 5f7d70b

Browse files
MauricioFauthMauricioFauth
committed
Move the Middleware namespace into the Http namespace
Middleware is directly related to HTTP. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent da32818 commit 5f7d70b

37 files changed

Lines changed: 178 additions & 178 deletions

‎phpstan-baseline.neon‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11510,6 +11510,71 @@ parameters:
1151011510
count: 1
1151111511
path: src/Http/Factory/UriFactory.php
1151211512

11513+
-
11514+
message: "#^Parameter \\#1 \\$source of method PhpMyAdmin\\\\Config\\:\\:loadAndCheck\\(\\) expects string\\|null, mixed given\\.$#"
11515+
count: 1
11516+
path: src/Http/Middleware/ConfigLoading.php
11517+
11518+
-
11519+
message: "#^Cannot access offset 'server' on mixed\\.$#"
11520+
count: 1
11521+
path: src/Http/Middleware/CurrentServerGlobalSetting.php
11522+
11523+
-
11524+
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
11525+
count: 1
11526+
path: src/Http/Middleware/CurrentServerGlobalSetting.php
11527+
11528+
-
11529+
message: "#^Cannot access offset 'table' on mixed\\.$#"
11530+
count: 1
11531+
path: src/Http/Middleware/DatabaseAndTableSetting.php
11532+
11533+
-
11534+
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
11535+
count: 1
11536+
path: src/Http/Middleware/DatabaseAndTableSetting.php
11537+
11538+
-
11539+
message: "#^Cannot cast mixed to string\\.$#"
11540+
count: 1
11541+
path: src/Http/Middleware/LanguageAndThemeCookieSaving.php
11542+
11543+
-
11544+
message: "#^Parameter \\#1 \\$server of method PhpMyAdmin\\\\Config\\:\\:getLoginCookieValidityFromCache\\(\\) expects int, mixed given\\.$#"
11545+
count: 1
11546+
path: src/Http/Middleware/LoginCookieValiditySetting.php
11547+
11548+
-
11549+
message: "#^Parameter \\#2 \\$value of method PhpMyAdmin\\\\Config\\:\\:setCookie\\(\\) expects string, mixed given\\.$#"
11550+
count: 1
11551+
path: src/Http/Middleware/SetupPageRedirection.php
11552+
11553+
-
11554+
message: "#^Parameter \\#1 \\$known_string of function hash_equals expects string, mixed given\\.$#"
11555+
count: 1
11556+
path: src/Http/Middleware/TokenRequestParamChecking.php
11557+
11558+
-
11559+
message: "#^Cannot access offset 'goto' on mixed\\.$#"
11560+
count: 1
11561+
path: src/Http/Middleware/UrlParamsSetting.php
11562+
11563+
-
11564+
message: "#^Parameter \\#1 \\$page of static method PhpMyAdmin\\\\Core\\:\\:checkPageValidity\\(\\) expects string, mixed given\\.$#"
11565+
count: 2
11566+
path: src/Http/Middleware/UrlParamsSetting.php
11567+
11568+
-
11569+
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
11570+
count: 3
11571+
path: src/Http/Middleware/UrlParamsSetting.php
11572+
11573+
-
11574+
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
11575+
count: 1
11576+
path: src/Http/Middleware/ZeroConfPostConnection.php
11577+
1151311578
-
1151411579
message: "#^Method PhpMyAdmin\\\\Http\\\\ServerRequest\\:\\:getAttributes\\(\\) return type has no value type specified in iterable type array\\.$#"
1151511580
count: 1
@@ -12455,71 +12520,6 @@ parameters:
1245512520
count: 1
1245612521
path: src/Message.php
1245712522

12458-
-
12459-
message: "#^Parameter \\#1 \\$source of method PhpMyAdmin\\\\Config\\:\\:loadAndCheck\\(\\) expects string\\|null, mixed given\\.$#"
12460-
count: 1
12461-
path: src/Middleware/ConfigLoading.php
12462-
12463-
-
12464-
message: "#^Cannot access offset 'server' on mixed\\.$#"
12465-
count: 1
12466-
path: src/Middleware/CurrentServerGlobalSetting.php
12467-
12468-
-
12469-
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
12470-
count: 1
12471-
path: src/Middleware/CurrentServerGlobalSetting.php
12472-
12473-
-
12474-
message: "#^Cannot access offset 'table' on mixed\\.$#"
12475-
count: 1
12476-
path: src/Middleware/DatabaseAndTableSetting.php
12477-
12478-
-
12479-
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
12480-
count: 1
12481-
path: src/Middleware/DatabaseAndTableSetting.php
12482-
12483-
-
12484-
message: "#^Cannot cast mixed to string\\.$#"
12485-
count: 1
12486-
path: src/Middleware/LanguageAndThemeCookieSaving.php
12487-
12488-
-
12489-
message: "#^Parameter \\#1 \\$server of method PhpMyAdmin\\\\Config\\:\\:getLoginCookieValidityFromCache\\(\\) expects int, mixed given\\.$#"
12490-
count: 1
12491-
path: src/Middleware/LoginCookieValiditySetting.php
12492-
12493-
-
12494-
message: "#^Parameter \\#2 \\$value of method PhpMyAdmin\\\\Config\\:\\:setCookie\\(\\) expects string, mixed given\\.$#"
12495-
count: 1
12496-
path: src/Middleware/SetupPageRedirection.php
12497-
12498-
-
12499-
message: "#^Parameter \\#1 \\$known_string of function hash_equals expects string, mixed given\\.$#"
12500-
count: 1
12501-
path: src/Middleware/TokenRequestParamChecking.php
12502-
12503-
-
12504-
message: "#^Cannot access offset 'goto' on mixed\\.$#"
12505-
count: 1
12506-
path: src/Middleware/UrlParamsSetting.php
12507-
12508-
-
12509-
message: "#^Parameter \\#1 \\$page of static method PhpMyAdmin\\\\Core\\:\\:checkPageValidity\\(\\) expects string, mixed given\\.$#"
12510-
count: 2
12511-
path: src/Middleware/UrlParamsSetting.php
12512-
12513-
-
12514-
message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
12515-
count: 3
12516-
path: src/Middleware/UrlParamsSetting.php
12517-
12518-
-
12519-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
12520-
count: 1
12521-
path: src/Middleware/ZeroConfPostConnection.php
12522-
1252312523
-
1252412524
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
1252512525
count: 3

‎psalm-baseline.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6820,6 +6820,51 @@
68206820
<code><![CDATA[$_REQUEST['unlim_num_rows']]]></code>
68216821
</RiskyCast>
68226822
</file>
6823+
<file src="src/Http/Middleware/Authentication.php">
6824+
<DeprecatedMethod>
6825+
<code>Config::getInstance()</code>
6826+
<code>DatabaseInterface::getInstance()</code>
6827+
</DeprecatedMethod>
6828+
</file>
6829+
<file src="src/Http/Middleware/DatabaseServerVersionChecking.php">
6830+
<DeprecatedMethod>
6831+
<code>DatabaseInterface::getInstance()</code>
6832+
</DeprecatedMethod>
6833+
</file>
6834+
<file src="src/Http/Middleware/LanguageAndThemeCookieSaving.php">
6835+
<RedundantCast>
6836+
<code><![CDATA[(string) $GLOBALS['lang']]]></code>
6837+
</RedundantCast>
6838+
</file>
6839+
<file src="src/Http/Middleware/ProfilingChecking.php">
6840+
<DeprecatedMethod>
6841+
<code>DatabaseInterface::getInstance()</code>
6842+
</DeprecatedMethod>
6843+
</file>
6844+
<file src="src/Http/Middleware/TokenRequestParamChecking.php">
6845+
<MixedArgument>
6846+
<code><![CDATA[$_SESSION[' PMA_token ']]]></code>
6847+
</MixedArgument>
6848+
<RedundantCast>
6849+
<code><![CDATA[(string) $_POST['token']]]></code>
6850+
<code><![CDATA[(string) $_POST['token']]]></code>
6851+
</RedundantCast>
6852+
</file>
6853+
<file src="src/Http/Middleware/UrlParamsSetting.php">
6854+
<PossiblyInvalidArgument>
6855+
<code><![CDATA[$_REQUEST['back']]]></code>
6856+
<code><![CDATA[$_REQUEST['goto']]]></code>
6857+
</PossiblyInvalidArgument>
6858+
<PossiblyInvalidCast>
6859+
<code><![CDATA[$_REQUEST['back']]]></code>
6860+
<code><![CDATA[$_REQUEST['goto']]]></code>
6861+
</PossiblyInvalidCast>
6862+
</file>
6863+
<file src="src/Http/Middleware/ZeroConfPostConnection.php">
6864+
<DeprecatedMethod>
6865+
<code>DatabaseInterface::getInstance()</code>
6866+
</DeprecatedMethod>
6867+
</file>
68236868
<file src="src/Image/ImageWrapper.php">
68246869
<PossiblyUnusedReturnValue>
68256870
<code>bool</code>
@@ -7378,51 +7423,6 @@
73787423
<code><![CDATA[self::$level[$this->getNumber()]]]></code>
73797424
</MixedReturnStatement>
73807425
</file>
7381-
<file src="src/Middleware/Authentication.php">
7382-
<DeprecatedMethod>
7383-
<code>Config::getInstance()</code>
7384-
<code>DatabaseInterface::getInstance()</code>
7385-
</DeprecatedMethod>
7386-
</file>
7387-
<file src="src/Middleware/DatabaseServerVersionChecking.php">
7388-
<DeprecatedMethod>
7389-
<code>DatabaseInterface::getInstance()</code>
7390-
</DeprecatedMethod>
7391-
</file>
7392-
<file src="src/Middleware/LanguageAndThemeCookieSaving.php">
7393-
<RedundantCast>
7394-
<code><![CDATA[(string) $GLOBALS['lang']]]></code>
7395-
</RedundantCast>
7396-
</file>
7397-
<file src="src/Middleware/ProfilingChecking.php">
7398-
<DeprecatedMethod>
7399-
<code>DatabaseInterface::getInstance()</code>
7400-
</DeprecatedMethod>
7401-
</file>
7402-
<file src="src/Middleware/TokenRequestParamChecking.php">
7403-
<MixedArgument>
7404-
<code><![CDATA[$_SESSION[' PMA_token ']]]></code>
7405-
</MixedArgument>
7406-
<RedundantCast>
7407-
<code><![CDATA[(string) $_POST['token']]]></code>
7408-
<code><![CDATA[(string) $_POST['token']]]></code>
7409-
</RedundantCast>
7410-
</file>
7411-
<file src="src/Middleware/UrlParamsSetting.php">
7412-
<PossiblyInvalidArgument>
7413-
<code><![CDATA[$_REQUEST['back']]]></code>
7414-
<code><![CDATA[$_REQUEST['goto']]]></code>
7415-
</PossiblyInvalidArgument>
7416-
<PossiblyInvalidCast>
7417-
<code><![CDATA[$_REQUEST['back']]]></code>
7418-
<code><![CDATA[$_REQUEST['goto']]]></code>
7419-
</PossiblyInvalidCast>
7420-
</file>
7421-
<file src="src/Middleware/ZeroConfPostConnection.php">
7422-
<DeprecatedMethod>
7423-
<code>DatabaseInterface::getInstance()</code>
7424-
</DeprecatedMethod>
7425-
</file>
74267426
<file src="src/Navigation/Navigation.php">
74277427
<DeprecatedMethod>
74287428
<code>Config::getInstance()</code>

‎src/Application.php‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,41 @@
1111
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
1212
use PhpMyAdmin\Http\Handler\ApplicationHandler;
1313
use PhpMyAdmin\Http\Handler\QueueRequestHandler;
14+
use PhpMyAdmin\Http\Middleware\Authentication;
15+
use PhpMyAdmin\Http\Middleware\ConfigErrorAndPermissionChecking;
16+
use PhpMyAdmin\Http\Middleware\ConfigLoading;
17+
use PhpMyAdmin\Http\Middleware\CurrentServerGlobalSetting;
18+
use PhpMyAdmin\Http\Middleware\DatabaseAndTableSetting;
19+
use PhpMyAdmin\Http\Middleware\DatabaseServerVersionChecking;
20+
use PhpMyAdmin\Http\Middleware\EncryptedQueryParamsHandling;
21+
use PhpMyAdmin\Http\Middleware\ErrorHandling;
22+
use PhpMyAdmin\Http\Middleware\LanguageAndThemeCookieSaving;
23+
use PhpMyAdmin\Http\Middleware\LanguageLoading;
24+
use PhpMyAdmin\Http\Middleware\LoginCookieValiditySetting;
25+
use PhpMyAdmin\Http\Middleware\MinimumCommonRedirection;
26+
use PhpMyAdmin\Http\Middleware\OutputBuffering;
27+
use PhpMyAdmin\Http\Middleware\PhpExtensionsChecking;
28+
use PhpMyAdmin\Http\Middleware\PhpSettingsConfiguration;
29+
use PhpMyAdmin\Http\Middleware\ProfilingChecking;
30+
use PhpMyAdmin\Http\Middleware\RequestProblemChecking;
31+
use PhpMyAdmin\Http\Middleware\ResponseRendererLoading;
32+
use PhpMyAdmin\Http\Middleware\RouteParsing;
33+
use PhpMyAdmin\Http\Middleware\ServerConfigurationChecking;
34+
use PhpMyAdmin\Http\Middleware\SessionHandling;
35+
use PhpMyAdmin\Http\Middleware\SetupPageRedirection;
36+
use PhpMyAdmin\Http\Middleware\SqlDelimiterSetting;
37+
use PhpMyAdmin\Http\Middleware\SqlQueryGlobalSetting;
38+
use PhpMyAdmin\Http\Middleware\ThemeInitialization;
39+
use PhpMyAdmin\Http\Middleware\TokenMismatchChecking;
40+
use PhpMyAdmin\Http\Middleware\TokenRequestParamChecking;
41+
use PhpMyAdmin\Http\Middleware\TrackerEnabling;
42+
use PhpMyAdmin\Http\Middleware\UriSchemeUpdating;
43+
use PhpMyAdmin\Http\Middleware\UrlParamsSetting;
44+
use PhpMyAdmin\Http\Middleware\UrlRedirection;
45+
use PhpMyAdmin\Http\Middleware\UserPreferencesLoading;
46+
use PhpMyAdmin\Http\Middleware\ZeroConfPostConnection;
1447
use PhpMyAdmin\Http\Response;
1548
use PhpMyAdmin\Http\ServerRequest;
16-
use PhpMyAdmin\Middleware\Authentication;
17-
use PhpMyAdmin\Middleware\ConfigErrorAndPermissionChecking;
18-
use PhpMyAdmin\Middleware\ConfigLoading;
19-
use PhpMyAdmin\Middleware\CurrentServerGlobalSetting;
20-
use PhpMyAdmin\Middleware\DatabaseAndTableSetting;
21-
use PhpMyAdmin\Middleware\DatabaseServerVersionChecking;
22-
use PhpMyAdmin\Middleware\EncryptedQueryParamsHandling;
23-
use PhpMyAdmin\Middleware\ErrorHandling;
24-
use PhpMyAdmin\Middleware\LanguageAndThemeCookieSaving;
25-
use PhpMyAdmin\Middleware\LanguageLoading;
26-
use PhpMyAdmin\Middleware\LoginCookieValiditySetting;
27-
use PhpMyAdmin\Middleware\MinimumCommonRedirection;
28-
use PhpMyAdmin\Middleware\OutputBuffering;
29-
use PhpMyAdmin\Middleware\PhpExtensionsChecking;
30-
use PhpMyAdmin\Middleware\PhpSettingsConfiguration;
31-
use PhpMyAdmin\Middleware\ProfilingChecking;
32-
use PhpMyAdmin\Middleware\RequestProblemChecking;
33-
use PhpMyAdmin\Middleware\ResponseRendererLoading;
34-
use PhpMyAdmin\Middleware\RouteParsing;
35-
use PhpMyAdmin\Middleware\ServerConfigurationChecking;
36-
use PhpMyAdmin\Middleware\SessionHandling;
37-
use PhpMyAdmin\Middleware\SetupPageRedirection;
38-
use PhpMyAdmin\Middleware\SqlDelimiterSetting;
39-
use PhpMyAdmin\Middleware\SqlQueryGlobalSetting;
40-
use PhpMyAdmin\Middleware\ThemeInitialization;
41-
use PhpMyAdmin\Middleware\TokenMismatchChecking;
42-
use PhpMyAdmin\Middleware\TokenRequestParamChecking;
43-
use PhpMyAdmin\Middleware\TrackerEnabling;
44-
use PhpMyAdmin\Middleware\UriSchemeUpdating;
45-
use PhpMyAdmin\Middleware\UrlParamsSetting;
46-
use PhpMyAdmin\Middleware\UrlRedirection;
47-
use PhpMyAdmin\Middleware\UserPreferencesLoading;
48-
use PhpMyAdmin\Middleware\ZeroConfPostConnection;
4949
use PhpMyAdmin\Routing\Routing;
5050
use Psr\Http\Message\ResponseInterface;
5151
use Psr\Http\Message\ServerRequestInterface;

src/Middleware/Authentication.php renamed to src/Http/Middleware/Authentication.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use Fig\Http\Message\StatusCodeInterface;
88
use PhpMyAdmin\Config;

src/Middleware/ConfigErrorAndPermissionChecking.php renamed to src/Http/Middleware/ConfigErrorAndPermissionChecking.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use Fig\Http\Message\StatusCodeInterface;
88
use PhpMyAdmin\Config;

src/Middleware/ConfigLoading.php renamed to src/Http/Middleware/ConfigLoading.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use Fig\Http\Message\StatusCodeInterface;
88
use PhpMyAdmin\Config;

src/Middleware/CurrentServerGlobalSetting.php renamed to src/Http/Middleware/CurrentServerGlobalSetting.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use PhpMyAdmin\Config;
88
use PhpMyAdmin\Core;

src/Middleware/DatabaseAndTableSetting.php renamed to src/Http/Middleware/DatabaseAndTableSetting.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use PhpMyAdmin\Core;
88
use PhpMyAdmin\Http\ServerRequest;

src/Middleware/DatabaseServerVersionChecking.php renamed to src/Http/Middleware/DatabaseServerVersionChecking.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use Fig\Http\Message\StatusCodeInterface;
88
use PhpMyAdmin\Config;

src/Middleware/EncryptedQueryParamsHandling.php renamed to src/Http/Middleware/EncryptedQueryParamsHandling.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin\Middleware;
5+
namespace PhpMyAdmin\Http\Middleware;
66

77
use PhpMyAdmin\Core;
88
use PhpMyAdmin\Http\ServerRequest;

0 commit comments

Comments
 (0)