thinktomorrow / chief

database/factories/ModelFactory.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 use Thinktomorrow\Chief\Users\User;
 use Thinktomorrow\Chief\Pages\Page;
 
-$factory->define(User::class, function (Faker\Generator $faker) {
+$factory->define(User::class, function(Faker\Generator $faker) {
 
     static $password;
 
@@ -15,7 +15,7 @@ 
     ];
 });
 
-$factory->define(Page::class, function (Faker\Generator $faker) {
+$factory->define(Page::class, function(Faker\Generator $faker) {
     return [
         'published'   => $faker->boolean(),
         'featured'    => $faker->boolean(),

config/chief.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
      * This contact will receive e.g. contact form submissions
      */
     'contact'   => [
-        'email' => env('MAIL_ADMIN_EMAIL','info@thinktomorrow.be'),
-        'name' => env('MAIL_ADMIN_NAME','Think Tomorrow')
+        'email' => env('MAIL_ADMIN_EMAIL', 'info@thinktomorrow.be'),
+        'name' => env('MAIL_ADMIN_NAME', 'Think Tomorrow')
     ],
 
     /**

app/Console/CreateAdmin.php

Spacing +7 added lines, -7 removed lines

@@ -16,27 +16,27 @@
 
         $anticipations = $this->getAnticipations();
 
-        $firstname = $this->anticipate('firstname',array_pluck($anticipations,'firstname'));
+        $firstname = $this->anticipate('firstname', array_pluck($anticipations, 'firstname'));
         $anticipatedLastname = null;
-        $lastname = $this->anticipate('lastname',array_pluck($anticipations,'lastname'),$anticipatedLastname);
+        $lastname = $this->anticipate('lastname', array_pluck($anticipations, 'lastname'), $anticipatedLastname);
 
-        $email = $this->ask('email',str_slug($firstname).'@thinktomorrow.be');
+        $email = $this->ask('email', str_slug($firstname).'@thinktomorrow.be');
 
         $password = $this->askPassword();
 
         $this->createUser($firstname, $lastname, $email, $password, ['admin']);
 
-        $this->info($firstname.' '.$lastname. ' succesfully added as admin user.');
+        $this->info($firstname.' '.$lastname.' succesfully added as admin user.');
     }
 
     private function settingPermissionsAndRoles()
     {
-        AuthorizationDefaults::permissions()->each(function($permissionName){
+        AuthorizationDefaults::permissions()->each(function($permissionName) {
             Artisan::call('chief:permission', ['name' => $permissionName]);
         });
 
-        AuthorizationDefaults::roles()->each(function($defaultPermissions, $roleName){
-            Artisan::call('chief:role', ['name' => $roleName, '--permissions' => implode(',',$defaultPermissions)]);
+        AuthorizationDefaults::roles()->each(function($defaultPermissions, $roleName) {
+            Artisan::call('chief:role', ['name' => $roleName, '--permissions' => implode(',', $defaultPermissions)]);
         });
 
         $this->info('Default permissions and roles');

app/Console/RefreshDatabase.php

Spacing +8 added lines, -8 removed lines

@@ -14,12 +14,12 @@ 
 
     public function handle()
     {
-        if(app()->environment() != 'local' && !$this->option('force'))
+        if (app()->environment() != 'local' && !$this->option('force'))
         {
             throw new \Exception('Aborting. This command is dangerous and only meant for your local environment.');
         }
 
-        if(app()->environment() != 'local' && $this->option('force'))
+        if (app()->environment() != 'local' && $this->option('force'))
         {
             if (!$this->confirm('You are about to force refresh the database in the '.app()->environment().' environment! ARE YOU SURE?')) {
                 $this->info('aborting.');
@@ -32,9 +32,9 @@ 
             }
         }
 
-        if($this->option('force')){
+        if ($this->option('force')) {
             $this->call('migrate:fresh', ['--force' => true]);
-        }else{
+        }else {
             $this->call('migrate:fresh');
         }
 
@@ -50,12 +50,12 @@ 
 
     private function settingPermissionsAndRoles()
     {
-        AuthorizationDefaults::permissions()->each(function($permissionName){
+        AuthorizationDefaults::permissions()->each(function($permissionName) {
             Artisan::call('chief:permission', ['name' => $permissionName]);
         });
 
-        AuthorizationDefaults::roles()->each(function($defaultPermissions, $roleName){
-            Artisan::call('chief:role', ['name' => $roleName, '--permissions' => implode(',',$defaultPermissions)]);
+        AuthorizationDefaults::roles()->each(function($defaultPermissions, $roleName) {
+            Artisan::call('chief:role', ['name' => $roleName, '--permissions' => implode(',', $defaultPermissions)]);
         });
 
         $this->info('Default permissions and roles');
@@ -79,7 +79,7 @@ 
             ['Json', 'Voorhees', 'json@thinktomorrow.be', $password],
         ]);
 
-        $admins->each(function($admin){
+        $admins->each(function($admin) {
             $this->createUser($admin[0], $admin[1], $admin[2], $admin[3], 'developer');
             $this->info('Added '.$admin[0].' as developer role with your provided password.');
         });

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         if($this->option('force')){
             $this->call('migrate:fresh', ['--force' => true]);
-        }else{
+        } else{
             $this->call('migrate:fresh');
         }
 

app/Http/Controllers/Auth/LoginController.php

Spacing +2 added lines, -2 removed lines

@@ -25,14 +25,14 @@
             'password' => 'required|min:6',
         ]);
 
-        if(Auth::guard('chief')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember))
+        if (Auth::guard('chief')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember))
         {
             return redirect()->intended(route('chief.back.dashboard'));
         }
 
         $failedAttempt = 'Uw gegevens zijn onjuist of uw account is nog niet actief.';
 
-        return redirect()->back()->withInput($request->only('email','remember'))->withErrors($failedAttempt);
+        return redirect()->back()->withInput($request->only('email', 'remember'))->withErrors($failedAttempt);
     }
 
     /**

app/Http/Controllers/Back/Authorization/PermissionController.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
         }
         return redirect()->route('chief.back.permissions.index')
             ->with('flash_message',
-                'Permission'. $permission->name.' added!');
+                'Permission'.$permission->name.' added!');
     }
     /**
      * Display the specified resource.
@@ -98,7 +98,7 @@ 
         $permission->fill($input)->save();
         return redirect()->route('chief.back.permissions.index')
             ->with('flash_message',
-                'Permission'. $permission->name.' updated!');
+                'Permission'.$permission->name.' updated!');
     }
     /**
      * Remove the specified resource from storage.

app/Http/Controllers/Back/Authorization/RoleController.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $role->givePermissionTo($request->permission_names);
 
         return redirect()->route('chief.back.roles.index')
-                         ->with('messages.success', 'Rol '. $role->name.' is toegevoegd.');
+                            ->with('messages.success', 'Rol '. $role->name.' is toegevoegd.');
     }
 
     public function edit($id)

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
     {
         $this->authorize('view-role');
 
-        return view('chief::back.authorization.roles.index',[
+        return view('chief::back.authorization.roles.index', [
             'roles' => Role::all(),
         ]);
     }
@@ -42,7 +42,7 @@ 
         $role->givePermissionTo($request->permission_names);
 
         return redirect()->route('chief.back.roles.index')
-                         ->with('messages.success', 'Rol '. $role->name.' is toegevoegd.');
+                         ->with('messages.success', 'Rol '.$role->name.' is toegevoegd.');
     }
 
     public function edit($id)
@@ -71,7 +71,7 @@ 
         $role->syncPermissions($request->permission_names);
 
         return redirect()->route('chief.back.roles.index')
-            ->with('messages.success', 'Rol '. $role->name.' is aangepast.');
+            ->with('messages.success', 'Rol '.$role->name.' is aangepast.');
     }
 
     public function destroy($id)
@@ -82,6 +82,6 @@ 
         $role->delete();
 
         return redirect()->route('chief.back.roles.index')
-            ->with('messages.success', 'Rol '. $role->name.' is verwijderd.');
+            ->with('messages.success', 'Rol '.$role->name.' is verwijderd.');
     }
 }

app/Http/Controllers/Back/PagesController.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
         $page->existingRelationIds = collect([]);
         $relations = RelatedCollection::availableChildren($page)->flattenForGroupedSelect()->toArray();
 
-        return view('chief::back.pages.create',['page' => $page, 'relations' => $relations]);
+        return view('chief::back.pages.create', ['page' => $page, 'relations' => $relations]);
     }
 
     /**
@@ -48,7 +48,7 @@ 
     {
         $page = app(CreatePage::class)->handle($request->trans);
 
-        return redirect()->route('chief.back.pages.index')->with('messages.success', $page->title .' is aangemaakt');
+        return redirect()->route('chief.back.pages.index')->with('messages.success', $page->title.' is aangemaakt');
     }
 
     /**
@@ -79,7 +79,7 @@ 
     {
         $page = app(UpdatePage::class)->handle($id, $request->trans, $request->relations);
 
-        return redirect()->route('chief.back.pages.index')->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$page->title .'" werd aangepast');
+        return redirect()->route('chief.back.pages.index')->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$page->title.'" werd aangepast');
     }
 
     /**
@@ -91,10 +91,10 @@ 
     public function destroy($id)
     {
         $page = Page::findOrFail($id);
-        if(request()->get('deleteconfirmation') !== 'DELETE' && (!$page->isPublished() || $page->isArchived())) return redirect()->back()->with('messages.warning', 'fout');
+        if (request()->get('deleteconfirmation') !== 'DELETE' && (!$page->isPublished() || $page->isArchived())) return redirect()->back()->with('messages.warning', 'fout');
 
-        if($page->isDraft() || $page->isArchived()) $page->delete();
-        if($page->isPublished()) $page->archive();
+        if ($page->isDraft() || $page->isArchived()) $page->delete();
+        if ($page->isPublished()) $page->archive();
 
         $message = 'Het item werd verwijderd.';
 
@@ -103,8 +103,8 @@ 
 
     public function publish(Request $request)
     {
-        $page    = Page::findOrFail($request->get('id'));
-        $published  = true === !$request->checkboxStatus; // string comp. since bool is passed as string
+        $page = Page::findOrFail($request->get('id'));
+        $published = true === !$request->checkboxStatus; // string comp. since bool is passed as string
 
         ($published) ? $page->publish() : $page->draft();
 

Braces +10 added lines, -4 removed lines

@@ -91,10 +91,16 @@
     public function destroy($id)
     {
         $page = Page::findOrFail($id);
-        if(request()->get('deleteconfirmation') !== 'DELETE' && (!$page->isPublished() || $page->isArchived())) return redirect()->back()->with('messages.warning', 'fout');
-
-        if($page->isDraft() || $page->isArchived()) $page->delete();
-        if($page->isPublished()) $page->archive();
+        if(request()->get('deleteconfirmation') !== 'DELETE' && (!$page->isPublished() || $page->isArchived())) {
+            return redirect()->back()->with('messages.warning', 'fout');
+        }
+
+        if($page->isDraft() || $page->isArchived()) {
+            $page->delete();
+        }
+        if($page->isPublished()) {
+            $page->archive();
+        }
 
         $message = 'Het item werd verwijderd.';
 

app/Http/Controllers/Back/Users/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     {
         $this->authorize('update-user');
 
-        return view('chief::back.users.edit',[
+        return view('chief::back.users.edit', [
             'user' => User::findOrFail($id),
             'roleNames'=> Role::all()->pluck('name')->toArray()
         ]);