Skip to content

Commit

Permalink
Fixing misc stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
arcanedev-maroc committed Sep 28, 2017
1 parent 9539c96 commit 4a09938
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 24 deletions.
20 changes: 12 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -36,8 +37,5 @@
"psr-4": {
"Arcanesoft\\Auth\\Tests\\": "tests/"
}
},
"scripts": {
"testbench": "composer require --dev \"orchestra/testbench=~3.5.0\""
}
}
4 changes: 3 additions & 1 deletion src/Http/Requests/Admin/Users/UpdateUserRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
);
}
}
2 changes: 2 additions & 0 deletions src/Providers/PackagesServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class PackagesServiceProvider extends ServiceProvider
| Main Methods
| -----------------------------------------------------------------
*/

/**
* Register the service provider.
*/
Expand All @@ -37,6 +38,7 @@ public function register()
| Register Packages
| -----------------------------------------------------------------
*/

/**
* Register the API Helper package.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php namespace Arcanesoft\Auth\Seeds;

use Arcanedev\Support\Bases\Seeder;
use Arcanedev\Support\Database\Seeder;

/**
* Class DatabaseSeeder
Expand Down
2 changes: 1 addition & 1 deletion src/Seeds/Foundation/UserTableSeeder.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Seeds/PermissionsSeeder.php
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Seeds/RolesSeeder.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Seeds/UsersSeeder.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php namespace Arcanesoft\Auth\Seeds;

use Arcanedev\Support\Bases\Seeder;
use Arcanedev\Support\Database\Seeder;

/**
* Class UsersSeeder
Expand Down

0 comments on commit 4a09938

Please sign in to comment.