update formatting

Author: cmgmyr

.php-cs-fixer.php

@@ -8,55 +8,109 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return (new PhpCsFixer\Config)
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PSR1' => false,
-        '@PSR2' => true,
+        '@PSR12' => true,
 
         /**
-         * symfony
+         * Array Notation.
+         */
+        // PHP arrays should be declared using the configured syntax.
+        'array_syntax' => ['syntax' => 'short'],
+
+        /**
+         * Cast Notation.
+         */
+        // A single space should be between cast and variable.
+        'cast_spaces' => true,
+
+        /**
+         * Class Notation.
+         */
+        // Methods must be separated with one blank line.
+        'class_attributes_separation' => true,
+
+        /**
+         * Control Structure.
          */
-        // Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline.
-        'blank_line_after_opening_tag' => true,
-        // Remove duplicated semicolons.
-        'no_empty_statement' => true,
         // PHP multi-line arrays should have a trailing comma.
         'trailing_comma_in_multiline' => true,
-        // There should be no empty lines after class opening brace.
-        'no_blank_lines_after_class_opening' => true,
+
+        /**
+         * Function Notation.
+         */
+        // In method arguments and method call, there MUST NOT be a space before each comma and there MUST be one space after each comma. Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line.
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ],
+
+        /**
+         * Import.
+         */
+        // Unused use statements must be removed.
+        'no_unused_imports' => true,
+        // Ordering use statements.
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        // Transforms imported FQCN parameters and return types in function arguments to short version.
+        'fully_qualified_strict_types' => true,
+        // Imports or fully qualifies global classes/functions/constants.
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => null,
+            'import_functions' => null,
+        ],
+
+        /**
+         * Operator.
+         */
+        // Unary operators should be placed adjacent to their operands.
+        'unary_operator_spaces' => true,
+        // Binary operators should be surrounded by at least one space.
+        'binary_operator_spaces' => true,
+        // Concatenation should be used with at least one whitespace around.
+        'concat_space' => ['spacing' => 'one'],
+        // Logical NOT operators `(!)` should have one trailing whitespace.
+        'not_operator_with_successor_space' => true,
+
+        /**
+         * PHPDoc.
+         */
+        // Scalar types should always be written in the same form. int not integer, bool not boolean, float not real or double.
+        'phpdoc_scalar' => true,
+        // Single line @var PHPDoc should have proper spacing.
+        'phpdoc_single_line_var_spacing' => true,
+        // @var and @type annotations of classy properties should not contain the name.
+        'phpdoc_var_without_name' => true,
         // There should not be blank lines between docblock and the documented element.
         'no_blank_lines_after_phpdoc' => true,
         // Phpdocs short descriptions should end in either a full stop, exclamation mark, or question mark.
         'phpdoc_summary' => true,
         // Phpdocs should start and end with content, excluding the very first and last line of the docblocks.
         'phpdoc_trim' => true,
-        // Removes line breaks between use statements.
-        'no_extra_blank_lines' => ['tokens' => ['use']],
-        // An empty line feed should precede a return statement.
-        'blank_line_before_statement' => true,
-        // There should be exactly one blank line before a namespace declaration.
-        'single_blank_line_before_namespace' => true,
+
+        /**
+         * Semicolon.
+         */
+        // Remove duplicated semicolons.
+        'no_empty_statement' => true,
+
+        /**
+         * String Notation.
+         */
         // Convert double quotes to single quotes for simple strings.
         'single_quote' => true,
-        // Unused use statements must be removed.
-        'no_unused_imports' => true,
-        // Methods must be separated with one blank line.
-        'class_attributes_separation' => true,
-        // Binary operators should be surrounded by at least one space.
-        'binary_operator_spaces' => ['operators' => ['=>' => 'single_space']],
-        // A single space should be between cast and variable.
-        'cast_spaces' => true,
 
         /**
-         * contrib
+         * Whitespace.
          */
-        // Concatenation should be used with at least one whitespace around.
-        'concat_space' => ['spacing' => 'one'],
-        // Ordering use statements.
-        'ordered_imports' => true,
-        // PHP arrays should be declared using the configured syntax.
-        'array_syntax' => ['syntax' => 'short']
+        // An empty line feed should precede a return statement.
+        'blank_line_before_statement' => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        // Removes line breaks between use statements.
+        'no_extra_blank_lines' => ['tokens' => ['use']],
     ])
     ->setFinder($finder)
     ->setUsingCache(true);

examples/MessagesController.php

@@ -97,7 +97,7 @@ public function store()
         Participant::create([
             'thread_id' => $thread->id,
             'user_id' => Auth::id(),
-            'last_read' => new Carbon,
+            'last_read' => new Carbon(),
         ]);
 
         // Recipients
@@ -138,7 +138,7 @@ public function update($id)
             'thread_id' => $thread->id,
             'user_id' => Auth::id(),
         ]);
-        $participant->last_read = new Carbon;
+        $participant->last_read = new Carbon();
         $participant->save();
 
         // Recipients

src/MessengerServiceProvider.php

@@ -103,7 +103,7 @@ protected function setUserModel(): void
         Models::setUserModel($model);
 
         Models::setTables([
-            'users' => (new $model)->getTable(),
+            'users' => (new $model())->getTable(),
         ]);
     }
 }

src/Models/Thread.php

@@ -48,7 +48,7 @@ class Thread extends Eloquent
      * @var null|Models::user()|\Illuminate\Database\Eloquent\Model
      */
     protected $creatorCache;
-    
+
     /**
      * {@inheritDoc}
      */
@@ -433,7 +433,7 @@ public function userUnreadMessages($userId): Collection
             return collect();
         }
 
-        if (!$participant->last_read) {
+        if (! $participant->last_read) {
             return $messages;
         }
 

tests/TestCase.php

@@ -13,7 +13,8 @@
 
 class TestCase extends OrchestraTestCase
 {
-    use RefreshDatabase, WithFaker;
+    use RefreshDatabase;
+    use WithFaker;
 
     protected $loadEnvironmentVariables = true;