39ff · 39ff · Mar 24, 2023 · Mar 24, 2023
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,46 +1,165 @@
-<?php declare(strict_types=1);
+<?php
+// https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
 
-$finder = PhpCsFixer\Finder::create()
+$rules = [
+    'array_indentation' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => [
+        'default' => 'single_space',
+        'operators' => ['=>' => null],
+    ],
+    'blank_line_after_namespace' => true,
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => [
+        'statements' => ['return'],
+    ],
+    'braces' => true,
+    'cast_spaces' => true,
+    'class_attributes_separation' => [
+        'elements' => [
+            'const' => 'one',
+            'method' => 'one',
+            'property' => 'one',
+            'trait_import' => 'none',
+        ],
+    ],
+    'class_definition' => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line' => true,
+        'single_line' => true,
+    ],
+    'concat_space' => [
+        'spacing' => 'none',
+    ],
+    'constant_case' => ['case' => 'lower'],
+    'declare_equal_normalize' => true,
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'fully_qualified_strict_types' => true, // added by Shift
+    'function_declaration' => true,
+    'function_typehint_space' => true,
+    'general_phpdoc_tag_rename' => true,
+    'heredoc_to_nowdoc' => true,
+    'include' => true,
+    'increment_style' => ['style' => 'post'],
+    'indentation_type' => true,
+    'linebreak_after_opening_tag' => true,
+    'line_ending' => true,
+    'lowercase_cast' => true,
+    'lowercase_keywords' => true,
+    'lowercase_static_reference' => true, // added from Symfony
+    'magic_method_casing' => true, // added from Symfony
+    'magic_constant_casing' => true,
+    'method_argument_space' => [
+        'on_multiline' => 'ignore',
+    ],
+    'multiline_whitespace_before_semicolons' => [
+        'strategy' => 'no_multi_line',
+    ],
+    'native_function_casing' => true,
+    'no_alias_functions' => true,
+    'no_extra_blank_lines' => [
+        'tokens' => [
+            'extra',
+            'throw',
+            'use',
+        ],
+    ],
+    'no_blank_lines_after_class_opening' => true,
+    'no_blank_lines_after_phpdoc' => true,
+    'no_closing_tag' => true,
+    'no_empty_phpdoc' => true,
+    'no_empty_statement' => true,
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_mixed_echo_print' => [
+        'use' => 'echo',
+    ],
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_around_offset' => [
+        'positions' => ['inside', 'outside'],
+    ],
+    'no_spaces_inside_parenthesis' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_trailing_whitespace' => true,
+    'no_trailing_whitespace_in_comment' => true,
+    'no_unneeded_control_parentheses' => [
+        'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'],
+    ],
+    'no_unreachable_default_argument_value' => true,
+    'no_useless_return' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'not_operator_with_successor_space' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'psr_autoloading' => true,
+    'phpdoc_indent' => true,
+    'phpdoc_inline_tag_normalizer' => true,
+    'phpdoc_no_access' => true,
+    'phpdoc_no_package' => true,
+    'phpdoc_no_useless_inheritdoc' => true,
+    'phpdoc_scalar' => true,
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_summary' => false,
+    'phpdoc_to_comment' => false, // override to preserve user preference
+    'phpdoc_tag_type' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => true,
+    'phpdoc_var_without_name' => true,
+    'self_accessor' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => false, // disabled as "risky"
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => [
+        'elements' => ['const', 'property'],
+    ],
+    'single_import_per_statement' => true,
+    'single_line_after_imports' => true,
+    'single_line_comment_style' => [
+        'comment_types' => ['hash'],
+    ],
+    'single_quote' => true,
+    'space_after_semicolon' => true,
+    'standardize_not_equals' => true,
+    'switch_case_semicolon_to_colon' => true,
+    'switch_case_space' => true,
+    'ternary_operator_spaces' => true,
+    'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => [
+        'elements' => ['method', 'property'],
+    ],
+    'whitespace_after_comma_in_array' => true,
+];
+
+
+$finder = Finder::create()
     ->in([
         __DIR__ . '/app',
         __DIR__ . '/config',
-        __DIR__ . '/database/factories',
-        __DIR__ . '/database/seeders',
+        __DIR__ . '/database',
+        __DIR__ . '/resources',
         __DIR__ . '/routes',
         __DIR__ . '/tests',
-    ]);
-
-$config = new PhpCsFixer\Config();
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
 
-return $config
+return (new Config)
+    ->setFinder($finder)
+    ->setRules($rules)
     ->setRiskyAllowed(true)
-    ->setRules([
-        '@PhpCsFixer:risky' => true,
-        'blank_line_after_opening_tag' => false,
-        'linebreak_after_opening_tag' => false,
-        'phpdoc_types_order' => [
-            'null_adjustment' => 'always_last',
-            'sort_algorithm' => 'none',
-        ],
-        'no_superfluous_phpdoc_tags' => false,
-        'global_namespace_import' => [
-            'import_classes' => true,
-            'import_constants' => true,
-            'import_functions' => true,
-        ],
-        'php_unit_test_case_static_method_calls' => [
-            'call_type' => 'this'
-        ],
-        'phpdoc_align' => [
-            'align' => 'left',
-        ],
-        'not_operator_with_successor_space' => true,
-        'blank_line_after_namespace' => true,
-        'date_time_immutable' => true,
-        'declare_parentheses' => true,
-        'final_public_method_for_abstract_class' => true,
-        'mb_str_functions' => true,
-        'simplified_if_return' => false,
-        'simplified_null_return' => false,
-    ])
-    ->setFinder($finder);
+    ->setUsingCache(true);
diff --git a/app/Http/Controllers/Api/SquidAllowedIpController.php b/app/Http/Controllers/Api/SquidAllowedIpController.php
@@ -14,19 +14,22 @@
 
 class SquidAllowedIpController extends Controller
 {
-    public function search(SearchRequest $request,SearchAction $action) : SquidAllowedIpCollection{
+    public function search(SearchRequest $request, SearchAction $action) : SquidAllowedIpCollection
+    {
         $query = $request->searchSquidAllowedIp();
 
         return new SquidAllowedIpCollection($action($query));
     }
 
-    public function create(CreateRequest $request,CreateAction $action) : SquidAllowedIpResource{
+    public function create(CreateRequest $request, CreateAction $action) : SquidAllowedIpResource
+    {
         $squidAllowedIp = $request->createSquidAllowedIp();
 
         return new SquidAllowedIpResource($action($squidAllowedIp));
     }
 
-    public function destroy(DestroyRequest $request,DestroyAction $action): SquidAllowedIpResource{
+    public function destroy(DestroyRequest $request, DestroyAction $action): SquidAllowedIpResource
+    {
         $squidAllowedIp = $request->destroySquidAllowedIp();
 
         return new SquidAllowedIpResource($action($squidAllowedIp));

diff --git a/app/Http/Controllers/Api/SquidUserController.php b/app/Http/Controllers/Api/SquidUserController.php
@@ -16,25 +16,29 @@
 
 class SquidUserController extends Controller
 {
-    public function search(SearchRequest $request, SearchAction $action) : SquidUserCollection{
+    public function search(SearchRequest $request, SearchAction $action) : SquidUserCollection
+    {
         $query = $request->searchSquidUser();
 
         return new SquidUserCollection($action($query));
     }
 
-    public function create(CreateRequest $request, CreateAction $action) : SquidUserResource{
+    public function create(CreateRequest $request, CreateAction $action) : SquidUserResource
+    {
         $user = $request->createSquidUser();
 
         return new SquidUserResource($action($user));
     }
 
-    public function modify(ModifyRequest $request, ModifyAction $action) : SquidUserResource{
+    public function modify(ModifyRequest $request, ModifyAction $action) : SquidUserResource
+    {
         $user = $request->modifySquidUser();
 
         return new SquidUserResource($action($user));
     }
 
-    public function destroy(DestroyRequest $request, DestroyAction $action) : SquidUserResource{
+    public function destroy(DestroyRequest $request, DestroyAction $action) : SquidUserResource
+    {
         $user = $request->destroySquidUser();
 
         return new SquidUserResource($action($user));

diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
@@ -3,38 +3,42 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\User\SearchRequest;
 use App\Http\Requests\User\CreateRequest;
 use App\Http\Requests\User\DestroyRequest;
 use App\Http\Requests\User\ModifyRequest;
+use App\Http\Requests\User\SearchRequest;
 use App\Http\Resources\UserCollection;
 use App\Http\Resources\UserResource;
-use App\UseCases\User\SearchAction;
 use App\UseCases\User\CreateAction;
 use App\UseCases\User\DestroyAction;
 use App\UseCases\User\ModifyAction;
+use App\UseCases\User\SearchAction;
 
 class UserController extends Controller
 {
-    public function search(SearchRequest $request, SearchAction $action) : UserCollection{
+    public function search(SearchRequest $request, SearchAction $action) : UserCollection
+    {
         $query = $request->searchUser();
 
         return new UserCollection($action($query));
     }
 
-    public function create(CreateRequest $request, CreateAction $action) : UserResource{
+    public function create(CreateRequest $request, CreateAction $action) : UserResource
+    {
         $user = $request->createUser();
 
         return new UserResource($action($user));
     }
 
-    public function modify(ModifyRequest $request, ModifyAction $action) : UserResource{
+    public function modify(ModifyRequest $request, ModifyAction $action) : UserResource
+    {
         $user = $request->modifyUser();
 
         return new UserResource($action($user));
     }
 
-    public function destroy(DestroyRequest $request, DestroyAction $action) : UserResource{
+    public function destroy(DestroyRequest $request, DestroyAction $action) : UserResource
+    {
         $user = $request->destroyUser();
 
         return new UserResource($action($user));

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;

diff --git a/app/Http/Controllers/Gui/SquidAllowedIpController.php b/app/Http/Controllers/Gui/SquidAllowedIpController.php
@@ -12,23 +12,29 @@
 
 class SquidAllowedIpController extends Controller
 {
-    public function search(SearchRequest $request,SearchAction $action){
-        return view('squidallowedips.search',[
-            'ips'=>$action($request->searchSquidAllowedIp())
+    public function search(SearchRequest $request, SearchAction $action)
+    {
+        return view('squidallowedips.search', [
+            'ips'=>$action($request->searchSquidAllowedIp()),
         ]);
     }
 
-    public function creator(){
+    public function creator()
+    {
         return view('squidallowedips.creator');
     }
 
-    public function create(CreateRequest $request,CreateAction $action){
+    public function create(CreateRequest $request, CreateAction $action)
+    {
         $action($request->createSquidAllowedIp());
-        return redirect()->route('ip.search',$request->user()->id);
+
+        return redirect()->route('ip.search', $request->user()->id);
     }
 
-    public function destroy(DestroyRequest $request,DestroyAction $action){
+    public function destroy(DestroyRequest $request, DestroyAction $action)
+    {
         $action($request->destroySquidAllowedIp());
-        return redirect()->route('ip.search',$request->user()->id);
+
+        return redirect()->route('ip.search', $request->user()->id);
     }
 }