From c047fbe0df10c92698f08dfb18aeb254b6b5425d Mon Sep 17 00:00:00 2001 From: AlexGx Date: Tue, 4 Mar 2014 05:46:43 +0200 Subject: [PATCH] fix code style `No space found after comma in function call` --- framework/base/Formatter.php | 12 ++++++------ framework/console/controllers/FixtureController.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/base/Formatter.php b/framework/base/Formatter.php index 78fdac8cc4..80c08e1744 100644 --- a/framework/base/Formatter.php +++ b/framework/base/Formatter.php @@ -442,17 +442,17 @@ class Formatter extends Component switch($position) { case 0: - return $verbose ? Yii::t('yii','{n, plural, =1{# byte} other{# bytes}}', $params) : Yii::t('yii', '{n} B', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# byte} other{# bytes}}', $params) : Yii::t('yii', '{n} B', $params); case 1: - return $verbose ? Yii::t('yii','{n, plural, =1{# kilobyte} other{# kilobytes}}', $params) : Yii::t('yii','{n} KB', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# kilobyte} other{# kilobytes}}', $params) : Yii::t('yii', '{n} KB', $params); case 2: - return $verbose ? Yii::t('yii','{n, plural, =1{# megabyte} other{# megabytes}}', $params) : Yii::t('yii','{n} MB', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# megabyte} other{# megabytes}}', $params) : Yii::t('yii', '{n} MB', $params); case 3: - return $verbose ? Yii::t('yii','{n, plural, =1{# gigabyte} other{# gigabytes}}', $params) : Yii::t('yii','{n} GB', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# gigabyte} other{# gigabytes}}', $params) : Yii::t('yii', '{n} GB', $params); case 4: - return $verbose ? Yii::t('yii','{n, plural, =1{# terabyte} other{# terabytes}}', $params) : Yii::t('yii','{n} TB', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# terabyte} other{# terabytes}}', $params) : Yii::t('yii', '{n} TB', $params); default: - return $verbose ? Yii::t('yii','{n, plural, =1{# petabyte} other{# petabytes}}', $params) : Yii::t('yii','{n} PB', $params); + return $verbose ? Yii::t('yii', '{n, plural, =1{# petabyte} other{# petabytes}}', $params) : Yii::t('yii', '{n} PB', $params); } } } diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php index 49478cbd17..96a7cac639 100644 --- a/framework/console/controllers/FixtureController.php +++ b/framework/console/controllers/FixtureController.php @@ -64,7 +64,7 @@ class FixtureController extends Controller public function globalOptions() { return array_merge(parent::globalOptions(), [ - 'namespace','globalFixtures' + 'namespace', 'globalFixtures' ]); } @@ -100,7 +100,7 @@ class FixtureController extends Controller } $filtered = array_diff($foundFixtures, $except); - $fixtures = $this->getFixturesConfig(array_merge($this->globalFixtures ,$filtered)); + $fixtures = $this->getFixturesConfig(array_merge($this->globalFixtures, $filtered)); if (!$fixtures) { throw new Exception('No fixtures were found in namespace: "' . $this->namespace . '"' . '');