Fix phpstan level 6

[MAILPOET-1969]
This commit is contained in:
Pavel Dohnal
2019-04-09 13:46:03 +02:00
committed by M. Shull
parent 46a0b7501b
commit 3e66e9e1dd
36 changed files with 320 additions and 244 deletions

View File

@@ -2,6 +2,7 @@
namespace MailPoet\Config;
use MailPoet\WP\Functions as WPFunctions;
use WP_Role;
class Capabilities {
const MEMBERS_CAP_GROUP_NAME = 'mailpoet';
@@ -35,7 +36,7 @@ class Capabilities {
if (!isset($role_objects[$role])) {
$role_objects[$role] = WPFunctions::get()->getRole($role);
}
if (!is_object($role_objects[$role])) continue;
if (!$role_objects[$role] instanceof WP_Role) continue;
$role_objects[$role]->add_cap($name);
}
}
@@ -49,7 +50,7 @@ class Capabilities {
if (!isset($role_objects[$role])) {
$role_objects[$role] = WPFunctions::get()->getRole($role);
}
if (!is_object($role_objects[$role])) continue;
if (!$role_objects[$role] instanceof WP_Role) continue;
$role_objects[$role]->remove_cap($name);
}
}

View File

@@ -748,7 +748,7 @@ class Menu {
function formEditor() {
$id = (isset($_GET['id']) ? (int)$_GET['id'] : 0);
$form = Form::findOne($id);
if ($form !== false) {
if ($form instanceof Form) {
$form = $form->asArray();
}

View File

@@ -121,9 +121,13 @@ class Renderer {
}
function getAssetManifest($manifest_file) {
return (is_readable($manifest_file)) ?
json_decode(file_get_contents($manifest_file), true) :
false;
if (is_readable($manifest_file)) {
$contents = file_get_contents($manifest_file);
if (is_string($contents)) {
return json_decode($contents, true);
}
}
return false;
}
function getJsAsset($asset) {

View File

@@ -47,7 +47,10 @@ class RequirementsChecker {
);
$results = array();
foreach ($available_tests as $test) {
$results[$test] = call_user_func(array($this, 'check' . $test));
$callback = [$this, 'check' . $test];
if (is_callable($callback)) {
$results[$test] = call_user_func($callback);
}
}
return $results;
}

View File

@@ -28,9 +28,9 @@ class Updater {
function init() {
WPFunctions::get()->addFilter('pre_set_site_transient_update_plugins', array($this, 'checkForUpdate'));
}
function checkForUpdate($update_transient) {
if (!is_object($update_transient)) {
if (!$update_transient instanceof \stdClass) {
$update_transient = new \stdClass;
}