Fixed code style and indentations

lirnbo · May 3, 2016 · 030913e · 030913e
1 parent aaf6c84
commit 030913e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/framework/data/ArrayDataProvider.php b/framework/data/ArrayDataProvider.php
@@ -63,11 +63,12 @@ class ArrayDataProvider extends BaseDataProvider
      * The array elements must use zero-based integer keys.
      */
     public $allModels;
-	/**
-	 * @var string the name of the \yii\base\Model based class used to provide column labels.
-	 * @since 2.0.9
-	 */
-	public $modelClass;
+    /**
+     * @var string the name of the [[yii\base\Model|Model]] class that will be represented.
+     * This property is used to get columns' names.
+     * @since 2.0.9
+     */
+    public $modelClass;
 
     /**
      * @inheritdoc

diff --git a/framework/grid/DataColumn.php b/framework/grid/DataColumn.php
@@ -144,10 +144,10 @@ protected function getHeaderCellLabel()
                 /* @var $model Model */
                 $model = new $provider->query->modelClass;
                 $label = $model->getAttributeLabel($this->attribute);
-            } else if($provider instanceof ArrayDataProvider && $provider->modelClass !== null) {
-	            /* @var $model Model */
-	            $model = new $provider->modelClass;
-	            $label = $model->getAttributeLabel($this->attribute);
+            } else if ($provider instanceof ArrayDataProvider && $provider->modelClass !== null) {
+                /* @var $model Model */
+                $model = new $provider->modelClass;
+                $label = $model->getAttributeLabel($this->attribute);
             } else {
                 $models = $provider->getModels();
                 if (($model = reset($models)) instanceof Model) {

diff --git a/tests/framework/data/ArrayDataProviderTest.php b/tests/framework/data/ArrayDataProviderTest.php
@@ -179,4 +179,4 @@ public function testGetKeys()
         $dataProvider = new ArrayDataProvider(['allModels' => $mixedArray, 'pagination' => $pagination]);
         $this->assertEquals(['key1', 9], $dataProvider->getKeys());
     }
-} 
+}