From 9de24c2740bab11315efe08e8a79b4193c891a5d Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 27 Oct 2019 16:29:15 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../Commands/ReDownloadWebMentions.php | 2 +- app/Exceptions/Handler.php | 4 ++-- .../Controllers/Admin/ArticlesController.php | 6 ++--- .../Controllers/Admin/ClientsController.php | 6 ++--- .../Controllers/Admin/ContactsController.php | 10 ++++---- app/Http/Controllers/Admin/HomeController.php | 2 +- .../Controllers/Admin/LikesController.php | 6 ++--- .../Controllers/Admin/NotesController.php | 8 +++---- .../Controllers/Admin/PlacesController.php | 8 +++---- app/Http/Controllers/ArticlesController.php | 2 +- app/Http/Controllers/AuthController.php | 2 +- app/Http/Controllers/ContactsController.php | 2 +- app/Http/Controllers/FeedsController.php | 2 +- app/Http/Controllers/FrontPageController.php | 4 ++-- app/Http/Controllers/MicropubController.php | 20 ++++++++-------- app/Http/Controllers/NotesController.php | 8 +++---- .../Controllers/TokenEndpointController.php | 2 +- .../Controllers/WebMentionsController.php | 8 +++---- app/Jobs/AddClientToDatabase.php | 6 ++--- app/Jobs/DownloadWebMention.php | 6 ++--- app/Jobs/ProcessBookmark.php | 8 +++---- app/Jobs/ProcessLike.php | 9 ++++--- app/Jobs/ProcessMedia.php | 8 +++---- app/Jobs/ProcessWebMention.php | 14 +++++------ app/Jobs/SaveProfileImage.php | 6 ++--- app/Jobs/SendWebMentions.php | 6 ++--- app/Jobs/SyndicateBookmarkToTwitter.php | 6 ++--- app/Jobs/SyndicateNoteToTwitter.php | 4 ++-- app/Models/Article.php | 8 +++---- app/Models/Like.php | 4 ++-- app/Models/Media.php | 2 +- app/Models/Note.php | 24 +++++++++---------- app/Models/Place.php | 10 ++++---- app/Models/User.php | 2 +- app/Models/WebMention.php | 2 +- app/Providers/AppServiceProvider.php | 8 +++---- app/Providers/AuthServiceProvider.php | 1 - app/Providers/HorizonServiceProvider.php | 2 +- app/Providers/TelescopeServiceProvider.php | 2 +- app/Services/BookmarkService.php | 18 +++++++------- app/Services/LikeService.php | 2 +- app/Services/Micropub/HCardService.php | 2 +- app/Services/Micropub/HEntryService.php | 2 +- app/Services/Micropub/UpdateService.php | 2 +- app/Services/NoteService.php | 4 ++-- app/Services/TokenService.php | 2 +- 46 files changed, 135 insertions(+), 137 deletions(-) diff --git a/app/Console/Commands/ReDownloadWebMentions.php b/app/Console/Commands/ReDownloadWebMentions.php index 1bd1f93b..2c5c18e0 100644 --- a/app/Console/Commands/ReDownloadWebMentions.php +++ b/app/Console/Commands/ReDownloadWebMentions.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Console\Commands; +use App\Jobs\DownloadWebMention; use App\Models\WebMention; use Illuminate\Console\Command; -use App\Jobs\DownloadWebMention; class ReDownloadWebMentions extends Command { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 2d1523c5..80b5a15b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -4,9 +4,9 @@ namespace App\Exceptions; use App; use Exception; -use Illuminate\Support\Facades\Route; -use Illuminate\Session\TokenMismatchException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Session\TokenMismatchException; +use Illuminate\Support\Facades\Route; /** * @codeCoverageIgnore diff --git a/app/Http/Controllers/Admin/ArticlesController.php b/app/Http/Controllers/Admin/ArticlesController.php index 848f8440..30e5e275 100644 --- a/app/Http/Controllers/Admin/ArticlesController.php +++ b/app/Http/Controllers/Admin/ArticlesController.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use App\Models\Article; -use Illuminate\View\View; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; +use App\Models\Article; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; class ArticlesController extends Controller { diff --git a/app/Http/Controllers/Admin/ClientsController.php b/app/Http/Controllers/Admin/ClientsController.php index 9eb37c97..fd12cba9 100644 --- a/app/Http/Controllers/Admin/ClientsController.php +++ b/app/Http/Controllers/Admin/ClientsController.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use Illuminate\View\View; -use Illuminate\Http\Request; -use App\Models\MicropubClient; use App\Http\Controllers\Controller; +use App\Models\MicropubClient; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; class ClientsController extends Controller { diff --git a/app/Http/Controllers/Admin/ContactsController.php b/app/Http/Controllers/Admin/ContactsController.php index 44a86f88..030ef797 100644 --- a/app/Http/Controllers/Admin/ContactsController.php +++ b/app/Http/Controllers/Admin/ContactsController.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use GuzzleHttp\Client; -use App\Models\Contact; -use Illuminate\View\View; -use Illuminate\Support\Arr; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; +use App\Models\Contact; +use GuzzleHttp\Client; use Illuminate\Filesystem\Filesystem; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Arr; +use Illuminate\View\View; class ContactsController extends Controller { diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 6ad2d0d7..ee10e4dc 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use Illuminate\View\View; use App\Http\Controllers\Controller; +use Illuminate\View\View; class HomeController extends Controller { diff --git a/app/Http/Controllers/Admin/LikesController.php b/app/Http/Controllers/Admin/LikesController.php index 6d69a879..102c281e 100644 --- a/app/Http/Controllers/Admin/LikesController.php +++ b/app/Http/Controllers/Admin/LikesController.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use App\Models\Like; -use App\Jobs\ProcessLike; -use Illuminate\View\View; use App\Http\Controllers\Controller; +use App\Jobs\ProcessLike; +use App\Models\Like; use Illuminate\Http\RedirectResponse; +use Illuminate\View\View; class LikesController extends Controller { diff --git a/app/Http/Controllers/Admin/NotesController.php b/app/Http/Controllers/Admin/NotesController.php index 98ef6f9a..75a15231 100644 --- a/app/Http/Controllers/Admin/NotesController.php +++ b/app/Http/Controllers/Admin/NotesController.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use App\Models\Note; -use Illuminate\View\View; -use Illuminate\Http\Request; -use App\Jobs\SendWebMentions; use App\Http\Controllers\Controller; +use App\Jobs\SendWebMentions; +use App\Models\Note; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; class NotesController extends Controller { diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php index 9247eb31..5db5b9d2 100644 --- a/app/Http/Controllers/Admin/PlacesController.php +++ b/app/Http/Controllers/Admin/PlacesController.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace App\Http\Controllers\Admin; -use App\Models\Place; -use Illuminate\View\View; -use Illuminate\Http\Request; -use App\Services\PlaceService; use App\Http\Controllers\Controller; +use App\Models\Place; +use App\Services\PlaceService; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; use Phaza\LaravelPostgis\Geometries\Point; class PlacesController extends Controller diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php index cdb91b61..3c1e9f21 100644 --- a/app/Http/Controllers/ArticlesController.php +++ b/app/Http/Controllers/ArticlesController.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Models\Article; +use Illuminate\Http\RedirectResponse; use Illuminate\View\View; use Jonnybarnes\IndieWeb\Numbers; -use Illuminate\Http\RedirectResponse; class ArticlesController extends Controller { diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 0ee61fd5..67aa1f27 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Http\Controllers; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Facades\Auth; class AuthController extends Controller { diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php index 5ed7f945..8550a79b 100644 --- a/app/Http/Controllers/ContactsController.php +++ b/app/Http/Controllers/ContactsController.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Models\Contact; -use Illuminate\View\View; use Illuminate\Filesystem\Filesystem; +use Illuminate\View\View; class ContactsController extends Controller { diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php index e7602230..530b0af0 100644 --- a/app/Http/Controllers/FeedsController.php +++ b/app/Http/Controllers/FeedsController.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Http\Controllers; -use Illuminate\Http\Response; use App\Models\{Article, Note}; +use Illuminate\Http\Response; class FeedsController extends Controller { diff --git a/app/Http/Controllers/FrontPageController.php b/app/Http/Controllers/FrontPageController.php index dd8521c1..371f94c1 100644 --- a/app/Http/Controllers/FrontPageController.php +++ b/app/Http/Controllers/FrontPageController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use App\Models\Like; -use App\Models\Note; use App\Models\Article; use App\Models\Bookmark; +use App\Models\Like; +use App\Models\Note; use App\Services\ActivityStreamsService; class FrontPageController extends Controller diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index 02d5a580..5d1cff1d 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -4,22 +4,22 @@ declare(strict_types=1); namespace App\Http\Controllers; -use Monolog\Logger; -use Ramsey\Uuid\Uuid; -use Illuminate\Http\File; +use App\Exceptions\InvalidTokenException; use App\Jobs\ProcessMedia; +use App\Models\{Like, Media, Note, Place}; +use App\Services\Micropub\{HCardService, HEntryService, UpdateService}; use App\Services\TokenService; +use Illuminate\Http\File; use Illuminate\Http\JsonResponse; use Illuminate\Http\UploadedFile; -use Monolog\Handler\StreamHandler; -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 Illuminate\Support\Facades\Storage; use Intervention\Image\Exception\NotReadableException; -use App\Services\Micropub\{HCardService, HEntryService, UpdateService}; +use Intervention\Image\ImageManager; +use Monolog\Handler\StreamHandler; +use Monolog\Logger; +use Phaza\LaravelPostgis\Geometries\Point; +use Ramsey\Uuid\Uuid; class MicropubController extends Controller { diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index d5ff483e..92e4ee5d 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Models\Note; -use Illuminate\View\View; -use Illuminate\Http\Request; -use Jonnybarnes\IndieWeb\Numbers; -use Illuminate\Http\RedirectResponse; use App\Services\ActivityStreamsService; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; +use Jonnybarnes\IndieWeb\Numbers; // Need to sort out Twitter and webmentions! diff --git a/app/Http/Controllers/TokenEndpointController.php b/app/Http/Controllers/TokenEndpointController.php index 9a2aab06..5a32aac4 100644 --- a/app/Http/Controllers/TokenEndpointController.php +++ b/app/Http/Controllers/TokenEndpointController.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Http\Controllers; -use IndieAuth\Client; use App\Services\TokenService; use Illuminate\Http\JsonResponse; +use IndieAuth\Client; class TokenEndpointController extends Controller { diff --git a/app/Http/Controllers/WebMentionsController.php b/app/Http/Controllers/WebMentionsController.php index 960840ea..69dcf3d3 100644 --- a/app/Http/Controllers/WebMentionsController.php +++ b/app/Http/Controllers/WebMentionsController.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace App\Http\Controllers; -use App\Models\Note; -use Illuminate\View\View; -use Illuminate\Http\Response; use App\Jobs\ProcessWebMention; -use Jonnybarnes\IndieWeb\Numbers; +use App\Models\Note; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Http\Response; +use Illuminate\View\View; +use Jonnybarnes\IndieWeb\Numbers; class WebMentionsController extends Controller { diff --git a/app/Jobs/AddClientToDatabase.php b/app/Jobs/AddClientToDatabase.php index b7d9c0f4..c7f801dc 100644 --- a/app/Jobs/AddClientToDatabase.php +++ b/app/Jobs/AddClientToDatabase.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace App\Jobs; -use Illuminate\Bus\Queueable; use App\Models\MicropubClient; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class AddClientToDatabase implements ShouldQueue { diff --git a/app/Jobs/DownloadWebMention.php b/app/Jobs/DownloadWebMention.php index a3e311e6..dbe0a34a 100644 --- a/app/Jobs/DownloadWebMention.php +++ b/app/Jobs/DownloadWebMention.php @@ -6,10 +6,10 @@ namespace App\Jobs; use GuzzleHttp\Client; use Illuminate\Bus\Queueable; -use Illuminate\FileSystem\FileSystem; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\FileSystem\FileSystem; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class DownloadWebMention implements ShouldQueue { diff --git a/app/Jobs/ProcessBookmark.php b/app/Jobs/ProcessBookmark.php index 491c2b5c..fcb35432 100644 --- a/app/Jobs/ProcessBookmark.php +++ b/app/Jobs/ProcessBookmark.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Jobs; +use App\Exceptions\InternetArchiveException; use App\Models\Bookmark; -use Illuminate\Bus\Queueable; use App\Services\BookmarkService; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use App\Exceptions\InternetArchiveException; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class ProcessBookmark implements ShouldQueue { diff --git a/app/Jobs/ProcessLike.php b/app/Jobs/ProcessLike.php index 753b44fa..976ad010 100644 --- a/app/Jobs/ProcessLike.php +++ b/app/Jobs/ProcessLike.php @@ -8,14 +8,13 @@ use App\Models\Like; use Codebird\Codebird; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; -use Illuminate\Support\Arr; -use Illuminate\Bus\Queueable; -use Thujohn\Twitter\Facades\Twitter; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use GuzzleHttp\Exception\RequestException; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Arr; use Jonnybarnes\WebmentionsParser\Authorship; use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException; diff --git a/app/Jobs/ProcessMedia.php b/app/Jobs/ProcessMedia.php index 19c95910..6001cb67 100644 --- a/app/Jobs/ProcessMedia.php +++ b/app/Jobs/ProcessMedia.php @@ -5,13 +5,13 @@ declare(strict_types=1); namespace App\Jobs; use Illuminate\Bus\Queueable; -use Intervention\Image\ImageManager; -use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Storage; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Storage; use Intervention\Image\Exception\NotReadableException; +use Intervention\Image\ImageManager; class ProcessMedia implements ShouldQueue { diff --git a/app/Jobs/ProcessWebMention.php b/app/Jobs/ProcessWebMention.php index c39b7472..692f2731 100644 --- a/app/Jobs/ProcessWebMention.php +++ b/app/Jobs/ProcessWebMention.php @@ -4,15 +4,15 @@ declare(strict_types=1); namespace App\Jobs; -use Mf2; -use GuzzleHttp\Client; -use Illuminate\Bus\Queueable; -use App\Models\{Note, WebMention}; -use Jonnybarnes\WebmentionsParser\Parser; -use GuzzleHttp\Exception\RequestException; -use Illuminate\Contracts\Queue\ShouldQueue; use App\Exceptions\RemoteContentNotFoundException; +use App\Models\{Note, WebMention}; +use GuzzleHttp\Client; +use GuzzleHttp\Exception\RequestException; +use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\{InteractsWithQueue, SerializesModels}; +use Jonnybarnes\WebmentionsParser\Parser; +use Mf2; class ProcessWebMention implements ShouldQueue { diff --git a/app/Jobs/SaveProfileImage.php b/app/Jobs/SaveProfileImage.php index abdebae6..6594db0c 100644 --- a/app/Jobs/SaveProfileImage.php +++ b/app/Jobs/SaveProfileImage.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace App\Jobs; use GuzzleHttp\Client; -use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use GuzzleHttp\Exception\RequestException; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; use Jonnybarnes\WebmentionsParser\Authorship; use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException; diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php index bbbd6f5c..eaa303e2 100644 --- a/app/Jobs/SendWebMentions.php +++ b/app/Jobs/SendWebMentions.php @@ -6,11 +6,11 @@ namespace App\Jobs; use App\Models\Note; use GuzzleHttp\Client; -use Illuminate\Support\Str; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Str; class SendWebMentions implements ShouldQueue { diff --git a/app/Jobs/SyndicateBookmarkToTwitter.php b/app/Jobs/SyndicateBookmarkToTwitter.php index 289a6f0e..a8b7a7f2 100644 --- a/app/Jobs/SyndicateBookmarkToTwitter.php +++ b/app/Jobs/SyndicateBookmarkToTwitter.php @@ -4,13 +4,13 @@ declare(strict_types=1); namespace App\Jobs; -use GuzzleHttp\Client; use App\Models\Bookmark; +use GuzzleHttp\Client; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SyndicateBookmarkToTwitter implements ShouldQueue { diff --git a/app/Jobs/SyndicateNoteToTwitter.php b/app/Jobs/SyndicateNoteToTwitter.php index 712aa461..7a7e476f 100644 --- a/app/Jobs/SyndicateNoteToTwitter.php +++ b/app/Jobs/SyndicateNoteToTwitter.php @@ -7,9 +7,9 @@ namespace App\Jobs; use App\Models\Note; use GuzzleHttp\Client; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SyndicateNoteToTwitter implements ShouldQueue { diff --git a/app/Models/Article.php b/app/Models/Article.php index 89f6ea98..25a3432e 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Models; -use League\CommonMark\Environment; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Builder; use Cviebrock\EloquentSluggable\Sluggable; -use League\CommonMark\CommonMarkConverter; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use League\CommonMark\Block\Element\FencedCode; use League\CommonMark\Block\Element\IndentedCode; +use League\CommonMark\CommonMarkConverter; +use League\CommonMark\Environment; use Spatie\CommonMarkHighlighter\FencedCodeRenderer; use Spatie\CommonMarkHighlighter\IndentedCodeRenderer; diff --git a/app/Models/Like.php b/app/Models/Like.php index f200816f..2679041d 100644 --- a/app/Models/Like.php +++ b/app/Models/Like.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Models; -use Mf2; use App\Traits\FilterHtml; -use Illuminate\Support\Arr; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Arr; +use Mf2; class Like extends Model { diff --git a/app/Models/Media.php b/app/Models/Media.php index a564adb9..1bea5e2d 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Models; -use Illuminate\Support\Str; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Support\Str; class Media extends Model { diff --git a/app/Models/Note.php b/app/Models/Note.php index 020a5ebb..3cc8ae26 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -4,30 +4,30 @@ declare(strict_types=1); namespace App\Models; +use App\Exceptions\TwitterContentException; use Cache; use Codebird\Codebird; use Exception; +use GuzzleHttp\Client; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; -use Twitter; -use Normalizer; -use GuzzleHttp\Client; -use Laravel\Scout\Searchable; -use Jonnybarnes\IndieWeb\Numbers; -use League\CommonMark\Environment; -use Illuminate\Database\Eloquent\Model; -use Jonnybarnes\EmojiA11y\EmojiModifier; -use Illuminate\Database\Eloquent\Builder; -use League\CommonMark\CommonMarkConverter; -use App\Exceptions\TwitterContentException; use Illuminate\Database\Eloquent\SoftDeletes; +use Jonnybarnes\EmojiA11y\EmojiModifier; +use Jonnybarnes\IndieWeb\Numbers; +use Laravel\Scout\Searchable; use League\CommonMark\Block\Element\FencedCode; use League\CommonMark\Block\Element\IndentedCode; -use Spatie\CommonMarkHighlighter\FencedCodeRenderer; +use League\CommonMark\CommonMarkConverter; +use League\CommonMark\Environment; use League\CommonMark\Ext\Autolink\AutolinkExtension; +use Normalizer; +use Spatie\CommonMarkHighlighter\FencedCodeRenderer; use Spatie\CommonMarkHighlighter\IndentedCodeRenderer; +use Twitter; class Note extends Model { diff --git a/app/Models/Place.php b/app/Models/Place.php index 7b0ea0d8..d045a26c 100644 --- a/app/Models/Place.php +++ b/app/Models/Place.php @@ -4,13 +4,13 @@ declare(strict_types=1); namespace App\Models; -use Illuminate\Support\Str; -use Illuminate\Support\Facades\DB; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Builder; use Cviebrock\EloquentSluggable\Sluggable; -use Phaza\LaravelPostgis\Geometries\Point; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Str; use Phaza\LaravelPostgis\Eloquent\PostgisTrait; +use Phaza\LaravelPostgis\Geometries\Point; class Place extends Model { diff --git a/app/Models/User.php b/app/Models/User.php index 37ac985f..5a0b03eb 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Models; -use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class User extends Authenticatable { diff --git a/app/Models/WebMention.php b/app/Models/WebMention.php index 770f6e66..0a0b3c15 100644 --- a/app/Models/WebMention.php +++ b/app/Models/WebMention.php @@ -6,9 +6,9 @@ namespace App\Models; use App\Traits\FilterHtml; use Codebird\Codebird; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Filesystem\Filesystem; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Cache; use Jonnybarnes\WebmentionsParser\Authorship; use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 325408c5..15c2ae09 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,12 +3,12 @@ namespace App\Providers; use App\Models\Note; -use Codebird\Codebird; -use Illuminate\Support\Str; -use Illuminate\Http\Request; use App\Observers\NoteObserver; -use Laravel\Dusk\DuskServiceProvider; +use Codebird\Codebird; +use Illuminate\Http\Request; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Str; +use Laravel\Dusk\DuskServiceProvider; class AppServiceProvider extends ServiceProvider { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 0717d048..686d6023 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php index 9f635e3f..0db3c49c 100644 --- a/app/Providers/HorizonServiceProvider.php +++ b/app/Providers/HorizonServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Laravel\Horizon\Horizon; use Illuminate\Support\Facades\Gate; +use Laravel\Horizon\Horizon; use Laravel\Horizon\HorizonApplicationServiceProvider; class HorizonServiceProvider extends HorizonApplicationServiceProvider diff --git a/app/Providers/TelescopeServiceProvider.php b/app/Providers/TelescopeServiceProvider.php index f923a21c..4c07ac08 100644 --- a/app/Providers/TelescopeServiceProvider.php +++ b/app/Providers/TelescopeServiceProvider.php @@ -2,9 +2,9 @@ namespace App\Providers; -use Laravel\Telescope\Telescope; use Illuminate\Support\Facades\Gate; use Laravel\Telescope\IncomingEntry; +use Laravel\Telescope\Telescope; use Laravel\Telescope\TelescopeApplicationServiceProvider; class TelescopeServiceProvider extends TelescopeApplicationServiceProvider diff --git a/app/Services/BookmarkService.php b/app/Services/BookmarkService.php index 1e565af7..16f5bfd0 100644 --- a/app/Services/BookmarkService.php +++ b/app/Services/BookmarkService.php @@ -4,16 +4,16 @@ declare(strict_types=1); namespace App\Services; -use Ramsey\Uuid\Uuid; -use GuzzleHttp\Client; -use Illuminate\Http\Request; -use App\Jobs\ProcessBookmark; -use App\Models\{Bookmark, Tag}; -use Illuminate\Support\{Arr, Str}; -use Spatie\Browsershot\Browsershot; -use App\Jobs\SyndicateBookmarkToTwitter; -use GuzzleHttp\Exception\ClientException; use App\Exceptions\InternetArchiveException; +use App\Jobs\ProcessBookmark; +use App\Jobs\SyndicateBookmarkToTwitter; +use App\Models\{Bookmark, Tag}; +use GuzzleHttp\Client; +use GuzzleHttp\Exception\ClientException; +use Illuminate\Http\Request; +use Illuminate\Support\{Arr, Str}; +use Ramsey\Uuid\Uuid; +use Spatie\Browsershot\Browsershot; class BookmarkService { diff --git a/app/Services/LikeService.php b/app/Services/LikeService.php index 237e776c..b2d371c2 100644 --- a/app/Services/LikeService.php +++ b/app/Services/LikeService.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Services; -use App\Models\Like; use App\Jobs\ProcessLike; +use App\Models\Like; use Illuminate\Support\Arr; class LikeService diff --git a/app/Services/Micropub/HCardService.php b/app/Services/Micropub/HCardService.php index c478d239..5b7aa330 100644 --- a/app/Services/Micropub/HCardService.php +++ b/app/Services/Micropub/HCardService.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Services\Micropub; -use Illuminate\Support\Arr; use App\Services\PlaceService; +use Illuminate\Support\Arr; class HCardService { diff --git a/app/Services/Micropub/HEntryService.php b/app/Services/Micropub/HEntryService.php index 8d4564b7..8b33ef0c 100644 --- a/app/Services/Micropub/HEntryService.php +++ b/app/Services/Micropub/HEntryService.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Services\Micropub; -use Illuminate\Support\Arr; use App\Services\{BookmarkService, LikeService, NoteService}; +use Illuminate\Support\Arr; class HEntryService { diff --git a/app/Services/Micropub/UpdateService.php b/app/Services/Micropub/UpdateService.php index f19c615b..8ec80597 100644 --- a/app/Services/Micropub/UpdateService.php +++ b/app/Services/Micropub/UpdateService.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace App\Services\Micropub; use App\Models\{Media, Note}; -use Illuminate\Support\{Arr, Str}; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Support\{Arr, Str}; class UpdateService { diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php index c8f9b4ee..e7a5dd9f 100644 --- a/app/Services/NoteService.php +++ b/app/Services/NoteService.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Services; -use Illuminate\Support\{Arr, Str}; -use App\Models\{Media, Note, Place}; use App\Jobs\{SendWebMentions, SyndicateNoteToTwitter}; +use App\Models\{Media, Note, Place}; +use Illuminate\Support\{Arr, Str}; class NoteService { diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php index acedba76..09954067 100644 --- a/app/Services/TokenService.php +++ b/app/Services/TokenService.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Services; +use App\Exceptions\InvalidTokenException; use App\Jobs\AddClientToDatabase; use Lcobucci\JWT\Signer\Hmac\Sha256; -use App\Exceptions\InvalidTokenException; use Lcobucci\JWT\{Builder, Parser, Token}; class TokenService