PSR formatting

This commit is contained in:
Dennis
2020-10-20 12:03:44 +02:00
parent 6ef5cd25f5
commit d17ae49155
36 changed files with 59 additions and 67 deletions

View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class ApplicationLogController extends Controller class ApplicationLogController extends Controller
{ {

View File

@@ -3,9 +3,9 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Models\Package; use App\Models\Package;
use App\Models\Provider;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\PackageRequest; use App\Http\Requests\Admin\PackageRequest;
use App\Models\Provider;
class PackageController extends Controller class PackageController extends Controller
{ {

View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Models\Provider;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ProviderRequest; use App\Http\Requests\Admin\ProviderRequest;
use App\Models\Provider;
use Illuminate\Http\Request;
class ProviderController extends Controller class ProviderController extends Controller
{ {

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Requests\Admin\ServerAttachRequest;
use App\Models\Server;
use App\Models\User; use App\Models\User;
use App\Models\Server;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ServerAttachRequest;
class ServerController extends Controller class ServerController extends Controller
{ {
@@ -14,7 +14,7 @@ class ServerController extends Controller
{ {
$server = Server::findOrFail($id); $server = Server::findOrFail($id);
$users = $server->users()->select('id', 'name', 'email')->get()->map(function($user){ $users = $server->users()->select('id', 'name', 'email')->get()->map(function ($user) {
return [ return [
'id' => $user->id, 'id' => $user->id,
'name' => $user->name, 'name' => $user->name,

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Models\Provider;
use App\Models\Site; use App\Models\Site;
use App\Models\Server; use App\Models\Server;
use App\Models\Provider;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
class ServiceController extends Controller class ServiceController extends Controller

View File

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Requests\Admin\ServerAttachRequest;
use App\Models\Server;
use App\Models\Site; use App\Models\Site;
use App\Models\User; use App\Models\User;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ServerAttachRequest;
class SiteController extends Controller class SiteController extends Controller
{ {
@@ -15,7 +14,7 @@ class SiteController extends Controller
{ {
$site = Site::findOrFail($id); $site = Site::findOrFail($id);
$users = $site->users()->select('id', 'name', 'email')->get()->map(function($user){ $users = $site->users()->select('id', 'name', 'email')->get()->map(function ($user) {
return [ return [
'id' => $user->id, 'id' => $user->id,
'name' => $user->name, 'name' => $user->name,

View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\Provider; use App\Models\Provider;
use App\Models\Server;
use App\Services\Ploi\Ploi; use App\Services\Ploi\Ploi;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class SynchronizeProviderController extends Controller class SynchronizeProviderController extends Controller
{ {

View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use Illuminate\Http\Request;
use App\Jobs\Core\UpdateSystem; use App\Jobs\Core\UpdateSystem;
use App\Services\VersionChecker; use App\Services\VersionChecker;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class SystemController extends Controller class SystemController extends Controller
{ {

View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Api; namespace App\Http\Controllers\Api;
use App\Models\User;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Api\UserRequest; use App\Http\Requests\Api\UserRequest;
use App\Http\Resources\Api\UserResource; use App\Http\Resources\Api\UserResource;
use App\Models\User;
use Illuminate\Http\Request;
class UserController extends Controller class UserController extends Controller
{ {

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Profile; namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use App\Models\Package;
use App\Models\User;
use Carbon\Carbon; use Carbon\Carbon;
use App\Models\User;
use App\Models\Package;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class ProfileBillingController extends Controller class ProfileBillingController extends Controller
{ {

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile; namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use App\Rules\MatchOldPassword;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Rules\MatchOldPassword;
use App\Http\Controllers\Controller;
class ProfilePasswordController extends Controller class ProfilePasswordController extends Controller
{ {

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile; namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use App\Http\Controllers\Controller;
class ProfileSettingController extends Controller class ProfileSettingController extends Controller
{ {

View File

@@ -2,13 +2,13 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Requests\ServerRequest;
use App\Http\Requests\ServerUpdateRequest;
use App\Jobs\Servers\CreateServer;
use App\Jobs\Servers\DeleteServer;
use App\Models\Server; use App\Models\Server;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Jobs\Servers\CreateServer;
use App\Jobs\Servers\DeleteServer;
use App\Http\Requests\ServerRequest;
use App\Http\Resources\ServerResource; use App\Http\Resources\ServerResource;
use App\Http\Requests\ServerUpdateRequest;
class ServerController extends Controller class ServerController extends Controller
{ {

View File

@@ -2,8 +2,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request;
class ServerSettingController extends Controller class ServerSettingController extends Controller
{ {
public function show($id) public function show($id)

View File

@@ -2,9 +2,9 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Services\Ploi\Exceptions\Http\Unauthenticated;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\Ploi\Exceptions\Http\Unauthenticated;
class GlobalApiAuthenticated class GlobalApiAuthenticated
{ {

View File

@@ -3,8 +3,8 @@
namespace App\Http\Requests\Admin; namespace App\Http\Requests\Admin;
use App\Models\Package; use App\Models\Package;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
class PackageRequest extends FormRequest class PackageRequest extends FormRequest
{ {

View File

@@ -4,10 +4,10 @@ namespace App\Jobs\Core;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Artisan;
class UpdateSystem implements ShouldQueue class UpdateSystem implements ShouldQueue
{ {

View File

@@ -5,10 +5,10 @@ namespace App\Jobs\Servers;
use App\Models\Server; use App\Models\Server;
use App\Services\Ploi\Ploi; use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
class CreateServer implements ShouldQueue class CreateServer implements ShouldQueue
{ {

View File

@@ -4,10 +4,10 @@ namespace App\Jobs\Servers;
use App\Services\Ploi\Ploi; use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
class DeleteServer implements ShouldQueue class DeleteServer implements ShouldQueue
{ {

View File

@@ -4,12 +4,12 @@ namespace App\Jobs\Servers;
use App\Models\Server; use App\Models\Server;
use App\Services\Ploi\Ploi; use App\Services\Ploi\Ploi;
use App\Traits\JobHasThresholds;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use App\Traits\JobHasThresholds;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
class FetchServerStatus implements ShouldQueue class FetchServerStatus implements ShouldQueue
{ {

View File

@@ -4,10 +4,10 @@ namespace App\Mail\User;
use App\Models\User; use App\Models\User;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailable;
use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\URL;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class WelcomeEmail extends Mailable implements ShouldQueue class WelcomeEmail extends Mailable implements ShouldQueue
{ {

View File

@@ -3,14 +3,14 @@
namespace App\Models; namespace App\Models;
use App\Casts\Encrypted; use App\Casts\Encrypted;
use App\Mail\User\WelcomeEmail;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Laravel\Cashier\Billable;
use App\Mail\User\WelcomeEmail;
use Illuminate\Support\Facades\Mail;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Contracts\Translation\HasLocalePreference;
use Laravel\Cashier\Billable;
class User extends Authenticatable implements HasLocalePreference class User extends Authenticatable implements HasLocalePreference
{ {
@@ -126,7 +126,7 @@ class User extends Authenticatable implements HasLocalePreference
Mail::to($user)->send(new WelcomeEmail($user)); Mail::to($user)->send(new WelcomeEmail($user));
}); });
static::deleting(function(self $user){ static::deleting(function (self $user) {
$user->systemLogs()->delete(); $user->systemLogs()->delete();
$user->servers()->detach(); $user->servers()->detach();
$user->sites()->detach(); $user->sites()->detach();

View File

@@ -3,8 +3,8 @@
namespace App\Policies; namespace App\Policies;
use App\Models\User; use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Auth\Access\HandlesAuthorization;
class ServerPolicy class ServerPolicy
{ {

View File

@@ -3,8 +3,8 @@
namespace App\Policies; namespace App\Policies;
use App\Models\User; use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Auth\Access\HandlesAuthorization;
class SitePolicy class SitePolicy
{ {

View File

@@ -2,10 +2,10 @@
namespace App\Providers; namespace App\Providers;
use App\Models\Server;
use App\Models\Site; use App\Models\Site;
use App\Policies\ServerPolicy; use App\Models\Server;
use App\Policies\SitePolicy; use App\Policies\SitePolicy;
use App\Policies\ServerPolicy;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider class AuthServiceProvider extends ServiceProvider

View File

@@ -2,11 +2,11 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
class RouteServiceProvider extends ServiceProvider class RouteServiceProvider extends ServiceProvider
{ {

View File

@@ -2,8 +2,8 @@
namespace App\Rules; namespace App\Rules;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Contracts\Validation\Rule;
class MatchOldPassword implements Rule class MatchOldPassword implements Rule
{ {

View File

@@ -2,10 +2,10 @@
namespace App\Services\Ploi\Resources; namespace App\Services\Ploi\Resources;
use App\Services\Ploi\Exceptions\Http\NotValid;
use App\Services\Ploi\Ploi;
use Services\Ploi\Exceptions\Resource\RequiresId;
use stdClass; use stdClass;
use App\Services\Ploi\Ploi;
use App\Services\Ploi\Exceptions\Http\NotValid;
use Services\Ploi\Exceptions\Resource\RequiresId;
class Server extends Resource class Server extends Resource
{ {

View File

@@ -4,7 +4,6 @@ namespace Database\Factories;
use App\Models\Server; use App\Models\Server;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class ServerFactory extends Factory class ServerFactory extends Factory
{ {

View File

@@ -3,8 +3,8 @@
namespace Database\Factories; namespace Database\Factories;
use App\Models\User; use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Factories\Factory;
class UserFactory extends Factory class UserFactory extends Factory
{ {

View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateFailedJobsTable extends Migration class CreateFailedJobsTable extends Migration
{ {

View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddPermissionsToPackagesTable extends Migration class AddPermissionsToPackagesTable extends Migration
{ {

View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreatePaymentColumns extends Migration class CreatePaymentColumns extends Migration
{ {

View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreatePackageProviderTable extends Migration class CreatePackageProviderTable extends Migration
{ {

View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddAdditionalColumnsToServersTable extends Migration class AddAdditionalColumnsToServersTable extends Migration
{ {

View File

@@ -13,6 +13,5 @@ class DatabaseSeeder extends Seeder
*/ */
public function run() public function run()
{ {
} }
} }