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

fix code style

Browse Source
This commit is contained in:
AlexGx
2014-03-04 06:12:30 +02:00
parent c6183fc205
commit eaaa5b1bb5
14 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/console/controllers/MessageController.php
View File

@@ -190,7 +190,7 @@ class MessageController extends Controller
echo "Inserting new messages..."; echo "Inserting new messages...";
$savedFlag = false; $savedFlag = false;
foreach ($new as $category => $msgs) { foreach ($new as $category => $msgs) {
foreach ($msgs as $m) { foreach ($msgs as $m) {
$savedFlag = true; $savedFlag = true;
@@ -268,7 +268,7 @@ class MessageController extends Controller
{ {
echo "Saving messages to $fileName..."; echo "Saving messages to $fileName...";
if (is_file($fileName)) { if (is_file($fileName)) {
if($format === 'po'){ if ($format === 'po') {
$translated = file_get_contents($fileName); $translated = file_get_contents($fileName);
preg_match_all('/(?<=msgid ").*(?="\n(#*)msgstr)/', $translated, $keys); preg_match_all('/(?<=msgid ").*(?="\n(#*)msgstr)/', $translated, $keys);
preg_match_all('/(?<=msgstr ").*(?="\n\n)/', $translated, $values); preg_match_all('/(?<=msgstr ").*(?="\n\n)/', $translated, $values);
@@ -285,7 +285,7 @@ class MessageController extends Controller
$merged = []; $merged = [];
$untranslated = []; $untranslated = [];
foreach ($messages as $message) { foreach ($messages as $message) {
if($format === 'po'){ if ($format === 'po') {
$message = preg_replace('/\"/', '\"', $message); $message = preg_replace('/\"/', '\"', $message);
} }
if (array_key_exists($message, $translated) && strlen($translated[$message]) > 0) { if (array_key_exists($message, $translated) && strlen($translated[$message]) > 0) {
@@ -317,9 +317,9 @@ class MessageController extends Controller
if (false === $overwrite) { if (false === $overwrite) {
$fileName .= '.merged'; $fileName .= '.merged';
} }
if ($format === 'po'){ if ($format === 'po') {
$output = ''; $output = '';
foreach ($merged as $k => $v){ foreach ($merged as $k => $v) {
$k = preg_replace('/(\")|(\\\")/', "\\\"", $k); $k = preg_replace('/(\")|(\\\")/', "\\\"", $k);
$v = preg_replace('/(\")|(\\\")/', "\\\"", $v); $v = preg_replace('/(\")|(\\\")/', "\\\"", $v);
if (substr($v, 0, 2) === '@@' && substr($v, -2) === '@@') { if (substr($v, 0, 2) === '@@' && substr($v, -2) === '@@') {
@@ -338,7 +338,7 @@ class MessageController extends Controller
if ($format === 'po') { if ($format === 'po') {
$merged = ''; $merged = '';
sort($messages); sort($messages);
foreach($messages as $message) { foreach ($messages as $message) {
$message = preg_replace('/(\")|(\\\")/', '\\\"', $message); $message = preg_replace('/(\")|(\\\")/', '\\\"', $message);
$merged .= "msgid \"$message\"\n"; $merged .= "msgid \"$message\"\n";
$merged .= "msgstr \"\"\n"; $merged .= "msgstr \"\"\n";

2
framework/db/ActiveRelationTrait.php
View File

@@ -288,7 +288,7 @@ trait ActiveRelationTrait
foreach ($primaryModels as $i => $primaryModel) { foreach ($primaryModels as $i => $primaryModel) {
if ($primaryModels[$i][$primaryName] instanceof ActiveRecordInterface) { if ($primaryModels[$i][$primaryName] instanceof ActiveRecordInterface) {
$primaryModels[$i][$primaryName]->populateRelation($name, $primaryModel); $primaryModels[$i][$primaryName]->populateRelation($name, $primaryModel);
} elseif (!empty($primaryModels[$i][$primaryName])) { } elseif (!empty($primaryModels[$i][$primaryName])) {
$primaryModels[$i][$primaryName][$name] = $primaryModel; $primaryModels[$i][$primaryName][$name] = $primaryModel;
} }
} }

8
framework/helpers/BaseFileHelper.php
View File

@@ -281,14 +281,14 @@ class BaseFileHelper
$options['basePath'] = realpath($dir); $options['basePath'] = realpath($dir);
// this should also be done only once // this should also be done only once
if (isset($options['except'])) { if (isset($options['except'])) {
foreach($options['except'] as $key=>$value) { foreach ($options['except'] as $key => $value) {
if (is_string($value)) { if (is_string($value)) {
$options['except'][$key] = static::parseExcludePattern($value); $options['except'][$key] = static::parseExcludePattern($value);
} }
} }
} }
if (isset($options['only'])) { if (isset($options['only'])) {
foreach($options['only'] as $key=>$value) { foreach ($options['only'] as $key => $value) {
if (is_string($value)) { if (is_string($value)) {
$options['only'][$key] = static::parseExcludePattern($value); $options['only'][$key] = static::parseExcludePattern($value);
} }
@@ -398,7 +398,7 @@ class BaseFileHelper
if ($pattern === $baseName) { if ($pattern === $baseName) {
return true; return true;
} }
} else if ($flags & self::PATTERN_ENDSWITH) { } elseif ($flags & self::PATTERN_ENDSWITH) {
/* "*literal" matching against "fooliteral" */ /* "*literal" matching against "fooliteral" */
$n = StringHelper::byteLength($pattern); $n = StringHelper::byteLength($pattern);
if (StringHelper::byteSubstr($pattern, 1, $n) === StringHelper::byteSubstr($baseName, -$n, $n)) { if (StringHelper::byteSubstr($pattern, 1, $n) === StringHelper::byteSubstr($baseName, -$n, $n)) {
@@ -473,7 +473,7 @@ class BaseFileHelper
*/ */
private static function lastExcludeMatchingFromList($basePath, $path, $excludes) private static function lastExcludeMatchingFromList($basePath, $path, $excludes)
{ {
foreach(array_reverse($excludes) as $exclude) { foreach (array_reverse($excludes) as $exclude) {
if (is_string($exclude)) { if (is_string($exclude)) {
$exclude = self::parseExcludePattern($exclude); $exclude = self::parseExcludePattern($exclude);
} }

2
framework/helpers/BaseMarkdown.php
View File

@@ -86,7 +86,7 @@ class BaseMarkdown
/** @var \cebe\markdown\Markdown $parser */ /** @var \cebe\markdown\Markdown $parser */
if (!isset(static::$flavors[$flavor])) { if (!isset(static::$flavors[$flavor])) {
throw new InvalidParamException("Markdown flavor '$flavor' is not defined.'"); 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); $parser = Yii::createObject($config);
if (is_array($config)) { if (is_array($config)) {
foreach ($config as $name => $value) { foreach ($config as $name => $value) {

4
framework/helpers/BaseSecurity.php
View File

@@ -107,10 +107,10 @@ class BaseSecurity
*/ */
protected static function stripPadding($data) protected static function stripPadding($data)
{ {
$end = StringHelper::byteSubstr($data, -1, NULL); $end = StringHelper::byteSubstr($data, -1, null);
$last = ord($end); $last = ord($end);
$n = StringHelper::byteLength($data) - $last; $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 StringHelper::byteSubstr($data, 0, $n);
} }
return false; return false;

4
framework/i18n/GettextMessageSource.php
View File

@@ -70,9 +70,9 @@ class GettextMessageSource extends MessageSource
if ($messages === null && $fallbackMessages === null && $fallbackLanguage != $this->sourceLanguage) { 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__); 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; return $fallbackMessages;
} else if (!empty($fallbackMessages)) { } elseif (!empty($fallbackMessages)) {
foreach ($fallbackMessages as $key => $value) { foreach ($fallbackMessages as $key => $value) {
if (!empty($value) && empty($messages[$key])) { if (!empty($value) && empty($messages[$key])) {
$messages[$key] = $fallbackMessages[$key]; $messages[$key] = $fallbackMessages[$key];

2
framework/i18n/I18N.php
View File

@@ -126,7 +126,7 @@ class I18N extends Component
} }
$p = []; $p = [];
foreach($params as $name => $value) { foreach ($params as $name => $value) {
$p['{' . $name . '}'] = $value; $p['{' . $name . '}'] = $value;
} }
return strtr($message, $p); return strtr($message, $p);

10
framework/i18n/MessageFormatter.php
View File

@@ -143,7 +143,7 @@ class MessageFormatter extends Component
return false; return false;
} }
$map = []; $map = [];
foreach($tokens as $i => $token) { foreach ($tokens as $i => $token) {
if (is_array($token)) { if (is_array($token)) {
$param = trim($token[0]); $param = trim($token[0]);
if (!isset($map[$param])) { if (!isset($map[$param])) {
@@ -169,7 +169,7 @@ class MessageFormatter extends Component
return false; return false;
} else { } else {
$values = []; $values = [];
foreach($result as $key => $value) { foreach ($result as $key => $value) {
$values[$map[$key]] = $value; $values[$map[$key]] = $value;
} }
return $values; return $values;
@@ -190,7 +190,7 @@ class MessageFormatter extends Component
if (($tokens = self::tokenizePattern($pattern)) === false) { if (($tokens = self::tokenizePattern($pattern)) === false) {
return false; return false;
} }
foreach($tokens as $i => $token) { foreach ($tokens as $i => $token) {
if (!is_array($token)) { if (!is_array($token)) {
continue; continue;
} }
@@ -210,7 +210,7 @@ class MessageFormatter extends Component
} }
$type = isset($token[1]) ? trim($token[1]) : 'none'; $type = isset($token[1]) ? trim($token[1]) : 'none';
// replace plural and select format recursively // replace plural and select format recursively
if ($type == 'plural' || $type == 'select') { if ($type == 'plural' || $type == 'select') {
if (!isset($token[2])) { if (!isset($token[2])) {
return false; return false;
} }
@@ -244,7 +244,7 @@ class MessageFormatter extends Component
$this->_errorMessage = "Message pattern is invalid."; $this->_errorMessage = "Message pattern is invalid.";
return false; return false;
} }
foreach($tokens as $i => $token) { foreach ($tokens as $i => $token) {
if (is_array($token)) { if (is_array($token)) {
if (($tokens[$i] = $this->parseToken($token, $args, $locale)) === false) { if (($tokens[$i] = $this->parseToken($token, $args, $locale)) === false) {
$this->_errorCode = -1; $this->_errorCode = -1;

4
framework/i18n/PhpMessageSource.php
View File

@@ -73,9 +73,9 @@ class PhpMessageSource extends MessageSource
if ($messages === null && $fallbackMessages === null && $fallbackLanguage != $this->sourceLanguage) { 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__); 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; return $fallbackMessages;
} else if (!empty($fallbackMessages)) { } elseif (!empty($fallbackMessages)) {
foreach ($fallbackMessages as $key => $value) { foreach ($fallbackMessages as $key => $value) {
if (!empty($value) && empty($messages[$key])) { if (!empty($value) && empty($messages[$key])) {
$messages[$key] = $fallbackMessages[$key]; $messages[$key] = $fallbackMessages[$key];

1
framework/mail/BaseMailer.php
View File

@@ -348,5 +348,4 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont
$event = new MailEvent(['message' => $message, 'isSuccessful' => $isSuccessful]); $event = new MailEvent(['message' => $message, 'isSuccessful' => $isSuccessful]);
$this->trigger(self::EVENT_AFTER_SEND, $event); $this->trigger(self::EVENT_AFTER_SEND, $event);
} }
} }

1
framework/test/Fixture.php
View File

@@ -82,4 +82,3 @@ class Fixture extends Component
{ {
} }
} }

2
framework/web/AssetConverter.php
View File

@@ -82,7 +82,7 @@ class AssetConverter extends Component implements AssetConverterInterface
$proc = proc_open($command, $descriptor, $pipes, $basePath); $proc = proc_open($command, $descriptor, $pipes, $basePath);
$stdout = stream_get_contents($pipes[1]); $stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]); $stderr = stream_get_contents($pipes[2]);
foreach($pipes as $pipe) { foreach ($pipes as $pipe) {
fclose($pipe); fclose($pipe);
} }
$status = proc_close($proc); $status = proc_close($proc);

2
framework/widgets/LinkPager.php
View File

@@ -128,7 +128,7 @@ class LinkPager extends Widget
protected function registerLinkTags() protected function registerLinkTags()
{ {
$view = $this->getView(); $view = $this->getView();
foreach($this->pagination->getLinks() as $rel => $href) { foreach ($this->pagination->getLinks() as $rel => $href) {
$view->registerLinkTag(['rel' => $rel, 'href' => $href], $rel); $view->registerLinkTag(['rel' => $rel, 'href' => $href], $rel);
} }
} }