Merge branch 'develop'

dcyar · Sep 5, 2019 · 784541a · 784541a
2 parents c8a8b89 + 24323d0
commit 784541a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 46 deletions.
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Entities\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -59,7 +59,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Entities\User
      */
     protected function create(array $data)
     {

diff --git a/app/User.php b/app/User.php
diff --git a/config/auth.php b/config/auth.php
@@ -68,7 +68,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Entities\User::class,
         ],
 
         // 'users' => [

diff --git a/config/services.php b/config/services.php
@@ -35,7 +35,7 @@
     ],
 
     'stripe' => [
-        'model' => App\User::class,
+        'model' => App\Entities\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
         'webhook' => [

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -1,7 +1,7 @@
 <?php
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
-use App\User;
+use App\Entities\User;
 use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 

diff --git a/database/seeds/PhrasesTableSeeder.php b/database/seeds/PhrasesTableSeeder.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-use App\Models\Phrase;
+use App\Entities\Phrase;
 
 class PhrasesTableSeeder extends Seeder
 {

diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-use App\User;
+use App\Entities\User;
 
 class UsersTableSeeder extends Seeder
 {