Laravel 10.x Shift (#941)

* Convert deprecated methods Laravel 10 removed the deprecated methods and functions: - `getQueryBase` - `dispatchNow` and `dispatch_now` - `assertTimesSent` - `Redirect::home()` * Shift core files * Shift config files * Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them and merged your true customizations - where ENV variables may not be used. * Bump Laravel dependencies * Add PHP type hints for Laravel 10 * Remove redundant typing from DocBlocks * Shift cleanup * formatting * stable laravel * typo * Fix code styling * update dependencies * import trait * update return types * fix test * update horizon assets * Fix code styling * update .gitattributes * align with skeleton * Fix code styling --------- Co-authored-by: Shift <shift@laravelshift.com> Co-authored-by: Joe Dixon <hello@joedixon.co.uk> Co-authored-by: joedixon <joedixon@users.noreply.github.com>
laravelio · Sep 7, 2023 · 1d946e1 · 1d946e1
1 parent a096716
commit 1d946e1
Show file tree

Hide file tree

Showing 158 changed files with 1,801 additions and 1,415 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
-* text=auto
+* text=auto eol=lf
 *.css linguist-vendored
 *.scss linguist-vendored
diff --git a/app/Concerns/HasLikes.php b/app/Concerns/HasLikes.php
@@ -4,14 +4,12 @@
 
 use App\Models\Like;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 trait HasLikes
 {
-    /**
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function likes()
+    public function likes(): Collection
     {
         return $this->likesRelation;
     }

diff --git a/app/Concerns/HasTags.php b/app/Concerns/HasTags.php
@@ -3,14 +3,12 @@
 namespace App\Concerns;
 
 use App\Models\Tag;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 trait HasTags
 {
-    /**
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function tags()
+    public function tags(): Collection
     {
         return $this->tagsRelation;
     }

diff --git a/app/Concerns/PreparesSearch.php b/app/Concerns/PreparesSearch.php
@@ -42,7 +42,7 @@ private function batch(Collection $chunks, int $limit): array
             }
 
             // Append current item to last element of carry if the combination is < 5000 characters.
-            if (strlen(Arr::last($carry).$item) < $limit) {
+            if ($limit > strlen(Arr::last($carry).$item)) {
                 $carry[count($carry) - 1] .= "\r\n{$item}";
 
                 return $carry;

diff --git a/app/Concerns/ProvidesSubscriptions.php b/app/Concerns/ProvidesSubscriptions.php
@@ -4,15 +4,13 @@
 
 use App\Models\Subscription;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Ramsey\Uuid\Uuid;
 
 trait ProvidesSubscriptions
 {
-    /**
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function subscriptions()
+    public function subscriptions(): Collection
     {
         return $this->subscriptionsRelation;
     }

diff --git a/app/Console/Commands/UpdateArticleViewCounts.php b/app/Console/Commands/UpdateArticleViewCounts.php
@@ -24,7 +24,7 @@ public function __construct()
         $this->token = config('services.fathom.token');
     }
 
-    public function handle()
+    public function handle(): void
     {
         if (! $this->siteId || ! $this->token) {
             $this->error('Fathom site ID and token must be configured');

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -11,7 +11,7 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         $schedule->command('schedule-monitor:sync')->dailyAt('04:56');
         $schedule->command('model:prune', ['--model' => MonitoredScheduledTaskLogItem::class])->daily();
@@ -24,7 +24,7 @@ protected function schedule(Schedule $schedule)
     /**
      * Register the Closure based commands for the application.
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
     }

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -40,10 +40,8 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             if (app()->bound('sentry')) {

diff --git a/app/Http/Controllers/Admin/ArticlesController.php b/app/Http/Controllers/Admin/ArticlesController.php
@@ -11,6 +11,8 @@
 use App\Policies\ArticlePolicy;
 use App\Queries\SearchArticles;
 use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\View\View;
 
 class ArticlesController extends Controller
 {
@@ -19,7 +21,7 @@ public function __construct()
         $this->middleware([Authenticate::class, VerifyAdmins::class]);
     }
 
-    public function index()
+    public function index(): View
     {
         if ($adminSearch = request('admin_search')) {
             $articles = SearchArticles::get($adminSearch)->appends(['admin_search' => $adminSearch]);
@@ -32,7 +34,7 @@ public function index()
         return view('admin.articles', compact('articles', 'adminSearch'));
     }
 
-    public function approve(Article $article)
+    public function approve(Article $article): RedirectResponse
     {
         $this->authorize(ArticlePolicy::APPROVE, $article);
 
@@ -43,7 +45,7 @@ public function approve(Article $article)
         return redirect()->route('articles.show', $article->slug());
     }
 
-    public function disapprove(Article $article)
+    public function disapprove(Article $article): RedirectResponse
     {
         $this->authorize(ArticlePolicy::DISAPPROVE, $article);
 
@@ -54,7 +56,7 @@ public function disapprove(Article $article)
         return redirect()->route('articles.show', $article->slug());
     }
 
-    public function decline(Article $article)
+    public function decline(Article $article): RedirectResponse
     {
         $this->authorize(ArticlePolicy::DECLINE, $article);
 
@@ -63,7 +65,7 @@ public function decline(Article $article)
         return redirect()->route('articles.show', $article->slug());
     }
 
-    public function togglePinnedStatus(Article $article)
+    public function togglePinnedStatus(Article $article): RedirectResponse
     {
         $this->authorize(ArticlePolicy::PINNED, $article);
 

diff --git a/app/Http/Controllers/Admin/UsersController.php b/app/Http/Controllers/Admin/UsersController.php
@@ -12,6 +12,8 @@
 use App\Policies\UserPolicy;
 use App\Queries\SearchUsers;
 use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\View\View;
 
 class UsersController extends Controller
 {
@@ -20,7 +22,7 @@ public function __construct()
         $this->middleware([Authenticate::class, VerifyAdmins::class]);
     }
 
-    public function index()
+    public function index(): View
     {
         if ($adminSearch = request('admin_search')) {
             $users = SearchUsers::get($adminSearch)->appends(['admin_search' => $adminSearch]);
@@ -31,7 +33,7 @@ public function index()
         return view('admin.users', compact('users', 'adminSearch'));
     }
 
-    public function ban(BanRequest $request, User $user)
+    public function ban(BanRequest $request, User $user): RedirectResponse
     {
         $this->authorize(UserPolicy::BAN, $user);
 
@@ -42,7 +44,7 @@ public function ban(BanRequest $request, User $user)
         return redirect()->route('profile', $user->username());
     }
 
-    public function unban(User $user)
+    public function unban(User $user): RedirectResponse
     {
         $this->authorize(UserPolicy::BAN, $user);
 
@@ -53,7 +55,7 @@ public function unban(User $user)
         return redirect()->route('profile', $user->username());
     }
 
-    public function delete(User $user)
+    public function delete(User $user): RedirectResponse
     {
         $this->authorize(UserPolicy::DELETE, $user);
 

diff --git a/app/Http/Controllers/Articles/ArticlesController.php b/app/Http/Controllers/Articles/ArticlesController.php
@@ -19,6 +19,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Illuminate\View\View;
 use Symfony\Component\HttpFoundation\Response;
 
 class ArticlesController extends Controller
@@ -73,7 +74,7 @@ public function index(Request $request)
         ]);
     }
 
-    public function show(Article $article)
+    public function show(Article $article): View
     {
         $user = Auth::user();
 
@@ -94,7 +95,7 @@ public function show(Article $article)
         ]);
     }
 
-    public function create(Request $request)
+    public function create(Request $request): View
     {
         $tags = Tag::query();
 
@@ -121,7 +122,7 @@ public function store(ArticleRequest $request)
             : redirect()->route('articles.show', $article->slug());
     }
 
-    public function edit(Request $request, Article $article)
+    public function edit(Request $request, Article $article): View
     {
         $this->authorize(ArticlePolicy::UPDATE, $article);
 

diff --git a/app/Http/Controllers/Articles/AuthoredArticles.php b/app/Http/Controllers/Articles/AuthoredArticles.php
@@ -6,6 +6,7 @@
 use App\Http\Middleware\Authenticate;
 use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 use Illuminate\Http\Request;
+use Illuminate\View\View;
 
 class AuthoredArticles extends Controller
 {
@@ -14,7 +15,7 @@ public function __construct()
         $this->middleware([Authenticate::class, EnsureEmailIsVerified::class]);
     }
 
-    public function __invoke(Request $request)
+    public function __invoke(Request $request): View
     {
         return view('users.articles', [
             'articles' => $request->user()

diff --git a/app/Http/Controllers/Auth/GithubController.php b/app/Http/Controllers/Auth/GithubController.php
@@ -64,7 +64,7 @@ private function userNotFound(GithubUser $user): RedirectResponse
         if ($user->isTooYoung()) {
             $this->error('errors.github_account_too_young');
 
-            return redirect()->home();
+            return redirect()->route('home');
         }
 
         return $this->redirectUserToRegistrationPage($user);

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -52,10 +52,8 @@ public function username()
 
     /**
      * Get the needed authorization credentials from the request.
-     *
-     * @return array
      */
-    protected function credentials(Request $request)
+    protected function credentials(Request $request): array
     {
         $credentials = $request->only($this->username(), 'password');
 

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -42,10 +42,8 @@ public function __construct()
 
     /**
      * Get the password reset validation rules.
-     *
-     * @return array
      */
-    protected function rules()
+    protected function rules(): array
     {
         return [
             'token' => 'required',

diff --git a/app/Http/Controllers/BlockUserController.php b/app/Http/Controllers/BlockUserController.php
@@ -6,6 +6,7 @@
 use App\Models\User;
 use App\Policies\UserPolicy;
 use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
 class BlockUserController extends Controller
@@ -15,7 +16,7 @@ public function __construct()
         $this->middleware(Authenticate::class);
     }
 
-    public function __invoke(Request $request, User $user)
+    public function __invoke(Request $request, User $user): RedirectResponse
     {
         $this->authorize(UserPolicy::BLOCK, $user);
 

diff --git a/app/Http/Controllers/Forum/TagsController.php b/app/Http/Controllers/Forum/TagsController.php
@@ -7,12 +7,13 @@
 use App\Models\Tag;
 use App\Models\Thread;
 use App\Models\User;
+use Illuminate\View\View;
 
 class TagsController extends Controller
 {
     use UsesFilters;
 
-    public function show(Tag $tag)
+    public function show(Tag $tag): View
     {
         $threads = [];
         $filter = $this->getFilter();