Merge pull request #37 from sander3/php-cs-fixer-feature

Applied CS fixes

Author: sander3

.gitignore

@@ -1,4 +1,5 @@
+.DS_Store
+.php-cs-fixer.cache
 /vendor
 composer.lock
-.DS_Store
 Thumbs.db

.php-cs-fixer.php

@@ -0,0 +1,29 @@
+<?php
+
+$excluded_folders = [
+    'node_modules',
+    'storage',
+    'vendor',
+];
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude($excluded_folders)
+    ->in(__DIR__);
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony'               => true,
+        'binary_operator_spaces' => [
+            'operators' => [
+                '=>' => 'align_single_space_minimal',
+            ],
+        ],
+        'array_syntax'                      => ['syntax' => 'short'],
+        'linebreak_after_opening_tag'       => true,
+        'not_operator_with_successor_space' => true,
+        'ordered_imports'                   => ['sort_algorithm' => 'length'],
+        'phpdoc_order'                      => true,
+        'method_argument_space'             => ['on_multiline' => 'ensure_fully_multiline'],
+    ])
+    ->setFinder($finder)
+;

config/gdpr.php

@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Prefix URI
@@ -52,11 +51,9 @@
     */
 
     'cleanup' => [
-
         'strategy' => 'Soved\Laravel\Gdpr\Jobs\Cleanup\Strategies\DefaultStrategy',
 
         'defaultStrategy' => [
-
             /*
              * The number of months for which inactive users must be kept.
              */
@@ -66,9 +63,6 @@
              * The number of days before deletion at which inactive users will be notified.
              */
             'notifyUsersDaysBeforeDeletion' => 14,
-
         ],
-
     ],
-
 ];

src/EncryptsAttributes.php

@@ -7,15 +7,16 @@ trait EncryptsAttributes
     /**
      * Get a plain attribute (not a relationship).
      *
-     * @param  string  $key
+     * @param string $key
+     *
      * @return mixed
      */
     public function getAttributeValue($key)
     {
         $value = parent::getAttributeValue($key);
 
         if (in_array($key, $this->encrypted) &&
-            !is_null($value)) {
+            ! is_null($value)) {
             return decrypt($value);
         }
 
@@ -25,16 +26,17 @@ public function getAttributeValue($key)
     /**
      * Set a given attribute on the model.
      *
-     * @param  string  $key
-     * @param  mixed  $value
+     * @param string $key
+     * @param mixed  $value
+     *
      * @return $this
      */
     public function setAttribute(
         $key,
         $value
     ) {
         if (in_array($key, $this->encrypted) &&
-            !is_null($value)) {
+            ! is_null($value)) {
             $value = encrypt($value);
         }
 

src/Events/GdprDownloaded.php

@@ -17,7 +17,8 @@ class GdprDownloaded
     /**
      * Create a new event instance.
      *
-     * @param  \App\Authenticatable  $user
+     * @param \App\Authenticatable $user
+     *
      * @return void
      */
     public function __construct(Authenticatable $user)

src/Events/GdprInactiveUser.php

@@ -17,7 +17,6 @@ class GdprInactiveUser
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
     public function __construct(Authenticatable $user)

src/Events/GdprInactiveUserDeleted.php

@@ -17,7 +17,8 @@ class GdprInactiveUserDeleted
     /**
      * Create a new event instance.
      *
-     * @param  \App\Authenticatable  $user
+     * @param \App\Authenticatable $user
+     *
      * @return void
      */
     public function __construct(Authenticatable $user)

src/GdprServiceProvider.php

@@ -31,7 +31,7 @@ protected function registerRoutes()
             'namespace'  => 'Soved\Laravel\Gdpr\Http\Controllers',
             'middleware' => config('gdpr.middleware'),
         ], function () {
-            $this->loadRoutesFrom(__DIR__ . '/../routes/web.php');
+            $this->loadRoutesFrom(__DIR__.'/../routes/web.php');
         });
     }
 
@@ -68,7 +68,8 @@ public function register()
     protected function configure()
     {
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/gdpr.php', 'gdpr'
+            __DIR__.'/../config/gdpr.php',
+            'gdpr'
         );
     }
 
@@ -81,7 +82,7 @@ protected function offerPublishing()
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__ . '/../config/gdpr.php' => config_path('gdpr.php'),
+                __DIR__.'/../config/gdpr.php' => config_path('gdpr.php'),
             ], 'gdpr-config');
         }
     }

src/Http/Controllers/GdprController.php

@@ -13,12 +13,11 @@ class GdprController extends Controller
     /**
      * Download the GDPR compliant data portability JSON file.
      *
-     * @param  \Soved\Laravel\Gdpr\Http\Requests\GdprDownload  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function download(GdprDownload $request)
     {
-        if (!$this->validateRequest($request)) {
+        if (! $this->validateRequest($request)) {
             return $this->sendFailedLoginResponse();
         }
 
@@ -40,7 +39,6 @@ public function download(GdprDownload $request)
     /**
      * Validate the request.
      *
-     * @param  \Illuminate\Foundation\Http\FormRequest  $request
      * @return bool
      */
     protected function validateRequest(FormRequest $request)
@@ -55,7 +53,6 @@ protected function validateRequest(FormRequest $request)
     /**
      * Validate a user's credentials.
      *
-     * @param  \Illuminate\Foundation\Http\FormRequest  $request
      * @return bool
      */
     protected function hasValidCredentials(FormRequest $request)

src/Jobs/Cleanup/CleanupJob.php

@@ -11,7 +11,10 @@
 
 class CleanupJob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * @var \Illuminate\Database\Eloquent\Collection
@@ -26,8 +29,8 @@ class CleanupJob implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param  \Illuminate\Database\Eloquent\Collection  $users
-     * @param  \Soved\Laravel\Gdpr\Jobs\Cleanup\CleanupStrategy  $strategy
+     * @param \Soved\Laravel\Gdpr\Jobs\Cleanup\CleanupStrategy $strategy
+     *
      * @return void
      */
     public function __construct(