octicon-mirror(24/)
php/yii2
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 02:13:17 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

[minor]: SCA (#16269)

Browse Source 
* Php Inspections (EA Ultimate): minor code tweaks

* Php Inspections (EA Ultimate): code style

* Php Inspections (EA Ultimate): code style

* Php Inspections (EA Ultimate): code style
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Vladimir Reznichenko
2018-05-14 11:00:01 +02:00
committed by Alexander Makarov
gitea-unlock(16/)
parent 643ef6f820
commit 6dd2aec011
octicon-diff(16/tw-mr-1) 4 changed files with 19 additions and 23 deletions
gitea-whitespace(16/)
gitea-join(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/ActiveRelationTrait.php
View File

@@ -353,8 +353,7 @@ trait ActiveRelationTrait
} }
} }
} }
} else { } elseif ($this->multiple) {
if ($this->multiple) {
foreach ($primaryModels as $i => $primaryModel) { foreach ($primaryModels as $i => $primaryModel) {
foreach ($primaryModel[$primaryName] as $j => $m) { foreach ($primaryModel[$primaryName] as $j => $m) {
if ($m instanceof ActiveRecordInterface) { if ($m instanceof ActiveRecordInterface) {
@@ -374,7 +373,6 @@ trait ActiveRelationTrait
} }
} }
} }
}
/** /**
* @param array $models * @param array $models

2
framework/db/oci/Schema.php
View File

@@ -621,7 +621,7 @@ SQL;
} else { } else {
$returnParams[$phName]['dataType'] = \PDO::PARAM_INT; $returnParams[$phName]['dataType'] = \PDO::PARAM_INT;
} }
$returnParams[$phName]['size'] = isset($columnSchemas[$name]) && isset($columnSchemas[$name]->size) ? $columnSchemas[$name]->size : -1; $returnParams[$phName]['size'] = isset($columnSchemas[$name]->size) ? $columnSchemas[$name]->size : -1;
$returning[] = $this->quoteColumnName($name); $returning[] = $this->quoteColumnName($name);
} }
$sql .= ' RETURNING ' . implode(', ', $returning) . ' INTO ' . implode(', ', array_keys($returnParams)); $sql .= ' RETURNING ' . implode(', ', $returning) . ' INTO ' . implode(', ', array_keys($returnParams));

2
framework/web/Request.php
View File

@@ -937,7 +937,7 @@ class Request extends \yii\base\Request
throw new InvalidConfigException('Unable to determine the path info of the current request.'); throw new InvalidConfigException('Unable to determine the path info of the current request.');
} }
if (substr($pathInfo, 0, 1) === '/') { if (strncmp($pathInfo, '/', 1) === 0) {
$pathInfo = substr($pathInfo, 1); $pathInfo = substr($pathInfo, 1);
} }

4
framework/web/Session.php
View File

@@ -814,14 +814,12 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
$_SESSION[$this->flashParam] = $counters; $_SESSION[$this->flashParam] = $counters;
if (empty($_SESSION[$key])) { if (empty($_SESSION[$key])) {
$_SESSION[$key] = [$value]; $_SESSION[$key] = [$value];
} else { } elseif (is_array($_SESSION[$key])) {
if (is_array($_SESSION[$key])) {
$_SESSION[$key][] = $value; $_SESSION[$key][] = $value;
} else { } else {
$_SESSION[$key] = [$_SESSION[$key], $value]; $_SESSION[$key] = [$_SESSION[$key], $value];
} }
} }
}
/** /**
* Removes a flash message. * Removes a flash message.