jdrda / olapus

app/Http/Controllers/Auth/LoginController.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
      */
     public function __construct()
     {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest', [ 'except' => 'logout' ]);
     }
 }
\ No newline at end of file

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function boot()
     {
         //
-        require_once app_path().'/Http/Helpers.php';
+        require_once app_path() . '/Http/Helpers.php';
     }
 
     /**

app/Http/Middleware/MediaImageSelect.php

Doc Comments -1 removed lines

@@ -25,7 +25,6 @@
      *
      * @param \Illuminate\Http\Request $request
      * @param Closure $next
-     * @param array $models
      * @return mixed
      */
     public function handle(Request $request, Closure $next)

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@
     public function handle(Request $request, Closure $next)
     {
         $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;
             
             
-            $array = ['other_tables' =>
+            $array = [ 'other_tables' =>
             [
-                $model => $modelWithNamespace::orderBy('id', 'desc')->get(['id', 'name', 'url', 'image_extension'])
+                $model => $modelWithNamespace::orderBy('id', 'desc')->get([ 'id', 'name', 'url', 'image_extension' ])
             ]
                 ];
             

app/User.php

Spacing +8 added lines, -8 removed lines

@@ -41,29 +41,29 @@ 
      *
      * @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', 'email', 'password', 'age', 'blacklisted', 'ip', 'activation_code', 'active',
-    'fname', 'sname', 'bno', 'city', 'citypart', 'street', 'hno', 'zip', 'registration_data', 'phone'];
+    protected $fillable = [ 'name', 'email', 'password', 'age', 'blacklisted', 'ip', 'activation_code', 'active',
+    'fname', 'sname', 'bno', 'city', 'citypart', 'street', 'hno', 'zip', 'registration_data', 'phone' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = ['password'];
+    protected $excludedFromIndex = [ 'password' ];
     
     /**
      * Fields to search in fulltext mode
@@ -98,7 +98,7 @@ 
      * 
      * @return object
      */
-    public function articles(){
+    public function articles() {
         
         return $this->hasMany('App\Article', 'user_id');
     }
@@ -108,7 +108,7 @@ 
      *
      * @return object
      */
-    public function usergroups(){
+    public function usergroups() {
 
         return $this->belongsTo('App\Usergroup', 'usergroup_id');
     }
@@ -119,7 +119,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('usergroups');
     }

app/Usergroup.php

Spacing +4 added lines, -4 removed lines

@@ -33,14 +33,14 @@ 
      *
      * @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'];
+    protected $fillable = [ 'name' ];
 
     /**
      * Fields to search in fulltext mode
@@ -70,7 +70,7 @@ 
      * 
      * @return object
      */
-    public function users(){
+    public function users() {
         
         return $this->hasMany('App\User', 'usergroup_id');
     }
@@ -81,7 +81,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('users');
     }

app/Http/Controllers/Admin/ImageController.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Helpers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
     public function __construct() {
         parent::__construct();
 
-        $this->middleware('add.lookup.tables:ImageCategory', ['only' => ['index','create','edit']]);
+        $this->middleware('add.lookup.tables:ImageCategory', [ 'only' => [ 'index', 'create', 'edit' ] ]);
     }
    
     /**
@@ -45,14 +45,14 @@ 
      * 
      * @var array 
      */
-    protected $binaryFields = [];
+    protected $binaryFields = [ ];
             
     /**
      * Get number of pagination rows
      * 
      * @return integer
      */
-    public function getRowsToPaginate(){
+    public function getRowsToPaginate() {
         
         return env('ADMIN_MEDIA_PAGINATE', 12);
     }
@@ -63,7 +63,7 @@ 
      * @param object $object
      * @param Request $request
      */
-    public function associateRelationships($object, Request $request){
+    public function associateRelationships($object, Request $request) {
         
         /**
          * Validate category ID, if failed set to default
@@ -83,7 +83,7 @@ 
         /**
          * Validator OK - save it
          */
-        else{
+        else {
 
             $object->imagecategories()->associate($request->input('imagecategory_id'));
         } 
@@ -107,11 +107,11 @@ 
             /**
              * Image has an url
              */
-            if(strlen($request->input('url') > 5)){
+            if (strlen($request->input('url') > 5)) {
                 $object->addMedia($request->file('image'))->toMediaCollection('images')
                     ->usingName($request->input('url'));
             }
-            else{
+            else {
                 $object->addMedia($request->file('image'))->toMediaCollection('images');
             }
 

Braces +1 added lines, -2 removed lines

@@ -110,8 +110,7 @@
             if(strlen($request->input('url') > 5)){
                 $object->addMedia($request->file('image'))->toMediaCollection('images')
                     ->usingName($request->input('url'));
-            }
-            else{
+            } else{
                 $object->addMedia($request->file('image'))->toMediaCollection('images');
             }
 

app/Http/Controllers/Media/ImageController.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     * Get image from storage
     * 
     * @param Request $request
-    * @return file
+    * @return \Symfony\Component\HttpFoundation\StreamedResponse
     */
     public function getImage(Request $request)
     {

Unused Use Statements -3 removed lines

@@ -14,14 +14,11 @@
 
 namespace App\Http\Controllers\Media;
 
-use App\Helpers;
 use Illuminate\Http\Request;
-
 use App\Http\Controllers\Controller;
 use App\Image;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use Carbon\Carbon;
 

Spacing +7 added lines, -7 removed lines

@@ -40,17 +40,17 @@ 
         /**
          * Get META information
          */
-        $imageMeta = Image::where(['url' => $request->imageName])->first();
+        $imageMeta = Image::where([ 'url' => $request->imageName ])->first();
 
         /**
          * File does not exist
          */
-        if(empty($imageMeta) == TRUE){
+        if (empty($imageMeta) == TRUE) {
             App::abort(404);
         }
 
         $mediaItems = $imageMeta->getMedia();
-        $fullPathOnDisk = $mediaItems[0]->getPath();
+        $fullPathOnDisk = $mediaItems[ 0 ]->getPath();
 
 
         /**
@@ -66,15 +66,15 @@ 
             'Content-Description'       => 'File Transfer',
             'Content-Transfer-Encoding' => 'binary',
             'Pragma'                    => 'public',
-            'Expires'                   => Carbon::createFromTimestamp(time()+3600)->toRfc2822String(),
+            'Expires'                   => Carbon::createFromTimestamp(time() + 3600)->toRfc2822String(),
             'Last-Modified'             => $imageMeta->updated_at->toRfc2822String()
         );
         
         /**
          * Response code cached
          */
-        if( (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $imageMeta->image_etag)
-                || (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $imageMeta->updated_at->toRfc2822String()) ){
+        if ((isset($_SERVER[ 'HTTP_IF_NONE_MATCH' ]) && $_SERVER[ 'HTTP_IF_NONE_MATCH' ] == $imageMeta->image_etag)
+                || (isset($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ]) && $_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ] == $imageMeta->updated_at->toRfc2822String())) {
             
             $responseCode = 304;
         }
@@ -82,7 +82,7 @@ 
         /**
          * Response code not cached, but OK
          */
-        else{
+        else {
             
             $responseCode = 200;
         }

app/Image.php

Spacing +11 added lines, -11 removed lines

@@ -34,28 +34,28 @@ 
      *
      * @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', 'alt', 'url'];
+    protected $fillable = [ 'name', 'description', 'alt', 'url' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = [];
+    protected $excludedFromIndex = [ ];
     
     /**
      * Hidden from custom find
      * 
      * @var arrat 
      */
-    protected  $excludedFromFind = [];
+    protected  $excludedFromFind = [ ];
     
     /**
      * Fields to search in fulltext mode
@@ -100,7 +100,7 @@ 
      * 
      * @return object
      */
-    public function imagecategories(){
+    public function imagecategories() {
         
         return $this->belongsTo('App\ImageCategory', 'imagecategory_id');
     }
@@ -110,7 +110,7 @@ 
      * 
      * @return object
      */
-    public function slides(){
+    public function slides() {
         
         return $this->hasMany('App\Slide', 'image_id');
     }
@@ -120,7 +120,7 @@ 
      * 
      * @return object
      */
-    public function articlecategories(){
+    public function articlecategories() {
         
         return $this->hasMany('App\ArticleCategory', 'image_id');
     }
@@ -130,7 +130,7 @@ 
      * 
      * @return object
      */
-    public function pages(){
+    public function pages() {
         
         return $this->hasMany('App\Page', 'image_id');
     }
@@ -141,7 +141,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('imagecategories');
     }
@@ -151,8 +151,8 @@ 
      * 
      * @param array $array
      */
-    public function hide($array = []){
+    public function hide($array = [ ]) {
         
-        $this->hidden = ['image'];
+        $this->hidden = [ 'image' ];
     }
 }

app/Http/routesCustom.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');
-}]);
+} ]);