Moving models in a dedicated folder

app/Broadcasting/PostChannel.php

@@ -2,16 +2,16 @@
 
 namespace App\Broadcasting;
 
-use App\Post;
-use App\User;
+use App\Models\Post;
+use App\Models\User;
 
 class PostChannel
 {
     /**
      * Authenticate the user's access to the channel.
      *
-     * @param  \App\User  $user
-     * @param  \App\Post  $post
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Post  $post
      * @return array|bool
      */
     public function join(User $user, Post $post)

app/Concern/Likeable.php

@@ -2,7 +2,7 @@
 
 namespace App\Concern;
 
-use App\Like;
+use App\Models\Like;
 
 trait Likeable
 {

app/Events/CommentPosted.php

@@ -3,7 +3,7 @@
 namespace App\Events;
 
 use App\Http\Resources\Comment as CommentResource;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;

app/Http/Controllers/Admin/CommentController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Comment;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\CommentsRequest;
-use App\User;
+use App\Models\Comment;
+use App\Models\User;
 
 class CommentController extends Controller
 {

app/Http/Controllers/Admin/MediaLibraryController.php

@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\MediaLibraryRequest;
-use App\Media;
-use App\MediaLibrary;
+use App\Models\Media;
+use App\Models\MediaLibrary;
 use Illuminate\Http\Request;
 
 class MediaLibraryController extends Controller

app/Http/Controllers/Admin/PostController.php

@@ -4,9 +4,9 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PostsRequest;
-use App\MediaLibrary;
-use App\Post;
-use App\User;
+use App\Models\MediaLibrary;
+use App\Models\Post;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class PostController extends Controller

app/Http/Controllers/Admin/PostThumbnailController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Post;
+use App\Models\Post;
 
 class PostThumbnailController extends Controller
 {

app/Http/Controllers/Admin/ShowDashboard.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Comment;
 use App\Http\Controllers\Controller;
-use App\Post;
-use App\User;
+use App\Models\Comment;
+use App\Models\Post;
+use App\Models\User;
 
 class ShowDashboard extends Controller
 {

app/Http/Controllers/Admin/UserController.php

@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\UsersRequest;
-use App\Role;
-use App\User;
+use App\Models\Role;
+use App\Models\User;
 
 class UserController extends Controller
 {

app/Http/Controllers/Api/V1/Auth/AuthenticateController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\User as UserResource;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 

app/Http/Controllers/Api/V1/CommentController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Comment;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Comment as CommentResource;
+use App\Models\Comment;
 use Illuminate\Http\Request;
 
 class CommentController extends Controller

app/Http/Controllers/Api/V1/MediaController.php

@@ -5,8 +5,8 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\MediaLibraryRequest;
 use App\Http\Resources\Media as MediaResource;
-use App\Media;
-use App\MediaLibrary;
+use App\Models\Media;
+use App\Models\MediaLibrary;
 use Illuminate\Http\Request;
 
 class MediaController extends Controller

app/Http/Controllers/Api/V1/PostCommentController.php

@@ -6,7 +6,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Api\CommentsRequest;
 use App\Http\Resources\Comment as CommentResource;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 

app/Http/Controllers/Api/V1/PostController.php

@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PostsRequest;
 use App\Http\Resources\Post as PostResource;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\Request;
 
 class PostController extends Controller

app/Http/Controllers/Api/V1/PostLikeController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\Request;
 
 class PostLikeController extends Controller

app/Http/Controllers/Api/V1/UserCommentController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Comment as CommentResource;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class UserCommentController extends Controller

app/Http/Controllers/Api/V1/UserController.php

@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UsersRequest;
 use App\Http\Resources\User as UserResource;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class UserController extends Controller

app/Http/Controllers/Api/V1/UserPostController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Post as PostResource;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class UserPostController extends Controller

app/Http/Controllers/Auth/AuthController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Auth;
 use Socialite;
 

app/Http/Controllers/Auth/RegisterController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Validator;
 
@@ -58,7 +58,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

app/Http/Controllers/NewsletterSubscriptionController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Requests\NewsletterSubscriptionRequest;
 use App\Jobs\UnsubscribeEmailNewsletter;
-use App\NewsletterSubscription;
+use App\Models\NewsletterSubscription;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;

app/Http/Controllers/PostController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\Request;
 
 class PostController extends Controller

app/Http/Controllers/PostFeedController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Post;
+use App\Models\Post;
 use Illuminate\Support\Facades\Cache;
 
 class PostFeedController extends Controller

app/Http/Controllers/UserController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\UsersRequest;
-use App\Role;
-use App\User;
+use App\Models\Role;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class UserController extends Controller

app/Http/Controllers/UserPasswordController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\UserPasswordsRequest;
-use App\User;
+use App\Models\User;
 
 class UserPasswordController extends Controller
 {

app/Http/Controllers/UserTokenController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Token;
-use App\User;
+use App\Models\Token;
+use App\Models\User;
 
 class UserTokenController extends Controller
 {

app/Http/Requests/Admin/MediaLibraryRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests\Admin;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Http\FormRequest;
 
 class MediaLibraryRequest extends FormRequest

app/Http/Requests/Admin/PostsRequest.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Requests\Admin;
 
+use App\Models\User;
 use App\Rules\CanBeAuthor;
-use App\User;
 use Carbon\Carbon;
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Resources/Comment.php

@@ -15,10 +15,10 @@ class Comment extends Resource
      */
     public function toArray($request)
     {
-        // We need to create an App\Comment because the registred policy in
-        // AuthServiceProvider is App\Comment and not App\Http\Resources\Comment.
+        // We need to create an App\Models\Comment because the registred policy in
+        // AuthServiceProvider is App\Models\Comment and not App\Http\Resources\Comment.
         // I didn't find another way to make this cleaner.
-        $comment = new \App\Comment($this->getAttributes());
+        $comment = new \App\Models\Comment($this->getAttributes());
         $user = Auth::guard('api')->user();
 
         return [

app/Jobs/PrepareNewsletterSubscriptionEmail.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\NewsletterSubscription;
+use App\Models\NewsletterSubscription;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

app/Jobs/SendNewsletterSubscriptionEmail.php

@@ -3,7 +3,7 @@
 namespace App\Jobs;
 
 use App\Mail\Newsletter;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

app/Jobs/UnsubscribeEmailNewsletter.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\NewsletterSubscription;
+use App\Models\NewsletterSubscription;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

app/Comment.php → app/Models/Comment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Concern\Likeable;
 use Illuminate\Database\Eloquent\Model;

app/Like.php → app/Models/Like.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Media.php → app/Models/Media.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Spatie\MediaLibrary\Models\Media as BaseMedia;
 

app/MediaLibrary.php → app/Models/MediaLibrary.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Spatie\MediaLibrary\HasMedia\HasMedia;

app/NewsletterSubscription.php → app/Models/NewsletterSubscription.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Post.php → app/Models/Post.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Concern\Likeable;
 use App\Scopes\PostedScope;

app/Role.php → app/Models/Role.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;