Skip to content

Commit

Permalink
Merge branch '6.x' into namespace-rexvar
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.tools/phpstan/baseline.neon
#	.tools/psalm/baseline.xml
#	src/RexVar/LinkListVar.php
#	src/RexVar/LinkVar.php
#	src/RexVar/MediaListVar.php
#	src/RexVar/MediaVar.php
  • Loading branch information
@gharlan
gharlan committed May 12, 2024
2 parents 1145b05 + be67bc8 commit ee460c2
Show file tree
Hide file tree
Showing 146 changed files with 1,473 additions and 1,153 deletions.
6 changes: 3 additions & 3 deletions .phpstorm.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

registerArgumentsSet('formatter_type', 'date', 'strftime', 'intlDateTime', 'intlDate', 'intlTime', 'number', 'bytes', 'sprintf', 'nl2br', 'truncate', 'widont', 'version', 'url', 'email', 'custom');
expectedArguments(\Redaxo\Core\Util\Formatter::format(), 1, argumentsSet('formatter_type'));
expectedArguments(\rex_list::setColumnFormat(), 1, argumentsSet('formatter_type'));
expectedArguments(\Redaxo\Core\View\DataList::setColumnFormat(), 1, argumentsSet('formatter_type'));

registerArgumentsSet('intl_format', \IntlDateFormatter::FULL, \IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
expectedArguments(\Redaxo\Core\Util\Formatter::intlDateTime(), 1, argumentsSet('intl_format'));
Expand All @@ -44,7 +44,7 @@
expectedArguments(\Redaxo\Core\Translation\I18n::msgInLocale(), 1, argumentsSet('locale'));
expectedArguments(\Redaxo\Core\Translation\I18n::rawMsgInLocale(), 1, argumentsSet('locale'));

expectedArguments(\rex_list::setColumnSortable(), 1, 'asc', 'desc');
expectedArguments(\Redaxo\Core\View\DataList::setColumnSortable(), 1, 'asc', 'desc');

expectedArguments(\Redaxo\Core\Security\Permission::register(), 2, \Redaxo\Core\Security\Permission::GENERAL, \Redaxo\Core\Security\Permission::OPTIONS, \Redaxo\Core\Security\Permission::EXTRAS);
expectedArguments(\Redaxo\Core\Security\Permission::getAll(), 0, \Redaxo\Core\Security\Permission::GENERAL, \Redaxo\Core\Security\Permission::OPTIONS, \Redaxo\Core\Security\Permission::EXTRAS);
Expand Down Expand Up @@ -125,7 +125,7 @@
expectedArguments(\Redaxo\Core\RexVar\RexVar::parse(), 1, \Redaxo\Core\RexVar\RexVar::ENV_BACKEND | \Redaxo\Core\RexVar\RexVar::ENV_FRONTEND | \Redaxo\Core\RexVar\RexVar::ENV_INPUT | \Redaxo\Core\RexVar\RexVar::ENV_OUTPUT);
expectedArguments(\Redaxo\Core\RexVar\RexVar::environmentIs(), 0, \Redaxo\Core\RexVar\RexVar::ENV_BACKEND | \Redaxo\Core\RexVar\RexVar::ENV_FRONTEND | \Redaxo\Core\RexVar\RexVar::ENV_INPUT | \Redaxo\Core\RexVar\RexVar::ENV_OUTPUT);

expectedArguments(\rex_view::addCssFile(), 1, 'all', 'print', 'screen', 'speech');
expectedArguments(\Redaxo\Core\View\Asset::addCssFile(), 1, 'all', 'print', 'screen', 'speech');

expectedArguments(\Symfony\Component\Console\Command\Command::addArgument(), 1, \Symfony\Component\Console\Input\InputArgument::REQUIRED, \Symfony\Component\Console\Input\InputArgument::OPTIONAL, \Symfony\Component\Console\Input\InputArgument::IS_ARRAY);

Expand Down
240 changes: 120 additions & 120 deletions .tools/phpstan/baseline.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,111 +175,6 @@ parameters:
count: 1
path: ../../redaxo/src/core/lib/context.php

-
message: "#^Method rex_list\\:\\:_getAttributeString\\(\\) has parameter \\$array with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

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

-
message: "#^Method rex_list\\:\\:addTableColumn\\(\\) has parameter \\$class with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

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

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

-
message: "#^Method rex_list\\:\\:getArrayValue\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getColumnLink\\(\\) has parameter \\$columnName with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getColumnLink\\(\\) has parameter \\$columnValue with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getColumnLink\\(\\) has parameter \\$params with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getColumnParams\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getLinkAttributes\\(\\) has parameter \\$column with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

-
message: "#^Method rex_list\\:\\:getLinkAttributes\\(\\) has parameter \\$default with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

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

-
message: "#^Method rex_list\\:\\:getTableColumnGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

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

-
message: "#^Method rex_list\\:\\:isCustomFormat\\(\\) has parameter \\$format with no type specified\\.$#"
count: 1
path: ../../redaxo/src/core/lib/list.php

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

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

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

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

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

-
message: "#^Method rex_request\\:\\:arrayKeyCast\\(\\) has parameter \\$haystack with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -315,21 +210,6 @@ parameters:
count: 1
path: ../../redaxo/src/core/lib/structure/navigation.php

-
message: "#^Method rex_view\\:\\:getJsFilesWithOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../redaxo/src/core/lib/view.php

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

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

-
message: "#^Call to static method Redaxo\\\\Core\\\\Util\\\\Type\\:\\:string\\(\\) on a separate line has no effect\\.$#"
count: 1
Expand Down Expand Up @@ -1645,6 +1525,126 @@ parameters:
count: 1
path: ../../src/Validator/Validator.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\Asset\\:\\:getJsFilesWithOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/View/Asset.php

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

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:_getAttributeString\\(\\) has parameter \\$array with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

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

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:addTableColumn\\(\\) has parameter \\$class with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

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

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

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getArrayValue\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getColumnLink\\(\\) has parameter \\$columnName with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getColumnLink\\(\\) has parameter \\$columnValue with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getColumnLink\\(\\) has parameter \\$params with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getColumnParams\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getLinkAttributes\\(\\) has parameter \\$column with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getLinkAttributes\\(\\) has parameter \\$default with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

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

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:getTableColumnGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: ../../src/View/DataList.php

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

-
message: "#^Method Redaxo\\\\Core\\\\View\\\\DataList\\:\\:isCustomFormat\\(\\) has parameter \\$format with no type specified\\.$#"
count: 1
path: ../../src/View/DataList.php

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

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

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

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

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

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

-
message: "#^Method Redaxo\\\\Core\\\\Tests\\\\Content\\\\CategoryTest\\:\\:createCategories\\(\\) has parameter \\$lev1Params with no value type specified in iterable type array\\.$#"
count: 1
Expand Down
Loading

0 comments on commit ee460c2

Please sign in to comment.