jf-guillou / lcds

controllers/FlowController.php

Spacing +3 added lines, -3 removed lines

@@ -76,12 +76,12 @@
         }
 
         $dataProvider = new ActiveDataProvider([
-            'query' => Content::find()->joinWith(['type', 'flow'])->where([Flow::tableName() . '.id' => $id]),
+            'query' => Content::find()->joinWith(['type', 'flow'])->where([Flow::tableName().'.id' => $id]),
         ]);
 
         $dataProvider->sort->attributes['type.name'] = [
-            'asc' => [ContentType::tableName() . '.id' => SORT_ASC],
-            'desc' => [ContentType::tableName() . '.id' => SORT_DESC],
+            'asc' => [ContentType::tableName().'.id' => SORT_ASC],
+            'desc' => [ContentType::tableName().'.id' => SORT_DESC],
         ];
 
         return $this->render('view', [

controllers/ScreenController.php

Spacing +5 added lines, -5 removed lines

@@ -51,8 +51,8 @@ 
         ]);
 
         $dataProvider->sort->attributes['template'] = [
-            'asc' => [ScreenTemplate::tableName() . '.name' => SORT_ASC],
-            'desc' => [ScreenTemplate::tableName() . '.name' => SORT_DESC],
+            'asc' => [ScreenTemplate::tableName().'.name' => SORT_ASC],
+            'desc' => [ScreenTemplate::tableName().'.name' => SORT_DESC],
         ];
 
         return $this->render('index', [
@@ -69,7 +69,7 @@ 
      */
     public function actionView($id)
     {
-        $model = Screen::find()->where([Screen::tableName() . '.id' => $id])->joinWith('template')->one();
+        $model = Screen::find()->where([Screen::tableName().'.id' => $id])->joinWith('template')->one();
         if ($model === null) {
             throw new NotFoundHttpException(Yii::t('app', 'The requested screen does not exist.'));
         }
@@ -103,7 +103,7 @@ 
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             $templates = ScreenTemplate::find()->all();
-            $templatesArray = array_reduce($templates, function ($a, $t) {
+            $templatesArray = array_reduce($templates, function($a, $t) {
                 $a[$t->id] = $t->name;
 
                 return $a;
@@ -132,7 +132,7 @@ 
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             $templates = ScreenTemplate::find()->all();
-            $templatesArray = array_reduce($templates, function ($a, $t) {
+            $templatesArray = array_reduce($templates, function($a, $t) {
                 $a[$t->id] = $t->name;
 
                 return $a;

controllers/ScreenTemplateController.php

Spacing +3 added lines, -3 removed lines

@@ -72,8 +72,8 @@ 
             'background' => $screenTemplate->background ? $screenTemplate->background->uri : null,
             'fields' => $screenTemplate->getFields()->with('contentTypes')->asArray()->all(),
             'contentTypes' => ContentType::getAllList(),
-            'setFieldPosUrl' => Url::to([Yii::$app->controller->id . '/set-field-pos', 'id' => '']),
-            'editFieldUrl' => Url::to([Yii::$app->controller->id . '/edit-field', 'id' => '']),
+            'setFieldPosUrl' => Url::to([Yii::$app->controller->id.'/set-field-pos', 'id' => '']),
+            'editFieldUrl' => Url::to([Yii::$app->controller->id.'/edit-field', 'id' => '']),
         ]);
     }
 
@@ -221,7 +221,7 @@ 
             if (!is_array($newTypeIds)) {
                 $newTypeIds = [];
             }
-            $oldTypeIds = array_map(function ($c) {
+            $oldTypeIds = array_map(function($c) {
                 return $c->id;
             }, $field->contentTypes);
 

controllers/ContentController.php

Spacing +5 added lines, -5 removed lines

@@ -57,13 +57,13 @@ 
         ]);
 
         $dataProvider->sort->attributes['type.name'] = [
-            'asc' => [ContentType::tableName() . '.id' => SORT_ASC],
-            'desc' => [ContentType::tableName() . '.id' => SORT_DESC],
+            'asc' => [ContentType::tableName().'.id' => SORT_ASC],
+            'desc' => [ContentType::tableName().'.id' => SORT_DESC],
         ];
 
         $dataProvider->sort->attributes['flow.name'] = [
-            'asc' => [Flow::tableName() . '.id' => SORT_ASC],
-            'desc' => [Flow::tableName() . '.id' => SORT_DESC],
+            'asc' => [Flow::tableName().'.id' => SORT_ASC],
+            'desc' => [Flow::tableName().'.id' => SORT_DESC],
         ];
 
         return $this->render('index', [
@@ -134,7 +134,7 @@ 
                     // Latitude & longitude
                 case ContentType::KINDS['TEXT']:
                     // Same as URL, text doesn't require processing
-                    return $this->render('type/' . $contentType->input, [
+                    return $this->render('type/'.$contentType->input, [
                         'type' => $contentType,
                         'model' => $model,
                         'uploadUrl' => Url::to(['content/upload', 'type' => $type]),

models/Content.php

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
     {
         $data = $this->data;
         if ($this->type->appendParams) {
-            $data .= (strpos($data, '#') === false ? '#' : ';') . $this->type->appendParams;
+            $data .= (strpos($data, '#') === false ? '#' : ';').$this->type->appendParams;
         }
 
         $data = $this->processData($data);
@@ -200,7 +200,7 @@ 
         if ($this->type->input == ContentType::KINDS['FILE']) {
             return self::find()
                 ->joinWith(['type'])
-                ->where([ContentType::tableName() . '.id' => ContentType::getAllFileTypeIds()])
+                ->where([ContentType::tableName().'.id' => ContentType::getAllFileTypeIds()])
                 ->andWhere(['data' => $this->data])
                 ->count() == 0;
         }
@@ -237,6 +237,6 @@ 
      */
     public function getRealFilepath()
     {
-        return \Yii::getAlias('@app/') . 'web/' . $this->getFilepath();
+        return \Yii::getAlias('@app/').'web/'.$this->getFilepath();
     }
 }

models/ContentType.php

Spacing +6 added lines, -6 removed lines

@@ -96,7 +96,7 @@ 
      */
     public static function fromType($typeId)
     {
-        $className = self::SUB_PATH . $typeId;
+        $className = self::SUB_PATH.$typeId;
         if (!class_exists($className)) {
             throw new ServerErrorHttpException(Yii::t('app', 'The requested content type has no class.'));
         }
@@ -142,7 +142,7 @@ 
     {
         $types = self::find()->all();
 
-        return array_filter($types, function ($t) use ($selfUpdate, $usableOnly) {
+        return array_filter($types, function($t) use ($selfUpdate, $usableOnly) {
             return ($selfUpdate === null || $t->selfUpdate == $selfUpdate) && (!$usableOnly || ($t->usable && $t->enabled));
         });
     }
@@ -177,7 +177,7 @@ 
     {
         $types = self::find()->all();
 
-        return array_filter(array_map(function ($t) {
+        return array_filter(array_map(function($t) {
             return $t->input == self::KINDS['FILE'] ? $t->id : null;
         }, $types));
     }
@@ -218,7 +218,7 @@ 
      */
     public function hasCache($key)
     {
-        return \Yii::$app->cache->exists($this->id . $key);
+        return \Yii::$app->cache->exists($this->id.$key);
     }
 
     /**
@@ -231,7 +231,7 @@ 
     public function fromCache($key)
     {
         $cache = \Yii::$app->cache;
-        $cacheKey = $this->id . $key;
+        $cacheKey = $this->id.$key;
 
         return $cache->get($cacheKey);
     }
@@ -245,7 +245,7 @@ 
     public function toCache($key, $content)
     {
         $cache = \Yii::$app->cache;
-        $cacheKey = $this->id . $key;
+        $cacheKey = $this->id.$key;
         $cache->set($cacheKey, $content, static::BASE_CACHE_TIME);
     }