Fix code issues (yiisoft#15435)

* Fix some scrunitizer warnings * Remove obsolete require * Fix codestyle
ihipop · Jan 1, 2018 · b44bbd6 · b44bbd6
1 parent b8f4397
commit b44bbd6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/framework/Yii.php b/framework/Yii.php
@@ -5,8 +5,6 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require __DIR__ . '/BaseYii.php';
-
 /**
  * Yii is a helper class serving common framework functionalities.
  *

diff --git a/framework/console/widgets/Table.php b/framework/console/widgets/Table.php
@@ -228,6 +228,7 @@ protected function renderRow(array $row, $spanLeft, $spanMiddle, $spanRight)
 
         $buffer = '';
         $arrayPointer = [];
+        $finalChunk = [];
         for ($i = 0, ($max = $this->calculateRowHeight($row)) ?: $max = 1; $i < $max; $i++) {
             $buffer .= $spanLeft . ' ';
             foreach ($size as $index => $cellSize) {

diff --git a/framework/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php
@@ -1249,7 +1249,7 @@ private static function collectErrors($models, $encode, $showAllErrors)
         }
 
         if ($encode) {
-            for ($i = 0; $i < count($lines); $i++) {
+            for ($i = 0, $linesCount = count($lines); $i < $linesCount; $i++) {
                 $lines[$i] = Html::encode($lines[$i]);
             }
         }

diff --git a/framework/i18n/Formatter.php b/framework/i18n/Formatter.php
@@ -1013,6 +1013,7 @@ public function asDuration($value, $implodeString = ', ', $negativeSign = '-')
             $isNegative = $interval->invert;
         }
 
+        $parts = [];
         if ($interval->y > 0) {
             $parts[] = Yii::t('yii', '{delta, plural, =1{1 year} other{# years}}', ['delta' => $interval->y], $this->locale);
         }

diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php
@@ -92,7 +92,7 @@ public function validateAttribute($model, $attribute)
     {
         $targetAttribute = $this->targetAttribute === null ? $attribute : $this->targetAttribute;
         $params = $this->prepareConditions($targetAttribute, $model, $attribute);
-        $conditions[] = $this->targetAttributeJunction == 'or' ? 'or' : 'and';
+        $conditions = [$this->targetAttributeJunction == 'or' ? 'or' : 'and'];
 
         if (!$this->allowArray) {
             foreach ($params as $key => $value) {

diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
@@ -121,7 +121,7 @@ public function validateAttribute($model, $attribute)
         $targetClass = $this->getTargetClass($model);
         $targetAttribute = $this->targetAttribute === null ? $attribute : $this->targetAttribute;
         $rawConditions = $this->prepareConditions($targetAttribute, $model, $attribute);
-        $conditions[] = $this->targetAttributeJunction === 'or' ? 'or' : 'and';
+        $conditions = [$this->targetAttributeJunction === 'or' ? 'or' : 'and'];
 
         foreach ($rawConditions as $key => $value) {
             if (is_array($value)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ @@
      * @license http://www.yiiframework.com/license/
      */
-    require __DIR__ . '/BaseYii.php';
     /**
      * Yii is a helper class serving common framework functionalities.
      *
@@ Expand Down @@