Merge pull request #345 from spira/analysis-z3LkY8

Applied fixes from StyleCI

api/app/Console/Commands/ApiaryValidateCommand.php

@@ -59,10 +59,10 @@ public function handle()
 
         exec("$validator $fileLocation", $output, $exitCode);
 
-        if ($exitCode == 0){
-            $this->info("Apiary Documentation validation passed");
+        if ($exitCode == 0) {
+            $this->info('Apiary Documentation validation passed');
         } else {
-            $this->error("Apiary Documentation validation failed");
+            $this->error('Apiary Documentation validation failed');
         }
 
         return $exitCode;

api/app/Console/Commands/ForumCleanupCommand.php

@@ -35,8 +35,8 @@ class ForumCleanupCommand extends Command
      */
     public function handle()
     {
-        $dir = realpath(base_path() . '/../forum');
-        exec('composer run-script post-install-cmd --working-dir "' . $dir . '"', $output, $exitCode);
+        $dir = realpath(base_path().'/../forum');
+        exec('composer run-script post-install-cmd --working-dir "'.$dir.'"', $output, $exitCode);
 
         return $exitCode;
     }

api/app/Http/Controllers/AbstractTagController.php

@@ -30,5 +30,4 @@ protected function getPivotValidationRules()
             '_pivot.tag_group_parent_id' => 'required|uuid',
         ];
     }
-
 }

api/app/Http/Controllers/AuthController.php

@@ -156,7 +156,6 @@ public function loginAsUser(Request $request, User $userModel, $userId)
         return $this->getResponse()
             ->transformer($this->getTransformer())
             ->item($this->auth->generateToken($user));
-
     }
 
     /**

api/app/Http/routes.php

@@ -98,5 +98,3 @@
     $app->get('images/{id}', ['as' => \App\Models\Image::class, 'uses' => 'ImageController@getOne']);
 
 });
-
-

api/app/Models/AbstractPost.php

@@ -102,7 +102,7 @@ class AbstractPost extends IndexedModel implements LocalizableModelInterface, Co
         'status',
         'users_can_comment',
         'public_access',
-        'short_title'
+        'short_title',
     ];
 
     protected $hidden = ['permalinks'];
@@ -204,7 +204,7 @@ public static function boot()
 
         static::saved(function (AbstractPost $model) {
             if ($model->getOriginal('permalink') !== $model->permalink && ! is_null($model->permalink)) {
-                $permalink = call_user_func_array(static::$permalinkModel . '::findOrFail', [$model->permalink]);
+                $permalink = call_user_func_array(static::$permalinkModel.'::findOrFail', [$model->permalink]);
                 $model->permalinks()->save($permalink);
             }
 
@@ -252,7 +252,7 @@ public function findByIdentifier($id)
         } catch (ModelNotFoundException $e) { //id or permalink not found, try permalink history
             $name = class_basename($this);
 
-            return call_user_func_array(static::$permalinkModel . '::findOrFail', [$id])->{$name};
+            return call_user_func_array(static::$permalinkModel.'::findOrFail', [$id])->{$name};
         }
     }
 

api/app/Models/PostComment.php

@@ -80,5 +80,4 @@ public static function find($id, $columns = ['*'])
     {
         return;
     }
-
 }

api/app/Models/PostDiscussion.php

@@ -11,7 +11,6 @@
 namespace App\Models;
 
 use App;
-use App\Models\Traits\CommentableInterface;
 use App\Services\Api\Vanilla\Client as VanillaClient;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Spira\Core\Model\Collection\Collection;

api/app/Models/Section.php

@@ -75,5 +75,4 @@ public static function getContentTypes()
     {
         return array_keys(self::$contentTypeMap);
     }
-
 }

api/app/Models/Tag.php

@@ -41,7 +41,7 @@ class Tag extends IndexedModel
     protected $mappingProperties = [
         'tag_id' => [
             'type' => 'string',
-            'index' => 'no'
+            'index' => 'no',
         ],
         'tag' => [
             'type' => 'string',
@@ -55,7 +55,6 @@ public function articles()
         return $this->getBelongsRelation(Article::class, 'post_tag', null, 'post_id');
     }
 
-
     /**
      * @param mixed $id
      * @return BaseModel

api/app/Models/Traits/CommentableInterface.php

@@ -1,5 +1,13 @@
 <?php
 
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 namespace App\Models\Traits;
 
 /**

api/app/Models/Traits/CommentableTrait.php

@@ -1,5 +1,13 @@
 <?php
 
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 namespace App\Models\Traits;
 
 use App\Models\PostDiscussion;

api/app/Models/User.php

@@ -11,7 +11,6 @@
 namespace App\Models;
 
 use Rhumsaa\Uuid\Uuid;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Support\Facades\Cache;
 use Spira\Core\Model\Model\IndexedModel;
@@ -22,7 +21,6 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 
 /**
@@ -33,7 +31,6 @@
  *
  * * scopes
  * @method static Builder hasRoles(array $roleKeys) modifies query to return only users who has particular role
- *
  */
 class User extends IndexedModel implements AuthenticatableContract, SocialiteAuthenticatable
 {
@@ -115,36 +112,36 @@ public static function getValidationRules($entityId = null, array $requestEntity
     protected $mappingProperties = [
         'user_id' => [
             'type' => 'string',
-            'index' => 'no'
+            'index' => 'no',
         ],
         'timezone_identifier' => [
             'type' => 'string',
-            'index' => 'no'
+            'index' => 'no',
         ],
         'avatar_img_url' => [
             'type' => 'string',
-            'index' => 'no'
+            'index' => 'no',
         ],
         'username' => [
             'type' => 'string',
             'index_analyzer' => 'autocomplete',
-            'search_analyzer' => 'standard'
+            'search_analyzer' => 'standard',
         ],
         'email' => [
             'type' => 'string',
             'index_analyzer' => 'autocomplete',
-            'search_analyzer' => 'standard'
+            'search_analyzer' => 'standard',
         ],
         'first_name' => [
             'type' => 'string',
             'index_analyzer' => 'autocomplete',
-            'search_analyzer' => 'standard'
+            'search_analyzer' => 'standard',
         ],
         'last_name' => [
             'type' => 'string',
             'index_analyzer' => 'autocomplete',
-            'search_analyzer' => 'standard'
-        ]
+            'search_analyzer' => 'standard',
+        ],
     ];
 
     /**
@@ -202,15 +199,13 @@ public function ratedArticles()
      */
     public function getTimeZone()
     {
-        if ($this->timezone_identifier){
+        if ($this->timezone_identifier) {
             return new \DateTimeZone($this->timezone_identifier);
         }
 
-        return null;
+        return;
     }
 
-
-
     /**
      * Get the user's uploaded avatar image if they have one.
      *
@@ -420,7 +415,6 @@ public function getCurrentAuthMethod()
     }
 
     /**
-     *
      * @param Builder|\Illuminate\Database\Query\Builder $query
      * @param array $roleKeys
      * @return Builder

api/app/Services/Api/Vanilla/Api/Discussion.php

@@ -13,13 +13,13 @@
 class Discussion extends ApiAbstract
 {
     /**
-     * Toggle spam check for comments
+     * Toggle spam check for comments.
      *
      * @param $enable
      */
     public function toggleSpamCheck($enable)
     {
-        return $this->put('discussions/spamcheck', ['Enable' => (int)$enable]);
+        return $this->put('discussions/spamcheck', ['Enable' => (int) $enable]);
     }
 
     /**

api/config/cors.php

@@ -1,4 +1,13 @@
 <?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 return [
     /*
      |--------------------------------------------------------------------------
@@ -16,4 +25,4 @@
     'exposedHeaders' => [],
     'maxAge' => 0,
     'hosts' => [],
-];
+];

api/config/permissions.php

@@ -16,4 +16,4 @@
     $resultArray = Arr::merge($resultArray, $array);
 }
 
-return $resultArray;
+return $resultArray;

api/config/permissions/articles.php

@@ -114,8 +114,7 @@
         'type' => 'permission',
         'description' => 'Put section localization',
     ],
-
-
+
     ArticleUserRatingsController::class.'@putOne' => [
         'type' => 'permission',
         'description' => 'Rate article or change rating value',
@@ -142,7 +141,7 @@
             ArticleBookmarksController::class.'@deleteOne',
         ],
     ],
-    
+
     // Roles
 
     Role::ADMIN_ROLE => [
@@ -160,7 +159,7 @@
             ArticleSectionController::class.'@postMany',
             ArticleSectionController::class.'@deleteMany',
             ArticleSectionController::class.'@deleteOne',
-            ArticleSectionController::class.'@putOneChildLocalization'
+            ArticleSectionController::class.'@putOneChildLocalization',
 
         ],
     ],
@@ -176,7 +175,7 @@
             ArticleCommentController::class.'@postOne',
             ArticleTagController::class.'@getAll',
             ArticleSectionController::class.'@getAll',
-            ArticleController::class.'@getAllTagCategories'
+            ArticleController::class.'@getAllTagCategories',
         ],
     ],
 ];

api/database/migrations/2015_08_19_150932_create_tags_table.php

@@ -15,7 +15,6 @@
 
 class CreateTagsTable extends Migration
 {
-
     /**
      * Run the migrations.
      *

api/database/migrations/2015_09_01_114925_create_tag_tag_table.php

@@ -43,7 +43,6 @@ public function up()
                 ->references('tag_id')->on(Tag::getTableName())
                 ->onDelete('cascade');
         });
-
     }
 
     /**

api/database/migrations/2015_10_21_051428_seed_tags.php

@@ -1,12 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 use App\Models\Tag;
 use Faker\Factory as Faker;
 use Illuminate\Database\Migrations\Migration;
 
 class SeedTags extends Migration
 {
-
     /** @var \Faker\Generator */
     private $faker;
 
@@ -49,8 +56,8 @@ class SeedTags extends Migration
         ],
     ];
 
-    public static function getSeedTags(){
-
+    public static function getSeedTags()
+    {
         return self::$tagHierarchy;
     }
 
@@ -150,7 +157,7 @@ public function up()
      */
     public function down()
     {
-        if(!Schema::hasTable(Tag::getTableName())){
+        if (! Schema::hasTable(Tag::getTableName())) {
             return;
         }
 

api/database/seeds/AbstractPostSeeder.php

@@ -114,7 +114,7 @@ function (PostComment $comment) use ($post, $users) {
                                 }
                             );
                     } catch (HttpException $e) {
-                        echo 'Caught exception "' . get_class($e) . '": ' . $e->getMessage() . "\n";
+                        echo 'Caught exception "'.get_class($e).'": '.$e->getMessage()."\n";
                     } finally {
                         $discussionsApi->toggleSpamCheck(true);
                     }

api/database/seeds/ArticleSeeder.php

@@ -24,5 +24,4 @@ protected function getGroupTagPivots($tags)
     {
         return Tag::getGroupedTagPivots($tags, SeedTags::articleGroupTagName);
     }
-
 }

api/database/seeds/BaseSeeder.php

@@ -36,5 +36,4 @@ public function randomElements(Collection $collection, $count = null)
                 return $collection->random($count);
         }
     }
-
 }

api/tests/ElasticSearchTest.php

@@ -117,7 +117,7 @@ public function testGetIndexedModels()
             $this->assertInstanceOf(IndexedModel::class, new $className);
         }
     }
-    
+
     public function testRebuildIndex()
     {
         $elasticSearchService = Mockery::mock(ElasticSearch::class)->makePartial();