From 4a099387a05546a38cb622633bba3cc70a95a075 Mon Sep 17 00:00:00 2001
From: Unknown <arcanedev.maroc@gmail.com>
Date: Thu, 28 Sep 2017 13:50:04 +0100
Subject: [PATCH] Fixing misc stuff

---
 .gitattributes                                | 20 +++++++++++--------
 .travis.yml                                   |  5 +----
 composer.json                                 | 10 ++++------
 .../Admin/Users/UpdateUserRequest.php         |  4 +++-
 src/Providers/PackagesServiceProvider.php     |  2 ++
 src/Seeds/DatabaseSeeder.php                  |  2 +-
 src/Seeds/Foundation/UserTableSeeder.php      |  2 +-
 src/Seeds/PermissionsSeeder.php               |  2 +-
 src/Seeds/RolesSeeder.php                     |  2 +-
 src/Seeds/UsersSeeder.php                     |  2 +-
 10 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 29b5c0c..7ccb1f3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
-/_docs             export-ignore
-/tests             export-ignore
-/.editorconfig     export-ignore
-/.gitattributes    export-ignore
-/.gitignore        export-ignore
-/.scrutinizer.yml  export-ignore
-/.travis.yml       export-ignore
-/phpunit.xml.dist  export-ignore
+* text=auto
+
+/.github          export-ignore
+/_docs            export-ignore
+/tests            export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+.gitignore        export-ignore
+.scrutinizer.yml  export-ignore
+.travis.yml       export-ignore
+phpunit.xml.dist  export-ignore
+CONTRIBUTING.md   export-ignore
diff --git a/.travis.yml b/.travis.yml
index 03a87c5..f16602e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,9 @@ matrix:
   allow_failures:
     - php: nightly
 
-env:
-  - TESTBENCH_VERSION=3.5.*
-
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench:${TESTBENCH_VERSION}"
+  - travis_retry composer install --prefer-source --no-interaction
 
 script:
   - composer validate
diff --git a/composer.json b/composer.json
index eb08c86..a13ee65 100644
--- a/composer.json
+++ b/composer.json
@@ -23,9 +23,10 @@
         "arcanesoft/core":                "~2.6"
     },
     "require-dev": {
-        "phpunit/phpcov":    "~4.0",
-        "phpunit/phpunit":   "~6.0",
-        "laravel/socialite": "~3.0"
+        "orchestra/testbench": "~3.5.0",
+        "phpunit/phpcov":      "~4.0",
+        "phpunit/phpunit":     "~6.0",
+        "laravel/socialite":   "~3.0"
     },
     "autoload": {
         "psr-4": {
@@ -36,8 +37,5 @@
         "psr-4": {
             "Arcanesoft\\Auth\\Tests\\": "tests/"
         }
-    },
-    "scripts": {
-        "testbench": "composer require --dev \"orchestra/testbench=~3.5.0\""
     }
 }
diff --git a/src/Http/Requests/Admin/Users/UpdateUserRequest.php b/src/Http/Requests/Admin/Users/UpdateUserRequest.php
index d4107bd..bf05e80 100644
--- a/src/Http/Requests/Admin/Users/UpdateUserRequest.php
+++ b/src/Http/Requests/Admin/Users/UpdateUserRequest.php
@@ -53,6 +53,8 @@ public function rules()
      */
     public function getValidatedData()
     {
-        return $this->intersect(['username', 'email', 'password', 'first_name', 'last_name']);
+        return array_filter(
+            $this->only(['username', 'email', 'password', 'first_name', 'last_name'])
+        );
     }
 }
diff --git a/src/Providers/PackagesServiceProvider.php b/src/Providers/PackagesServiceProvider.php
index e1d8ab4..5f161bf 100644
--- a/src/Providers/PackagesServiceProvider.php
+++ b/src/Providers/PackagesServiceProvider.php
@@ -20,6 +20,7 @@ class PackagesServiceProvider extends ServiceProvider
      |  Main Methods
      | -----------------------------------------------------------------
      */
+
     /**
      * Register the service provider.
      */
@@ -37,6 +38,7 @@ public function register()
      |  Register Packages
      | -----------------------------------------------------------------
      */
+
     /**
      * Register the API Helper package.
      */
diff --git a/src/Seeds/DatabaseSeeder.php b/src/Seeds/DatabaseSeeder.php
index 8a1d2c2..22c436a 100644
--- a/src/Seeds/DatabaseSeeder.php
+++ b/src/Seeds/DatabaseSeeder.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Auth\Seeds;
 
-use Arcanedev\Support\Bases\Seeder;
+use Arcanedev\Support\Database\Seeder;
 
 /**
  * Class     DatabaseSeeder
diff --git a/src/Seeds/Foundation/UserTableSeeder.php b/src/Seeds/Foundation/UserTableSeeder.php
index d80646a..9beb3b0 100644
--- a/src/Seeds/Foundation/UserTableSeeder.php
+++ b/src/Seeds/Foundation/UserTableSeeder.php
@@ -1,7 +1,7 @@
 <?php namespace Arcanesoft\Auth\Seeds\Foundation;
 
 use Arcanedev\LaravelAuth\Services\UserConfirmator;
-use Arcanedev\Support\Bases\Seeder;
+use Arcanedev\Support\Database\Seeder;
 use Arcanesoft\Auth\Models\Role;
 use Arcanesoft\Auth\Models\User;
 use Carbon\Carbon;
diff --git a/src/Seeds/PermissionsSeeder.php b/src/Seeds/PermissionsSeeder.php
index dd31e30..dab52d9 100644
--- a/src/Seeds/PermissionsSeeder.php
+++ b/src/Seeds/PermissionsSeeder.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Auth\Seeds;
 
-use Arcanedev\Support\Bases\Seeder;
+use Arcanedev\Support\Database\Seeder;
 use Arcanesoft\Auth\Models\Permission;
 use Arcanesoft\Auth\Models\PermissionsGroup;
 
diff --git a/src/Seeds/RolesSeeder.php b/src/Seeds/RolesSeeder.php
index ec89b75..2de5935 100644
--- a/src/Seeds/RolesSeeder.php
+++ b/src/Seeds/RolesSeeder.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Auth\Seeds;
 
-use Arcanedev\Support\Bases\Seeder;
+use Arcanedev\Support\Database\Seeder;
 use Arcanesoft\Auth\Models\Permission;
 use Arcanesoft\Auth\Models\Role;
 use Carbon\Carbon;
diff --git a/src/Seeds/UsersSeeder.php b/src/Seeds/UsersSeeder.php
index af50aaf..56419ca 100644
--- a/src/Seeds/UsersSeeder.php
+++ b/src/Seeds/UsersSeeder.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Auth\Seeds;
 
-use Arcanedev\Support\Bases\Seeder;
+use Arcanedev\Support\Database\Seeder;
 
 /**
  * Class     UsersSeeder