Move models to their own subdirectory

app/Console/Commands/ParseCachedWebMentions.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\WebMention;
+use App\Models\WebMention;
 use Illuminate\Console\Command;
 use Illuminate\FileSystem\FileSystem;
 

app/Console/Commands/ReDownloadWebMentions.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\WebMention;
+use App\Models\WebMention;
 use Illuminate\Console\Command;
 use App\Jobs\DownloadWebMention;
 

app/Http/Controllers/Admin/ArticlesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Article;
+use App\Models\Article;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 

app/Http/Controllers/Admin/ClientsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\MicropubClient;
 use Illuminate\Http\Request;
+use App\Models\MicropubClient;
 use App\Http\Controllers\Controller;
 
 class ClientsController extends Controller

app/Http/Controllers/Admin/ContactsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Contact;
 use GuzzleHttp\Client;
+use App\Models\Contact;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Filesystem\Filesystem;

app/Http/Controllers/Admin/NotesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use App\Jobs\SendWebMentions;
 use App\Http\Controllers\Controller;

app/Http/Controllers/Admin/PlacesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Place;
+use App\Models\Place;
 use Illuminate\Http\Request;
 use App\Services\PlaceService;
 use App\Http\Controllers\Controller;

app/Http/Controllers/ArticlesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Article;
+use App\Models\Article;
 use Jonnybarnes\IndieWeb\Numbers;
 
 class ArticlesController extends Controller

app/Http/Controllers/BookmarksController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Bookmark;
+use App\Models\Bookmark;
 
 class BookmarksController extends Controller
 {

app/Http/Controllers/ContactsController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Contact;
+use App\Models\Contact;
 use Illuminate\Filesystem\Filesystem;
 
 class ContactsController extends Controller

app/Http/Controllers/FeedsController.php

@@ -2,8 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\{Article, Note};
-use App\Article;
 
 class FeedsController extends Controller
 {

app/Http/Controllers/LikesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Like;
+use App\Models\Like;
 
 class LikesController extends Controller
 {

app/Http/Controllers/MicropubController.php

@@ -8,11 +8,11 @@ use App\Jobs\ProcessMedia;
 use App\Services\TokenService;
 use Illuminate\Http\UploadedFile;
 use Monolog\Handler\StreamHandler;
-use App\{Like, Media, Note, Place};
 use Intervention\Image\ImageManager;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\{Request, Response};
 use App\Exceptions\InvalidTokenException;
+use App\Models\{Like, Media, Note, Place};
 use Phaza\LaravelPostgis\Geometries\Point;
 use Intervention\Image\Exception\NotReadableException;
 use App\Services\Micropub\{HCardService, HEntryService, UpdateService};

app/Http/Controllers/NotesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use Jonnybarnes\IndieWeb\Numbers;
 use App\Services\ActivityStreamsService;

app/Http/Controllers/PlacesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Place;
+use App\Models\Place;
 
 class PlacesController extends Controller
 {

app/Http/Controllers/SearchController.php

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

app/Http/Controllers/WebMentionsController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Jobs\ProcessWebMention;

app/Jobs/AddClientToDatabase.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\MicropubClient;
 use Illuminate\Bus\Queueable;
+use App\Models\MicropubClient;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Jobs/ProcessBookmark.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use App\Services\BookmarkService;
 use Illuminate\Queue\SerializesModels;

app/Jobs/ProcessLike.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Like;
+use App\Models\Like;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/ProcessWebMention.php

@@ -4,8 +4,8 @@ namespace App\Jobs;
 
 use Mf2;
 use GuzzleHttp\Client;
-use App\{Note, WebMention};
 use Illuminate\Bus\Queueable;
+use App\Models\{Note, WebMention};
 use Jonnybarnes\WebmentionsParser\Parser;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Jobs/SendWebMentions.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/SyndicateBookmarkToFacebook.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;

app/Jobs/SyndicateBookmarkToTwitter.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;

app/Jobs/SyndicateNoteToFacebook.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/SyndicateNoteToTwitter.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Models/Article.php

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

app/Models/Bookmark.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -27,7 +27,7 @@ class Bookmark extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany('App\Tag');
+        return $this->belongsToMany('App\Models\Tag');
     }
 
     /**

app/Models/Contact.php

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

app/Models/Like.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Mf2;
 use HTMLPurifier;

app/Models/Media.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -25,7 +25,7 @@ class Media extends Model
      */
     public function note()
     {
-        return $this->belongsTo('App\Note');
+        return $this->belongsTo('App\Models\Note');
     }
 
     /**

app/Models/MicropubClient.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -27,6 +27,6 @@ class MicropubClient extends Model
      */
     public function notes()
     {
-        return $this->hasMany('App\Note', 'client_id', 'client_url');
+        return $this->hasMany('App\Models\Note', 'client_id', 'client_url');
     }
 }

app/Models/Note.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Cache;
 use Twitter;
@@ -69,7 +69,7 @@ class Note extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany('App\Tag');
+        return $this->belongsToMany('App\Models\Tag');
     }
 
     /**
@@ -79,7 +79,7 @@ class Note extends Model
      */
     public function client()
     {
-        return $this->belongsTo('App\MicropubClient', 'client_id', 'client_url');
+        return $this->belongsTo('App\Models\MicropubClient', 'client_id', 'client_url');
     }
 
     /**
@@ -89,7 +89,7 @@ class Note extends Model
      */
     public function webmentions()
     {
-        return $this->morphMany('App\WebMention', 'commentable');
+        return $this->morphMany('App\Models\WebMention', 'commentable');
     }
 
     /**
@@ -99,7 +99,7 @@ class Note extends Model
      */
     public function place()
     {
-        return $this->belongsTo('App\Place');
+        return $this->belongsTo('App\Models\Place');
     }
 
     /**
@@ -109,7 +109,7 @@ class Note extends Model
      */
     public function media()
     {
-        return $this->hasMany('App\Media');
+        return $this->hasMany('App\Models\Media');
     }
 
     /**

app/Models/Place.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
@@ -53,7 +53,7 @@ class Place extends Model
      */
     public function notes()
     {
-        return $this->hasMany('App\Note');
+        return $this->hasMany('App\Models\Note');
     }
 
     /**

app/Models/Tag.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -20,7 +20,7 @@ class Tag extends Model
      */
     public function notes()
     {
-        return $this->belongsToMany('App\Note');
+        return $this->belongsToMany('App\Models\Note');
     }
 
     /**
@@ -28,7 +28,7 @@ class Tag extends Model
      */
     public function bookmarks()
     {
-        return $this->belongsToMany('App\Bookmark');
+        return $this->belongsToMany('App\Models\Bookmark');
     }
 
     /**

app/Models/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;

app/Models/WebMention.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Cache;
 use Twitter;

app/Observers/NoteObserver.php

@@ -2,7 +2,7 @@
 
 namespace App\Observers;
 
-use App\{Note, Tag};
+use App\Models\{Note, Tag};
 
 class NoteObserver
 {

app/Providers/AppServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace App\Providers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use App\Observers\NoteObserver;
 use Laravel\Dusk\DuskServiceProvider;

app/Services/ActivityStreamsService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use App\Note;
+use App\Models\Note;
 
 class ActivityStreamsService
 {

app/Services/BookmarkService.php

@@ -4,12 +4,11 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Tag;
-use App\Bookmark;
 use Ramsey\Uuid\Uuid;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use App\Jobs\ProcessBookmark;
+use App\Models\{Bookmark, Tag};
 use Spatie\Browsershot\Browsershot;
 use App\Jobs\SyndicateBookmarkToTwitter;
 use App\Jobs\SyndicateBookmarkToFacebook;

app/Services/LikeService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Like;
+use App\Models\Like;
 use App\Jobs\ProcessLike;
 
 class LikeService

app/Services/Micropub/UpdateService.php

@@ -2,8 +2,7 @@
 
 namespace App\Services\Micropub;
 
-use App\Note;
+use App\Models\{Media, Note};
-use App\Media;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class UpdateService

app/Services/NoteService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\{Media, Note, Place};
+use App\Models\{Media, Note, Place};
 use App\Jobs\{SendWebMentions, SyndicateNoteToFacebook, SyndicateNoteToTwitter};
 
 class NoteService

app/Services/PlaceService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Place;
+use App\Models\Place;
 use Phaza\LaravelPostgis\Geometries\Point;
 
 class PlaceService

tests/Feature/ActivityStreamTest.php

@@ -31,7 +31,7 @@ class ActivityStreamTest extends TestCase
      */
     public function test_single_note_returns_as_data()
     {
-        $note = \App\Note::find(11);
+        $note = \App\Models\Note::find(11);
         $response = $this->get('/notes/B', ['Accept' => 'application/activity+json']);
         $response->assertHeader('Content-Type', 'application/activity+json');
         $response->assertJson([

tests/Feature/Admin/ContactsTest.php

@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Admin;
 
-use App\Contact;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Contact;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Http\UploadedFile;

tests/Feature/LikesTest.php

@@ -3,8 +3,8 @@
 namespace Tests\Feature;
 
 use Queue;
-use App\Like;
 use Tests\TestCase;
+use App\Models\Like;
 use Tests\TestToken;
 use GuzzleHttp\Client;
 use App\Jobs\ProcessLike;

tests/Feature/MicropubControllerTest.php

@@ -2,14 +2,13 @@
 
 namespace Tests\Feature;
 
-use App\Media;
-use App\Place;
 use Carbon\Carbon;
 use Tests\TestCase;
 use Tests\TestToken;
 use Lcobucci\JWT\Builder;
 use App\Jobs\ProcessMedia;
 use App\Jobs\SendWebMentions;
+use App\Models\{Media, Place};
 use Illuminate\Http\UploadedFile;
 use App\Jobs\SyndicateNoteToTwitter;
 use Lcobucci\JWT\Signer\Hmac\Sha256;

tests/Feature/NotesControllerTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 
 class NotesControllerTest extends TestCase
 {

tests/Feature/ParseCachedWebMentionsTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\WebMention;
 use Tests\TestCase;
+use App\Models\WebMention;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 

tests/Feature/PlacesTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Feature;
 
 use Tests\TestCase;
+use App\Models\Place;
 
 class PlacesTest extends TestCase
 {
@@ -24,7 +25,7 @@ class PlacesTest extends TestCase
      */
     public function test_single_place()
     {
-        $place = \App\Place::where('slug', 'the-bridgewater-pub')->first();
+        $place = Place::where('slug', 'the-bridgewater-pub')->first();
         $response = $this->get('/places/the-bridgewater-pub');
         $response->assertViewHas('place', $place);
     }

tests/Unit/ArticlesTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Article;
 use Tests\TestCase;
+use App\Models\Article;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ArticlesTest extends TestCase

tests/Unit/Jobs/ProcessBookmarkJobTest.php

@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use App\Jobs\ProcessBookmark;
 use GuzzleHttp\Psr7\Response;

tests/Unit/Jobs/ProcessWebMentionJobTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;

tests/Unit/Jobs/SendWebMentionJobTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use App\Jobs\SendWebMentions;

tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php

@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Handler\MockHandler;

tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php

@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Handler\MockHandler;

tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;

tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;

tests/Unit/LikesTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Like;
 use Tests\TestCase;
+use App\Models\Like;
 
 class LikesTest extends TestCase
 {

tests/Unit/MediaTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Media;
 use Tests\TestCase;
+use App\Models\Media;
 
 class MediaTest extends TestCase
 {
@@ -11,6 +11,6 @@ class MediaTest extends TestCase
     {
         $media = Media::find(1);
         $note = $media->note;
-        $this->assertInstanceOf('App\Note', $note);
+        $this->assertInstanceOf('App\Models\Note', $note);
     }
 }

tests/Unit/MicropbClientsTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit;
 
 use Tests\TestCase;
-use App\MicropubClient;
+use App\Models\MicropubClient;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 

tests/Unit/NotesTest.php

@@ -2,9 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Tag;
-use App\Note;
 use Tests\TestCase;
+use App\Models\{Note, Tag};
 use Thujohn\Twitter\Facades\Twitter;
 
 class NotesTest extends TestCase

tests/Unit/PlacesTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Place;
 use Tests\TestCase;
+use App\Models\Place;
 use App\Services\PlaceService;
 use Phaza\LaravelPostgis\Geometries\Point;
 use Illuminate\Database\Eloquent\Collection;
@@ -62,7 +62,7 @@ class PlacesTest extends TestCase
                 'url' => ['https://www.openstreetmap.org/way/1234'],
             ]
         ]);
-        $this->assertInstanceOf('App\Place', $ret); // a place was returned
+        $this->assertInstanceOf('App\Models\Place', $ret); // a place was returned
         $this->assertEquals(2, count(Place::all())); // still 2 places
     }
 

tests/Unit/TagsTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Unit;
 
-use App\Tag;
+use App\Models\Tag;
 use Tests\TestCase;
 
 class TagsTest extends TestCase

tests/Unit/WebMentionTest.php

@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\WebMention;
 use Tests\TestCase;
+use App\Models\WebMention;
 use Thujohn\Twitter\Facades\Twitter;
 use Illuminate\Support\Facades\Cache;
 
@@ -12,7 +12,7 @@ class WebMentionTest extends TestCase
     public function test_commentable_method()
     {
         $webmention = WebMention::find(1);
-        $this->assertInstanceOf('App\Note', $webmention->commentable);
+        $this->assertInstanceOf('App\Models\Note', $webmention->commentable);
     }
     public function test_published_attribute_when_no_relavent_mf2()
     {