From 8260cfa4ea8acadb0da223a4bfd2d4a79692786b Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 10 Oct 2015 01:12:59 +0300
Subject: [PATCH] Compare with null instead of isset

---
 framework/console/Request.php       | 2 +-
 framework/filters/AccessControl.php | 4 ++--
 framework/test/ActiveFixture.php    | 2 +-
 framework/web/DbSession.php         | 2 +-
 framework/web/MultiFieldSession.php | 4 ++--
 framework/yii                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/console/Request.php b/framework/console/Request.php
index 5a594b71a9..de2e50a051 100644
--- a/framework/console/Request.php
+++ b/framework/console/Request.php
@@ -29,7 +29,7 @@ class Request extends \yii\base\Request
      */
     public function getParams()
     {
-        if (!isset($this->_params)) {
+        if ($this->_params === null) {
             if (isset($_SERVER['argv'])) {
                 $this->_params = $_SERVER['argv'];
                 array_shift($this->_params);
diff --git a/framework/filters/AccessControl.php b/framework/filters/AccessControl.php
index e60c13178c..85da2d6ff6 100644
--- a/framework/filters/AccessControl.php
+++ b/framework/filters/AccessControl.php
@@ -120,7 +120,7 @@ class AccessControl extends ActionFilter
             } elseif ($allow === false) {
                 if (isset($rule->denyCallback)) {
                     call_user_func($rule->denyCallback, $rule, $action);
-                } elseif (isset($this->denyCallback)) {
+                } elseif ($this->denyCallback !== null) {
                     call_user_func($this->denyCallback, $rule, $action);
                 } else {
                     $this->denyAccess($user);
@@ -128,7 +128,7 @@ class AccessControl extends ActionFilter
                 return false;
             }
         }
-        if (isset($this->denyCallback)) {
+        if ($this->denyCallback !== null) {
             call_user_func($this->denyCallback, null, $action);
         } else {
             $this->denyAccess($user);
diff --git a/framework/test/ActiveFixture.php b/framework/test/ActiveFixture.php
index 830d214d97..a9248ac053 100644
--- a/framework/test/ActiveFixture.php
+++ b/framework/test/ActiveFixture.php
@@ -57,7 +57,7 @@ class ActiveFixture extends BaseActiveFixture
     public function init()
     {
         parent::init();
-        if (!isset($this->modelClass) && !isset($this->tableName)) {
+        if ($this->modelClass === null && $this->tableName === null) {
             throw new InvalidConfigException('Either "modelClass" or "tableName" must be set.');
         }
     }
diff --git a/framework/web/DbSession.php b/framework/web/DbSession.php
index 56a9234e8c..ad06fd681b 100644
--- a/framework/web/DbSession.php
+++ b/framework/web/DbSession.php
@@ -139,7 +139,7 @@ class DbSession extends MultiFieldSession
         $query->from($this->sessionTable)
             ->where('[[expire]]>:expire AND [[id]]=:id', [':expire' => time(), ':id' => $id]);
 
-        if (isset($this->readCallback)) {
+        if ($this->readCallback !== null) {
             $fields = $query->one($this->db);
             return $fields === false ? '' : $this->extractData($fields);
         }
diff --git a/framework/web/MultiFieldSession.php b/framework/web/MultiFieldSession.php
index 449296dab4..03ed7c4754 100644
--- a/framework/web/MultiFieldSession.php
+++ b/framework/web/MultiFieldSession.php
@@ -98,7 +98,7 @@ abstract class MultiFieldSession extends Session
         $fields = [
             'data' => $data,
         ];
-        if (isset($this->writeCallback)) {
+        if ($this->writeCallback !== null) {
             $fields = array_merge(
                 $fields,
                 call_user_func($this->writeCallback, $this)
@@ -123,7 +123,7 @@ abstract class MultiFieldSession extends Session
      */
     protected function extractData($fields)
     {
-        if (isset($this->readCallback)) {
+        if ($this->readCallback !== null) {
             if (!isset($fields['data'])) {
                 $fields['data'] = '';
             }
diff --git a/framework/yii b/framework/yii
index 78c8fa02fb..94a8050145 100755
--- a/framework/yii
+++ b/framework/yii
@@ -31,7 +31,7 @@ $application = new yii\console\Application([
     'basePath' => __DIR__ . '/console',
     'controllerNamespace' => 'yii\console\controllers',
 ]);
-if (isset($vendorPath)) {
+if ($vendorPath !== null) {
     $application->setVendorPath($vendorPath);
 }
 $exitCode = $application->run();