diff --git a/.github/tests-visual/cronjob_cronjobs_add--dark.png b/.github/tests-visual/cronjob_cronjobs_add--dark.png index 7daec0b90e..f527bf0302 100644 Binary files a/.github/tests-visual/cronjob_cronjobs_add--dark.png and b/.github/tests-visual/cronjob_cronjobs_add--dark.png differ diff --git a/.github/tests-visual/cronjob_cronjobs_add.png b/.github/tests-visual/cronjob_cronjobs_add.png index 9944fd7cd3..f0c96e1dbd 100644 Binary files a/.github/tests-visual/cronjob_cronjobs_add.png and b/.github/tests-visual/cronjob_cronjobs_add.png differ diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon index ad584b0565..13c02e8b6f 100644 --- a/.tools/phpstan/baseline.neon +++ b/.tools/phpstan/baseline.neon @@ -105,11 +105,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/cronjob/plugins/article_status/lib/cronjob.php - - - message: "#^Method rex_api_debug\\:\\:getUrlParams\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/debug/lib/api_debug.php - - message: "#^Method rex_debug\\:\\:getTrace\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -125,11 +120,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/debug/lib/extensions/extension_debug.php - - - message: "#^Method rex_extension_debug\\:\\:register\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/debug/lib/extensions/extension_debug.php - - message: "#^Property rex_extension_debug\\:\\:\\$extensionPoints type has no value type specified in iterable type array\\.$#" count: 1 @@ -145,21 +135,11 @@ parameters: count: 1 path: ../../redaxo/src/addons/debug/lib/extensions/extension_debug.php - - - message: "#^Method rex_sql_debug\\:\\:execute\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/debug/lib/extensions/sql_debug.php - - message: "#^Method rex_sql_debug\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 path: ../../redaxo/src/addons/debug/lib/extensions/sql_debug.php - - - message: "#^Method rex_sql_debug\\:\\:setQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/debug/lib/extensions/sql_debug.php - - message: "#^Method rex_sql_debug\\:\\:setQuery\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -465,11 +445,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/mediapool/functions/function_rex_mediapool.php - - - message: "#^Method rex_media\\:\\:addInstanceList\\(\\) has parameter \\$instanceKeyList with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/mediapool/lib/media.php - - message: "#^Method rex_media\\:\\:getValue\\(\\) has parameter \\$value with no type specified\\.$#" count: 1 @@ -505,21 +480,11 @@ parameters: count: 1 path: ../../redaxo/src/addons/mediapool/lib/media.php - - - message: "#^Property rex_media\\:\\:\\$instanceLists type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/mediapool/lib/media.php - - message: "#^Static property rex_media\\:\\:\\$instances \\(array\\\\>\\) does not accept array\\\\>\\.$#" count: 1 path: ../../redaxo/src/addons/mediapool/lib/media.php - - - message: "#^Method rex_media_category\\:\\:addInstanceList\\(\\) has parameter \\$instanceKeyList with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/mediapool/lib/media_category.php - - message: "#^Parameter \\#2 \\$createCallback of static method rex_media_category\\:\\:getInstance\\(\\) expects \\(callable\\(mixed \\.\\.\\.\\)\\: \\(static\\|null\\)\\)\\|null, Closure\\(mixed\\)\\: \\(static\\|null\\) given\\.$#" count: 1 @@ -540,11 +505,6 @@ parameters: count: 2 path: ../../redaxo/src/addons/mediapool/lib/media_category.php - - - message: "#^Property rex_media_category\\:\\:\\$instanceLists type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/mediapool/lib/media_category.php - - message: "#^Static property rex_media_category\\:\\:\\$instances \\(array\\\\>\\) does not accept array\\\\>\\.$#" count: 1 @@ -980,11 +940,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/structure/lib/linkmap/var_linklist.php - - - message: "#^Method rex_navigation\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/structure/lib/navigation.php - - message: "#^Method rex_structure_perm\\:\\:getFieldParams\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -1120,11 +1075,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/structure/lib/structure_element.php - - - message: "#^Method rex_structure_element\\:\\:addInstanceList\\(\\) has parameter \\$instanceKeyList with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/structure/lib/structure_element.php - - message: "#^Method rex_structure_element\\:\\:getUrl\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -1160,11 +1110,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/structure/lib/structure_element.php - - - message: "#^Property rex_structure_element\\:\\:\\$instanceLists type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/structure/lib/structure_element.php - - message: "#^Static property rex_structure_element\\:\\:\\$instances \\(array\\\\>\\) does not accept array\\\\>\\.$#" count: 1 @@ -1375,11 +1320,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/structure/plugins/content/lib/event_select.php - - - message: "#^Method rex_extension_point_art_content_updated\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/addons/structure/plugins/content/lib/extension_point/art_content_updated.php - - message: "#^Method rex_extension_point_slice_menu\\:\\:addAdditionalActions\\(\\) has parameter \\$additionalActions with no value type specified in iterable type array\\.$#" count: 1 @@ -1495,21 +1435,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/api_function.php - - - message: "#^Method rex_api_function\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/api_function.php - - - - message: "#^Method rex_api_function\\:\\:getUrlParams\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/api_function.php - - - - message: "#^Method rex_autoload\\:\\:findClasses\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/autoload.php - - message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, Closure\\(string\\)\\: bool given\\.$#" count: 1 @@ -1540,11 +1465,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/be/navigation.php - - - message: "#^Method rex_be_navigation\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/be/navigation.php - - message: "#^Method rex_be_navigation\\:\\:getNavigation\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -1600,61 +1520,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/context.php - - - message: "#^Method rex_csrf_token\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/csrf_token.php - - - - message: "#^Method rex_csrf_token\\:\\:getUrlParams\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/csrf_token.php - - - - message: "#^Method rex_extension\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension.php - - - - message: "#^Method rex_extension\\:\\:register\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension.php - - - - message: "#^Property rex_extension\\:\\:\\$extensions type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension.php - - - - message: "#^Method rex_extension_point\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension_point.php - - - - message: "#^Method rex_extension_point\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension_point.php - - - - message: "#^Method rex_extension_point\\:\\:setExtensionParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension_point.php - - - - message: "#^Property rex_extension_point\\:\\:\\$extensionParams type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension_point.php - - - - message: "#^Property rex_extension_point\\:\\:\\$params type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/extension_point.php - - - - message: "#^Method rex_config_form\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/form/config_form.php - - message: "#^Method rex_form_container_element\\:\\:addField\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#" count: 1 @@ -1705,11 +1570,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/form/form.php - - - message: "#^Method rex_form\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/form/form.php - - message: "#^Property rex_form\\:\\:\\$languageSupport type has no value type specified in iterable type array\\.$#" count: 1 @@ -1845,21 +1705,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/list.php - - - message: "#^Method rex_list\\:\\:addLinkAttribute\\(\\) has parameter \\$attrName with no type specified\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/list.php - - - - message: "#^Method rex_list\\:\\:addLinkAttribute\\(\\) has parameter \\$attrValue with no type specified\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/list.php - - - - message: "#^Method rex_list\\:\\:addLinkAttribute\\(\\) has parameter \\$columnName with no type specified\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/list.php - - message: "#^Method rex_list\\:\\:addTableColumn\\(\\) has parameter \\$class with no type specified\\.$#" count: 1 @@ -1870,11 +1715,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/list.php - - - message: "#^Method rex_list\\:\\:callFactoryClass\\(\\) has parameter \\$arguments 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 @@ -1890,11 +1730,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/list.php - - - message: "#^Method rex_list\\:\\:getColumnLayout\\(\\) 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 @@ -1990,11 +1825,6 @@ parameters: count: 2 path: ../../redaxo/src/core/lib/login/api_user_impersonate.php - - - message: "#^Method rex_backend_password_policy\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/login/backend_password_policy.php - - message: "#^Parameter \\#1 \\$options of method rex_password_policy\\:\\:__construct\\(\\) expects array\\, array\\{no_reuse_of_last\\?\\: int, no_reuse_within\\?\\: string, force_renew_after\\?\\: string, block_account_after\\?\\: string\\} given\\.$#" count: 1 @@ -2015,16 +1845,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/login/login.php - - - message: "#^Method rex_perm\\:\\:getAll\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/login/perm.php - - - - message: "#^Property rex_perm\\:\\:\\$perms type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/login/perm.php - - message: "#^Method rex_user\\:\\:getComplexPerm\\(\\) should return rex_clang_perm\\|rex_media_perm\\|rex_module_perm\\|rex_structure_perm\\|null but returns rex_complex_perm\\|null\\.$#" count: 2 @@ -2050,11 +1870,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/packages/manager.php - - - message: "#^Method rex_package_manager\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/packages/manager.php - - message: "#^Method rex_package_manager\\:\\:factory\\(\\) return type with generic class rex_package_manager does not specify its types\\: T$#" count: 1 @@ -2300,11 +2115,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/setup/setup.php - - - message: "#^Method rex_setup\\:\\:checkEnvironment\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/setup/setup.php - - message: "#^Method rex_setup\\:\\:checkFilesystem\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -2330,21 +2140,11 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/sql/sql.php - - - message: "#^Method rex_sql\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/sql/sql.php - - message: "#^Method rex_sql\\:\\:createConnection\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" count: 1 path: ../../redaxo/src/core/lib/sql/sql.php - - - message: "#^Method rex_sql\\:\\:execute\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/sql/sql.php - - message: "#^Method rex_sql\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -2360,11 +2160,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/sql/sql.php - - - message: "#^Method rex_sql\\:\\:getArrayValue\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/sql/sql.php - - message: "#^Method rex_sql\\:\\:getDBArray\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -2395,21 +2190,11 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/sql/sql.php - - - message: "#^Method rex_sql\\:\\:setDBQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/sql/sql.php - - message: "#^Method rex_sql\\:\\:setDBQuery\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 path: ../../redaxo/src/core/lib/sql/sql.php - - - message: "#^Method rex_sql\\:\\:setQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/sql/sql.php - - message: "#^Method rex_sql\\:\\:setQuery\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -2485,41 +2270,11 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/system_report.php - - - message: "#^Method rex_editor\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/editor.php - - message: "#^Method rex_file\\:\\:formattedSize\\(\\) has parameter \\$format with no value type specified in iterable type array\\.$#" count: 1 path: ../../redaxo/src/core/lib/util/file.php - - - message: "#^Method rex_file\\:\\:getCache\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/file.php - - - - message: "#^Method rex_file\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/file.php - - - - message: "#^Method rex_file\\:\\:putCache\\(\\) has parameter \\$content with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/file.php - - - - message: "#^Method rex_file\\:\\:putConfig\\(\\) has parameter \\$content with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/file.php - - - - message: "#^Method rex_finder\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/finder.php - - message: "#^Method rex_formatter\\:\\:bytes\\(\\) has parameter \\$format with no value type specified in iterable type array\\.$#" count: 1 @@ -2545,26 +2300,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/util/formatter.php - - - message: "#^Method rex_log_file\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/log_file.php - - - - message: "#^Method rex_logger\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/logger.php - - - - message: "#^Method rex_markdown\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/markdown.php - - - - message: "#^Method rex_markdown\\:\\:parseWithToc\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/markdown.php - - message: "#^Method rex_parsedown\\:\\:blockFencedCodeComplete\\(\\) has parameter \\$Block with no type specified\\.$#" count: 1 @@ -2655,11 +2390,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/util/string.php - - - message: "#^Method rex_string\\:\\:yamlDecode\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/string.php - - message: "#^Method rex_string\\:\\:yamlEncode\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" count: 1 @@ -2690,11 +2420,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/util/url.php - - - message: "#^Method rex_validator\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/lib/util/validator.php - - message: "#^Method rex_validator\\:\\:values\\(\\) has parameter \\$validValues with no value type specified in iterable type array\\.$#" count: 1 @@ -2720,16 +2445,6 @@ parameters: count: 1 path: ../../redaxo/src/core/lib/view.php - - - message: "#^Method rex_test_factory\\:\\:callFactoryClass\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/tests/base/factory_trait_test.php - - - - message: "#^Method rex_test_instance_list_pool\\:\\:addInstanceList\\(\\) has parameter \\$instanceKeyList with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php - - message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\) expects callable\\(mixed \\.\\.\\.\\)\\: \\(object\\|null\\), Closure\\(mixed, mixed\\)\\: void given\\.$#" count: 1 @@ -2750,11 +2465,6 @@ parameters: count: 1 path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php - - - message: "#^Property rex_test_instance_list_pool\\:\\:\\$instanceLists type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php - - message: "#^Unable to resolve the template type T in call to method static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\)$#" count: 1 diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml index 1ac25e60dd..33c14938da 100644 --- a/.tools/psalm/baseline.xml +++ b/.tools/psalm/baseline.xml @@ -1299,6 +1299,9 @@ + + + @@ -3451,7 +3454,6 @@ - @@ -3462,7 +3464,6 @@ - @@ -4079,8 +4080,6 @@ - - @@ -4094,8 +4093,6 @@ customColumns[$column]]]> - linkAttributes[$columnName]]]> - linkAttributes[$columnName][$attrName]]]> linkAttributes[$column]]]> @@ -4129,7 +4126,6 @@ - linkAttributes]]> columnNames[$columnIndex] ?? $default]]> @@ -4138,12 +4134,6 @@ linkAttributes[$column] ?? $default]]> getValue($column), true)]]> - - - - - - @@ -4263,24 +4253,6 @@ getDescription()]]> - - - - - - - - - - - - - - - - - - @@ -4803,7 +4775,7 @@ - + |T]]> @@ -5180,7 +5152,6 @@ - @@ -5200,7 +5171,6 @@ - diff --git a/redaxo/src/addons/structure/plugins/content/lib/extension_point/art_content_updated.php b/redaxo/src/addons/structure/plugins/content/lib/extension_point/art_content_updated.php index b52e7a5d63..0ca49922c6 100644 --- a/redaxo/src/addons/structure/plugins/content/lib/extension_point/art_content_updated.php +++ b/redaxo/src/addons/structure/plugins/content/lib/extension_point/art_content_updated.php @@ -15,6 +15,7 @@ class rex_extension_point_art_content_updated extends rex_extension_point /** @var string */ private $action; + /** @param array $params */ public function __construct(rex_article $article, string $action, string $subject = '', array $params = [], bool $readonly = false) { // for BC 'simple' attach params diff --git a/redaxo/src/core/lib/api_function.php b/redaxo/src/core/lib/api_function.php index b46926fe91..3d4a7a2ee2 100644 --- a/redaxo/src/core/lib/api_function.php +++ b/redaxo/src/core/lib/api_function.php @@ -103,7 +103,7 @@ public static function factory() * * The method must be called on sub classes. * - * @return array + * @return array */ public static function getUrlParams() { diff --git a/redaxo/src/core/lib/autoload.php b/redaxo/src/core/lib/autoload.php index 136883c93f..6f5316e3d3 100644 --- a/redaxo/src/core/lib/autoload.php +++ b/redaxo/src/core/lib/autoload.php @@ -314,7 +314,7 @@ private static function _addDirectory($dir) * * @throws RuntimeException * - * @return array The found classes + * @return list The found classes */ private static function findClasses($path) { diff --git a/redaxo/src/core/lib/base/factory_trait.php b/redaxo/src/core/lib/base/factory_trait.php index f90b262207..ef04e08783 100644 --- a/redaxo/src/core/lib/base/factory_trait.php +++ b/redaxo/src/core/lib/base/factory_trait.php @@ -90,7 +90,7 @@ public static function hasFactoryClass() * Calls the factory class with the given method and arguments. * * @param string $method Method name - * @param array $arguments Array of arguments + * @param array $arguments Array of arguments * * @return mixed Result of the callback * diff --git a/redaxo/src/core/lib/base/instance_list_pool_trait.php b/redaxo/src/core/lib/base/instance_list_pool_trait.php index 7326d5b08d..ab4eee22e6 100644 --- a/redaxo/src/core/lib/base/instance_list_pool_trait.php +++ b/redaxo/src/core/lib/base/instance_list_pool_trait.php @@ -9,14 +9,14 @@ */ trait rex_instance_list_pool_trait { - /** @var array */ + /** @var array> */ private static $instanceLists = []; /** * Adds an instance list. * * @param mixed $key Key - * @param array $instanceKeyList Array of instance keys + * @param array $instanceKeyList Array of instance keys * @return void */ protected static function addInstanceList($key, array $instanceKeyList) diff --git a/redaxo/src/core/lib/base/singleton_trait.php b/redaxo/src/core/lib/base/singleton_trait.php index 65c9250ca9..7f451712eb 100644 --- a/redaxo/src/core/lib/base/singleton_trait.php +++ b/redaxo/src/core/lib/base/singleton_trait.php @@ -12,7 +12,7 @@ trait rex_singleton_trait /** * Singleton instances. * - * @var static[] + * @var array, static> */ private static $instances = []; diff --git a/redaxo/src/core/lib/csrf_token.php b/redaxo/src/core/lib/csrf_token.php index 9c570c5944..bcb824c76e 100644 --- a/redaxo/src/core/lib/csrf_token.php +++ b/redaxo/src/core/lib/csrf_token.php @@ -70,7 +70,7 @@ public function getHiddenField() /** * Returns an array containing the `_csrf_token` param. * - * @return array + * @return array */ public function getUrlParams() { diff --git a/redaxo/src/core/lib/extension.php b/redaxo/src/core/lib/extension.php index e42ba480b2..7f89f37f2b 100644 --- a/redaxo/src/core/lib/extension.php +++ b/redaxo/src/core/lib/extension.php @@ -18,7 +18,7 @@ abstract class rex_extension /** * Array of registered extensions. * - * @var array>> + * @var array}>>> */ private static $extensions = []; @@ -72,7 +72,7 @@ public static function registerPoint(rex_extension_point $extensionPoint) * @param string|string[] $extensionPoint Name(s) of extension point(s) * @param callable(T):mixed $extension Callback extension * @param self::* $level Runlevel (`rex_extension::EARLY`, `rex_extension::NORMAL` or `rex_extension::LATE`) - * @param array $params Additional params + * @param array $params Additional params * @return void */ public static function register($extensionPoint, callable $extension, $level = self::NORMAL, array $params = []) diff --git a/redaxo/src/core/lib/extension_point.php b/redaxo/src/core/lib/extension_point.php index 3c258ed2ea..7784bb0caf 100644 --- a/redaxo/src/core/lib/extension_point.php +++ b/redaxo/src/core/lib/extension_point.php @@ -17,9 +17,9 @@ class rex_extension_point private $name; /** @var T */ private $subject; - /** @var array */ + /** @var array */ private $params = []; - /** @var array */ + /** @var array */ private $extensionParams = []; /** @var bool */ private $readonly = false; @@ -27,6 +27,7 @@ class rex_extension_point /** * @param string $name * @param T $subject + * @param array $params * @param bool $readonly */ public function __construct($name, $subject = null, array $params = [], $readonly = false) @@ -91,6 +92,7 @@ public function setParam($key, $value) /** * Sets the specific params for the next extension. + * @param array $params * @return void */ public function setExtensionParams(array $params) @@ -126,7 +128,7 @@ public function getParam($key, $default = null) /** * Returns all params. * - * @return array + * @return array */ public function getParams() { diff --git a/redaxo/src/core/lib/list.php b/redaxo/src/core/lib/list.php index 7deeb5b1db..978ee52efa 100644 --- a/redaxo/src/core/lib/list.php +++ b/redaxo/src/core/lib/list.php @@ -363,6 +363,9 @@ public function getFormAttributes() } /** + * @param string $columnName + * @param string $attrName + * @param string|int $attrValue * @return void */ public function addLinkAttribute($columnName, $attrName, $attrValue) @@ -457,7 +460,7 @@ public function setColumnLayout($columnHead, $columnLayout) * * @param string $columnName Name der Spalte * - * @return array + * @return array{string, string} */ public function getColumnLayout($columnName) { diff --git a/redaxo/src/core/lib/login/perm.php b/redaxo/src/core/lib/login/perm.php index 174df0ede3..30302f0074 100644 --- a/redaxo/src/core/lib/login/perm.php +++ b/redaxo/src/core/lib/login/perm.php @@ -16,7 +16,7 @@ abstract class rex_perm /** * Array of permissions. * - * @var array + * @var array> */ private static $perms = []; @@ -24,8 +24,8 @@ abstract class rex_perm * Registers a new permission. * * @param string $perm Perm key - * @param string $name Perm name - * @param string $group Perm group, possible values are rex_perm::GENERAL, rex_perm::OPTIONS and rex_perm::EXTRAS + * @param string|null $name Perm name + * @param self::* $group Perm group, possible values are rex_perm::GENERAL, rex_perm::OPTIONS and rex_perm::EXTRAS * @return void */ public static function register($perm, $name = null, $group = self::GENERAL) @@ -59,9 +59,9 @@ public static function has($perm) /** * Returns all permissions for the given group. * - * @param string $group Perm group + * @param self::* $group Perm group * - * @return array Permissions + * @return array Permissions */ public static function getAll($group = self::GENERAL) { diff --git a/redaxo/src/core/lib/setup/setup.php b/redaxo/src/core/lib/setup/setup.php index 09c39e5c6b..3c177d0463 100644 --- a/redaxo/src/core/lib/setup/setup.php +++ b/redaxo/src/core/lib/setup/setup.php @@ -61,7 +61,7 @@ public static function init($skinAddon = 'be_style', $skinPlugin = 'redaxo') /** * checks environment related conditions. * - * @return array An array of error messages + * @return list An array of error messages */ public static function checkEnvironment() { diff --git a/redaxo/src/core/lib/sql/sql.php b/redaxo/src/core/lib/sql/sql.php index 46feef131c..ff8d406e92 100644 --- a/redaxo/src/core/lib/sql/sql.php +++ b/redaxo/src/core/lib/sql/sql.php @@ -301,7 +301,7 @@ public static function datetime($timestamp = null) * * @param string $query The sql-query * @param array $params An optional array of statement parameter - * @param array $options For possible option keys view `rex_sql::OPT_*` constants + * @param array $options For possible option keys view `rex_sql::OPT_*` constants * * @throws rex_sql_exception on errors * @@ -371,7 +371,7 @@ public function prepareQuery($query) * Executes the prepared statement with the given input parameters. * * @param array $params Array of input parameters - * @param array $options For possible option keys view `rex_sql::OPT_*` constants + * @param array $options For possible option keys view `rex_sql::OPT_*` constants * * @throws rex_sql_exception * @@ -436,7 +436,7 @@ public function execute(array $params = [], array $options = []) * * @param string $query The sql-query * @param array $params An optional array of statement parameter - * @param array $options For possible option keys view `rex_sql::OPT_*` constants + * @param array $options For possible option keys view `rex_sql::OPT_*` constants * * @throws rex_sql_exception on errors * @@ -747,7 +747,7 @@ public function getValue($column) * * @throws rex_sql_exception * - * @return array + * @return array */ public function getArrayValue($column) { diff --git a/redaxo/src/core/lib/util/file.php b/redaxo/src/core/lib/util/file.php index b772dcb5ed..026f463401 100644 --- a/redaxo/src/core/lib/util/file.php +++ b/redaxo/src/core/lib/util/file.php @@ -53,7 +53,7 @@ public static function get($file, $default = null) * @template T * @param string $file Path to the file * @param T $default Default value - * @return array|T Content of the file or default value if the file isn't readable + * @return array|T Content of the file or default value if the file isn't readable */ public static function getConfig($file, $default = []) { @@ -67,7 +67,7 @@ public static function getConfig($file, $default = []) * @template T * @param string $file Path to the file * @param T $default Default value - * @return array|T Content of the file or default value if the file isn't readable + * @return array|T Content of the file or default value if the file isn't readable */ public static function getCache($file, $default = []) { @@ -144,7 +144,7 @@ public static function append(string $file, string $content, string $delimiter = * Puts content in a config file. * * @param string $file Path to the file - * @param array $content Content for the file + * @param array $content Content for the file * @param int $inline The level where you switch to inline YAML * * @return bool TRUE on success, FALSE on failure @@ -160,7 +160,7 @@ public static function putConfig($file, $content, $inline = 3) * Puts content in a cache file. * * @param string $file Path to the file - * @param array $content Content for the file + * @param array $content Content for the file * * @return bool TRUE on success, FALSE on failure * diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index 05086d6968..a2636612ea 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -53,7 +53,7 @@ public function parse($code, $options = []) * @param int $bottomLevel Bottom included headline level for TOC, e.g. `6` for `
` * @param array|bool $options * - * @return array tupel of table-of-content and content + * @return list{string, string} tupel of table-of-content and content */ public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, $options = []) { diff --git a/redaxo/src/core/lib/util/string.php b/redaxo/src/core/lib/util/string.php index 4d1ad55641..56a1d1122a 100644 --- a/redaxo/src/core/lib/util/string.php +++ b/redaxo/src/core/lib/util/string.php @@ -149,7 +149,7 @@ public static function yamlEncode(array $value, $inline = 3) * * @throws rex_yaml_parse_exception * - * @return array + * @return array */ public static function yamlDecode($value) {