cs-fix

Author: wilkerwma

.github/workflows/code-style.yml

@@ -4,7 +4,7 @@ jobs:
   php-cs-fixer:
     runs-on: ubuntu-latest
     container:
-      image: kirschbaumdevelopment/laravel-test-runner:7.3.0
+      image: kirschbaumdevelopment/laravel-test-runner:8.0
 
     steps:
     - uses: actions/checkout@v1

.php_cs .php-cs-fixer.php.php_cs renamed to .php-cs-fixer.php

@@ -9,7 +9,7 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setFinder($finder)
     ->setRules([
         '@PSR2' => true,
@@ -20,9 +20,14 @@
         ],
         'no_singleline_whitespace_before_semicolons' => true,
         'no_extra_blank_lines' => [
-            'break', 'case', 'continue', 'curly_brace_block', 'default',
-            'extra', 'parenthesis_brace_block', 'return',
-            'square_brace_block', 'switch', 'throw', 'use', 'useTrait', 'use_trait',
+            'tokens' => [
+                'curly_brace_block',
+                'extra',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'throw',
+                'use',
+            ]
         ],
         'cast_spaces' => [
             'space' => 'single',
@@ -43,7 +48,7 @@
         // 'increment_style' => ['style' => 'post'],
         'short_scalar_cast' => true,
         'class_attributes_separation' => [
-            'elements' => ['const', 'method', 'property'],
+            'elements' => ['method' => 'one',],
         ],
         'no_mixed_echo_print' => [
             'use' => 'echo',
@@ -54,7 +59,7 @@
         ],
         'no_empty_statement' => true,
         'unary_operator_spaces' => true, // $number ++ becomes $number++
-        'hash_to_slash_comment' => true, // # becomes //
+        'single_line_comment_style' => true, // # becomes //
         'standardize_not_equals' => true, // <> becomes !=
         'native_function_casing' => true,
         'ternary_operator_spaces' => true,
@@ -64,16 +69,7 @@
         ],
         'function_typehint_space' => true,
         'no_leading_import_slash' => true,
-        'blank_line_before_statement' => [
-            'statements' => [
-                'break', 'case', 'continue',
-                'declare', 'default', 'die',
-                'do', 'exit', 'for', 'foreach',
-                'goto', 'if', 'include',
-                'include_once', 'require', 'require_once',
-                'return', 'switch', 'throw', 'try', 'while', 'yield',
-            ],
-        ],
+        'blank_line_before_statement' => true,
         'combine_consecutive_unsets' => true,
         'method_chaining_indentation' => true,
         'no_whitespace_in_blank_line' => true,
@@ -84,7 +80,7 @@
         'compact_nullable_typehint' => true,
         'explicit_string_variable' => true,
         'no_leading_namespace_whitespace' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'not_operator_with_successor_space' => true,
         'object_operator_without_whitespace' => true,
         'single_blank_line_before_namespace' => true,
@@ -113,7 +109,7 @@
                 'protected',
                 'private',
             ],
-            'sortAlgorithm' => 'none',
+            'sort_algorithm' => 'none',
         ],
         'return_type_declaration' => [
             'space_before' => 'none',

src/NovaInlineRelationship.php

@@ -23,7 +23,7 @@
 use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
 use KirschbaumDevelopment\NovaInlineRelationship\Traits\RequireRelationship;
 use KirschbaumDevelopment\NovaInlineRelationship\Observers\NovaInlineRelationshipObserver;
-use Laravel\Nova\Fields\Select;
+
 class NovaInlineRelationship extends Field
 {
     use RequireRelationship;
@@ -258,6 +258,27 @@ public function getValueFromField(Field $field, NovaInlineRelationshipRequest $r
         return $temp->{$attribute} ?? null;
     }
 
+    /**
+    * Serialize options for the field.
+    *
+    * @param  bool  $searchable
+    * @param mixed $optionsCallback
+    *
+    * @return array<int, array<string, mixed>>
+    */
+   public function serializeOptions($optionsCallback)
+   {
+       $options = value($optionsCallback);
+
+       if (is_callable($options)) {
+           $options = $options();
+       }
+
+       return collect($options ?? [])->map(function ($label, $value) {
+           return is_array($label) ? $label + ['value' => $value] : ['label' => $label, 'value' => $value];
+       })->values()->all();
+   }
+
     /**
      * Resolve the fields for the resource.
      *
@@ -431,7 +452,7 @@ protected function getRelationshipRule($attribute, Collection $properties): Rela
     protected function getPropertiesFromResource($model, $attribute): Collection
     {
         $fields = $this->getFieldsFromResource($model, $attribute);
-        
+
         return $this->getPropertiesFromFields($fields)
             ->keyBy('attribute');
     }
@@ -563,23 +584,4 @@ protected function setModelAttributeValue(Model $model, $attribute, array $value
 
         static::$observedModels[$modelClass][$attribute] = $this->isNullValue($value) ? null : $value;
     }
-
-    /**
-    * Serialize options for the field.
-    *
-    * @param  bool  $searchable
-    * @return array<int, array<string, mixed>>
-    */
-   public function serializeOptions($optionsCallback)
-   {
-       $options = value($optionsCallback);
-
-       if (is_callable($options)) {
-           $options = $options();
-       }
-
-       return collect($options ?? [])->map(function ($label, $value) {
-           return is_array($label) ? $label + ['value' => $value] : ['label' => $label, 'value' => $value];
-       })->values()->all();
-   }
 }

src/NovaInlineRelationshipRequest.php

@@ -9,7 +9,6 @@
 
 class NovaInlineRelationshipRequest extends NovaRequest
 {
-
     /**
      * Update list of converted files
      *