phundament / app

src/modules/backend/assets/AdminAsset.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * @link http://www.yiiframework.com/
- *
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
+     * @link http://www.yiiframework.com/
+     *
+     * @copyright Copyright (c) 2008 Yii Software LLC
+     * @license http://www.yiiframework.com/license/
+     */
 namespace app\modules\backend\assets;
 
 use yii\helpers\FileHelper;

src/modules/backend/controllers/DefaultController.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
                     ],
                     [
                         'allow' => true,
-                        'matchCallback' => function ($rule, $action) {
+                        'matchCallback' => function($rule, $action) {
                             return \Yii::$app->user->can(
                                 $this->module->id.'_'.$this->id.'_'.$action->id,
                                 ['route' => true]

src/modules/backend/views/layouts/_sidebar.php

Spacing +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 
     // check for module configuration and assign to favourites
     $moduleConfigItem = (is_object($module)) ?
-        (isset($module->params['menuItems']) ? $module->params['menuItems'] : []) :
-        (isset($module['params']['menuItems']) ? $module['params']['menuItems'] : []);
+        (isset($module->params['menuItems']) ? $module->params['menuItems'] : []) : (isset($module['params']['menuItems']) ? $module['params']['menuItems'] : []);
     switch (true) {
         case !empty($moduleConfigItem):
             $moduleConfigItem = array_merge($defaultItem, $moduleConfigItem);

src/modules/prototype/controllers/api/LessController.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 {
     public $modelClass = 'app\modules\prototype\models\Less';
     /**
-    * @inheritdoc
-    */
+     * @inheritdoc
+     */
     public function behaviors()
     {
         return ArrayHelper::merge(

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                     'rules' => [
                         [
                             'allow' => true,
-                            'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
+                            'matchCallback' => function($rule, $action) {return \Yii::$app->user->can($this->module->id.'_'.$this->id.'_'.$action->id, ['route' => true]); },
                         ]
                     ]
                 ]

src/modules/prototype/controllers/base/HtmlController.php

Indentation +102 added lines, -102 removed lines

@@ -23,71 +23,71 @@ 
      */
     public $enableCsrfValidation = false;
 
-		/**
-	* @inheritdoc
-	*/
-	public function behaviors()
-	{
-		return [
-			'access' => [
-				'class' => AccessControl::className(),
-				'rules' => [
-					[
-						'allow' => true,
-						'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
-					]
-				]
-			]
-		];
-	}
+        /**
+         * @inheritdoc
+         */
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => AccessControl::className(),
+                'rules' => [
+                    [
+                        'allow' => true,
+                        'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
+                    ]
+                ]
+            ]
+        ];
+    }
 	
-	/**
-	 * Lists all Html models.
-	 * @return mixed
-	 */
-	public function actionIndex()
-	{
-		$searchModel  = new HtmlSearch;
-		$dataProvider = $searchModel->search($_GET);
+    /**
+     * Lists all Html models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel  = new HtmlSearch;
+        $dataProvider = $searchModel->search($_GET);
 
-		Tabs::clearLocalStorage();
+        Tabs::clearLocalStorage();
 
         Url::remember();
         \Yii::$app->session['__crudReturnUrl'] = null;
 
-		return $this->render('index', [
-			'dataProvider' => $dataProvider,
-			'searchModel' => $searchModel,
-		]);
-	}
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+            'searchModel' => $searchModel,
+        ]);
+    }
 
-	/**
-	 * Displays a single Html model.
-	 * @param integer $id
+    /**
+     * Displays a single Html model.
+     * @param integer $id
      *
-	 * @return mixed
-	 */
-	public function actionView($id)
-	{
+     * @return mixed
+     */
+    public function actionView($id)
+    {
         \Yii::$app->session['__crudReturnUrl'] = Url::previous();
         Url::remember();
         Tabs::rememberActiveState();
 
         return $this->render('view', [
-			'model' => $this->findModel($id),
-		]);
-	}
-
-	/**
-	 * Creates a new Html model.
-	 * If creation is successful, the browser will be redirected to the 'view' page.
-	 * @return mixed
-	 */
-	public function actionCreate()
-	{
-		$model = new Html;
-
-		try {
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Html model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Html;
+
+        try {
             if ($model->load($_POST) && $model->save()) {
                 return $this->redirect(Url::previous());
             } elseif (!\Yii::$app->request->isPost) {
@@ -96,37 +96,37 @@ 
         } catch (\Exception $e) {
             $msg = (isset($e->errorInfo[2]))?$e->errorInfo[2]:$e->getMessage();
             $model->addError('_exception', $msg);
-		}
+        }
         return $this->render('create', ['model' => $model]);
-	}
-
-	/**
-	 * Updates an existing Html model.
-	 * If update is successful, the browser will be redirected to the 'view' page.
-	 * @param integer $id
-	 * @return mixed
-	 */
-	public function actionUpdate($id)
-	{
-		$model = $this->findModel($id);
-
-		if ($model->load($_POST) && $model->save()) {
+    }
+
+    /**
+     * Updates an existing Html model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load($_POST) && $model->save()) {
             return $this->redirect(Url::previous());
-		} else {
-			return $this->render('update', [
-				'model' => $model,
-			]);
-		}
-	}
-
-	/**
-	 * Deletes an existing Html model.
-	 * If deletion is successful, the browser will be redirected to the 'index' page.
-	 * @param integer $id
-	 * @return mixed
-	 */
-	public function actionDelete($id)
-	{
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Html model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
         try {
             $this->findModel($id)->delete();
         } catch (\Exception $e) {
@@ -140,29 +140,29 @@ 
         if ($isPivot == true) {
             return $this->redirect(Url::previous());
         } elseif (isset(\Yii::$app->session['__crudReturnUrl']) && \Yii::$app->session['__crudReturnUrl'] != '/') {
-			Url::remember(null);
-			$url = \Yii::$app->session['__crudReturnUrl'];
-			\Yii::$app->session['__crudReturnUrl'] = null;
+            Url::remember(null);
+            $url = \Yii::$app->session['__crudReturnUrl'];
+            \Yii::$app->session['__crudReturnUrl'] = null;
 
-			return $this->redirect($url);
+            return $this->redirect($url);
         } else {
             return $this->redirect(['index']);
         }
-	}
-
-	/**
-	 * Finds the Html model based on its primary key value.
-	 * If the model is not found, a 404 HTTP exception will be thrown.
-	 * @param integer $id
-	 * @return Html the loaded model
-	 * @throws HttpException if the model cannot be found
-	 */
-	protected function findModel($id)
-	{
-		if (($model = Html::findOne($id)) !== null) {
-			return $model;
-		} else {
-			throw new HttpException(404, 'The requested page does not exist.');
-		}
-	}
+    }
+
+    /**
+     * Finds the Html model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Html the loaded model
+     * @throws HttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Html::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new HttpException(404, 'The requested page does not exist.');
+        }
+    }
 }

Doc Comments +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	
 	/**
 	 * Lists all Less models.
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionIndex()
 	{
@@ -65,7 +65,7 @@ 
 	 * Displays a single Less model.
 	 * @param integer $id
      *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionView($id)
 	{
@@ -123,7 +123,7 @@ 
 	 * Deletes an existing Less model.
 	 * If deletion is successful, the browser will be redirected to the 'index' page.
 	 * @param integer $id
-	 * @return mixed
+	 * @return \yii\web\Response
 	 */
 	public function actionDelete($id)
 	{

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 				'rules' => [
 					[
 						'allow' => true,
-						'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
+						'matchCallback' => function($rule, $action) {return \Yii::$app->user->can($this->module->id.'_'.$this->id.'_'.$action->id, ['route' => true]); },
 					]
 				]
 			]
@@ -94,7 +94,7 @@ 
                 $model->load($_GET);
             }
         } catch (\Exception $e) {
-            $msg = (isset($e->errorInfo[2]))?$e->errorInfo[2]:$e->getMessage();
+            $msg = (isset($e->errorInfo[2])) ? $e->errorInfo[2] : $e->getMessage();
             $model->addError('_exception', $msg);
 		}
         return $this->render('create', ['model' => $model]);
@@ -130,13 +130,13 @@ 
         try {
             $this->findModel($id)->delete();
         } catch (\Exception $e) {
-            $msg = (isset($e->errorInfo[2]))?$e->errorInfo[2]:$e->getMessage();
+            $msg = (isset($e->errorInfo[2])) ? $e->errorInfo[2] : $e->getMessage();
             \Yii::$app->getSession()->addFlash('error', $msg);
             return $this->redirect(Url::previous());
         }
 
         // TODO: improve detection
-        $isPivot = strstr('$id',',');
+        $isPivot = strstr('$id', ',');
         if ($isPivot == true) {
             return $this->redirect(Url::previous());
         } elseif (isset(\Yii::$app->session['__crudReturnUrl']) && \Yii::$app->session['__crudReturnUrl'] != '/') {

src/modules/prototype/migrations/m151226_111407_init.php

Spacing +5 added lines, -5 removed lines

@@ -9,17 +9,17 @@
     {
         $this->createTable('{{%html}}', [
             'id' => Schema::TYPE_PK,
-            'key' => Schema::TYPE_STRING . ' NOT NULL',
-            'value' => Schema::TYPE_TEXT . ' NOT NULL',
+            'key' => Schema::TYPE_STRING.' NOT NULL',
+            'value' => Schema::TYPE_TEXT.' NOT NULL',
         ]);
-        $this->createIndex('html_key_unique','{{%html}}', 'key', true);
+        $this->createIndex('html_key_unique', '{{%html}}', 'key', true);
 
         $this->createTable('{{%less}}', [
             'id' => Schema::TYPE_PK,
-            'key' => Schema::TYPE_STRING . ' NOT NULL',
+            'key' => Schema::TYPE_STRING.' NOT NULL',
             'value' => Schema::TYPE_TEXT,
         ]);
-        $this->createIndex('less_key_unique','{{%less}}', 'key', true);
+        $this->createIndex('less_key_unique', '{{%less}}', 'key', true);
     }
 
     public function down()

src/modules/prototype/views/html/index.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 /**
 * @var yii\web\View $this
 * @var yii\data\ActiveDataProvider $dataProvider
-    * @var app\modules\prototype\models\search\Html $searchModel
+ * @var app\modules\prototype\models\search\Html $searchModel
 */
 
 $this->title = Yii::t('app', 'Htmls');
@@ -80,7 +80,7 @@ 
             },
             'contentOptions' => ['nowrap'=>'nowrap']
         ],
-			'key',
+            'key',
         ],
         ]); ?>
     </div>

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     </h1>
     <div class="clearfix crud-navigation">
         <div class="pull-left">
-            <?= Html::a('<span class="glyphicon glyphicon-plus"></span> ' . Yii::t('app', 'New'), ['create'], ['class' => 'btn btn-success']) ?>
+            <?= Html::a('<span class="glyphicon glyphicon-plus"></span> '.Yii::t('app', 'New'), ['create'], ['class' => 'btn btn-success']) ?>
         </div>
 
         <div class="pull-right">
@@ -40,7 +40,7 @@ 
             [
             'id' => 'giiant-relations',
             'encodeLabel' => false,
-            'label' => '<span class="glyphicon glyphicon-paperclip"></span> ' . Yii::t('app', 'Relations'),
+            'label' => '<span class="glyphicon glyphicon-paperclip"></span> '.Yii::t('app', 'Relations'),
             'dropdown' => [
             'options' => [
             'class' => 'dropdown-menu-right'
@@ -64,7 +64,7 @@ 
         'pager' => [
         'class' => yii\widgets\LinkPager::className(),
         'firstPageLabel' => Yii::t('app', 'First'),
-        'lastPageLabel' => Yii::t('app', 'Last')        ],
+        'lastPageLabel' => Yii::t('app', 'Last')],
                     'filterModel' => $searchModel,
                 'tableOptions' => ['class' => 'table table-striped table-bordered table-hover'],
         'headerRowOptions' => ['class'=>'x'],
@@ -74,8 +74,8 @@ 
             'class' => 'yii\grid\ActionColumn',
             'urlCreator' => function($action, $model, $key, $index) {
                 // using the column name as key, not mapping to 'id' like the standard generator
-                $params = is_array($key) ? $key : [$model->primaryKey()[0] => (string) $key];
-                $params[0] = \Yii::$app->controller->id ? \Yii::$app->controller->id . '/' . $action : $action;
+                $params = is_array($key) ? $key : [$model->primaryKey()[0] => (string)$key];
+                $params[0] = \Yii::$app->controller->id ? \Yii::$app->controller->id.'/'.$action : $action;
                 return Url::toRoute($params);
             },
             'contentOptions' => ['nowrap'=>'nowrap']

src/modules/prototype/views/html/update.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  * @var app\modules\prototype\models\Html $model
  */
 
-$this->title = 'Html ' . $model->id . ', ' . Yii::t('app', 'Edit');
+$this->title = 'Html '.$model->id.', '.Yii::t('app', 'Edit');
 $this->params['breadcrumbs'][] = ['label' => 'Htmls', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => (string)$model->id, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = Yii::t('app', 'Edit');
@@ -20,7 +20,7 @@ 
     </h1>
 
     <div class="crud-navigation">
-        <?= Html::a('<span class="glyphicon glyphicon-eye-open"></span> ' . Yii::t('app', 'View'), ['view', 'id' => $model->id], ['class' => 'btn btn-default']) ?>
+        <?= Html::a('<span class="glyphicon glyphicon-eye-open"></span> '.Yii::t('app', 'View'), ['view', 'id' => $model->id], ['class' => 'btn btn-default']) ?>
     </div>
 
 	<?php echo $this->render('_form', [

Indentation +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@
     </div>
 
 	<?php echo $this->render('_form', [
-		'model' => $model,
-	]); ?>
+        'model' => $model,
+    ]); ?>
 
 </div>

src/modules/prototype/views/html/view.php

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 */
 $copyParams = $model->attributes;
 
-$this->title = 'Html ' . $model->id;
+$this->title = 'Html '.$model->id;
 $this->params['breadcrumbs'][] = ['label' => 'Htmls', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => (string)$model->id, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = Yii::t('app', 'View');
@@ -39,12 +39,12 @@ 
     <div class="clearfix crud-navigation">
         <!-- menu buttons -->
         <div class='pull-left'>
-            <?= Html::a('<span class="glyphicon glyphicon-pencil"></span> ' . Yii::t('app', 'Edit'), ['update', 'id' => $model->id],['class' => 'btn btn-info']) ?>
-            <?= Html::a('<span class="glyphicon glyphicon-copy"></span> ' . Yii::t('app', 'Copy'), ['create', 'id' => $model->id, 'Html'=>$copyParams],['class' => 'btn btn-success']) ?>
-            <?= Html::a('<span class="glyphicon glyphicon-plus"></span> ' . Yii::t('app', 'New'), ['create'], ['class' => 'btn btn-success']) ?>
+            <?= Html::a('<span class="glyphicon glyphicon-pencil"></span> '.Yii::t('app', 'Edit'), ['update', 'id' => $model->id], ['class' => 'btn btn-info']) ?>
+            <?= Html::a('<span class="glyphicon glyphicon-copy"></span> '.Yii::t('app', 'Copy'), ['create', 'id' => $model->id, 'Html'=>$copyParams], ['class' => 'btn btn-success']) ?>
+            <?= Html::a('<span class="glyphicon glyphicon-plus"></span> '.Yii::t('app', 'New'), ['create'], ['class' => 'btn btn-success']) ?>
         </div>
         <div class="pull-right">
-            <?= Html::a('<span class="glyphicon glyphicon-list"></span> ' . Yii::t('app', 'List Htmls'), ['index'], ['class'=>'btn btn-default']) ?>
+            <?= Html::a('<span class="glyphicon glyphicon-list"></span> '.Yii::t('app', 'List Htmls'), ['index'], ['class'=>'btn btn-default']) ?>
         </div>
 
     </div>
@@ -65,10 +65,10 @@ 
     
     <hr/>
 
-    <?= Html::a('<span class="glyphicon glyphicon-trash"></span> ' . Yii::t('app', 'Delete'), ['delete', 'id' => $model->id],
+    <?= Html::a('<span class="glyphicon glyphicon-trash"></span> '.Yii::t('app', 'Delete'), ['delete', 'id' => $model->id],
     [
     'class' => 'btn btn-danger',
-    'data-confirm' => '' . Yii::t('app', 'Are you sure to delete this item?') . '',
+    'data-confirm' => ''.Yii::t('app', 'Are you sure to delete this item?').'',
     'data-method' => 'post',
     ]); ?>
     <?php $this->endBlock(); ?>
@@ -79,7 +79,7 @@ 
                  [
                      'id' => 'relation-tabs',
                      'encodeLabels' => false,
-                     'items' => [ [
+                     'items' => [[
     'label'   => '<b class=""># '.$model->id.'</b>',
     'content' => $this->blocks['app\modules\prototype\models\Html'],
     'active'  => true,

Unused Use Statements -3 removed lines

@@ -1,10 +1,7 @@
 <?php
 
 use dmstr\helpers\Html;
-use yii\helpers\Url;
-use yii\grid\GridView;
 use yii\widgets\DetailView;
-use yii\widgets\Pjax;
 use dmstr\bootstrap\Tabs;
 
 /**

Indentation +5 added lines, -5 removed lines

@@ -76,15 +76,15 @@
 
     
     <?= Tabs::widget(
-                 [
-                     'id' => 'relation-tabs',
-                     'encodeLabels' => false,
-                     'items' => [ [
+                    [
+                        'id' => 'relation-tabs',
+                        'encodeLabels' => false,
+                        'items' => [ [
     'label'   => '<b class=""># '.$model->id.'</b>',
     'content' => $this->blocks['app\modules\prototype\models\Less'],
     'active'  => true,
 ], ]
-                 ]
+                    ]
     );
     ?>
 </div>