@@ -102,7 +102,7 @@ |
||
102 | 102 | * |
103 | 103 | * @param string $module |
104 | 104 | * @param array $possibleParameters |
105 | - * @return boolean |
|
105 | + * @return false|string |
|
106 | 106 | */ |
107 | 107 | public static function resetSaveIndexParameters($module, $possibleParameters = ['search', 'orderbycolumn', 'orderbytype', 'relation']) |
108 | 108 | { |
@@ -44,16 +44,16 @@ discard block |
||
44 | 44 | */ |
45 | 45 | if (is_numeric($fieldName) == TRUE) { |
46 | 46 | $fieldName = $fieldAttributes; |
47 | - $fieldAttributes = ['operator' => '=', 'prefix' => '', 'sufix' => '']; |
|
47 | + $fieldAttributes = [ 'operator' => '=', 'prefix' => '', 'sufix' => '' ]; |
|
48 | 48 | } |
49 | - if (isset($fieldAttributes['operator']) == FALSE) { |
|
50 | - $fieldAttributes['operator'] = '='; |
|
49 | + if (isset($fieldAttributes[ 'operator' ]) == FALSE) { |
|
50 | + $fieldAttributes[ 'operator' ] = '='; |
|
51 | 51 | } |
52 | - if (isset($fieldAttributes['prefix']) == FALSE) { |
|
53 | - $fieldAttributes['prefix'] = ''; |
|
52 | + if (isset($fieldAttributes[ 'prefix' ]) == FALSE) { |
|
53 | + $fieldAttributes[ 'prefix' ] = ''; |
|
54 | 54 | } |
55 | - if (isset($fieldAttributes['sufix']) == FALSE) { |
|
56 | - $fieldAttributes['sufix'] = ''; |
|
55 | + if (isset($fieldAttributes[ 'sufix' ]) == FALSE) { |
|
56 | + $fieldAttributes[ 'sufix' ] = ''; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | */ |
62 | 62 | if ($first == TRUE) { |
63 | 63 | |
64 | - $query->where($fieldName, $fieldAttributes['operator'], $fieldAttributes['prefix'] . $word |
|
65 | - . $fieldAttributes['sufix']); |
|
64 | + $query->where($fieldName, $fieldAttributes[ 'operator' ], $fieldAttributes[ 'prefix' ] . $word |
|
65 | + . $fieldAttributes[ 'sufix' ]); |
|
66 | 66 | |
67 | 67 | $first = FALSE; |
68 | 68 | } else { |
69 | - $query->orWhere($fieldName, $fieldAttributes['operator'], $fieldAttributes['prefix'] . $word |
|
70 | - . $fieldAttributes['sufix']); |
|
69 | + $query->orWhere($fieldName, $fieldAttributes[ 'operator' ], $fieldAttributes[ 'prefix' ] . $word |
|
70 | + . $fieldAttributes[ 'sufix' ]); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param array $possibleParameters |
105 | 105 | * @return boolean |
106 | 106 | */ |
107 | - public static function resetSaveIndexParameters($module, $possibleParameters = ['search', 'orderbycolumn', 'orderbytype', 'relation']) |
|
107 | + public static function resetSaveIndexParameters($module, $possibleParameters = [ 'search', 'orderbycolumn', 'orderbytype', 'relation' ]) |
|
108 | 108 | { |
109 | 109 | |
110 | 110 | /** |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | foreach ($allParameters as $parameter => $value) { |
119 | 119 | |
120 | - $cacheKey = implode('.', [$module, Auth::user()->id, $parameter]); |
|
120 | + $cacheKey = implode('.', [ $module, Auth::user()->id, $parameter ]); |
|
121 | 121 | |
122 | 122 | /** |
123 | 123 | * Reset |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | if (empty($value) == TRUE) { |
126 | 126 | |
127 | 127 | Cache::forget($cacheKey); |
128 | - unset($allParameters[$parameter]); |
|
128 | + unset($allParameters[ $parameter ]); |
|
129 | 129 | } /** |
130 | 130 | * Save |
131 | 131 | */ else { |
@@ -139,9 +139,9 @@ discard block |
||
139 | 139 | */ |
140 | 140 | foreach ($possibleParameters as $parameter => $value) { |
141 | 141 | |
142 | - $cacheKey = implode('.', [$module, Auth::user()->id, $value]); |
|
142 | + $cacheKey = implode('.', [ $module, Auth::user()->id, $value ]); |
|
143 | 143 | |
144 | - $allParameters[$value] = Cache::get($cacheKey); |
|
144 | + $allParameters[ $value ] = Cache::get($cacheKey); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | |
250 | 250 | if (preg_match('/content: \$fa-var-(.*)\;/', $row, $matches) == TRUE) { |
251 | 251 | |
252 | - $icons[] = "fa-" . $matches[1]; |
|
252 | + $icons[ ] = "fa-" . $matches[ 1 ]; |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | /** |
81 | 81 | * Image link |
82 | 82 | * |
83 | - * @return object |
|
83 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
84 | 84 | */ |
85 | 85 | public function images(){ |
86 | 86 |
@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'description', 'color']; |
|
43 | + protected $fillable = [ 'name', 'description', 'color' ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Columns to exclude from index |
47 | 47 | * |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected $excludedFromIndex = []; |
|
50 | + protected $excludedFromIndex = [ ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Fields to search in fulltext mode |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * |
83 | 83 | * @return object |
84 | 84 | */ |
85 | - public function images(){ |
|
85 | + public function images() { |
|
86 | 86 | |
87 | 87 | return $this->hasMany('App\Image', 'imagecategory_id'); |
88 | 88 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param query $query@ |
94 | 94 | * @return query |
95 | 95 | */ |
96 | - public function scopeRelationships($query){ |
|
96 | + public function scopeRelationships($query) { |
|
97 | 97 | |
98 | 98 | return $query->with('images'); |
99 | 99 | } |
@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'color']; |
|
43 | + protected $fillable = [ 'name', 'color' ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Columns to exclude from index |
47 | 47 | * |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected $excludedFromIndex = []; |
|
50 | + protected $excludedFromIndex = [ ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Fields to search in fulltext mode |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * |
79 | 79 | * @return object |
80 | 80 | */ |
81 | - public function comments(){ |
|
81 | + public function comments() { |
|
82 | 82 | |
83 | 83 | return $this->hasMany('App\Comment', 'commentstatus_id'); |
84 | 84 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @param query $query |
90 | 90 | * @return query |
91 | 91 | */ |
92 | - public function scopeRelationships($query){ |
|
92 | + public function scopeRelationships($query) { |
|
93 | 93 | |
94 | 94 | return $query->with('comments'); |
95 | 95 | } |
@@ -33,22 +33,22 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'headline', 'text', 'email', |
|
44 | - 'url', 'approved', 'commentstatus_id', 'page_id', 'article_id']; |
|
43 | + protected $fillable = [ 'name', 'headline', 'text', 'email', |
|
44 | + 'url', 'approved', 'commentstatus_id', 'page_id', 'article_id' ]; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Columns to exclude from index |
48 | 48 | * |
49 | 49 | * @var array |
50 | 50 | */ |
51 | - protected $excludedFromIndex = []; |
|
51 | + protected $excludedFromIndex = [ ]; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Fields to search in fulltext mode |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * |
90 | 90 | * @return object |
91 | 91 | */ |
92 | - public function commentstatuses(){ |
|
92 | + public function commentstatuses() { |
|
93 | 93 | |
94 | 94 | return $this->belongsTo('App\CommentStatus', 'commentstatus_id'); |
95 | 95 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * |
100 | 100 | * @return object |
101 | 101 | */ |
102 | - public function articles(){ |
|
102 | + public function articles() { |
|
103 | 103 | |
104 | 104 | return $this->belongsTo('App\Article', 'article_id'); |
105 | 105 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * |
110 | 110 | * @return object |
111 | 111 | */ |
112 | - public function pages(){ |
|
112 | + public function pages() { |
|
113 | 113 | |
114 | 114 | return $this->belongsTo('App\Page', 'page_id'); |
115 | 115 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | * @param query $query |
121 | 121 | * @return query |
122 | 122 | */ |
123 | - public function scopeRelationships($query){ |
|
123 | + public function scopeRelationships($query) { |
|
124 | 124 | |
125 | 125 | return $query->with('articles', 'pages', 'commentstatuses'); |
126 | 126 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | */ |
38 | 38 | public function map(Router $router) |
39 | 39 | { |
40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
40 | + $router->group([ 'namespace' => $this->namespace ], function($router) { |
|
41 | 41 | require app_path('Http/routes.php'); |
42 | 42 | }); |
43 | 43 | } |
@@ -19,7 +19,6 @@ |
||
19 | 19 | /** |
20 | 20 | * Define your route model bindings, pattern filters, etc. |
21 | 21 | * |
22 | - * @param \Illuminate\Routing\Router $router |
|
23 | 22 | * @return void |
24 | 23 | */ |
25 | 24 | public function boot() |
@@ -33,22 +33,22 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'published_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at', 'published_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'author_name', 'meta_title', 'meta_description', |
|
44 | - 'meta_keywords', 'text', 'url', 'image_id', 'user_id', 'published_at']; |
|
43 | + protected $fillable = [ 'name', 'author_name', 'meta_title', 'meta_description', |
|
44 | + 'meta_keywords', 'text', 'url', 'image_id', 'user_id', 'published_at' ]; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Columns to exclude from index |
48 | 48 | * |
49 | 49 | * @var array |
50 | 50 | */ |
51 | - protected $excludedFromIndex = []; |
|
51 | + protected $excludedFromIndex = [ ]; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Fields to search in fulltext mode |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * |
79 | 79 | * @return object |
80 | 80 | */ |
81 | - public function images(){ |
|
81 | + public function images() { |
|
82 | 82 | |
83 | 83 | return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', |
84 | 84 | 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * |
92 | 92 | * @return object |
93 | 93 | */ |
94 | - public function articlecategories(){ |
|
94 | + public function articlecategories() { |
|
95 | 95 | |
96 | 96 | return $this->belongsToMany('App\ArticleCategory', 'article_articlecategory', 'article_id', 'articlecategory_id'); |
97 | 97 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * |
102 | 102 | * @return object |
103 | 103 | */ |
104 | - public function comments(){ |
|
104 | + public function comments() { |
|
105 | 105 | |
106 | 106 | return $this->hasMany('App\Comment', 'article_id'); |
107 | 107 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * |
112 | 112 | * @return object |
113 | 113 | */ |
114 | - public function users(){ |
|
114 | + public function users() { |
|
115 | 115 | |
116 | 116 | return $this->belongsTo('App\User', 'user_id'); |
117 | 117 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @param query $query |
123 | 123 | * @return query |
124 | 124 | */ |
125 | - public function scopeRelationships($query){ |
|
125 | + public function scopeRelationships($query) { |
|
126 | 126 | |
127 | 127 | return $query->with('images', 'images.imagecategories', 'articlecategories', 'users', 'comments'); |
128 | 128 | } |
@@ -33,22 +33,22 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'caption', 'text', 'link_url', |
|
44 | - 'link_title', 'image_id', 'position']; |
|
43 | + protected $fillable = [ 'name', 'caption', 'text', 'link_url', |
|
44 | + 'link_title', 'image_id', 'position' ]; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Columns to exclude from index |
48 | 48 | * |
49 | 49 | * @var array |
50 | 50 | */ |
51 | - protected $excludedFromIndex = []; |
|
51 | + protected $excludedFromIndex = [ ]; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Fields to search in fulltext mode |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * |
85 | 85 | * @return object |
86 | 86 | */ |
87 | - public function images(){ |
|
87 | + public function images() { |
|
88 | 88 | |
89 | 89 | return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', |
90 | 90 | 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @return object |
99 | 99 | */ |
100 | - public function advertlocations(){ |
|
100 | + public function advertlocations() { |
|
101 | 101 | |
102 | 102 | return $this->belongsToMany('App\AdvertLocation', 'advert_advertlocation', 'advertlocation_id', 'advert_id'); |
103 | 103 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param type $query |
109 | 109 | * @return object |
110 | 110 | */ |
111 | - public function scopeRelationships($query){ |
|
111 | + public function scopeRelationships($query) { |
|
112 | 112 | |
113 | 113 | return $query->with('images', 'images.imagecategories', 'advertlocations'); |
114 | 114 | } |
@@ -32,22 +32,22 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
35 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * The attributes that are mass assignable. |
39 | 39 | * |
40 | 40 | * @var array |
41 | 41 | */ |
42 | - protected $fillable = ['name', 'color', 'meta_title', 'meta_description', |
|
43 | - 'meta_keywords', 'text', 'url', 'image_id',]; |
|
42 | + protected $fillable = [ 'name', 'color', 'meta_title', 'meta_description', |
|
43 | + 'meta_keywords', 'text', 'url', 'image_id', ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Columns to exclude from index |
47 | 47 | * |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected $excludedFromIndex = ['image']; |
|
50 | + protected $excludedFromIndex = [ 'image' ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Fields to search in fulltext mode |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * |
88 | 88 | * @return object |
89 | 89 | */ |
90 | - public function images(){ |
|
90 | + public function images() { |
|
91 | 91 | |
92 | 92 | return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', |
93 | 93 | 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * |
101 | 101 | * @return object |
102 | 102 | */ |
103 | - public function articles(){ |
|
103 | + public function articles() { |
|
104 | 104 | |
105 | 105 | return $this->belongsToMany('App\Article', 'article_articlecategory', 'articlecategory_id', 'article_id'); |
106 | 106 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @param query $query |
112 | 112 | * @return query |
113 | 113 | */ |
114 | - public function scopeRelationships($query){ |
|
114 | + public function scopeRelationships($query) { |
|
115 | 115 | |
116 | 116 | return $query->with('images', 'images.imagecategories', 'articles'); |
117 | 117 | } |
@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'description', 'cycle_interval']; |
|
43 | + protected $fillable = [ 'name', 'description', 'cycle_interval' ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Columns to exclude from index |
47 | 47 | * |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected $excludedFromIndex = []; |
|
50 | + protected $excludedFromIndex = [ ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Fields to search in fulltext mode |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * |
84 | 84 | * @return object |
85 | 85 | */ |
86 | - public function slides(){ |
|
86 | + public function slides() { |
|
87 | 87 | |
88 | 88 | return $this->hasMany('App\Slide', 'slider_id')->orderBy('position', 'asc'); |
89 | 89 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param query $query |
95 | 95 | * @return query |
96 | 96 | */ |
97 | - public function scopeRelationships($query){ |
|
97 | + public function scopeRelationships($query) { |
|
98 | 98 | |
99 | 99 | return $query->with('slides', 'slides.images', 'slides.images', 'slides.images.imagecategories'); |
100 | 100 | } |