Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Unify add menu/submenu parameters with WP

Browse Source 
[MAILPOET-5383]
This commit is contained in:
Jan Jakes
2023-06-13 11:07:22 +02:00
committed by Veljko V
parent bb979cd1ba
commit 30a3bde940
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mailpoet/lib/WP/Functions.php
View File

@@ -77,17 +77,12 @@ class Functions {
* @param string $menuTitle
* @param string $capability
* @param string $menuSlug
* @param callable $callback|null
* @param callable|'' $callback
* @param string $iconUrl
* @param int $position
* @return string The resulting page's hook_suffix.
* @return string
*/
public function addMenuPage($pageTitle, $menuTitle, $capability, $menuSlug, callable $callback = null, $iconUrl = '', $position = null) {
if (is_null($callback)) {
$callback = function () {
};
}
public function addMenuPage($pageTitle, $menuTitle, $capability, $menuSlug, $callback = '', $iconUrl = '', $position = null) {
return add_menu_page($pageTitle, $menuTitle, $capability, $menuSlug, $callback, $iconUrl, $position);
}
@@ -109,12 +104,12 @@ class Functions {
* @param string $menuTitle
* @param string $capability
* @param string $menuSlug
* @param callable $function
* @param callable|'' $callback
* @param int $position
* @return string|false
*/
public function addSubmenuPage($parentSlug, $pageTitle, $menuTitle, $capability, $menuSlug, callable $function, $position = null) {
return add_submenu_page($parentSlug, $pageTitle, $menuTitle, $capability, $menuSlug, $function, $position);
public function addSubmenuPage($parentSlug, $pageTitle, $menuTitle, $capability, $menuSlug, $callback = '', $position = null) {
return add_submenu_page($parentSlug, $pageTitle, $menuTitle, $capability, $menuSlug, $callback, $position);
}
public function adminUrl($path = '', $scheme = 'admin') {

5
mailpoet/tasks/phpstan/phpstan.neon
View File

@@ -96,6 +96,11 @@ parameters:
message: "#^Cannot cast string|void to string\\.$#"
count: 2
path: ../../lib/Automation/Integrations/WooCommerce/Fields/CustomerReviewFieldsFactory.php
-
# WP annotates parameter as callable, but passes empty string as a default.
message: '/function add_(sub)?menu_page expects callable\(\): mixed, ''''\|\(callable\(\): mixed\) given/'
count: 2
path: ../../lib/WP/Functions.php
reportUnmatchedIgnoredErrors: true
dynamicConstantNames: