From eaaa5b1bb55f5cf1d3ff82dbaeebf57606c1e529 Mon Sep 17 00:00:00 2001 From: AlexGx Date: Tue, 4 Mar 2014 06:12:30 +0200 Subject: [PATCH] fix code style --- framework/console/controllers/MessageController.php | 12 ++++++------ framework/db/ActiveRelationTrait.php | 2 +- framework/grid/DataColumn.php | 2 +- framework/helpers/BaseFileHelper.php | 8 ++++---- framework/helpers/BaseMarkdown.php | 2 +- framework/helpers/BaseSecurity.php | 4 ++-- framework/i18n/GettextMessageSource.php | 4 ++-- framework/i18n/I18N.php | 2 +- framework/i18n/MessageFormatter.php | 10 +++++----- framework/i18n/PhpMessageSource.php | 4 ++-- framework/mail/BaseMailer.php | 1 - framework/test/Fixture.php | 1 - framework/web/AssetConverter.php | 2 +- framework/widgets/LinkPager.php | 2 +- 14 files changed, 27 insertions(+), 29 deletions(-) diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php index 0345b697d8..243038ef4e 100644 --- a/framework/console/controllers/MessageController.php +++ b/framework/console/controllers/MessageController.php @@ -190,7 +190,7 @@ class MessageController extends Controller echo "Inserting new messages..."; $savedFlag = false; - foreach ($new as $category => $msgs) { + foreach ($new as $category => $msgs) { foreach ($msgs as $m) { $savedFlag = true; @@ -268,7 +268,7 @@ class MessageController extends Controller { echo "Saving messages to $fileName..."; if (is_file($fileName)) { - if($format === 'po'){ + if ($format === 'po') { $translated = file_get_contents($fileName); preg_match_all('/(?<=msgid ").*(?="\n(#*)msgstr)/', $translated, $keys); preg_match_all('/(?<=msgstr ").*(?="\n\n)/', $translated, $values); @@ -285,7 +285,7 @@ class MessageController extends Controller $merged = []; $untranslated = []; foreach ($messages as $message) { - if($format === 'po'){ + if ($format === 'po') { $message = preg_replace('/\"/', '\"', $message); } if (array_key_exists($message, $translated) && strlen($translated[$message]) > 0) { @@ -317,9 +317,9 @@ class MessageController extends Controller if (false === $overwrite) { $fileName .= '.merged'; } - if ($format === 'po'){ + if ($format === 'po') { $output = ''; - foreach ($merged as $k => $v){ + foreach ($merged as $k => $v) { $k = preg_replace('/(\")|(\\\")/', "\\\"", $k); $v = preg_replace('/(\")|(\\\")/', "\\\"", $v); if (substr($v, 0, 2) === '@@' && substr($v, -2) === '@@') { @@ -338,7 +338,7 @@ class MessageController extends Controller if ($format === 'po') { $merged = ''; sort($messages); - foreach($messages as $message) { + foreach ($messages as $message) { $message = preg_replace('/(\")|(\\\")/', '\\\"', $message); $merged .= "msgid \"$message\"\n"; $merged .= "msgstr \"\"\n"; diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php index ab06c1646e..32f6953c89 100644 --- a/framework/db/ActiveRelationTrait.php +++ b/framework/db/ActiveRelationTrait.php @@ -288,7 +288,7 @@ trait ActiveRelationTrait foreach ($primaryModels as $i => $primaryModel) { if ($primaryModels[$i][$primaryName] instanceof ActiveRecordInterface) { $primaryModels[$i][$primaryName]->populateRelation($name, $primaryModel); - } elseif (!empty($primaryModels[$i][$primaryName])) { + } elseif (!empty($primaryModels[$i][$primaryName])) { $primaryModels[$i][$primaryName][$name] = $primaryModel; } } diff --git a/framework/grid/DataColumn.php b/framework/grid/DataColumn.php index a8ef9ad528..7b0f493467 100644 --- a/framework/grid/DataColumn.php +++ b/framework/grid/DataColumn.php @@ -152,7 +152,7 @@ class DataColumn extends Column return parent::getDataCellContent($model, $key, $index); } return $value; - } + } /** * @inheritdoc diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php index 1a424bd08c..ac6e6a55d1 100644 --- a/framework/helpers/BaseFileHelper.php +++ b/framework/helpers/BaseFileHelper.php @@ -281,14 +281,14 @@ class BaseFileHelper $options['basePath'] = realpath($dir); // this should also be done only once if (isset($options['except'])) { - foreach($options['except'] as $key=>$value) { + foreach ($options['except'] as $key => $value) { if (is_string($value)) { $options['except'][$key] = static::parseExcludePattern($value); } } } if (isset($options['only'])) { - foreach($options['only'] as $key=>$value) { + foreach ($options['only'] as $key => $value) { if (is_string($value)) { $options['only'][$key] = static::parseExcludePattern($value); } @@ -398,7 +398,7 @@ class BaseFileHelper if ($pattern === $baseName) { return true; } - } else if ($flags & self::PATTERN_ENDSWITH) { + } elseif ($flags & self::PATTERN_ENDSWITH) { /* "*literal" matching against "fooliteral" */ $n = StringHelper::byteLength($pattern); if (StringHelper::byteSubstr($pattern, 1, $n) === StringHelper::byteSubstr($baseName, -$n, $n)) { @@ -473,7 +473,7 @@ class BaseFileHelper */ private static function lastExcludeMatchingFromList($basePath, $path, $excludes) { - foreach(array_reverse($excludes) as $exclude) { + foreach (array_reverse($excludes) as $exclude) { if (is_string($exclude)) { $exclude = self::parseExcludePattern($exclude); } diff --git a/framework/helpers/BaseMarkdown.php b/framework/helpers/BaseMarkdown.php index a22e45ea8b..c72e07911d 100644 --- a/framework/helpers/BaseMarkdown.php +++ b/framework/helpers/BaseMarkdown.php @@ -86,7 +86,7 @@ class BaseMarkdown /** @var \cebe\markdown\Markdown $parser */ if (!isset(static::$flavors[$flavor])) { throw new InvalidParamException("Markdown flavor '$flavor' is not defined.'"); - } elseif(!is_object($config = static::$flavors[$flavor])) { + } elseif (!is_object($config = static::$flavors[$flavor])) { $parser = Yii::createObject($config); if (is_array($config)) { foreach ($config as $name => $value) { diff --git a/framework/helpers/BaseSecurity.php b/framework/helpers/BaseSecurity.php index d9459d9c52..8750a54c0a 100644 --- a/framework/helpers/BaseSecurity.php +++ b/framework/helpers/BaseSecurity.php @@ -107,10 +107,10 @@ class BaseSecurity */ protected static function stripPadding($data) { - $end = StringHelper::byteSubstr($data, -1, NULL); + $end = StringHelper::byteSubstr($data, -1, null); $last = ord($end); $n = StringHelper::byteLength($data) - $last; - if (StringHelper::byteSubstr($data, $n, NULL) == str_repeat($end, $last)) { + if (StringHelper::byteSubstr($data, $n, null) == str_repeat($end, $last)) { return StringHelper::byteSubstr($data, 0, $n); } return false; diff --git a/framework/i18n/GettextMessageSource.php b/framework/i18n/GettextMessageSource.php index 8da8edc9ab..fc6d87fa67 100644 --- a/framework/i18n/GettextMessageSource.php +++ b/framework/i18n/GettextMessageSource.php @@ -70,9 +70,9 @@ class GettextMessageSource extends MessageSource if ($messages === null && $fallbackMessages === null && $fallbackLanguage != $this->sourceLanguage) { Yii::error("The message file for category '$category' does not exist: $messageFile Fallback file does not exist as well: $fallbackMessageFile", __METHOD__); - } else if (empty($messages)) { + } elseif (empty($messages)) { return $fallbackMessages; - } else if (!empty($fallbackMessages)) { + } elseif (!empty($fallbackMessages)) { foreach ($fallbackMessages as $key => $value) { if (!empty($value) && empty($messages[$key])) { $messages[$key] = $fallbackMessages[$key]; diff --git a/framework/i18n/I18N.php b/framework/i18n/I18N.php index d0bbfcc8ec..6be3899f03 100644 --- a/framework/i18n/I18N.php +++ b/framework/i18n/I18N.php @@ -126,7 +126,7 @@ class I18N extends Component } $p = []; - foreach($params as $name => $value) { + foreach ($params as $name => $value) { $p['{' . $name . '}'] = $value; } return strtr($message, $p); diff --git a/framework/i18n/MessageFormatter.php b/framework/i18n/MessageFormatter.php index 4ea70832e9..c3d8c561bb 100644 --- a/framework/i18n/MessageFormatter.php +++ b/framework/i18n/MessageFormatter.php @@ -143,7 +143,7 @@ class MessageFormatter extends Component return false; } $map = []; - foreach($tokens as $i => $token) { + foreach ($tokens as $i => $token) { if (is_array($token)) { $param = trim($token[0]); if (!isset($map[$param])) { @@ -169,7 +169,7 @@ class MessageFormatter extends Component return false; } else { $values = []; - foreach($result as $key => $value) { + foreach ($result as $key => $value) { $values[$map[$key]] = $value; } return $values; @@ -190,7 +190,7 @@ class MessageFormatter extends Component if (($tokens = self::tokenizePattern($pattern)) === false) { return false; } - foreach($tokens as $i => $token) { + foreach ($tokens as $i => $token) { if (!is_array($token)) { continue; } @@ -210,7 +210,7 @@ class MessageFormatter extends Component } $type = isset($token[1]) ? trim($token[1]) : 'none'; // replace plural and select format recursively - if ($type == 'plural' || $type == 'select') { + if ($type == 'plural' || $type == 'select') { if (!isset($token[2])) { return false; } @@ -244,7 +244,7 @@ class MessageFormatter extends Component $this->_errorMessage = "Message pattern is invalid."; return false; } - foreach($tokens as $i => $token) { + foreach ($tokens as $i => $token) { if (is_array($token)) { if (($tokens[$i] = $this->parseToken($token, $args, $locale)) === false) { $this->_errorCode = -1; diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php index 2e611f50e0..78665112bf 100644 --- a/framework/i18n/PhpMessageSource.php +++ b/framework/i18n/PhpMessageSource.php @@ -73,9 +73,9 @@ class PhpMessageSource extends MessageSource if ($messages === null && $fallbackMessages === null && $fallbackLanguage != $this->sourceLanguage) { Yii::error("The message file for category '$category' does not exist: $messageFile Fallback file does not exist as well: $fallbackMessageFile", __METHOD__); - } else if (empty($messages)) { + } elseif (empty($messages)) { return $fallbackMessages; - } else if (!empty($fallbackMessages)) { + } elseif (!empty($fallbackMessages)) { foreach ($fallbackMessages as $key => $value) { if (!empty($value) && empty($messages[$key])) { $messages[$key] = $fallbackMessages[$key]; diff --git a/framework/mail/BaseMailer.php b/framework/mail/BaseMailer.php index 139b4afaa7..01f6635ac6 100644 --- a/framework/mail/BaseMailer.php +++ b/framework/mail/BaseMailer.php @@ -348,5 +348,4 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont $event = new MailEvent(['message' => $message, 'isSuccessful' => $isSuccessful]); $this->trigger(self::EVENT_AFTER_SEND, $event); } - } diff --git a/framework/test/Fixture.php b/framework/test/Fixture.php index 5a38ae513b..e22a139e68 100644 --- a/framework/test/Fixture.php +++ b/framework/test/Fixture.php @@ -82,4 +82,3 @@ class Fixture extends Component { } } - diff --git a/framework/web/AssetConverter.php b/framework/web/AssetConverter.php index 1b7d1c84d6..23062d97a9 100644 --- a/framework/web/AssetConverter.php +++ b/framework/web/AssetConverter.php @@ -82,7 +82,7 @@ class AssetConverter extends Component implements AssetConverterInterface $proc = proc_open($command, $descriptor, $pipes, $basePath); $stdout = stream_get_contents($pipes[1]); $stderr = stream_get_contents($pipes[2]); - foreach($pipes as $pipe) { + foreach ($pipes as $pipe) { fclose($pipe); } $status = proc_close($proc); diff --git a/framework/widgets/LinkPager.php b/framework/widgets/LinkPager.php index a2c905c731..22cfdf0dcf 100644 --- a/framework/widgets/LinkPager.php +++ b/framework/widgets/LinkPager.php @@ -128,7 +128,7 @@ class LinkPager extends Widget protected function registerLinkTags() { $view = $this->getView(); - foreach($this->pagination->getLinks() as $rel => $href) { + foreach ($this->pagination->getLinks() as $rel => $href) { $view->registerLinkTag(['rel' => $rel, 'href' => $href], $rel); } }