Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Namespace Redaxo\Core\Http #6096

Merged
merged 28 commits into from
May 19, 2024
Merged

Namespace Redaxo\Core\Http #6096

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c228c7f
rex_context -> Http\Context, rex_context_provider_interface -> Http\C…
tbaddade Apr 19, 2024
e7bae88
rector
tbaddade Apr 19, 2024
bcf7045
rex_request -> Redaxo\Core\Http\Request
tbaddade Apr 19, 2024
829765c
rex_response -> Redaxo\Core\Http\Response
tbaddade Apr 19, 2024
284f998
weitere Anpassungen rex_response -> Http\Response
tbaddade Apr 19, 2024
0d7e8ca
Request -> rex_request
tbaddade Apr 19, 2024
c9d1c43
Importe fehlten
tbaddade Apr 19, 2024
d555277
Baseline
tbaddade Apr 19, 2024
eb7b3a0
Apply php-cs-fixer changes
tbaddade Apr 19, 2024
6fe5379
Merge branch '6.x' into namespace-http
gharlan May 12, 2024
883f07a
Merge branch '6.x' into namespace-http
gharlan May 12, 2024
c150704
Function rex_request() -> Redaxo\Core\Http\Request::request()
tbaddade May 17, 2024
f884436
Function rex_get() -> Redaxo\Core\Http\Request::get()
tbaddade May 17, 2024
5f52821
Function rex_post() -> Redaxo\Core\Http\Request::post()
tbaddade May 17, 2024
ae70611
Function rex_server() -> Redaxo\Core\Http\Request::server()
tbaddade May 17, 2024
1b6a553
Function rex_session() -> Http\Request::session(), Function rex_set_s…
tbaddade May 17, 2024
88e16db
Function rex_cookie() -> Redaxo\Core\Http\Request::cookie()
tbaddade May 17, 2024
bd1627c
Function rex_files() -> Redaxo\Core\Http\Request::files()
tbaddade May 17, 2024
b32c495
Function rex_env() -> Redaxo\Core\Http\Request::env()
tbaddade May 17, 2024
38b265c
Function rex_request_method() -> Redaxo\Core\Http\Request::requestMet…
tbaddade May 17, 2024
90bc844
.phpstorm.meta.php angepasst
tbaddade May 17, 2024
0ee1853
function_rex_globals.php gelöscht
tbaddade May 17, 2024
349ab95
Baseline
tbaddade May 17, 2024
9bb26d7
Merge branch '6.x' into namespace-http
tbaddade May 17, 2024
4f4eeaa
Test Class umbenannt und Namespace hinzugefügt
tbaddade May 17, 2024
533a215
Apply php-cs-fixer changes
tbaddade May 17, 2024
6e78d5a
return auf self angepasst
tbaddade May 17, 2024
41fc9e2
Update redaxo/psalm-plugin
gharlan May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
90 changes: 45 additions & 45 deletions .tools/phpstan/baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,31 +150,6 @@ parameters:
count: 1
path: ../../redaxo/src/core/functions/function_structure_rex_url.php

-
message: "#^Method rex_context\\:\\:array2inputStr\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_context\\:\\:getHiddenInputFields\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_context\\:\\:getUrl\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_context_provider_interface\\:\\:getHiddenInputFields\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_url_provider_interface\\:\\:getUrl\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_var_media\\:\\:getWidget\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -205,26 +180,6 @@ parameters:
count: 1
path: ../../redaxo/src/core/lib/mediapool/var_medialist.php

-
message: "#^Method rex_request\\:\\:arrayKeyCast\\(\\) has parameter \\$haystack with no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/request.php

-
message: "#^If condition is always true\\.$#"
count: 1
path: ../../redaxo/src/core/lib/response.php

-
message: "#^Property rex_response\\:\\:\\$additionalHeaders type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/response.php

-
message: "#^Property rex_response\\:\\:\\$preloadFiles type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/response.php

-
message: "#^Method rex_setup\\:\\:checkDb\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -345,6 +300,11 @@ parameters:
count: 1
path: ../../src/Backend/Page.php

-
message: "#^Method Redaxo\\\\Core\\\\Base\\\\UrlProviderInterface\\:\\:getUrl\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Base/UrlProviderInterface.php

-
message: "#^Method Redaxo\\\\Core\\\\Content\\\\ArticleAction\\:\\:__construct\\(\\) has parameter \\$function with no type specified\\.$#"
count: 1
Expand Down Expand Up @@ -1015,6 +975,46 @@ parameters:
count: 1
path: ../../src/Form/Select/Select.php

-
message: "#^Method Redaxo\\\\Core\\\\Http\\\\Context\\:\\:array2inputStr\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Context.php

-
message: "#^Method Redaxo\\\\Core\\\\Http\\\\Context\\:\\:getHiddenInputFields\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Context.php

-
message: "#^Method Redaxo\\\\Core\\\\Http\\\\Context\\:\\:getUrl\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Context.php

-
message: "#^Method Redaxo\\\\Core\\\\Http\\\\ContextProviderInterface\\:\\:getHiddenInputFields\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/ContextProviderInterface.php

-
message: "#^Method Redaxo\\\\Core\\\\Http\\\\Request\\:\\:arrayKeyCast\\(\\) has parameter \\$haystack with no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Request.php

-
message: "#^If condition is always true\\.$#"
count: 1
path: ../../src/Http/Response.php

-
message: "#^Property Redaxo\\\\Core\\\\Http\\\\Response\\:\\:\\$additionalHeaders type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Response.php

-
message: "#^Property Redaxo\\\\Core\\\\Http\\\\Response\\:\\:\\$preloadFiles type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/Http/Response.php

-
message: "#^Method Redaxo\\\\Core\\\\Language\\\\LanguagePermission\\:\\:getClangs\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
Expand Down
16 changes: 8 additions & 8 deletions .tools/psalm/baseline-taint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
<file src="redaxo/src/core/backend.php">
<TaintedHtml>
<code><![CDATA['<script nonce="' . rex_response::getNonce() . '">
<code><![CDATA['<script nonce="' . Response::getNonce() . '">
var history_article_id = ' . Article::getCurrentId() . ';
var history_clang_id = ' . Language::getCurrentId() . ';
var history_ctype_id = ' . rex_request('ctype', 'int', 0) . ';
var history_article_link = "' . rex_escape($articleLink, 'js') . '";
</script>']]></code>
</TaintedHtml>
<TaintedTextWithQuotes>
<code><![CDATA['<script nonce="' . rex_response::getNonce() . '">
<code><![CDATA['<script nonce="' . Response::getNonce() . '">
var history_article_id = ' . Article::getCurrentId() . ';
var history_clang_id = ' . Language::getCurrentId() . ';
var history_ctype_id = ' . rex_request('ctype', 'int', 0) . ';
Expand Down Expand Up @@ -76,18 +76,18 @@
<code><![CDATA[$this->getVar('content2select')]]></code>
</TaintedTextWithQuotes>
</file>
<file src="redaxo/src/core/lib/response.php">
<TaintedHeader>
<code><![CDATA[$str]]></code>
<code><![CDATA['Location: ' . $url]]></code>
</TaintedHeader>
</file>
<file src="src/Database/Sql.php">
<TaintedSql>
<code><![CDATA[$query]]></code>
<code><![CDATA[$query]]></code>
</TaintedSql>
</file>
<file src="src/Http/Response.php">
<TaintedHeader>
<code><![CDATA[$str]]></code>
<code><![CDATA['Location: ' . $url]]></code>
</TaintedHeader>
</file>
<file src="src/HttpClient/Request.php">
<TaintedCallable>
<code><![CDATA[$data]]></code>
Expand Down
193 changes: 112 additions & 81 deletions .tools/psalm/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,25 +983,6 @@
<code><![CDATA[$path]]></code>
</MixedOperand>
</file>
<file src="redaxo/src/core/lib/context.php">
<InvalidArgument>
<code><![CDATA[$_GET]]></code>
<code><![CDATA[$_GET + $_POST]]></code>
<code><![CDATA[$_POST]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$params]]></code>
<code><![CDATA[$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$valVal]]></code>
<code><![CDATA[$value]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[rex_escape($valVal)]]></code>
<code><![CDATA[rex_escape($value)]]></code>
</MixedOperand>
</file>
<file src="redaxo/src/core/lib/error_handler.php">
<InvalidScalarArgument>
<code><![CDATA[$line]]></code>
Expand Down Expand Up @@ -1072,68 +1053,6 @@
<code><![CDATA[Config::get('phpmailer', 'errormail', 1)]]></code>
</PossiblyNullArgument>
</file>
<file src="redaxo/src/core/lib/request.php">
<MixedArgument>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedArrayAccess>
<MixedArrayAssignment>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedAssignment>
<PossiblyInvalidArrayOffset>
<code><![CDATA[$_SESSION[self::getSessionNamespace()]]]></code>
</PossiblyInvalidArrayOffset>
</file>
<file src="redaxo/src/core/lib/response.php">
<MixedArgument>
<code><![CDATA[$chunkSize]]></code>
<code><![CDATA[$range->getStart()]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$preloadFile['file']]]></code>
<code><![CDATA[$preloadFile['mimeType']]]></code>
<code><![CDATA[$preloadFile['type']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$chunkSize]]></code>
<code><![CDATA[$preloadFile]]></code>
<code><![CDATA[$value]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$preloadFile['file']]]></code>
<code><![CDATA[$preloadFile['mimeType']]]></code>
<code><![CDATA[$preloadFile['type']]]></code>
<code><![CDATA[$range->getEnd()]]></code>
<code><![CDATA[$range->getLength()]]></code>
<code><![CDATA[$range->getStart()]]></code>
<code><![CDATA[$value]]></code>
</MixedOperand>
<PossiblyNullArgument>
<code><![CDATA[$value]]></code>
</PossiblyNullArgument>
<PossiblyNullOperand>
<code><![CDATA[$_SERVER['HTTP_HOST']]]></code>
<code><![CDATA[$_SERVER['REQUEST_URI']]]></code>
<code><![CDATA[$filename]]></code>
<code><![CDATA[$raw ? $value : rawurlencode($value)]]></code>
</PossiblyNullOperand>
<PossiblyUndefinedArrayOffset>
<code><![CDATA[$_SERVER['HTTP_HOST']]]></code>
<code><![CDATA[$_SERVER['REQUEST_URI']]]></code>
</PossiblyUndefinedArrayOffset>
<RedundantCondition>
<code><![CDATA[$path]]></code>
</RedundantCondition>
</file>
<file src="redaxo/src/core/lib/setup/setup.php">
<MixedArgument>
<code><![CDATA[$config['db'][1]['host']]]></code>
Expand Down Expand Up @@ -3508,6 +3427,89 @@
<code><![CDATA[array<int, string>]]></code>
</MixedReturnTypeCoercion>
</file>
<file src="src/Http/Context.php">
<InvalidArgument>
<code><![CDATA[$_GET]]></code>
<code><![CDATA[$_GET + $_POST]]></code>
<code><![CDATA[$_POST]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$params]]></code>
<code><![CDATA[$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$valVal]]></code>
<code><![CDATA[$value]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[rex_escape($valVal)]]></code>
<code><![CDATA[rex_escape($value)]]></code>
</MixedOperand>
</file>
<file src="src/Http/Request.php">
<MixedArgument>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
<code><![CDATA[$vartype]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedArrayAccess>
<MixedArrayAssignment>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$_SESSION[self::getSessionNamespace()][$varname]]]></code>
</MixedAssignment>
<PossiblyInvalidArrayOffset>
<code><![CDATA[$_SESSION[self::getSessionNamespace()]]]></code>
</PossiblyInvalidArrayOffset>
</file>
<file src="src/Http/Response.php">
<MixedArgument>
<code><![CDATA[$chunkSize]]></code>
<code><![CDATA[$range->getStart()]]></code>
<code><![CDATA[$rangeHeader]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$preloadFile['file']]]></code>
<code><![CDATA[$preloadFile['mimeType']]]></code>
<code><![CDATA[$preloadFile['type']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$chunkSize]]></code>
<code><![CDATA[$preloadFile]]></code>
<code><![CDATA[$rangeHeader]]></code>
<code><![CDATA[$value]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$preloadFile['file']]]></code>
<code><![CDATA[$preloadFile['mimeType']]]></code>
<code><![CDATA[$preloadFile['type']]]></code>
<code><![CDATA[$range->getEnd()]]></code>
<code><![CDATA[$range->getLength()]]></code>
<code><![CDATA[$range->getStart()]]></code>
<code><![CDATA[$value]]></code>
</MixedOperand>
<PossiblyNullArgument>
<code><![CDATA[$value]]></code>
</PossiblyNullArgument>
<PossiblyNullOperand>
<code><![CDATA[$_SERVER['HTTP_HOST']]]></code>
<code><![CDATA[$_SERVER['REQUEST_URI']]]></code>
<code><![CDATA[$filename]]></code>
<code><![CDATA[$raw ? $value : rawurlencode($value)]]></code>
</PossiblyNullOperand>
<PossiblyUndefinedArrayOffset>
<code><![CDATA[$_SERVER['HTTP_HOST']]]></code>
<code><![CDATA[$_SERVER['REQUEST_URI']]]></code>
</PossiblyUndefinedArrayOffset>
<RedundantCondition>
<code><![CDATA[$path]]></code>
</RedundantCondition>
</file>
<file src="src/Language/Language.php">
<MixedArrayAccess>
<code><![CDATA[$data['priority']]]></code>
Expand Down Expand Up @@ -4202,6 +4204,31 @@
<code><![CDATA[$impersonate]]></code>
</MixedAssignment>
</file>
<file src="src/Security/ApiFunction/UserRemoveAuthMethod.php">
<MixedArgument>
<code><![CDATA[$userId]]></code>
<code><![CDATA[$userId]]></code>
<code><![CDATA[$userId]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['id' => $passkeyId, 'user_id' => $userId]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$passkeyId]]></code>
<code><![CDATA[$userId]]></code>
</MixedAssignment>
</file>
<file src="src/Security/ApiFunction/UserRemoveSession.php">
<MixedArgument>
<code><![CDATA[$sessionId]]></code>
<code><![CDATA[$userId]]></code>
<code><![CDATA[$userId]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$sessionId]]></code>
<code><![CDATA[$userId]]></code>
</MixedAssignment>
</file>
<file src="src/Security/BackendLogin.php">
<ArgumentTypeCoercion>
<code><![CDATA[$password]]></code>
Expand Down Expand Up @@ -4378,6 +4405,10 @@
<InvalidArgument>
<code><![CDATA[['cookie_key' => $cookieKey]]]></code>
</InvalidArgument>
<MixedArgument>
<code><![CDATA[Request::server('HTTP_USER_AGENT', 'string')]]></code>
<code><![CDATA[Request::server('REMOTE_ADDR', 'string')]]></code>
</MixedArgument>
</file>
<file src="src/Security/WebAuthn.php">
<MixedArgumentTypeCoercion>
Expand Down