From a3d7a028b44b1705ce1660d50ed0cbfa347fce25 Mon Sep 17 00:00:00 2001 From: Nathan van der Werf Date: Wed, 15 Aug 2018 18:54:46 +0200 Subject: [PATCH] Replace is_null with "=== null" comparison --- modules/backend/classes/Controller.php | 2 +- modules/backend/classes/ControllerBehavior.php | 2 +- modules/backend/classes/FormField.php | 2 +- modules/backend/classes/NavigationManager.php | 2 +- modules/backend/controllers/Auth.php | 2 +- modules/backend/formwidgets/RecordFinder.php | 2 +- modules/backend/widgets/Filter.php | 2 +- modules/backend/widgets/Form.php | 2 +- modules/cms/classes/Controller.php | 2 +- modules/system/classes/MarkupManager.php | 2 +- modules/system/console/OctoberEnv.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 1cfece561..2374bec88 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -361,7 +361,7 @@ class Controller extends Extendable } // Load the view - if (!$this->suppressView && is_null($result)) { + if (!$this->suppressView && $result === null) { return $this->makeView($actionName); } diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php index 99beca86d..95b711566 100644 --- a/modules/backend/classes/ControllerBehavior.php +++ b/modules/backend/classes/ControllerBehavior.php @@ -81,7 +81,7 @@ class ControllerBehavior extends ExtensionBase /* * Return all config */ - if (is_null($name)) { + if ($name === null) { return $this->config; } diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php index 05a3f5a01..75ae62ac2 100644 --- a/modules/backend/classes/FormField.php +++ b/modules/backend/classes/FormField.php @@ -266,7 +266,7 @@ class FormField */ protected function evalConfig($config) { - if (is_null($config)) { + if ($config === null) { $config = []; } diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php index 0ea6770f6..128ff1103 100644 --- a/modules/backend/classes/NavigationManager.php +++ b/modules/backend/classes/NavigationManager.php @@ -317,7 +317,7 @@ class NavigationManager { $activeItem = null; - if (!is_null($owner) && !is_null($code)) { + if ($owner !== null && $code !== null) { $activeItem = @$this->items[$this->makeItemKey($owner, $code)]; } else { foreach ($this->listMainMenuItems() as $item) { diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php index a024c6b18..4268d2b4e 100644 --- a/modules/backend/controllers/Auth.php +++ b/modules/backend/controllers/Auth.php @@ -75,7 +75,7 @@ class Auth extends Controller throw new ValidationException($validation); } - if (is_null($remember = config('cms.backendForceRemember', true))) { + if (($remember = config('cms.backendForceRemember', true)) === null) { $remember = (bool) post('remember'); } diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php index 232010bbb..29fe816cd 100644 --- a/modules/backend/formwidgets/RecordFinder.php +++ b/modules/backend/formwidgets/RecordFinder.php @@ -213,7 +213,7 @@ class RecordFinder extends FormWidgetBase { list($model, $attribute) = $this->resolveModelAttribute($this->valueFrom); - if (!is_null($model)) { + if ($model !== null) { return $model->{$attribute}; } diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php index 4e37ef1a1..94c415a94 100644 --- a/modules/backend/widgets/Filter.php +++ b/modules/backend/widgets/Filter.php @@ -263,7 +263,7 @@ class Filter extends WidgetBase case 'text': $values = post('options.value'); - if (!is_null($values) && $values !== '') { + if ($values !== null && $values !== '') { list($value) = $values; } else { diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php index 1852ee751..154c97410 100644 --- a/modules/backend/widgets/Form.php +++ b/modules/backend/widgets/Form.php @@ -672,7 +672,7 @@ class Form extends WidgetBase else { $fieldType = isset($config['type']) ? $config['type'] : null; - if (!is_string($fieldType) && !is_null($fieldType)) { + if (!is_string($fieldType) && $fieldType !== null) { throw new ApplicationException(Lang::get( 'backend::lang.field.invalid_type', ['type'=>gettype($fieldType)] diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index 301b87ba5..427933578 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -484,7 +484,7 @@ class Controller $useCache = !Config::get('cms.twigNoCache'); $isDebugMode = Config::get('app.debug', false); $strictVariables = Config::get('cms.enableTwigStrictVariables', false); - $strictVariables = is_null($strictVariables) ? $isDebugMode : $strictVariables; + $strictVariables = $strictVariables === null ? $isDebugMode : $strictVariables; $forceBytecode = Config::get('cms.forceBytecodeInvalidation', false); $options = [ diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php index 4f7943700..7708021a2 100644 --- a/modules/system/classes/MarkupManager.php +++ b/modules/system/classes/MarkupManager.php @@ -115,7 +115,7 @@ class MarkupManager { $items = $this->transactionMode ? 'transactionItems' : 'items'; - if (is_null($this->$items)) { + if ($this->$items === null) { $this->$items = []; } diff --git a/modules/system/console/OctoberEnv.php b/modules/system/console/OctoberEnv.php index 9bbfff34f..6e87ff908 100644 --- a/modules/system/console/OctoberEnv.php +++ b/modules/system/console/OctoberEnv.php @@ -266,7 +266,7 @@ class OctoberEnv extends Command return "'$value'"; } elseif (is_bool($value)) { return $value ? 'true' : 'false'; - } elseif (is_null($value)) { + } elseif ($value === null) { return 'null'; }