Update PHP CS fixer (#45)

Author: JoeyMckenzie

.gitignore

@@ -3,4 +3,5 @@
 composer.lock
 /.idea
 .DS_Store
-.php_cs.cache
+.php_cs.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -13,13 +13,13 @@
         'ordered_imports' => [
             'sort_algorithm' => 'alpha',
         ],
-        'braces' => [
-            'allow_single_line_closure' => true,
-        ],
+        'control_structure_braces' => true,
         'trailing_comma_in_multiline' => true,
         'single_quote' => false,
         'space_after_semicolon' => true,
-        'single_blank_line_before_namespace' => true,
+        'blank_lines_before_namespace' => [
+            'min_line_breaks' => 1,
+        ],
         'no_unused_imports' => true,
         'no_useless_else' => true,
     ])

composer.json

@@ -43,10 +43,10 @@
             "vendor/bin/phpunit"
         ],
         "lint": [
-            "vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no"
+            "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -v --dry-run --stop-on-violation --using-cache=no"
         ],
         "lint-fix": [
-            "vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --using-cache=no"
+            "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -v --using-cache=no"
         ]
     },
     "extra": {

src/Collections/CustomFieldCollection.php

@@ -27,4 +27,4 @@ public function toValidationMessages(): array
             ->flatMap(fn (array $rules): array => $rules)
             ->toArray();
     }
-}
+}

src/FieldTypes/SelectFieldType.php

@@ -17,5 +17,4 @@ public function validationRules(array $attributes): array
             ],
         ];
     }
-//
 }

src/Models/CustomFieldResponse.php

@@ -89,10 +89,10 @@ public function setValueAttribute(mixed $value): void
         $this->response_type->setValue($value);
     }
 
-     public function getValueFriendlyAttribute(): mixed
-     {
-         return $this->response_type->getValueFriendly();
-     }
+    public function getValueFriendlyAttribute(): mixed
+    {
+        return $this->response_type->getValueFriendly();
+    }
 
     public function responseType(): Attribute
     {

src/Traits/HasCustomFields.php

@@ -86,15 +86,15 @@ protected function validationRules(Collection $fields): array
             ->toArray();
     }
 
-     protected function validationAttributes(Collection $fields): array
-     {
-         return $fields
-             ->map(function ($field): array {
-                 $field->field_type->setValidationPrefix('field_');
-
-                 return $field->validation_attributes;
-             })
-             ->flatMap(fn (array $rules): array => $rules)
-             ->toArray();
-     }
+    protected function validationAttributes(Collection $fields): array
+    {
+        return $fields
+            ->map(function ($field): array {
+                $field->field_type->setValidationPrefix('field_');
+
+                return $field->validation_attributes;
+            })
+            ->flatMap(fn (array $rules): array => $rules)
+            ->toArray();
+    }
 }

tests/Feature/CustomFieldControllerTest.php

@@ -23,7 +23,7 @@ public function valid_data_passes_controller_validation()
             CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
-            ])
+            ]),
         );
 
         $field = $survey->customFields()->first();
@@ -55,7 +55,7 @@ public function can_overwrite_response_values()
             CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey, $surveyResponse) {
@@ -100,7 +100,7 @@ public function invalid_data_throws_validation_exception()
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
@@ -134,7 +134,7 @@ public function non_required_fields_can_be_left_null_for_validation()
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
                 'required' => false,
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
@@ -169,7 +169,7 @@ public function checkbox_can_pass_validation(mixed $value, callable $assert)
             CustomField::factory()->make([
                 'title' => 'Favorite Album',
                 'type' => 'checkbox',
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey, $surveyResponse) {
@@ -300,7 +300,7 @@ public function fields_can_be_saved_from_request_with_convenience_method()
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function () use ($surveyResponse) {
@@ -330,7 +330,7 @@ public function can_validate_request_with_no_custom_fields()
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
@@ -353,7 +353,7 @@ public function fails_validation_on_request_with_no_custom_fields_but_is_require
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
                 'required' => true,
-            ])
+            ]),
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
@@ -369,7 +369,7 @@ public function fails_validation_on_request_with_no_custom_fields_but_is_require
 
             $this->fail('ValidationException was not thrown');
         } catch (ValidationException $e) {
-           $this->assertArrayHasKey('field_'. $fieldId, $e->errors());
+            $this->assertArrayHasKey('field_'. $fieldId, $e->errors());
         }
     }
 }