jdrda / olapus

app/Http/Controllers/Admin/AdvertController.php

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@ 
         /**
          * Add lookup tables
          */
-        $this->middleware('add.lookup.tables:AdvertLocation', ['only' => ['create', 'edit']]);
+        $this->middleware('add.lookup.tables:AdvertLocation', [ 'only' => [ 'create', 'edit' ] ]);
 
         /**
          * Other tables
          */
-        $this->middleware('media.image.select:Image', ['only' => ['create', 'edit']]);
+        $this->middleware('media.image.select:Image', [ 'only' => [ 'create', 'edit' ] ]);
     }
 
     /**
@@ -95,13 +95,13 @@ 
         /**
          * Validate advert location ID, if failed set to default
          */
-        if($request->has('advertlocation_id')){
+        if ($request->has('advertlocation_id')) {
             
-            $validIDs = [];
+            $validIDs = [ ];
 
             foreach ($request->input('advertlocation_id') as $advertlocation_id) {
 
-                $arrayForValidator = ['advertlocation_id' =>  $advertlocation_id];
+                $arrayForValidator = [ 'advertlocation_id' =>  $advertlocation_id ];
 
                 $validator = Validator::make($arrayForValidator, [
                             'advertlocation_id' => 'required|integer|min:1|exists:advertlocation,id',
@@ -119,7 +119,7 @@ 
                  */
                 else {
 
-                    $validIDs[] = $advertlocation_id;
+                    $validIDs[ ] = $advertlocation_id;
                 }
             }
             

app/Http/Controllers/Auth/PasswordController.php

Spacing +6 added lines, -6 removed lines

@@ -31,25 +31,25 @@
         $this->middleware('guest');
     }
     
-    public function prePostEmail(Request $request){
+    public function prePostEmail(Request $request) {
         
         /**
          * Add recaptcha
          */
-        if(env('RECAPTCHA_ENABLED') == 1){
-            $this->validate($request, ['g-recaptcha-response' => 'required|recaptcha']);
+        if (env('RECAPTCHA_ENABLED') == 1) {
+            $this->validate($request, [ 'g-recaptcha-response' => 'required|recaptcha' ]);
         }
         
         return $this->postEmail($request);
     }
     
-    public function prePostReset(Request $request){
+    public function prePostReset(Request $request) {
         
         /**
          * Add recaptcha
          */
-        if(env('RECAPTCHA_ENABLED') == 1){
-            $this->validate($request, ['g-recaptcha-response' => 'required|recaptcha']);
+        if (env('RECAPTCHA_ENABLED') == 1) {
+            $this->validate($request, [ 'g-recaptcha-response' => 'required|recaptcha' ]);
         }
         
         return $this->postReset($request);

app/Http/Controllers/Auth/AuthController.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
     public function __construct()
     {
         $this->redirectAfterLogout = env('APP_ADMIN_URL', 'admin');
-        $this->middleware('guest', ['except' => 'getLogout']);
+        $this->middleware('guest', [ 'except' => 'getLogout' ]);
     }
 
     /**
@@ -66,9 +66,9 @@ 
     protected function create(array $data)
     {
         return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
     
@@ -77,8 +77,8 @@ 
         /**
          * Add recaptcha
          */
-        if(env('RECAPTCHA_ENABLED') == 1){
-            $this->validate($request, ['g-recaptcha-response' => 'required|recaptcha']);
+        if (env('RECAPTCHA_ENABLED') == 1) {
+            $this->validate($request, [ 'g-recaptcha-response' => 'required|recaptcha' ]);
         }
         
         return $this->postLogin($request);

app/Http/routesCustom-example.php

Spacing +2 added lines, -2 removed lines

@@ -15,6 +15,6 @@
 /**
  * Frontend root
  */
-Route::get('/', ['as' => 'root', function () {
+Route::get('/', [ 'as' => 'root', function() {
         return view('welcome');
-}]);
+} ]);

app/Http/Middleware/AddPublishedAt.php

Spacing +4 added lines, -4 removed lines

@@ -28,13 +28,13 @@
     public function handle($request, Closure $next)
     {
  
-        if($request->has('published')){
+        if ($request->has('published')) {
             
-            $request->merge(['published_at' => \Carbon\Carbon::now()]);
+            $request->merge([ 'published_at' => \Carbon\Carbon::now() ]);
         }
-        else{
+        else {
 
-            $request->merge(['published_at' => NULL]);
+            $request->merge([ 'published_at' => NULL ]);
         }
         
         return $next($request);

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
     {
         if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
             return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
-        }
-        else{
+        } else{
             return $query;
         }
     }

app/Http/Middleware/AddLookupTables.php

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@
          * Get lookup table data and insert into request
          */
         $intArgs = func_num_args();
-        for($a = 2; $a < $intArgs; $a++){
+        for ($a = 2; $a < $intArgs; $a++) {
             
             $model = func_get_arg($a);
-            $modelWithNamespace = 'App\\'.$model;
+            $modelWithNamespace = 'App\\' . $model;
             
-            $request->merge([$model => $modelWithNamespace::orderBy('name', 'asc')->get()]);
+            $request->merge([ $model => $modelWithNamespace::orderBy('name', 'asc')->get() ]);
         }
   
         return $next($request);     

app/Http/routes.php

Indentation +2 added lines, -2 removed lines

@@ -153,8 +153,8 @@
         ]]);
     
      /**
-     * Advertising
-     */
+      * Advertising
+      */
     Route::resource('advert', 'Admin\AdvertController', ['names' => [
         'index' => 'advert.index',
         'create' => 'advert.create',

Spacing +37 added lines, -37 removed lines

@@ -15,14 +15,14 @@ 
 /**
  * Root
  */
-Route::get('/', ['as' => 'root', function () {
+Route::get('/', [ 'as' => 'root', function() {
         return view('welcome');
-}]);
+} ]);
 
 /**
  * Admin
  */
-Route::group(['prefix' => env('APP_ADMIN_URL', 'admin'), 'as' => 'admin.', 'middleware' => 'auth'], function () {
+Route::group([ 'prefix' => env('APP_ADMIN_URL', 'admin'), 'as' => 'admin.', 'middleware' => 'auth' ], function() {
     
     /**
      * Main dashboard
@@ -34,7 +34,7 @@ 
     /**
      * Articles and categories
      */
-    Route::resource('page', 'Admin\PageController', ['names' => [
+    Route::resource('page', 'Admin\PageController', [ 'names' => [
         'index' => 'page.index',
         'create' => 'page.create',
         'store' => 'page.store',
@@ -42,8 +42,8 @@ 
         'edit' => 'page.edit',
         'update' => 'page.update',
         'destroy' => 'page.destroy'
-        ]]);
-    Route::resource('pageCategory', 'Admin\PageCategoryController', ['names' => [
+        ] ]);
+    Route::resource('pageCategory', 'Admin\PageCategoryController', [ 'names' => [
         'index' => 'pageCategory.index',
         'create' => 'pageCategory.create',
         'store' => 'pageCategory.store',
@@ -51,12 +51,12 @@ 
         'edit' => 'pageCategory.edit',
         'update' => 'pageCategory.update',
         'destroy' => 'pageCategory.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Articles and categories
      */
-    Route::resource('article', 'Admin\ArticleController', ['names' => [
+    Route::resource('article', 'Admin\ArticleController', [ 'names' => [
         'index' => 'article.index',
         'create' => 'article.create',
         'store' => 'article.store',
@@ -64,8 +64,8 @@ 
         'edit' => 'article.edit',
         'update' => 'article.update',
         'destroy' => 'article.destroy'
-        ]]);
-    Route::resource('articleCategory', 'Admin\ArticleCategoryController', ['names' => [
+        ] ]);
+    Route::resource('articleCategory', 'Admin\ArticleCategoryController', [ 'names' => [
         'index' => 'articleCategory.index',
         'create' => 'articleCategory.create',
         'store' => 'articleCategory.store',
@@ -73,12 +73,12 @@ 
         'edit' => 'articleCategory.edit',
         'update' => 'articleCategory.update',
         'destroy' => 'articleCategory.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Feedback
      */
-    Route::resource('feedback', 'Admin\FeedbackController', ['names' => [
+    Route::resource('feedback', 'Admin\FeedbackController', [ 'names' => [
         'index' => 'feedback.index',
         'create' => 'feedback.create',
         'store' => 'feedback.store',
@@ -86,12 +86,12 @@ 
         'edit' => 'feedback.edit',
         'update' => 'feedback.update',
         'destroy' => 'feedback.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Comment
      */
-    Route::resource('comment', 'Admin\CommentController', ['names' => [
+    Route::resource('comment', 'Admin\CommentController', [ 'names' => [
         'index' => 'comment.index',
         'create' => 'comment.create',
         'store' => 'comment.store',
@@ -99,7 +99,7 @@ 
         'edit' => 'comment.edit',
         'update' => 'comment.update',
         'destroy' => 'comment.destroy'
-        ]]);
+        ] ]);
     Route::get('comment/{id}/approve', [
         'as' => 'comment.approve', 'uses' => 'Admin\CommentController@approve'
     ]);
@@ -110,7 +110,7 @@ 
     /**
      * Sliders and slides
      */
-    Route::resource('slider', 'Admin\SliderController', ['names' => [
+    Route::resource('slider', 'Admin\SliderController', [ 'names' => [
         'index' => 'slider.index',
         'create' => 'slider.create',
         'store' => 'slider.store',
@@ -118,8 +118,8 @@ 
         'edit' => 'slider.edit',
         'update' => 'slider.update',
         'destroy' => 'slider.destroy'
-        ]]);
-    Route::resource('slide', 'Admin\SlideController', ['names' => [
+        ] ]);
+    Route::resource('slide', 'Admin\SlideController', [ 'names' => [
         'index' => 'slide.index',
         'create' => 'slide.create',
         'store' => 'slide.store',
@@ -127,12 +127,12 @@ 
         'edit' => 'slide.edit',
         'update' => 'slide.update',
         'destroy' => 'slide.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Images and categories
      */
-    Route::resource('image', 'Admin\ImageController', ['middleware' => ['media.addparameters'],
+    Route::resource('image', 'Admin\ImageController', [ 'middleware' => [ 'media.addparameters' ],
         'names' => [
         'index' => 'image.index',
         'create' => 'image.create',
@@ -141,8 +141,8 @@ 
         'edit' => 'image.edit',
         'update' => 'image.update',
         'destroy' => 'image.destroy'
-        ]]);
-    Route::resource('imageCategory', 'Admin\ImageCategoryController', ['names' => [
+        ] ]);
+    Route::resource('imageCategory', 'Admin\ImageCategoryController', [ 'names' => [
         'index' => 'imageCategory.index',
         'create' => 'imageCategory.create',
         'store' => 'imageCategory.store',
@@ -150,12 +150,12 @@ 
         'edit' => 'imageCategory.edit',
         'update' => 'imageCategory.update',
         'destroy' => 'imageCategory.destroy'
-        ]]);
+        ] ]);
     
      /**
      * Advertising
      */
-    Route::resource('advert', 'Admin\AdvertController', ['names' => [
+    Route::resource('advert', 'Admin\AdvertController', [ 'names' => [
         'index' => 'advert.index',
         'create' => 'advert.create',
         'store' => 'advert.store',
@@ -163,8 +163,8 @@ 
         'edit' => 'advert.edit',
         'update' => 'advert.update',
         'destroy' => 'advert.destroy'
-        ]]);
-    Route::resource('advertLocation', 'Admin\AdvertLocationController', ['names' => [
+        ] ]);
+    Route::resource('advertLocation', 'Admin\AdvertLocationController', [ 'names' => [
         'index' => 'advertLocation.index',
         'create' => 'advertLocation.create',
         'store' => 'advertLocation.store',
@@ -172,12 +172,12 @@ 
         'edit' => 'advertLocation.edit',
         'update' => 'advertLocation.update',
         'destroy' => 'advertLocation.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Products and categories
      */
-    Route::resource('productCategory', 'Admin\ProductCategoryController', ['names' => [
+    Route::resource('productCategory', 'Admin\ProductCategoryController', [ 'names' => [
         'index' => 'productCategory.index',
         'create' => 'productCategory.create',
         'store' => 'productCategory.store',
@@ -185,8 +185,8 @@ 
         'edit' => 'productCategory.edit',
         'update' => 'productCategory.update',
         'destroy' => 'productCategory.destroy'
-        ]]);
-    Route::resource('product', 'Admin\ProductController', ['names' => [
+        ] ]);
+    Route::resource('product', 'Admin\ProductController', [ 'names' => [
         'index' => 'product.index',
         'create' => 'product.create',
         'store' => 'product.store',
@@ -194,13 +194,13 @@ 
         'edit' => 'product.edit',
         'update' => 'product.update',
         'destroy' => 'product.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Settings
      */
     Route::resource('settings', 'Admin\SettingsController', [
-        'except' => ['delete', 'show'],
+        'except' => [ 'delete', 'show' ],
         'names' => [
         'index' => 'settings.index',
         'create' => 'settings.create',
@@ -209,13 +209,13 @@ 
         'edit' => 'settings.edit',
         'update' => 'settings.update',
         'destroy' => 'settings.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Users
      */
     Route::resource('user', 'Admin\UserController', [
-        'except' => ['show'],
+        'except' => [ 'show' ],
         'names' => [
         'index' => 'user.index',
         'create' => 'user.create',
@@ -224,14 +224,14 @@ 
         'edit' => 'user.edit',
         'update' => 'user.update',
         'destroy' => 'user.destroy'
-        ]]);
+        ] ]);
     
 });
 
 /**
  * Authentication
  */
-Route::group(['prefix' => 'auth'], function () {
+Route::group([ 'prefix' => 'auth' ], function() {
     
     Route::get('login', [
         'as' => 'authGetLogin', 'uses' => 'Auth\AuthController@getLogin'
@@ -259,7 +259,7 @@ 
 /**
  * Images
  */
-Route::get('/' . env('APP_IMAGE_URL', 'images').'/{imageName}.{imageExtension}', [
+Route::get('/' . env('APP_IMAGE_URL', 'images') . '/{imageName}.{imageExtension}', [
     'as' => 'getImage', 'uses' => 'Media\ImageController@getImage'
 ]);
 

app/Http/Helpers.php

Spacing +17 added lines, -17 removed lines

@@ -44,16 +44,16 @@ 
                  */
                 if (is_numeric($fieldName) == TRUE) {
                     $fieldName = $fieldAttributes;
-                    $fieldAttributes = ['operator' => '=', 'prefix' => '', 'sufix' => ''];
+                    $fieldAttributes = [ 'operator' => '=', 'prefix' => '', 'sufix' => '' ];
                 }
-                if (isset($fieldAttributes['operator']) == FALSE) {
-                    $fieldAttributes['operator'] = '=';
+                if (isset($fieldAttributes[ 'operator' ]) == FALSE) {
+                    $fieldAttributes[ 'operator' ] = '=';
                 }
-                if (isset($fieldAttributes['prefix']) == FALSE) {
-                    $fieldAttributes['prefix'] = '';
+                if (isset($fieldAttributes[ 'prefix' ]) == FALSE) {
+                    $fieldAttributes[ 'prefix' ] = '';
                 }
-                if (isset($fieldAttributes['sufix']) == FALSE) {
-                    $fieldAttributes['sufix'] = '';
+                if (isset($fieldAttributes[ 'sufix' ]) == FALSE) {
+                    $fieldAttributes[ 'sufix' ] = '';
                 }
 
                 /**
@@ -61,13 +61,13 @@ 
                  */
                 if ($first == TRUE) {
 
-                    $query->where($fieldName, $fieldAttributes['operator'], $fieldAttributes['prefix'] . $word
-                        . $fieldAttributes['sufix']);
+                    $query->where($fieldName, $fieldAttributes[ 'operator' ], $fieldAttributes[ 'prefix' ] . $word
+                        . $fieldAttributes[ 'sufix' ]);
 
                     $first = FALSE;
                 } else {
-                    $query->orWhere($fieldName, $fieldAttributes['operator'], $fieldAttributes['prefix'] . $word
-                        . $fieldAttributes['sufix']);
+                    $query->orWhere($fieldName, $fieldAttributes[ 'operator' ], $fieldAttributes[ 'prefix' ] . $word
+                        . $fieldAttributes[ 'sufix' ]);
                 }
             }
         }
@@ -104,7 +104,7 @@ 
      * @param array $possibleParameters
      * @return boolean
      */
-    public static function resetSaveIndexParameters($module, $possibleParameters = ['search', 'orderbycolumn', 'orderbytype', 'relation'])
+    public static function resetSaveIndexParameters($module, $possibleParameters = [ 'search', 'orderbycolumn', 'orderbytype', 'relation' ])
     {
 
         /**
@@ -117,7 +117,7 @@ 
          */
         foreach ($allParameters as $parameter => $value) {
 
-            $cacheKey = implode('.', [$module, Auth::user()->id, $parameter]);
+            $cacheKey = implode('.', [ $module, Auth::user()->id, $parameter ]);
 
             /**
              * Reset
@@ -125,7 +125,7 @@ 
             if (empty($value) == TRUE) {
 
                 Cache::forget($cacheKey);
-                unset($allParameters[$parameter]);
+                unset($allParameters[ $parameter ]);
             } /**
              * Save
              */ else {
@@ -139,9 +139,9 @@ 
          */
         foreach ($possibleParameters as $parameter => $value) {
 
-            $cacheKey = implode('.', [$module, Auth::user()->id, $value]);
+            $cacheKey = implode('.', [ $module, Auth::user()->id, $value ]);
 
-            $allParameters[$value] = Cache::get($cacheKey);
+            $allParameters[ $value ] = Cache::get($cacheKey);
         }
 
         /**
@@ -249,7 +249,7 @@ 
 
             if (preg_match('/content: \$fa-var-(.*)\;/', $row, $matches) == TRUE) {
 
-                $icons[] = "fa-" . $matches[1];
+                $icons[ ] = "fa-" . $matches[ 1 ];
             }
 
         }

Doc Comments +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * Search columns like fulltext do
      *
-     * @param \Illuminate\Database\Query $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
      * @param string $word
      * @param array $fields
      * @return \Illuminate\Database\Query
@@ -78,7 +78,7 @@ 
     /**
      * Order by columns based on parameters
      *
-     * @param Query $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
      * @param string $orderBy
      * @return Query
      */
@@ -102,7 +102,7 @@ 
      *
      * @param string $module
      * @param array $possibleParameters
-     * @return boolean
+     * @return false|string
      */
     public static function resetSaveIndexParameters($module, $possibleParameters = ['search', 'orderbycolumn', 'orderbytype', 'relation'])
     {

app/AdvertLocation.php

Spacing +5 added lines, -5 removed lines

@@ -33,21 +33,21 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'color'];
+    protected $fillable = [ 'name', 'description', 'color' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = [];
+    protected $excludedFromIndex = [ ];
 
     /**
      * Fields to search in fulltext mode
@@ -82,7 +82,7 @@ 
      * 
      * @return object
      */
-    public function adverts(){
+    public function adverts() {
         
         return $this->belongsToMany('App\Advert', 'advert_advertlocation', 'advert_id', 'advertlocation_id');
     }
@@ -93,7 +93,7 @@ 
      * @param type $query
      * @return object
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('adverts');
     }