Add php-cs-fixer (#61)

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,19 @@
+name: test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install Composer Dependencies
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+      - name: Run php-cs-fixer
+        run: composer cs-check

.gitignore

@@ -2,14 +2,33 @@
 /public/hot
 /public/storage
 /storage/*.key
+/storage/.php_cs.cache
+/tmp
 /vendor
-.env
-.env.backup
-.phpunit.result.cache
+/.vagrant
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+.env
+
+# Folders with IDE`s settings
 /.idea
 /.vscode
+
+.phpunit.result.cache
+
+# php-cs-fixer
+.php-cs-fixer.cache
+
+# PHPUnit coverage files
+/storage/coverage
+
+# Files with identifiers
+foo*.csv
+*.csv.success
+*.csv.duplicates
+*.csv.errors
+
+# OS X 
 .DS_Store

.php-cs-fixer.dist.php

@@ -0,0 +1,155 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$rules = [
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => [
+        'default' => 'align_single_space_minimal',
+        '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' => [
+            'method' => 'one',
+            'trait_import' => 'none'
+        ]
+    ],
+    'class_definition' => true,
+    'concat_space' => [
+        'spacing' => 'one'
+    ],
+    'declare_equal_normalize' => true,
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'fully_qualified_strict_types' => true,
+    'function_declaration' => true,
+    'function_typehint_space' => 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,
+    'constant_case' => true,
+    'lowercase_keywords' => true,
+    'lowercase_static_reference' => true,
+    'magic_method_casing' => true,
+    'magic_constant_casing' => true,
+    'method_argument_space' => true,
+    'native_function_casing' => true,
+    //'no_alias_functions' => true, RISKY
+    '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,
+    'multiline_whitespace_before_semicolons' => [
+        'strategy' => 'no_multi_line'
+    ],
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_around_offset' => true,
+    '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' => true,
+    // 'no_unreachable_default_argument_value' => true, RISKY
+    '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' => false,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => [
+        'sort_algorithm' => 'alpha',
+        'imports_order' => ['class', 'function', 'const']
+    ],
+    'phpdoc_indent' => true,
+    'general_phpdoc_tag_rename' => true,
+    'phpdoc_inline_tag_normalizer' => true,
+    'phpdoc_tag_type' => 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' => true,
+    'phpdoc_to_comment' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => true,
+    'phpdoc_var_without_name' => true,
+    // 'psr_autoloading' => true, RISKY
+    // 'self_accessor' => true, RISKY
+    'short_scalar_cast' => true,
+    'simplified_null_return' => false,
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => true,
+    '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' => true,
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => [
+        'elements' => ['method', 'property']
+    ],
+    'whitespace_after_comma_in_array' => true,
+    'no_unused_imports' => true,
+];
+
+$finder = Finder::create()
+    ->in([
+        __DIR__ . '/app',
+        __DIR__ . '/config',
+        __DIR__ . '/database',
+        __DIR__ . '/resources',
+        __DIR__ . '/routes',
+        __DIR__ . '/tests',
+    ])
+    //->append(['.php_cs'])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+
+return (new Config())
+    ->setFinder($finder)
+    ->setRules($rules)
+    //->setRiskyAllowed(true)
+    ->setUsingCache(false);

app/Console/Kernel.php

@@ -25,7 +25,7 @@ protected function schedule(Schedule $schedule)
      */
     protected function commands()
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }

app/Http/Controllers/NoteController.php

@@ -2,13 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Models\Note;
-use Illuminate\Http\Response;
-use Illuminate\Support\Str;
 use Hashids\Hashids;
-use Illuminate\Support\Facades\Hash;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
 
 class NoteController extends Controller
 {
@@ -40,7 +39,6 @@ public function create()
      */
     public function store(Request $request)
     {
-
         $hashids = new Hashids('', 5);
 
         // TODO To request
@@ -55,7 +53,7 @@ public function store(Request $request)
                 'text.max' => 'Ограничение составляет 20 000 символов',
                 'encrypt_password.string' => 'К сожалению, произошла ошибка',
                 'encrypt_password.min' => 'Пароль должен быть не менее 6 символов',
-                'encrypt_password.max' => 'Пароль не может превышать 100 символов'
+                'encrypt_password.max' => 'Пароль не может превышать 100 символов',
             ]
         );
 
@@ -78,7 +76,6 @@ public function store(Request $request)
             $expiration_date = null;
         }
 
-
         $request->encrypt_password ? $password = \Hash::make($request->encrypt_password) : $password = 'none';
 
         $note = Note::create([
@@ -91,7 +88,6 @@ public function store(Request $request)
         $note->slug = $hashids->encode($note->id);
         $note->save();
 
-
         return back()->with(['success' => route('note.display', $note->slug)]);
     }
 
@@ -107,22 +103,22 @@ public function show($slug)
 
         if ($note->expiration_date ?? '' && $note->expiration_date < now()) {
             $note->delete();
+
             return view('password-note');
         }
 
-        $note->password ?? '' === "none" ? $password = false :  $password = true;
+        $note->password ?? '' === 'none' ? $password = false : $password = true;
 
         return view('password-note', compact('note', 'password'));
     }
 
-
     public function decrypt($slug)
     {
         request()->validate([
-            'decrypt_password' => 'string|max:100'
+            'decrypt_password' => 'string|max:100',
         ], [
             'decrypt_password.string' => 'Le champ est vide ou une erreur est survenue',
-            'decrypt_password.max' => 'Le mot de passe ne peut pas faire plus de 100 caractères'
+            'decrypt_password.max' => 'Le mot de passe ne peut pas faire plus de 100 caractères',
         ]);
 
         $note = Note::where('slug', $slug)->firstOr(
@@ -131,7 +127,7 @@ function () {
             }
         );
 
-        if ($note->password !== "none") {
+        if ($note->password !== 'none') {
             if (Hash::check(request()->decrypt_password, $note->password)) {
                 $note->text = Crypt::decryptString($note->text);
             } else {

app/Http/Middleware/Authenticate.php

@@ -14,7 +14,7 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if (!$request->expectsJson()) {
             return route('login');
         }
     }

app/Http/Middleware/TrustProxies.php

@@ -19,10 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers =
-        Request::HEADER_X_FORWARDED_FOR |
-        Request::HEADER_X_FORWARDED_HOST |
-        Request::HEADER_X_FORWARDED_PORT |
-        Request::HEADER_X_FORWARDED_PROTO |
-        Request::HEADER_X_FORWARDED_AWS_ELB;
+    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Models/User.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Illuminate\Contracts\Auth\MustVerifyEmail;
+// use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;

app/Providers/AuthServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
+// use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {

app/Services/Foo.php

@@ -4,7 +4,6 @@
 
 class Foo
 {
-
     public static function foo(int $x): int
     {
         return 13;

codecov.yml

@@ -1 +1,29 @@
-threshold': 1%
+# Docs: <https://docs.codecov.io/docs/commit-status>
+
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  # coverage lower than 50 is red, higher than 90 green
+  range: 30..80
+
+  status:
+    project:
+      default:
+        # Choose a minimum coverage ratio that the commit must meet to be considered a success.
+        #
+        # `auto` will use the coverage from the base commit (pull request base or parent commit) coverage to compare
+        # against.
+        target: auto
+
+        # Allow the coverage to drop by X%, and posting a success status.
+        threshold: 5%
+
+        # Resulting status will pass no matter what the coverage is or what other settings are specified.
+        informational: true
+
+    patch:
+      default:
+        target: auto
+        threshold: 5%
+        informational: true