From 16f829b63464101ebdbf87e3d7211d51b3d795c5 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Wed, 27 Jul 2022 15:15:15 +0200 Subject: [PATCH] phpcs warning compliance manual corrections --- app/Console/Commands/AdminCreate.php | 10 ---------- app/Console/Kernel.php | 2 +- app/Http/Controllers/Bo/EncartsController.php | 1 + app/Http/Controllers/Bo/MomentsController.php | 1 + app/Http/Controllers/Bo/PictoBrandsController.php | 6 ++++-- app/Http/Controllers/Bo/PictosController.php | 6 ++++-- app/Http/Controllers/Bo/ProductsController.php | 1 + app/Http/Controllers/Bo/SeoDataController.php | 1 + app/Http/Controllers/Bo/SlidersController.php | 3 ++- app/Http/Controllers/Bo/TextsController.php | 6 ++++-- app/Http/Controllers/ContactController.php | 3 ++- app/Http/Controllers/NewsController.php | 9 ++++++++- app/Http/Requests/StoreProductRequest.php | 3 +-- app/Http/Requests/UpdateEncartRequest.php | 4 ---- app/Models/Advice.php | 1 + app/Models/Gamme.php | 1 + app/Models/Post.php | 1 + app/Providers/AuthServiceProvider.php | 4 +--- app/Providers/RouteServiceProvider.php | 14 ++++---------- config/app.php | 2 -- config/auth.php | 5 ----- config/cache.php | 2 +- config/translation.php | 2 -- database/factories/UserFactory.php | 1 + 24 files changed, 40 insertions(+), 49 deletions(-) diff --git a/app/Console/Commands/AdminCreate.php b/app/Console/Commands/AdminCreate.php index 6631d90..66fc87b 100644 --- a/app/Console/Commands/AdminCreate.php +++ b/app/Console/Commands/AdminCreate.php @@ -22,16 +22,6 @@ class AdminCreate extends Command */ protected $description = 'Create Admin User'; - /** - * Create a new command instance. - * - * @return void - */ - public function __construct() - { - parent::__construct(); - } - /** * Execute the console command. * diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 31f4b24..35e792e 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - // $schedule->command('inspire')->hourly(); + //write schedules here } /** diff --git a/app/Http/Controllers/Bo/EncartsController.php b/app/Http/Controllers/Bo/EncartsController.php index faad408..77c328e 100644 --- a/app/Http/Controllers/Bo/EncartsController.php +++ b/app/Http/Controllers/Bo/EncartsController.php @@ -15,6 +15,7 @@ class EncartsController extends Controller * @param Encart $encart * @return \Illuminate\Http\Response */ + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function edit(Encart $encart) { return view('back.encarts.edit', compact('encart')); diff --git a/app/Http/Controllers/Bo/MomentsController.php b/app/Http/Controllers/Bo/MomentsController.php index d4ab9a2..6820470 100644 --- a/app/Http/Controllers/Bo/MomentsController.php +++ b/app/Http/Controllers/Bo/MomentsController.php @@ -27,6 +27,7 @@ class MomentsController extends Controller * @param Moment $moment * @return \Illuminate\Http\Response */ + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function edit(Moment $moment) { return view('back.moments.edit', compact('moment')); diff --git a/app/Http/Controllers/Bo/PictoBrandsController.php b/app/Http/Controllers/Bo/PictoBrandsController.php index 0da0131..2a06035 100644 --- a/app/Http/Controllers/Bo/PictoBrandsController.php +++ b/app/Http/Controllers/Bo/PictoBrandsController.php @@ -48,9 +48,11 @@ class PictoBrandsController extends Controller } if (!$pictobrand->saveOrFail()) { - return redirect()->route('bo.pictobrands.edit', $pictobrand->id)->with('error', 'Le pictogramme n\'a pas été crée'); + return redirect()->route('bo.pictobrands.edit', $pictobrand->id) + ->with('error', 'Le pictogramme n\'a pas été crée'); } - return redirect()->route('bo.pictobrands.edit', $pictobrand->id)->with('success', 'Pictogramme créé !'); + return redirect()->route('bo.pictobrands.edit', $pictobrand->id) + ->with('success', 'Pictogramme créé !'); } /** diff --git a/app/Http/Controllers/Bo/PictosController.php b/app/Http/Controllers/Bo/PictosController.php index 8330bcb..4318b6f 100644 --- a/app/Http/Controllers/Bo/PictosController.php +++ b/app/Http/Controllers/Bo/PictosController.php @@ -101,9 +101,11 @@ class PictosController extends Controller public function destroy(Picto $picto) { if (!$picto->delete()) { - return redirect()->route('bo.pictos.content', $picto->page)->with('error', trans('La suppression a échoué')); + return redirect()->route('bo.pictos.content', $picto->page) + ->with('error', trans('La suppression a échoué')); } - return redirect()->route('bo.pictos.content', $picto->page)->with('success', trans('Suppression faite avec succès')); + return redirect()->route('bo.pictos.content', $picto->page) + ->with('success', trans('Suppression faite avec succès')); } } diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index e280f86..082c98f 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -121,6 +121,7 @@ class ProductsController extends Controller 'name' => '', 'url' => '', ); + //phpcs:ignore Generic.Files.LineLength.TooLong $product->pictos = json_encode([$tabFour, $tabFriteuse, $tabPoele, $tabCocotte, $tabPlancha, $tabBainMarie, $tabBarbecue, $tabMicroOndes, $tabCasserole]); $product->plusproduit = json_encode([$tabPlusProduit1, $tabPlusProduit2, $tabPlusProduit3]); return view('back.products.create', compact('product', 'gammes')); diff --git a/app/Http/Controllers/Bo/SeoDataController.php b/app/Http/Controllers/Bo/SeoDataController.php index a35a637..da1a6ae 100644 --- a/app/Http/Controllers/Bo/SeoDataController.php +++ b/app/Http/Controllers/Bo/SeoDataController.php @@ -14,6 +14,7 @@ class SeoDataController extends Controller * @param \App\Models\SeoDatum $SeoDatum * @return \Illuminate\Http\Response */ + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function edit(SeoDatum $SeoDatum) { return view('back.seo_data.edit', compact('SeoDatum')); diff --git a/app/Http/Controllers/Bo/SlidersController.php b/app/Http/Controllers/Bo/SlidersController.php index 8d397a7..6898901 100644 --- a/app/Http/Controllers/Bo/SlidersController.php +++ b/app/Http/Controllers/Bo/SlidersController.php @@ -27,6 +27,7 @@ class SlidersController extends Controller * @param Slider $slider * @return \Illuminate\Http\Response */ + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function create(Slider $slider) { return view('back.sliders.create', compact('slider')); @@ -54,6 +55,7 @@ class SlidersController extends Controller * @param Slider $slider * @return \Illuminate\Http\Response */ + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function edit(Slider $slider) { return view('back.sliders.edit', compact('slider')); @@ -90,7 +92,6 @@ class SlidersController extends Controller if ($count === 1) { return redirect()->back()->withErrors("Suppression impossible : Vous devez conserver au moins 1 Slider"); } - // @todo : controller les slides liés if (!$slider->delete()) { return redirect()->route('bo.sliders.index')->with('error', trans('La suppression a échoué')); diff --git a/app/Http/Controllers/Bo/TextsController.php b/app/Http/Controllers/Bo/TextsController.php index bb39dd2..159d2cf 100644 --- a/app/Http/Controllers/Bo/TextsController.php +++ b/app/Http/Controllers/Bo/TextsController.php @@ -95,9 +95,11 @@ class TextsController extends Controller public function destroy(Text $text) { if (!$text->delete()) { - return redirect()->route('bo.texts.content', $text->page)->with('error', trans('La suppression a échoué')); + return redirect()->route('bo.texts.content', $text->page) + ->with('error', trans('La suppression a échoué')); } - return redirect()->route('bo.texts.content', $text->page)->with('success', trans('Suppression faite avec succès')); + return redirect()->route('bo.texts.content', $text->page) + ->with('success', trans('Suppression faite avec succès')); } } diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index e3f68f1..265a09d 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -18,6 +18,7 @@ class ContactController extends Controller Mail::to(config('mail.contactsList.contactform'))->send(new SendContactMail($request->validated())); $lang = session()->get('lang', config('app.locale')); - return redirect()->route(session()->get('lang', config('app.locale')) === 'fr' ? 'contact' : $lang . ".contact")->with('status', true); + return redirect()->route(session()->get('lang', config('app.locale')) === 'fr' ? 'contact' : $lang . ".contact") + ->with('status', true); } } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index c861436..7ac2a09 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -31,6 +31,13 @@ class NewsController extends Controller $products_news = Product::where('is_news', true)->get(); - return view('front.news', compact('seoDatum', 'advice_news', 'texts_news', 'title_newsPosts', 'posts', 'products_news')); + return view('front.news', compact( + 'seoDatum', + 'advice_news', + 'texts_news', + 'title_newsPosts', + 'posts', + 'products_news' + )); } } diff --git a/app/Http/Requests/StoreProductRequest.php b/app/Http/Requests/StoreProductRequest.php index 76e5bb7..2f48523 100644 --- a/app/Http/Requests/StoreProductRequest.php +++ b/app/Http/Requests/StoreProductRequest.php @@ -24,6 +24,7 @@ class StoreProductRequest extends FormRequest * * @return void */ + //phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh protected function prepareForValidation() { try { @@ -184,8 +185,6 @@ class StoreProductRequest extends FormRequest 'is_news' => 'nullable|boolean', 'is_food_service' => 'nullable|boolean', 'is_halal' => 'nullable|boolean', - // 'seo_title' => 'required|max:255', - // 'seo_description' => 'required|max:255', ]; } diff --git a/app/Http/Requests/UpdateEncartRequest.php b/app/Http/Requests/UpdateEncartRequest.php index 851f93e..c2b20b9 100644 --- a/app/Http/Requests/UpdateEncartRequest.php +++ b/app/Http/Requests/UpdateEncartRequest.php @@ -26,10 +26,6 @@ class UpdateEncartRequest extends FormRequest return [ 'title' => 'required|max:255', 'subtitle' => 'sometimes|max:255', - // TODO 'subtitle' => [ - // Rule::requiredIf(), 'max:255' - // 'required|max:255' - // ], 'text' => 'required|max:2047', 'picture' => 'sometimes|image|mimes:jpeg,png,jpg|max:2048', 'alt_text_picture' => 'sometimes|max:255', diff --git a/app/Models/Advice.php b/app/Models/Advice.php index 5a0a00a..dd4bb3f 100644 --- a/app/Models/Advice.php +++ b/app/Models/Advice.php @@ -39,6 +39,7 @@ class Advice extends Model 'text2', ]; + //phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh protected static function boot() { static::creating(function (Advice $advice) { diff --git a/app/Models/Gamme.php b/app/Models/Gamme.php index 07752f5..3a68dd7 100644 --- a/app/Models/Gamme.php +++ b/app/Models/Gamme.php @@ -35,6 +35,7 @@ class Gamme extends Model 'alt_text_banner', ]; + //phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh protected static function boot() { static::creating(function (Gamme $gamme) { diff --git a/app/Models/Post.php b/app/Models/Post.php index a36ab92..caf4a5b 100644 --- a/app/Models/Post.php +++ b/app/Models/Post.php @@ -44,6 +44,7 @@ class Post extends Model 'alt_text_picture_news' ]; + //phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh protected static function boot() { static::creating(function (Post $post) { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index d49c386..d2151bd 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -11,9 +11,7 @@ class AuthServiceProvider extends ServiceProvider * * @var array */ - protected $policies = [ - // 'App\Models\Model' => 'App\Policies\ModelPolicy', - ]; + protected $policies = []; /** * Register any authentication / authorization services. diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5224fd9..874fe1a 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -21,15 +21,6 @@ class RouteServiceProvider extends ServiceProvider */ public const HOME = '/bo'; - /** - * The controller namespace for the application. - * - * When present, controller route declarations will automatically be prefixed with this namespace. - * - * @var string|null - */ - // protected $namespace = 'App\\Http\\Controllers'; - /** * Define your route model bindings, pattern filters, etc. * @@ -50,6 +41,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/web.php')); }); + //phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed Route::bind('gammeSlug', function ($value, $route) { $gamme = Gamme::where('slug', 'LIKE', '%:"' . $value . '"%')->firstOrFail(); return $gamme; @@ -57,7 +49,9 @@ class RouteServiceProvider extends ServiceProvider Route::bind('productSlug', function ($value, $route) { $gamme = $route->parameter('gammeSlug'); - $product = Product::where('slug', 'LIKE', '%:"' . $value . '"%')->where('gamme_id', $gamme->id)->firstOrFail(); + $product = Product::where('slug', 'LIKE', '%:"' . $value . '"%') + ->where('gamme_id', $gamme->id) + ->firstOrFail(); return $product; }); } diff --git a/config/app.php b/config/app.php index 7f91e09..f0f9238 100644 --- a/config/app.php +++ b/config/app.php @@ -171,7 +171,6 @@ return [ */ App\Providers\AppServiceProvider::class, App\Providers\AuthServiceProvider::class, - // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, @@ -217,7 +216,6 @@ return [ 'Queue' => Illuminate\Support\Facades\Queue::class, 'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class, 'Redirect' => Illuminate\Support\Facades\Redirect::class, - // 'Redis' => Illuminate\Support\Facades\Redis::class, 'Request' => Illuminate\Support\Facades\Request::class, 'Response' => Illuminate\Support\Facades\Response::class, 'Route' => Illuminate\Support\Facades\Route::class, diff --git a/config/auth.php b/config/auth.php index e29a3f7..a62f993 100644 --- a/config/auth.php +++ b/config/auth.php @@ -64,11 +64,6 @@ return [ 'driver' => 'eloquent', 'model' => App\Models\User::class, ], - - // 'users' => [ - // 'driver' => 'database', - // 'table' => 'users', - // ], ], /* diff --git a/config/cache.php b/config/cache.php index e9eb649..b092dd2 100644 --- a/config/cache.php +++ b/config/cache.php @@ -62,7 +62,7 @@ return [ env('MEMCACHED_PASSWORD'), ], 'options' => [ - // Memcached::OPT_CONNECT_TIMEOUT => 2000, + ], 'servers' => [ [ diff --git a/config/translation.php b/config/translation.php index faf38ec..45b49a7 100644 --- a/config/translation.php +++ b/config/translation.php @@ -50,8 +50,6 @@ return [ | */ 'scan_paths' => [ - //app_path(), - //resource_path().'\views\back', resource_path() . '/views/front', resource_path() . '/views/layouts/frontend', ], diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index a24ce53..1a70635 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -38,6 +38,7 @@ class UserFactory extends Factory */ public function unverified() { + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass return $this->state(function (array $attributes) { return [ 'email_verified_at' => null,