php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare with null instead of isset

Browse Source
This commit is contained in:
Alexander Makarov
2015-10-10 01:12:59 +03:00
parent 7a08b8d9d9
commit 8260cfa4ea
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/console/Request.php
View File

@ -29,7 +29,7 @@ class Request extends \yii\base\Request
*/ */
public function getParams() public function getParams()
{ {
if (!isset($this->_params)) { if ($this->_params === null) {
if (isset($_SERVER['argv'])) { if (isset($_SERVER['argv'])) {
$this->_params = $_SERVER['argv']; $this->_params = $_SERVER['argv'];
array_shift($this->_params); array_shift($this->_params);

4
framework/filters/AccessControl.php
View File

@ -120,7 +120,7 @@ class AccessControl extends ActionFilter
} elseif ($allow === false) { } elseif ($allow === false) {
if (isset($rule->denyCallback)) { if (isset($rule->denyCallback)) {
call_user_func($rule->denyCallback, $rule, $action); call_user_func($rule->denyCallback, $rule, $action);
} elseif (isset($this->denyCallback)) { } elseif ($this->denyCallback !== null) {
call_user_func($this->denyCallback, $rule, $action); call_user_func($this->denyCallback, $rule, $action);
} else { } else {
$this->denyAccess($user); $this->denyAccess($user);
@ -128,7 +128,7 @@ class AccessControl extends ActionFilter
return false; return false;
} }
} }
if (isset($this->denyCallback)) { if ($this->denyCallback !== null) {
call_user_func($this->denyCallback, null, $action); call_user_func($this->denyCallback, null, $action);
} else { } else {
$this->denyAccess($user); $this->denyAccess($user);

2
framework/test/ActiveFixture.php
View File

@ -57,7 +57,7 @@ class ActiveFixture extends BaseActiveFixture
public function init() public function init()
{ {
parent::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.'); throw new InvalidConfigException('Either "modelClass" or "tableName" must be set.');
} }
} }

2
framework/web/DbSession.php
View File

@ -139,7 +139,7 @@ class DbSession extends MultiFieldSession
$query->from($this->sessionTable) $query->from($this->sessionTable)
->where('[[expire]]>:expire AND [[id]]=:id', [':expire' => time(), ':id' => $id]); ->where('[[expire]]>:expire AND [[id]]=:id', [':expire' => time(), ':id' => $id]);
if (isset($this->readCallback)) { if ($this->readCallback !== null) {
$fields = $query->one($this->db); $fields = $query->one($this->db);
return $fields === false ? '' : $this->extractData($fields); return $fields === false ? '' : $this->extractData($fields);
} }

4
framework/web/MultiFieldSession.php
View File

@ -98,7 +98,7 @@ abstract class MultiFieldSession extends Session
$fields = [ $fields = [
'data' => $data, 'data' => $data,
]; ];
if (isset($this->writeCallback)) { if ($this->writeCallback !== null) {
$fields = array_merge( $fields = array_merge(
$fields, $fields,
call_user_func($this->writeCallback, $this) call_user_func($this->writeCallback, $this)
@ -123,7 +123,7 @@ abstract class MultiFieldSession extends Session
*/ */
protected function extractData($fields) protected function extractData($fields)
{ {
if (isset($this->readCallback)) { if ($this->readCallback !== null) {
if (!isset($fields['data'])) { if (!isset($fields['data'])) {
$fields['data'] = ''; $fields['data'] = '';
} }

2
framework/yii
View File

@ -31,7 +31,7 @@ $application = new yii\console\Application([
'basePath' => __DIR__ . '/console', 'basePath' => __DIR__ . '/console',
'controllerNamespace' => 'yii\console\controllers', 'controllerNamespace' => 'yii\console\controllers',
]); ]);
if (isset($vendorPath)) { if ($vendorPath !== null) {
$application->setVendorPath($vendorPath); $application->setVendorPath($vendorPath);
} }
$exitCode = $application->run(); $exitCode = $application->run();