Merge branch 'release/8.4.0'

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
             -   name: Install PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.0'
+                    php-version: '8.2'
             - name: Checkout
               uses: actions/checkout@v3.3.0
               with:

.gitignore

@@ -20,6 +20,6 @@ cs_fixer_tmp*
 .php-cs-fixer.cache
 /public/mix-manifest.json
 /*.diff
-.phpunit.result.cache
+/.phpunit.cache
 .env.backup
 /tools

.phpbrewrc

@@ -1 +1 @@
-phpbrew use 8.0.13
+phpbrew use 8.2.7

app/Console/Commands/BaseFeature.php

@@ -20,7 +20,7 @@ class BaseFeature extends Command
     /**
      * Scaffold files.
      */
-    public function handle()
+    public function handle(): void
     {
         $this->setFeature($this->argument('feature'));
 

app/Console/Commands/RedisClear.php

@@ -25,8 +25,6 @@ class RedisClear extends Command
 
     /**
      * Construct the RedisClear instance.
-     *
-     * @param Repository $cache
      */
     public function __construct(Repository $cache)
     {
@@ -38,7 +36,7 @@ public function __construct(Repository $cache)
     /**
      * Delete the keys from REDIS which match the database.redis.options.prefix config value.
      */
-    public function handle()
+    public function handle(): void
     {
         // Get the keys for the site
         $num_deleted_keys = 0;

app/Console/Kernel.php

@@ -18,22 +18,17 @@ class Kernel extends ConsoleKernel
 
     /**
      * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')
         //          ->hourly();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
     }

app/Exceptions/Handler.php

@@ -9,15 +9,6 @@
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
@@ -33,7 +24,6 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Throwable  $e
      * @return void
      */
     public function report(Throwable $e)
@@ -45,7 +35,6 @@ public function report(Throwable $e)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $e
      * @return \Illuminate\Http\Response
      */
     public function render($request, Throwable $e)

app/Http/Controllers/ArticleController.php

@@ -7,17 +7,16 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Contracts\Repositories\ArticleRepositoryContract;
 use Contracts\Repositories\TopicRepositoryContract;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 
 class ArticleController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param ArticleRepositoryContract $article
-     * @param TopicRepositoryContract $topic
      */
     public function __construct(ArticleRepositoryContract $article, TopicRepositoryContract $topic)
     {
@@ -28,13 +27,11 @@ public function __construct(ArticleRepositoryContract $article, TopicRepositoryC
     /**
      * Display the articles.
      *
-     * @param Request $request
-     * @return \Illuminate\View\View
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         $topics = $this->topic->listing($request->data['base']['site']['news']['application_id'], $request->data['base']['site']['subsite-folder']);
 
@@ -65,13 +62,11 @@ public function index(Request $request)
     /**
      * Display the individual article.
      *
-     * @param Request $request
-     * @return \Illuminate\View\View
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function show(Request $request)
+    public function show(Request $request): View|Redirector
     {
         if (empty($request->data['base']['site']['news']['application_id'])) {
             abort('404');

app/Http/Controllers/ChildpageController.php

@@ -7,17 +7,15 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Illuminate\Http\Request;
 
 class ChildpageController extends Controller
 {
     /**
      * Display the childpage view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         return view('childpage', merge($request->data));
     }

app/Http/Controllers/ContactTableController.php

@@ -7,15 +7,14 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Contracts\Repositories\ProfileRepositoryContract;
 use Illuminate\Http\Request;
 
 class ContactTableController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param ProfileRepositoryContract $profile
      */
     public function __construct(ProfileRepositoryContract $profile)
     {
@@ -24,11 +23,8 @@ public function __construct(ProfileRepositoryContract $profile)
 
     /**
      * Display the view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         // Determine what site to pull profiles from
         $site_id = $this->profile->getSiteID($request->data['base']);

app/Http/Controllers/DirectoryController.php

@@ -7,15 +7,14 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Contracts\Repositories\ProfileRepositoryContract;
 use Illuminate\Http\Request;
 
 class DirectoryController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param ProfileRepositoryContract $profile
      */
     public function __construct(ProfileRepositoryContract $profile)
     {
@@ -24,11 +23,8 @@ public function __construct(ProfileRepositoryContract $profile)
 
     /**
      * Display directory listing view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         // Determine what site to pull profiles from
         $site_id = $this->profile->getSiteID($request->data['base']);

app/Http/Controllers/HomepageController.php

@@ -7,6 +7,7 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Contracts\Repositories\PromoRepositoryContract;
 use Contracts\Repositories\EventRepositoryContract;
@@ -16,10 +17,6 @@ class HomepageController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param PromoRepositoryContract $promo
-     * @param ArticleRepositoryContract $article
-     * @param EventRepositoryContract $event
      */
     public function __construct(PromoRepositoryContract $promo, ArticleRepositoryContract $article, EventRepositoryContract $event)
     {
@@ -30,11 +27,8 @@ public function __construct(PromoRepositoryContract $promo, ArticleRepositoryCon
 
     /**
      * Display the homepage view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         // $promos = $this->promo->getHomepagePromos();
 

app/Http/Controllers/ProfileController.php

@@ -7,15 +7,14 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Contracts\Repositories\ProfileRepositoryContract;
 use Illuminate\Http\Request;
 
 class ProfileController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param ProfileRepositoryContract $profile
      */
     public function __construct(ProfileRepositoryContract $profile)
     {
@@ -24,11 +23,8 @@ public function __construct(ProfileRepositoryContract $profile)
 
     /**
      * Display profile listing view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         // Determine what site to pull profiles from
         $site_id = $this->profile->getSiteID($request->data['base']);
@@ -60,13 +56,11 @@ public function index(Request $request)
     /**
      * Display the individual profile view.
      *
-     * @param Request $request
-     * @return \Illuminate\View\View
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function show(Request $request)
+    public function show(Request $request): View
     {
         if (empty($request->accessid)) {
             abort('404');

app/Http/Controllers/PromoPageController.php

@@ -7,15 +7,14 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Contracts\Repositories\PromoPageRepositoryContract;
 use Illuminate\Http\Request;
 
 class PromoPageController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param PromoRepositoryContract $promo
      */
     public function __construct(PromoPageRepositoryContract $promo)
     {
@@ -25,14 +24,13 @@ public function __construct(PromoPageRepositoryContract $promo)
     /**
      * Display the view.
      *
-     * @param Request $request
      *
      * @return \Illuminate\View\View|void
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         $promos = $this->promo->getPromoPagePromos($request->data['base']);
 
@@ -42,13 +40,11 @@ public function index(Request $request)
     /**
      * Display the individual item.
      *
-     * @param Request $request
-     * @return \Illuminate\View\View
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function show(Request $request)
+    public function show(Request $request): View
     {
         $promo = $this->promo->getPromoView($request->id);
 

app/Http/Controllers/TopicController.php

@@ -7,15 +7,14 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Contracts\Repositories\TopicRepositoryContract;
 
 class TopicController extends Controller
 {
     /**
      * Construct the controller.
-     *
-     * @param TopicRepositoryContract $topic
      */
     public function __construct(TopicRepositoryContract $topic)
     {
@@ -24,11 +23,8 @@ public function __construct(TopicRepositoryContract $topic)
 
     /**
      * Display the topic listing view.
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
         $topics = $this->topic->listing($request->data['base']['site']['news']['application_id']);