phundament / app

src/commands/AppController.php

Doc Comments +3 added lines

@@ -115,6 +115,9 @@
         }
     }
 
+    /**
+     * @param string $command
+     */
     protected function action($command, $params = [])
     {
         echo "\nRunning action '$command'...\n";

src/components/User.php

Doc Comments +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
      * @param array     $params
      * @param bool|true $allowCaching
      *
-     * @return bool
+     * @return boolean|null
      */
     public function can($permissionName, $params = [], $allowCaching = true)
     {
@@ -45,7 +45,7 @@ 
     /**
      * Checks permissions from guest role, when no user is logged in.
      *
-     * @param $permissionName
+     * @param string $permissionName
      * @param $params
      * @param $allowCaching
      *
@@ -64,7 +64,7 @@ 
      * Splits `permissionName` by underscore and match parts against more global rule
      * eg. a permission `app_site` will match, `app_site_foo`
      *
-     * @param $permissionName
+     * @param string $permissionName
      * @param $params
      * @param $allowCaching
      *

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

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/config/giiant.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use schmunk42\giiant\generators\crud\callbacks\yii\Db;
 use schmunk42\giiant\generators\crud\callbacks\yii\Html;
 
-$aceEditorField = function ($attribute, $model, $generator) {
+$aceEditorField = function($attribute, $model, $generator) {
     return "\$form->field(\$model, '{$attribute}')->widget(\\trntv\\aceeditor\\AceEditor::className())";
 };
 

src/config/main.php

Spacing +2 added lines, -3 removed lines

@@ -18,8 +18,7 @@ 
             // Note: For using mounted volumes or shared folders
             'dirMode' => YII_ENV_PROD ? 0777 : null,
             'bundles' => getenv('APP_ASSET_USE_BUNDLED') ?
-                require(__DIR__.'/assets-gen/prod.php') :
-                [
+                require(__DIR__.'/assets-gen/prod.php') : [
                     // Note: if your asset bundle includes bootstrap, you can disable the default asset
                     #'yii\bootstrap\BootstrapAsset' => false,
                 ],
@@ -78,7 +77,7 @@ 
                 'docs/<file:[a-zA-Z0-9_\-\./]+>' => 'docs',
                 #'docs' => 'docs/default/index',
             ],
-            'languages' => explode(',',getenv('APP_LANGUAGES')),
+            'languages' => explode(',', getenv('APP_LANGUAGES')),
         ],
         'user' => [
             'class' => 'app\components\User',

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

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/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()