Merge branch '2.x' into bugfix/two_dots

Search from URL fixed #1369

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: '7.4'
+          php-version: '8.3'
           extensions: mbstring, dom, fileinfo, mysql, libxml, xml, xmlwriter, dom, tokenizer, filter, json, phar, pcre, openssl, pdo, intl, curl
 
       - name: Cache composer dependencies
@@ -21,10 +21,10 @@ jobs:
           path: vendor
           key: composer-${{ hashFiles('composer.lock') }}
 
-      - name: Run composer install
-        run: composer install -n --prefer-dist
-        env:
-          APP_ENV: testing
+      #- name: Run composer install
+      #  run: composer install -n --prefer-dist
+      #  env:
+      #    APP_ENV: testing
 
       - name: Prepare Laravel Application
         run: |
@@ -49,11 +49,11 @@ jobs:
           APP_ENV: testing
 
       - name: Php code sniffer
-        run: ./vendor/bin/phpcs
+        run: ./vendor/bin/phpcs --config-set ignore_warnings_on_exit 1
 
       - name: Upload artifacts
         uses: actions/upload-artifact@master
         if: failure()
         with:
           name: Logs
-          path: ./storage/logs
+          path: ./storage/logs

app/Application.php

@@ -66,17 +66,11 @@ class Application extends Model
         return $this->icon;
     }
 
-    /**
-     * @return string
-     */
     public function iconView(): string
     {
         return asset('storage/'.$this->icon);
     }
 
-    /**
-     * @return string
-     */
     public function defaultColour(): string
     {
         // check if light or dark
@@ -87,33 +81,26 @@ class Application extends Model
         return '#161b1f';
     }
 
-    /**
-     * @return string
-     */
     public function class(): string
     {
         $name = $this->name;
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        return '\App\SupportedApps\\'.$name.'\\'.$name;
+        return \App\SupportedApps::class.'\\'.$name.'\\'.$name;
     }
 
     /**
      * @param $name
-     * @return string
      */
     public static function classFromName($name): string
     {
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+        $class = \App\SupportedApps::class.'\\'.$name.'\\'.$name;
 
         return $class;
     }
 
-    /**
-     * @return Collection
-     */
     public static function apps(): Collection
     {
         $json = json_decode(file_get_contents(storage_path('app/supportedapps.json'))) ?? [];
@@ -122,9 +109,6 @@ class Application extends Model
         return $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
     }
 
-    /**
-     * @return array
-     */
     public static function autocomplete(): array
     {
         $apps = self::apps();
@@ -188,14 +172,11 @@ class Application extends Model
             return null;
         }
         $classname = preg_replace('/[^\p{L}\p{N}]/u', '', $app->name);
-        $app->class = '\App\SupportedApps\\'.$classname.'\\'.$classname;
+        $app->class = \App\SupportedApps::class.'\\'.$classname.'\\'.$classname;
 
         return $app;
     }
 
-    /**
-     * @return array
-     */
     public static function applist(): array
     {
         $list = [];

app/Console/Commands/RegisterApp.php

@@ -35,10 +35,8 @@ class RegisterApp extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $folder = $this->argument('folder');
         if ($folder == 'all') {
@@ -56,10 +54,8 @@ class RegisterApp extends Command
 
     /**
      * @param $folder
-     * @param bool $remove
-     * @return void
      */
-    public function addApp($folder, bool $remove = false)
+    public function addApp($folder, bool $remove = false): void
     {
         $json = app_path('SupportedApps/'.$folder.'/app.json');
 
@@ -96,9 +92,8 @@ class RegisterApp extends Command
     /**
      * @param $appFolder
      * @param $icon
-     * @return void
      */
-    private function saveIcon($appFolder, $icon)
+    private function saveIcon($appFolder, $icon): void
     {
         $iconPath = app_path('SupportedApps/' . $appFolder . '/' . $icon);
         $contents = file_get_contents($iconPath);

app/Console/Kernel.php

@@ -7,22 +7,10 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
     /**
      * Define the application's command schedule.
-     *
-     * @param Schedule $schedule
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')
         //          ->hourly();
@@ -30,10 +18,8 @@ class Kernel extends ConsoleKernel
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
 

app/Exceptions/Handler.php

@@ -8,18 +8,9 @@ use Throwable;
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of the exception types that are not reported.
+     * The list of the inputs that are never flashed to the session on validation exceptions.
      *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
+     * @var array<int, string>
      */
     protected $dontFlash = [
         'current_password',
@@ -29,10 +20,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) {
             //

app/Helper.php

@@ -123,14 +123,16 @@ function isImage(string $file, string $extension): bool
         return false;
     }
 
-    $tempFileName = tempnam("/tmp", "image-check-");
+    $tempFileName = @tempnam("/tmp", "image-check-");
     $handle = fopen($tempFileName, "w");
 
     fwrite($handle, $file);
-
-    $size = @getimagesize($tempFileName);
-
     fclose($handle);
 
+    if ($extension == 'svg') {
+        return 'image/svg+xml' === mime_content_type($tempFileName);
+    }
+
+    $size = @getimagesize($tempFileName);
     return is_array($size) && str_starts_with($size['mime'], 'image');
 }

app/Http/Controllers/Auth/LoginController.php

@@ -49,9 +49,6 @@ class LoginController extends Controller
         $this->middleware('guest')->except(['logout','autologin']);
     }
 
-    /**
-     * @return string
-     */
     public function username(): string
     {
         return 'username';
@@ -60,8 +57,6 @@ class LoginController extends Controller
     /**
      * Handle a login request to the application.
      *
-     * @param Request $request
-     * @return Response
      *
      * @throws ValidationException
      */
@@ -97,10 +92,6 @@ class LoginController extends Controller
     {
     }
 
-    /**
-     * @param User $user
-     * @return RedirectResponse
-     */
     public function setUser(User $user): RedirectResponse
     {
         Auth::logout();
@@ -111,7 +102,6 @@ class LoginController extends Controller
 
     /**
      * @param $uuid
-     * @return RedirectResponse
      */
     public function autologin($uuid): RedirectResponse
     {
@@ -135,15 +125,13 @@ class LoginController extends Controller
      *
      * @return Application|Factory|View
      */
-    public function showLoginForm()
+    public function showLoginForm(): \Illuminate\View\View
     {
         return view('auth.login');
     }
 
     /**
-     * @param Request $request
      * @param $user
-     * @return RedirectResponse
      */
     protected function authenticated(Request $request, $user): RedirectResponse
     {

app/Http/Controllers/Auth/RegisterController.php

@@ -41,9 +41,6 @@ class RegisterController extends Controller
 
     /**
      * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data): \Illuminate\Contracts\Validation\Validator
     {
@@ -56,11 +53,8 @@ class RegisterController extends Controller
 
     /**
      * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return User
      */
-    protected function create(array $data)
+    protected function create(array $data): User
     {
         return User::create([
             'name' => $data['name'],

app/Http/Controllers/Controller.php

@@ -4,13 +4,12 @@ namespace App\Http\Controllers;
 
 use App\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, ValidatesRequests;
 
     protected $user;
 

app/Http/Controllers/HealthController.php

@@ -12,17 +12,11 @@ use Illuminate\Support\Facades\RateLimiter;
 
 class HealthController extends Controller
 {
-    /**
-     * @return int
-     */
     private static function getUsers(): int
     {
         return User::count();
     }
 
-    /**
-     * @return int
-     */
     private static function getItems(): int
     {
         return Item::select('id')
@@ -34,7 +28,6 @@ class HealthController extends Controller
     /**
      * Handle the incoming request.
      *
-     * @param Request $request
      * @return JsonResponse|Response
      * @throws BindingResolutionException
      */

app/Http/Controllers/HomeController.php

@@ -19,8 +19,6 @@ class HomeController extends Controller
 
     /**
      * Show the application dashboard.
-     *
-     * @return RedirectResponse
      */
     public function index(): RedirectResponse
     {

app/Http/Controllers/ImportController.php

@@ -20,9 +20,6 @@ class ImportController extends Controller
 
     /**
      * Handle the incoming request.
-     *
-     * @param Request $request
-     * @return View
      */
     public function __invoke(Request $request): View
     {

app/Http/Controllers/ItemController.php

@@ -32,21 +32,39 @@ class ItemController extends Controller
 
     /**
      * Display a listing of the resource on the dashboard.
-     *
-     * @return View
      */
     public function dash(): View
     {
-        $data['apps'] = Item::whereHas('parents', function ($query) {
-            $query->where('id', 0);
-        })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
+        $treat_tags_as = \App\Setting::fetch('treat_tags_as');
 
-        $data['all_apps'] = Item::whereHas('parents', function ($query) {
-            $query->where('id', 0);
-        })->orWhere('type', 1)->orderBy('order', 'asc')->get();
+        $data["treat_tags_as"] = $treat_tags_as;
+
+        if ($treat_tags_as == 'categories') {
+            $data['categories'] = Item::whereHas('children')->with('children', function ($query) {
+                $query->pinned()->orderBy('order', 'asc');
+            })->pinned()->orderBy('order', 'asc')->get();
+
+        } elseif ($treat_tags_as == 'tags') {
+            $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
+            $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
+            $data['taglist'] = Item::where('id', 0)->orWhere(function($query) {
+                $query->where('type', 1)->pinned();
+            })->orderBy('order', 'asc')->get();
+        } else {
+
+            $data['apps'] = Item::whereHas('parents', function ($query) {
+                $query->where('id', 0);
+            })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
+
+            $data['all_apps'] = Item::whereHas('parents', function ($query) {
+                $query->where('id', 0);
+            })->orWhere(function ($query) {
+                $query->where('type', 1)->whereNot('id', 0);
+            })->orderBy('order', 'asc')->get();
+        }
 
         //$data['all_apps'] = Item::doesntHave('parents')->get();
-        //die(print_r($data['apps']));
+        // die(print_r($data));
         return view('welcome', $data);
     }
 
@@ -69,7 +87,6 @@ class ItemController extends Controller
      * Pin item on the dashboard.
      *
      * @param $id
-     * @return RedirectResponse
      */
     public function pin($id): RedirectResponse
     {
@@ -85,7 +102,6 @@ class ItemController extends Controller
      * Unpin item on the dashboard.
      *
      * @param $id
-     * @return RedirectResponse
      */
     public function unpin($id): RedirectResponse
     {
@@ -135,9 +151,6 @@ class ItemController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @param Request $request
-     * @return View
      */
     public function index(Request $request): View
     {
@@ -154,8 +167,6 @@ class ItemController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return View
      */
     public function create(): View
     {
@@ -169,15 +180,12 @@ class ItemController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return View
      */
     public function edit(int $id): View
     {
         // Get the item
         $item = Item::find($id);
-        if ($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
+        if ($item->appid === null && $item->class !== null) { // old apps won't have an app id so set it
             $app = Application::where('class', $item->class)->first();
             if ($app) {
                 $item->appid = $app->appid;
@@ -194,9 +202,7 @@ class ItemController extends Controller
     }
 
     /**
-     * @param Request $request
      * @param null $id
-     * @return Item
      * @throws ValidationException
      */
     public static function storelogic(Request $request, $id = null): Item
@@ -209,17 +215,17 @@ class ItemController extends Controller
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
         } elseif (strpos($request->input('icon'), 'http') === 0) {
-            $options = array(
-                "ssl" => array(
+            $options = [
+                "ssl" => [
                     "verify_peer" => false,
                     "verify_peer_name" => false,
-                ),
-            );
+                ],
+            ];
 
             $file = $request->input('icon');
             $path_parts = pathinfo($file);
@@ -287,9 +293,6 @@ class ItemController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     public function store(Request $request): RedirectResponse
     {
@@ -303,9 +306,6 @@ class ItemController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
      */
     public function show(int $id): void
     {
@@ -314,10 +314,6 @@ class ItemController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     public function update(Request $request, int $id): RedirectResponse
     {
@@ -330,10 +326,6 @@ class ItemController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     public function destroy(Request $request, int $id): RedirectResponse
     {
@@ -355,9 +347,6 @@ class ItemController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param int $id
-     * @return RedirectResponse
      */
     public function restore(int $id): RedirectResponse
     {
@@ -375,8 +364,6 @@ class ItemController extends Controller
     /**
      * Return details for supported apps
      *
-     * @param Request $request
-     * @return string|null
      * @throws GuzzleException
      */
     public function appload(Request $request): ?string
@@ -419,7 +406,6 @@ class ItemController extends Controller
     }
 
     /**
-     * @param Request $request
      * @return void
      */
     public function testConfig(Request $request)
@@ -448,9 +434,7 @@ class ItemController extends Controller
 
     /**
      * @param $url
-     * @param array $attrs
      * @param array|bool $overridevars
-     * @return ResponseInterface|null
      * @throws GuzzleException
      */
     public function execute($url, array $attrs = [], $overridevars = false): ?ResponseInterface
@@ -481,7 +465,6 @@ class ItemController extends Controller
 
     /**
      * @param $url
-     * @return StreamInterface
      * @throws GuzzleException
      */
     public function websitelookup($url): StreamInterface
@@ -511,7 +494,7 @@ class ItemController extends Controller
     /**
      * @return \Illuminate\Contracts\Foundation\Application|RedirectResponse|Redirector
      */
-    public function checkAppList()
+    public function checkAppList(): RedirectResponse
     {
         ProcessApps::dispatch();
         $route = route('items.index');

app/Http/Controllers/ItemRestController.php

@@ -17,10 +17,8 @@ class ItemRestController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @return Collection
      */
-    public function index()
+    public function index(): Collection
     {
         $columns = [
             'title',
@@ -49,9 +47,6 @@ class ItemRestController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return object
      */
     public function store(Request $request): object
     {
@@ -66,45 +61,32 @@ class ItemRestController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param Item $item
-     * @return Response
      */
-    public function show(Item $item)
+    public function show(Item $item): Response
     {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param Item $item
-     * @return Response
      */
-    public function edit(Item $item)
+    public function edit(Item $item): Response
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param Item $item
-     * @return Response
      */
-    public function update(Request $request, Item $item)
+    public function update(Request $request, Item $item): Response
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param Item $item
-     * @return Response
      */
-    public function destroy(Item $item)
+    public function destroy(Item $item): Response
     {
         //
     }

app/Http/Controllers/SearchController.php

@@ -11,7 +11,6 @@ use Illuminate\Routing\Redirector;
 class SearchController extends Controller
 {
     /**
-     * @param Request $request
      * @return Application|RedirectResponse|Redirector|mixed|void
      */
     public function index(Request $request)

app/Http/Controllers/SettingsController.php

@@ -17,9 +17,6 @@ class SettingsController extends Controller
         $this->middleware('allowed');
     }
 
-    /**
-     * @return View
-     */
     public function index(): View
     {
         $settings = SettingGroup::with([
@@ -32,7 +29,6 @@ class SettingsController extends Controller
     }
 
     /**
-     * @param int $id
      *
      * @return RedirectResponse|View
      */
@@ -59,12 +55,6 @@ class SettingsController extends Controller
         }
     }
 
-    /**
-     * @param Request $request
-     * @param int $id
-     *
-     * @return RedirectResponse
-     */
     public function update(Request $request, int $id): RedirectResponse
     {
         $setting = Setting::find($id);
@@ -87,7 +77,7 @@ class SettingsController extends Controller
                     );
                 }
 
-                $path = $request->file('value')->store('backgrounds');
+                $path = $request->file('value')->store('backgrounds', 'public');
 
                 if ($path === null) {
                     throw new \Exception('file_not_stored');
@@ -114,11 +104,6 @@ class SettingsController extends Controller
         }
     }
 
-    /**
-     * @param int $id
-     *
-     * @return RedirectResponse
-     */
     public function clear(int $id): RedirectResponse
     {
         $user = $this->user();

app/Http/Controllers/TagController.php

@@ -22,7 +22,7 @@ class TagController extends Controller
      *
      * @return Application|Factory|View
      */
-    public function index(Request $request)
+    public function index(Request $request): \Illuminate\View\View
     {
         $trash = (bool) $request->input('trash');
 
@@ -40,7 +40,7 @@ class TagController extends Controller
      *
      * @return Application|Factory|View
      */
-    public function create()
+    public function create(): \Illuminate\View\View
     {
         $data = [];
 
@@ -49,9 +49,6 @@ class TagController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     public function store(Request $request): RedirectResponse
     {
@@ -61,7 +58,7 @@ class TagController extends Controller
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
@@ -90,7 +87,6 @@ class TagController extends Controller
      * Display the specified resource.
      *
      * @param $slug
-     * @return View
      */
     public function show($slug): View
     {
@@ -105,9 +101,6 @@ class TagController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return View
      */
     public function edit(int $id): View
     {
@@ -121,10 +114,6 @@ class TagController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     public function update(Request $request, int $id): RedirectResponse
     {
@@ -134,7 +123,7 @@ class TagController extends Controller
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
@@ -156,10 +145,6 @@ class TagController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     public function destroy(Request $request, int $id): RedirectResponse
     {
@@ -181,9 +166,6 @@ class TagController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param int $id
-     * @return RedirectResponse
      */
     public function restore(int $id): RedirectResponse
     {

app/Http/Controllers/UserController.php

@@ -19,8 +19,6 @@ class UserController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @return View
      */
     public function index(): View
     {
@@ -31,8 +29,6 @@ class UserController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return View
      */
     public function create(): View
     {
@@ -41,7 +37,7 @@ class UserController extends Controller
         return view('users.create', $data);
     }
 
-    public function selectUser()
+    public function selectUser(): \Illuminate\View\View
     {
         Auth::logout();
         $data['users'] = User::all();
@@ -51,9 +47,6 @@ class UserController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     public function store(Request $request): RedirectResponse
     {
@@ -75,7 +68,7 @@ class UserController extends Controller
         }
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('avatars');
+            $path = $request->file('file')->store('avatars', 'public');
             $user->avatar = $path;
         }
 
@@ -93,9 +86,6 @@ class UserController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
      */
     public function show(int $id): void
     {
@@ -104,9 +94,6 @@ class UserController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param User $user
-     * @return View
      */
     public function edit(User $user): View
     {
@@ -117,10 +104,6 @@ class UserController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param User $user
-     * @return RedirectResponse
      */
     public function update(Request $request, User $user): RedirectResponse
     {
@@ -145,7 +128,7 @@ class UserController extends Controller
         }
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('avatars');
+            $path = $request->file('file')->store('avatars', 'public');
             $user->avatar = $path;
         }
 
@@ -166,7 +149,6 @@ class UserController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param User $user
      * @return RedirectResponse | void
      */
     public function destroy(User $user): RedirectResponse

app/Http/Kernel.php

@@ -31,26 +31,25 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
-            'throttle:60,1',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':60,1',
             'bindings',
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
-     * These middleware may be assigned to groups or used individually.
+     * Aliases may be used to conveniently assign middleware to routes and groups.
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'allowed' => \App\Http\Middleware\CheckAllowed::class,
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

app/Http/Middleware/CheckAllowed.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use App\User;
 use Closure;
 use Illuminate\Auth\AuthenticationException;
@@ -15,12 +16,9 @@ class CheckAllowed
     /**
      * Handle an incoming request.
      *
-     * @param Request $request
-     * @param Closure $next
-     * @return mixed
      * @throws AuthenticationException
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         $route = Route::currentRouteName();
         $current_user = User::currentUser();

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -10,13 +11,8 @@ class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
-     *
-     * @param Request $request
-     * @param  Closure  $next
-     * @param string|null $guard
-     * @return mixed
      */
-    public function handle(Request $request, Closure $next, string $guard = null)
+    public function handle(Request $request, Closure $next, string $guard = null): Response
     {
         if (Auth::guard($guard)->check()) {
             return redirect()->intended();

app/Http/Middleware/TrimStrings.php

@@ -9,9 +9,10 @@ class TrimStrings extends Middleware
     /**
      * The names of the attributes that should not be trimmed.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
+        'current_password',
         'password',
         'password_confirmation',
     ];

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Middleware/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app/Item.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use stdClass;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 
@@ -76,10 +77,7 @@ class Item extends Model
 
     use HasFactory;
 
-    /**
-     * @return void
-     */
-    protected static function boot()
+    protected static function boot(): void
     {
         parent::boot();
 
@@ -113,9 +111,6 @@ class Item extends Model
 
     /**
      * Scope a query to only include pinned items.
-     *
-     * @param Builder $query
-     * @return Builder
      */
     public function scopePinned(Builder $query): Builder
     {
@@ -139,29 +134,33 @@ class Item extends Model
         $id = $this->id;
         $tags = ItemTag::select('tag_id')->where('item_id', $id)->pluck('tag_id')->toArray();
         $tagdetails = self::select('id', 'title', 'url', 'pinned')->whereIn('id', $tags)->get();
-        //print_r($tags);
-        if (in_array(0, $tags)) {
-            $details = new self([
-                'id' => 0,
-                'title' => __('app.dashboard'),
-                'url' => '',
-                'pinned' => 0,
-            ]);
-            $tagdetails->prepend($details);
-        }
 
         return $tagdetails;
     }
 
-    /**
-     * @return string
-     */
+    protected function title(): Attribute
+    {
+        return Attribute::make(
+            get: fn (mixed $value) => ($value === 'app.dashboard' ? __('app.dashboard') : $value),
+        );
+    }
+
+    protected function tagUrl(): Attribute
+    {
+        return Attribute::make(
+            get: fn (mixed $value, array $attributes) => ($attributes['id'] === 0 ? '0-dash' : $attributes['url']),
+        );
+    }
+
     public function getTagClass(): string
     {
         $tags = $this->tags();
         $slugs = [];
 
         foreach ($tags as $tag) {
+            if ($tag->id === 0) {
+                $tag->url = '0-dash';
+            }
             if ($tag->url) {
                 $slugs[] = 'tag-'.$tag->url;
             }
@@ -170,17 +169,25 @@ class Item extends Model
         return implode(' ', $slugs);
     }
 
-    /**
-     * @return BelongsToMany
-     */
+    public function getTagList(): string
+    {
+        $tags = $this->tags();
+        $titles = [];
+        // print_r($tags);
+        foreach ($tags as $tag) {
+            if ($tag->title) {
+                $titles[] = $tag->title;
+            }
+        }
+
+        return implode(', ', $titles);
+    }
+
     public function parents(): BelongsToMany
     {
         return $this->belongsToMany(Item::class, 'item_tag', 'item_id', 'tag_id');
     }
 
-    /**
-     * @return BelongsToMany
-     */
     public function children(): BelongsToMany
     {
         return $this->belongsToMany(Item::class, 'item_tag', 'tag_id', 'item_id');
@@ -198,9 +205,6 @@ class Item extends Model
         }
     }
 
-    /**
-     * @return string
-     */
     public function getDroppableAttribute(): string
     {
         if ((int) $this->type === 1) {
@@ -210,9 +214,6 @@ class Item extends Model
         }
     }
 
-    /**
-     * @return string
-     */
     public function getLinkTargetAttribute(): string
     {
         $target = Setting::fetch('window_target');
@@ -224,9 +225,6 @@ class Item extends Model
         }
     }
 
-    /**
-     * @return string
-     */
     public function getLinkIconAttribute(): string
     {
         if ((int) $this->type === 1) {
@@ -236,9 +234,6 @@ class Item extends Model
         }
     }
 
-    /**
-     * @return string
-     */
     public function getLinkTypeAttribute(): string
     {
         if ((int) $this->type === 1) {
@@ -279,9 +274,6 @@ class Item extends Model
         return $query->where('type', $typeid);
     }
 
-    /**
-     * @return bool
-     */
     public function enhanced(): bool
     {
         /*if(isset($this->class) && !empty($this->class)) {
@@ -295,7 +287,6 @@ class Item extends Model
 
     /**
      * @param $class
-     * @return bool
      */
     public static function isEnhanced($class): bool
     {
@@ -321,9 +312,6 @@ class Item extends Model
         return ((bool) ($app instanceof SearchInterface)) ? $app : false;
     }
 
-    /**
-     * @return bool
-     */
     public function enabled(): bool
     {
         if ($this->enhanced()) {
@@ -369,7 +357,6 @@ class Item extends Model
 
     /**
      * @param $class
-     * @return Application|null
      */
     public static function applicationDetails($class): ?Application
     {
@@ -386,7 +373,6 @@ class Item extends Model
 
     /**
      * @param $class
-     * @return string
      */
     public static function getApplicationDescription($class): string
     {
@@ -400,8 +386,6 @@ class Item extends Model
 
     /**
      * Get the user that owns the item.
-     *
-     * @return BelongsTo
      */
     public function user(): BelongsTo
     {

app/Jobs/ProcessApps.php

@@ -32,10 +32,9 @@ class ProcessApps implements ShouldQueue, ShouldBeUnique
     /**
      * Execute the job.
      *
-     * @return void
      * @throws GuzzleException
      */
-    public function handle()
+    public function handle(): void
     {
         Log::debug('Process Apps dispatched');
         $localapps = Application::whereNull('class')->get();

app/Jobs/UpdateApps.php

@@ -30,10 +30,9 @@ class UpdateApps implements ShouldQueue, ShouldBeUnique
     /**
      * Execute the job.
      *
-     * @return void
      * @throws GuzzleException
      */
-    public function handle()
+    public function handle(): void
     {
         Log::debug('Update of all apps triggered!');
         $apps = Application::all('appid')->toArray();
@@ -50,10 +49,7 @@ class UpdateApps implements ShouldQueue, ShouldBeUnique
         Cache::lock('updateApps')->forceRelease();
     }
 
-    /**
-     * @return void
-     */
-    public function failed($exception)
+    public function failed($exception): void
     {
         Cache::lock('updateApps')->forceRelease();
     }

app/Providers/AppServiceProvider.php

@@ -19,10 +19,8 @@ class AppServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         if (! class_exists('ZipArchive')) {
             die('You are missing php-zip');
@@ -105,10 +103,8 @@ class AppServiceProvider extends ServiceProvider
 
     /**
      * Generate app key if missing and .env exists
-     *
-     * @return void
      */
-    public function genKey()
+    public function genKey(): void
     {
         if (is_file(base_path('.env'))) {
             if (empty(env('APP_KEY'))) {
@@ -119,10 +115,8 @@ class AppServiceProvider extends ServiceProvider
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         if ($this->app->isLocal()) {
             $this->app->register(IdeHelperServiceProvider::class);
@@ -136,7 +130,6 @@ class AppServiceProvider extends ServiceProvider
     /**
      * Check if database needs an update or do first time database setup
      *
-     * @return void
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
@@ -158,9 +151,6 @@ class AppServiceProvider extends ServiceProvider
         }
     }
 
-    /**
-     * @return void
-     */
     public function createEnvFile(): void
     {
         if (!is_file(base_path('.env'))) {
@@ -170,9 +160,6 @@ class AppServiceProvider extends ServiceProvider
         $this->genKey();
     }
 
-    /**
-     * @return bool
-     */
     private function needsDBUpdate(): bool
     {
         if (!Schema::hasTable('settings')) {
@@ -185,10 +172,7 @@ class AppServiceProvider extends ServiceProvider
         return version_compare($app_version, $db_version) === 1;
     }
 
-    /**
-     * @return void
-     */
-    private function updateApps()
+    private function updateApps(): void
     {
         // This lock ensures that the job is not invoked multiple times.
         // In 5 minutes all app updates should be finished.

app/Providers/AuthServiceProvider.php

@@ -17,13 +17,9 @@ class AuthServiceProvider extends ServiceProvider
 
     /**
      * Register any authentication / authorization services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->registerPolicies();
-
         //
     }
 }

app/Providers/BroadcastServiceProvider.php

@@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Broadcast::routes();
 

app/Providers/EventServiceProvider.php

@@ -19,13 +19,19 @@ class EventServiceProvider extends ServiceProvider
 
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         parent::boot();
 
         //
     }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     */
+    public function shouldDiscoverEvents(): bool
+    {
+        return false;
+    }
 }

app/Providers/RouteServiceProvider.php

@@ -14,14 +14,11 @@ class RouteServiceProvider extends ServiceProvider
      *
      * REMOVED WITH LARAVEL 8 UPGRADE
      */
-//    protected $namespace = 'App\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
 
@@ -30,10 +27,8 @@ class RouteServiceProvider extends ServiceProvider
 
     /**
      * Define the routes for the application.
-     *
-     * @return void
      */
-    public function map()
+    public function map(): void
     {
         $this->mapApiRoutes();
 
@@ -46,13 +41,10 @@ class RouteServiceProvider extends ServiceProvider
      * Define the "web" routes for the application.
      *
      * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
      */
-    protected function mapWebRoutes()
+    protected function mapWebRoutes(): void
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
              ->group(base_path('routes/web.php'));
     }
 
@@ -60,14 +52,11 @@ class RouteServiceProvider extends ServiceProvider
      * Define the "api" routes for the application.
      *
      * These routes are typically stateless.
-     *
-     * @return void
      */
-    protected function mapApiRoutes()
+    protected function mapApiRoutes(): void
     {
         Route::prefix('api')
              ->middleware('api')
-             ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }
 }

app/Search.php

@@ -5,6 +5,7 @@ namespace App;
 use Cache;
 use Form;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Request as Input;
 use Yaml;
 
 abstract class Search
@@ -106,7 +107,7 @@ abstract class Search
         if ((bool) $homepage_search !== true) {
             return $output;
         }
-        $user_search_provider = $user_search_provider ?? 'none';
+        $user_search_provider = Input::get('p') ?? $user_search_provider ?? 'none';
 
         if ((bool) $search_provider) {
             if ((bool) $user_search_provider) {
@@ -124,7 +125,7 @@ abstract class Search
                 $output .= '</select>';
                 $output .= Form::text(
                     'q',
-                    null,
+                    Input::get('q') ?? null,
                     [
                         'class' => 'homesearch',
                         'autofocus' => 'autofocus',

app/Setting.php

@@ -70,10 +70,6 @@ class Setting extends Model
      */
     protected static $cache = [];
 
-    /**
-     * @param Request $request
-     * @return object
-     */
     public static function getInput(Request $request): object
     {
         return (object) [
@@ -198,16 +194,12 @@ class Setting extends Model
         return $value;
     }
 
-    /**
-     * @return BelongsTo
-     */
     public function group(): BelongsTo
     {
         return $this->belongsTo(\App\SettingGroup::class, 'group_id');
     }
 
     /**
-     * @param string $key
      *
      * @return mixed
      */
@@ -220,11 +212,10 @@ class Setting extends Model
 
     // @codingStandardsIgnoreStart
     /**
-     * @param string $key
      *
      * @return mixed
      */
-    public static function _fetch($key, $user = null)
+    public static function _fetch(string $key, $user = null)
     {
         // @codingStandardsIgnoreEnd
         //$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
@@ -267,20 +258,14 @@ class Setting extends Model
     }
 
     /**
-     * @param string $key
      * @param $value
      */
-    public static function add($key, $value)
+    public static function add(string $key, $value)
     {
         self::$cache[$key] = $value;
     }
 
-    /**
-     * @param string $key
-     *
-     * @return bool
-     */
-    public static function cached($key): bool
+    public static function cached(string $key): bool
     {
         return array_key_exists($key, self::$cache);
     }

app/SettingGroup.php

@@ -37,9 +37,6 @@ class SettingGroup extends Model
      */
     public $timestamps = false;
 
-    /**
-     * @return HasMany
-     */
     public function settings(): HasMany
     {
         return $this->hasMany(\App\Setting::class, 'group_id');

app/SupportedApps.php

@@ -134,7 +134,7 @@ abstract class SupportedApps
      */
     public function getLiveStats($status, $data)
     {
-        $className = get_class($this);
+        $className = $this::class;
         $explode = explode('\\', $className);
         $name = end($explode);
 

composer.json

@@ -8,28 +8,28 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.4.32",
-        "facade/ignition": "^2.3.6",
-        "fideloper/proxy": "^4.0",
-        "graham-campbell/github": "^10.5",
+        "php": "^8.1",
+        "graham-campbell/github": "^12.0",
         "guzzlehttp/guzzle": "^7.4",
-        "laravel/framework": "^8.0",
-        "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.0",
-        "laravelcollective/html": "^6.0",
-        "nunomaduro/collision": "^5.0",
-        "symfony/yaml": "^5.4",
+        "laravel/framework": "^10.44",
+        "laravel/tinker": "^2.8",
+        "laravel/ui": "^4.2",
+        "laravelcollective/html": "^6.4",
+        "nunomaduro/collision": "^6.3",
+        "symfony/yaml": "^6.2",
         "ext-json": "*",
-        "ext-intl": "*"
+        "ext-intl": "*",
+        "league/flysystem-aws-s3-v3": "^3.0",
+        "spatie/laravel-ignition": "^2.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.12",
-        "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~9.0",
+        "barryvdh/laravel-ide-helper": "^2.13",
+        "filp/whoops": "^2.8",
+        "mockery/mockery": "^1.4.4",
+        "phpunit/phpunit": "^9.5.10",
         "squizlabs/php_codesniffer": "3.*",
-        "symfony/thanks": "^1.0"
+        "symfony/thanks": "^1.2",
+        "fakerphp/faker": "^1.9.1"
     },
     "autoload": {
         "classmap": [
@@ -71,7 +71,8 @@
         "post-update-cmd": [
             "Illuminate\\Foundation\\ComposerScripts::postUpdate",
             "@php artisan ide-helper:generate",
-            "@php artisan ide-helper:meta"
+            "@php artisan ide-helper:meta",
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ]
     },
     "config": {
@@ -80,7 +81,10 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "kylekatarnls/update-helper": true,
-            "symfony/thanks": true
+            "symfony/thanks": true,
+            "php-http/discovery": true
         }
-    }
+    },
+    "minimum-stability": "stable",
+    "prefer-stable": true
 }

config/app.php

@@ -1,5 +1,8 @@
 <?php
 
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Facade;
+
 return [
 
     /*
@@ -14,7 +17,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),
-    'version' => '2.5.7',
+    'version' => '2.6.3',
 
     /*
     |--------------------------------------------------------------------------
@@ -125,6 +128,24 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Maintenance Mode Driver
+    |--------------------------------------------------------------------------
+    |
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
+    |
+    */
+
+    'maintenance' => [
+        'driver' => 'file',
+        // 'store'  => 'redis',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -136,34 +157,7 @@ return [
     |
     */
 
-    'providers' => [
-
-        /*
-         * Laravel Framework Service Providers...
-         */
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Translation\TranslationServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
+    'providers' => ServiceProvider::defaultProviders()->merge([
         /*
          * Package Service Providers...
          */
@@ -176,8 +170,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
-    ],
+    ])->toArray(),
 
     /*
     |--------------------------------------------------------------------------
@@ -190,51 +183,13 @@ return [
     |
     */
 
-    'aliases' => [
-
-        'App' => Illuminate\Support\Facades\App::class,
-        'Arr' => Illuminate\Support\Arr::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Form' => Collective\Html\FormFacade::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Html' => Collective\Html\HtmlFacade::class,
-        'Http' => Illuminate\Support\Facades\Http::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Mail' => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Redis' => Illuminate\Support\Facades\Redis::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'Str' => Illuminate\Support\Str::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
-        'Yaml' => Symfony\Component\Yaml\Yaml::class,
-
-        'SupportedApps' => App\SupportedApps::class,
+    'aliases' => Facade::defaultAliases()->merge([
         'EnhancedApps' => App\EnhancedApps::class,
-
-    ],
+        'Form' => Collective\Html\FormFacade::class,
+        'Html' => Collective\Html\HtmlFacade::class,
+        'Redis' => Illuminate\Support\Facades\Redis::class,
+        'SupportedApps' => App\SupportedApps::class,
+        'Yaml' => Symfony\Component\Yaml\Yaml::class,
+    ])->toArray(),
 
 ];

config/auth.php

@@ -31,7 +31,7 @@ return [
     | users are actually retrieved out of your database or other storage
     | mechanisms used by this application to persist your user's data.
     |
-    | Supported: "session", "token"
+    | Supported: "session"
     |
     */
 
@@ -86,16 +86,20 @@ return [
     | than one user table or model in the application and you want to have
     | separate password reset settings based on the specific user types.
     |
-    | The expire time is the number of minutes that the reset token should be
+    | The expiry time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
     | they have less time to be guessed. You may change this as needed.
     |
+    | The throttle setting is the number of seconds a user must wait before
+    | generating more password reset tokens. This prevents the user from
+    | quickly generating a very large amount of password reset tokens.
+    |
     */
 
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_resets',
+            'table' => 'password_reset_tokens',
             'expire' => 60,
             'throttle' => 60,
         ],

config/broadcasting.php

@@ -11,7 +11,7 @@ return [
     | framework when an event needs to be broadcast. You may set this to
     | any of the connections defined in the "connections" array below.
     |
-    | Supported: "pusher", "redis", "log", "null"
+    | Supported: "pusher", "ably", "redis", "log", "null"
     |
     */
 
@@ -37,8 +37,20 @@ return [
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS' => true,
+                'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
+                'port' => env('PUSHER_PORT', 443),
+                'scheme' => env('PUSHER_SCHEME', 'https'),
+                'encrypted' => true,
+                'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
             ],
+            'client_options' => [
+                // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
+            ],
+        ],
+
+        'ably' => [
+            'driver' => 'ably',
+            'key' => env('ABLY_KEY'),
         ],
 
         'redis' => [

config/cache.php

@@ -13,8 +13,6 @@ return [
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
-    | Supported: "apc", "array", "database", "file", "memcached", "redis"
-    |
     */
 
     'default' => env('CACHE_DRIVER', 'file'),
@@ -28,6 +26,9 @@ return [
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
+    | Supported drivers: "apc", "array", "database", "file",
+    |         "memcached", "redis", "dynamodb", "octane", "null"
+    |
     */
 
     'stores' => [
@@ -45,11 +46,13 @@ return [
             'driver' => 'database',
             'table' => 'cache',
             'connection' => null,
+            'lock_connection' => null,
         ],
 
         'file' => [
             'driver' => 'file',
             'path' => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
@@ -60,7 +63,7 @@ return [
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -74,6 +77,7 @@ return [
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
+            'lock_connection' => 'default',
         ],
 
         'dynamodb' => [
@@ -85,6 +89,10 @@ return [
             'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
+        'octane' => [
+            'driver' => 'octane',
+        ],
+
     ],
 
     /*
@@ -92,12 +100,12 @@ return [
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
+    | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
+    | stores there might be other applications using the same cache. For
+    | that reason, you may prefix every cache key to avoid collisions.
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
 ];

config/cors.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['api/*', 'sanctum/csrf-cookie'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];

config/database.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('DB_CONNECTION', 'sqlite'),
+    'default' => env('DB_CONNECTION', 'mysql'),
 
     /*
     |--------------------------------------------------------------------------
@@ -37,9 +37,10 @@ return [
 
         'sqlite' => [
             'driver' => 'sqlite',
-            //'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'database' => database_path(env('DB_DATABASE', 'app.sqlite')),
+            'url' => env('DATABASE_URL'),
+            'database' => database_path(env('DB_DATABASE', 'database.sqlite')),
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
         'mysql' => [
@@ -73,7 +74,7 @@ return [
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
-            'schema' => 'public',
+            'search_path' => 'public',
             'sslmode' => 'prefer',
         ],
 
@@ -88,8 +89,10 @@ return [
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
+            // 'encrypt' => env('DB_ENCRYPT', 'yes'),
+            // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'),
         ],
-        
+
     ],
 
     /*
@@ -111,7 +114,7 @@ return [
     |--------------------------------------------------------------------------
     |
     | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
+    | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
@@ -128,7 +131,8 @@ return [
         'default' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_DB', '0'),
         ],
@@ -136,7 +140,8 @@ return [
         'cache' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],

config/filesystems.php

@@ -13,18 +13,7 @@ return [
     |
     */
 
-    'default' => env('FILESYSTEM_DRIVER', 'public'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Cloud Filesystem Disk
-    |--------------------------------------------------------------------------
-    |
-    | Many applications store files both locally and in the cloud. For this
-    | reason, you may specify a default "cloud" driver here. This driver
-    | will be bound as the Cloud disk implementation in the container.
-    |
-    */
+    'default' => env('FILESYSTEM_DISK', 'local'),
 
     'cloud' => env('FILESYSTEM_CLOUD', 's3'),
 
@@ -35,9 +24,9 @@ return [
     |
     | Here you may configure as many filesystem "disks" as you wish, and you
     | may even configure multiple disks of the same driver. Defaults have
-    | been setup for each driver as an example of the required options.
+    | been set up for each driver as an example of the required values.
     |
-    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -46,6 +35,7 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'throw' => false,
         ],
 
         'public' => [
@@ -53,6 +43,7 @@ return [
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
+            'throw' => false,
         ],
 
         's3' => [
@@ -63,8 +54,25 @@ return [
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
         ],
-        
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Symbolic Links
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the symbolic links that will be created when the
+    | `storage:link` Artisan command is executed. The array keys should be
+    | the locations of the links and the values should be their targets.
+    |
+    */
+
+    'links' => [
+        public_path('storage') => storage_path('app/public'),
     ],
 
 ];

config/hashing.php

@@ -29,7 +29,8 @@ return [
     */
 
     'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 10),
+        'rounds' => env('BCRYPT_ROUNDS', 12),
+        'verify' => true,
     ],
 
     /*
@@ -44,9 +45,10 @@ return [
     */
 
     'argon' => [
-        'memory' => 1024,
-        'threads' => 2,
-        'time' => 2,
+        'memory' => 65536,
+        'threads' => 1,
+        'time' => 4,
+        'verify' => true,
     ],
 
 ];

config/logging.php

@@ -3,6 +3,7 @@
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
 
 return [
 
@@ -17,7 +18,23 @@ return [
     |
     */
 
-    'default' => env('LOG_CHANNEL', 'daily'),
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Deprecations Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the log channel that should be used to log warnings
+    | regarding deprecated PHP and library features. This allows you to get
+    | your application ready for upcoming major versions of dependencies.
+    |
+    */
+
+    'deprecations' => [
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => false,
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -44,14 +61,16 @@ return [
         'single' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'daily' => [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
             'days' => 14,
+            'replace_placeholders' => true,
         ],
 
         'slack' => [
@@ -59,36 +78,44 @@ return [
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
             'emoji' => ':boom:',
-            'level' => 'critical',
+            'level' => env('LOG_LEVEL', 'critical'),
+            'replace_placeholders' => true,
         ],
 
         'papertrail' => [
             'driver' => 'monolog',
-            'level' => 'debug',
-            'handler' => SyslogUdpHandler::class,
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'stderr' => [
             'driver' => 'monolog',
+            'level' => env('LOG_LEVEL', 'debug'),
             'handler' => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'facility' => LOG_USER,
+            'replace_placeholders' => true,
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'null' => [

config/mail.php

@@ -4,45 +4,97 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
-    |            "sparkpost", "log", "array"
+    | This option controls the default mailer that is used to send any email
+    | messages sent by your application. Alternative mailers may be setup
+    | and used as needed; however, this mailer will be used by default.
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | Here you may provide the host address of the SMTP server used by your
-    | applications. A default option is provided that is compatible with
-    | the Mailgun mail service which will provide reliable deliveries.
+    | Here you may configure all of the mailers used by your application plus
+    | their respective settings. Several examples have been configured for
+    | you and you are free to add your own as your application requires.
+    |
+    | Laravel supports a variety of mail "transport" drivers to be used while
+    | sending an e-mail. You will specify which one you are using for your
+    | mailers below. You are free to add additional mailers as required.
+    |
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
+    |            "postmark", "log", "array", "failover", "roundrobin"
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'mailers' => [
+        'smtp' => [
+            'transport' => 'smtp',
+            'url' => env('MAIL_URL'),
+            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+            'port' => env('MAIL_PORT', 587),
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'username' => env('MAIL_USERNAME'),
+            'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
+            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+        ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Port
-    |--------------------------------------------------------------------------
-    |
-    | This is the SMTP port used by your application to deliver e-mails to
-    | users of the application. Like the host we have set this value to
-    | stay compatible with the Mailgun e-mail application by default.
-    |
-    */
+        'ses' => [
+            'transport' => 'ses',
+        ],
 
-    'port' => env('MAIL_PORT', 587),
+        'postmark' => [
+            'transport' => 'postmark',
+            // 'message_stream_id' => null,
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
+
+        'mailgun' => [
+            'transport' => 'mailgun',
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+
+        'failover' => [
+            'transport' => 'failover',
+            'mailers' => [
+                'smtp',
+                'log',
+            ],
+        ],
+
+        'roundrobin' => [
+            'transport' => 'roundrobin',
+            'mailers' => [
+                'ses',
+                'postmark',
+            ],
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -60,47 +112,6 @@ return [
         'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-
-    'password' => env('MAIL_PASSWORD'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
     /*
     |--------------------------------------------------------------------------
     | Markdown Mail Settings

config/queue.php

@@ -39,6 +39,7 @@ return [
             'table' => 'jobs',
             'queue' => 'default',
             'retry_after' => 90,
+            'after_commit' => false,
         ],
 
         'beanstalkd' => [
@@ -47,6 +48,7 @@ return [
             'queue' => 'default',
             'retry_after' => 90,
             'block_for' => 0,
+            'after_commit' => false,
         ],
 
         'sqs' => [
@@ -54,9 +56,10 @@ return [
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'queue' => env('SQS_QUEUE', 'default'),
             'suffix' => env('SQS_SUFFIX'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'after_commit' => false,
         ],
 
         'redis' => [
@@ -65,6 +68,7 @@ return [
             'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
             'block_for' => null,
+            'after_commit' => false,
         ],
 
     ],
@@ -81,7 +85,7 @@ return [
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],

config/services.php

@@ -18,6 +18,7 @@ return [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
         'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+        'scheme' => 'https',
     ],
 
     'postmark' => [
@@ -29,5 +30,5 @@ return [
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
-    
+
 ];

config/session.php

@@ -14,7 +14,7 @@ return [
     | you may specify any of the other wonderful drivers provided here.
     |
     | Supported: "file", "cookie", "database", "apc",
-    |            "memcached", "redis", "array"
+    |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
@@ -72,7 +72,7 @@ return [
     |
     */
 
-    'connection' => env('SESSION_CONNECTION', null),
+    'connection' => env('SESSION_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------
@@ -92,13 +92,15 @@ return [
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
-    | When using the "apc" or "memcached" session drivers, you may specify a
-    | cache store that should be used for these sessions. This value must
-    | correspond with one of the application's configured cache stores.
+    | While using one of the framework's cache driven session backends you may
+    | list a cache store that should be used for these sessions. This value
+    | must match with one of the application's configured cache "stores".
+    |
+    | Affects: "apc", "dynamodb", "memcached", "redis"
     |
     */
 
-    'store' => env('SESSION_STORE', null),
+    'store' => env('SESSION_STORE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -153,7 +155,7 @@ return [
     |
     */
 
-    'domain' => env('SESSION_DOMAIN', null),
+    'domain' => env('SESSION_DOMAIN'),
 
     /*
     |--------------------------------------------------------------------------
@@ -162,7 +164,7 @@ return [
     |
     | By setting this option to true, session cookies will only be sent back
     | to the server if the browser has a HTTPS connection. This will keep
-    | the cookie from being sent to you if it can not be done securely.
+    | the cookie from being sent to you when it can't be done securely.
     |
     */
 
@@ -188,12 +190,25 @@ return [
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" since this is a secure default value.
     |
-    | Supported: "lax", "strict"
+    | Supported: "lax", "strict", "none", null
     |
     */
 
     'same_site' => null,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Partitioned Cookies
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will tie the cookie to the top-level site for
+    | a cross-site context. Partitioned cookies are accepted by the browser
+    | when flagged "secure" and the Same-Site attribute is set to "none".
+    |
+    */
+
+    'partitioned' => false,
+
 ];

database/factories/ItemFactory.php

@@ -7,17 +7,8 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ItemFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Item::class;
-
     /**
      * Define the model's default state.
-     *
-     * @return array
      */
     public function definition(): array
     {

database/factories/ItemTagFactory.php

@@ -8,17 +8,8 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ItemTagFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = ItemTag::class;
-
     /**
      * Define the model's default state.
-     *
-     * @return array
      */
     public function definition(): array
     {

database/factories/UserFactory.php

@@ -2,30 +2,26 @@
 
 namespace Database\Factories;
 
+use Illuminate\Support\Facades\Hash;
 use App\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
 class UserFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = User::class;
-
     /**
      * Define the model's default state.
      *
      * @return array
      */
-    public function definition()
+    protected static ?string $password;
+
+    public function definition(): array
     {
         return [
             'username' => $this->faker->name(),
             'email' => $this->faker->unique()->safeEmail(),
-            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+            'password' => static::$password ??= Hash::make('password'),
             'public_front' => 1,
             'remember_token' => Str::random(10),
         ];
@@ -33,10 +29,8 @@ class UserFactory extends Factory
 
     /**
      * Indicate that the model's email address should be unverified.
-     *
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
      */
-    public function unverified()
+    public function unverified(): Factory
     {
         return $this->state(function (array $attributes) {
             return [

database/migrations/2018_01_27_155922_create_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('items', function (Blueprint $table) {
             $table->increments('id');
@@ -29,11 +27,9 @@ class CreateItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('items');
     }
-}
+};

database/migrations/2018_02_04_185524_create_settings_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('settings', function (Blueprint $table) {
             $table->increments('id');
@@ -28,11 +26,9 @@ class CreateSettingsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('settings');
     }
-}
+};

database/migrations/2018_02_04_185802_create_setting_groups_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingGroupsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('setting_groups', function (Blueprint $table) {
             $table->increments('id');
@@ -22,11 +20,9 @@ class CreateSettingGroupsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('setting_groups');
     }
-}
+};

database/migrations/2018_02_16_175830_add_columns_to_items_for_groups.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddColumnsToItemsForGroups extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->integer('type')->default(0)->index(); // 0 = item, 1 = category
@@ -20,13 +18,11 @@ class AddColumnsToItemsForGroups extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['type']);
         });
     }
-}
+};

database/migrations/2018_02_16_193703_item_tag.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ItemTag extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('item_tag', function (Blueprint $table) {
             $table->integer('item_id')->unsigned()->index();
@@ -25,11 +23,9 @@ class ItemTag extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('item_tag');
     }
-}
+};

database/migrations/2018_10_12_122907_create_users_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
@@ -28,11 +26,9 @@ class CreateUsersTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
     }
-}
+};

database/migrations/2018_10_12_123036_create_password_resets_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePasswordResetsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('password_resets', function (Blueprint $table) {
             $table->string('email')->index();
@@ -22,11 +20,9 @@ class CreatePasswordResetsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('password_resets');
     }
-}
+};

database/migrations/2018_10_12_131222_add_user_id_to_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddUserIdToItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->integer('user_id')->default(1)->index(); // 0 = item, 1 = category
@@ -20,13 +18,11 @@ class AddUserIdToItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['user_id']);
         });
     }
-}
+};

database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingUserPivotTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('setting_user', function (Blueprint $table) {
             $table->integer('setting_id')->unsigned()->index();
@@ -25,11 +23,9 @@ class CreateSettingUserPivotTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('setting_user');
     }
-}
+};

database/migrations/2018_10_18_110905_create_applications_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateApplicationsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('applications', function (Blueprint $table) {
             $table->string('appid')->unique();
@@ -30,11 +28,9 @@ class CreateApplicationsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('applications');
     }
-}
+};

database/migrations/2018_10_23_132008_add_class_to_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClassToItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->string('class')->nullable();
@@ -20,13 +18,11 @@ class AddClassToItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['class']);
         });
     }
-}
+};

database/migrations/2018_10_31_191604_create_jobs_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -26,11 +24,9 @@ class CreateJobsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('jobs');
     }
-}
+};

database/migrations/2018_11_06_112434_create_failed_jobs_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFailedJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -25,11 +23,9 @@ class CreateFailedJobsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('failed_jobs');
     }
-}
+};

database/migrations/2022_03_15_140911_add_appid_to_items.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAppidToItems extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->string('appid')->nullable();
@@ -20,13 +18,11 @@ class AddAppidToItems extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['appid']);
         });
     }
-}
+};

database/migrations/2022_03_16_093044_add_class_to_application.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClassToApplication extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->string('class')->nullable()->index();
@@ -20,13 +18,11 @@ class AddClassToApplication extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->dropColumn(['class']);
         });
     }
-}
+};

database/migrations/2022_03_16_181343_add_app_description_to_items.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAppDescriptionToItems extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->text('appdescription')->nullable();
@@ -20,13 +18,11 @@ class AddAppDescriptionToItems extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             //
         });
     }
-}
+};

database/migrations/2024_02_16_000000_rename_password_resets_table.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::rename('password_resets', 'password_reset_tokens');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::rename('password_reset_tokens', 'password_resets');
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -8,10 +8,8 @@ class DatabaseSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         $this->call(SettingsSeeder::class);
         $this->call(UsersSeeder::class);

database/seeders/SettingsSeeder.php

@@ -22,7 +22,7 @@ class SettingsSeeder extends Seeder
             return json_encode(['en' => 'English']);
         }
 
-        $languageDirectories = array_filter(glob(resource_path().'/lang/*'), 'is_dir');
+        $languageDirectories = array_filter(glob(lang_path().'/*'), 'is_dir');
         $result = [];
 
         foreach ($languageDirectories as $languageDirectory) {
@@ -52,10 +52,8 @@ class SettingsSeeder extends Seeder
 
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Groups
         if (! $setting_group = SettingGroup::find(1)) {
@@ -329,5 +327,28 @@ class SettingsSeeder extends Seeder
                 $app->parents()->attach(0);
             }
         }
+
+        $tag_options = json_encode([
+            'folders' => 'app.settings.folders',
+            'tags' => 'app.settings.tags',
+            'categories' => 'app.settings.categories',
+        ]);
+
+        if (! $setting = Setting::find(14)) {
+            $setting = new Setting;
+            $setting->id = 14;
+            $setting->group_id = 2;
+            $setting->key = 'treat_tags_as';
+            $setting->type = 'select';
+            $setting->options = $tag_options;
+            $setting->value = 'folders';
+            $setting->label = 'app.settings.treat_tags_as';
+            $setting->save();
+        } else {
+            $setting->options = $tag_options;
+            $setting->label = 'app.settings.treat_tags_as';
+            $setting->save();
+        }
+
     }
 }

database/seeders/UsersSeeder.php

@@ -9,10 +9,8 @@ class UsersSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Groups
         if (!User::find(1)) {

lang/en/app.php

@@ -0,0 +1,117 @@
+<?php
+
+return array (
+  'settings.system' => 'System',
+  'settings.appearance' => 'Appearance',
+  'settings.miscellaneous' => 'Miscellaneous',
+  'settings.advanced' => 'Advanced',
+  'settings.support' => 'Support',
+  'settings.donate' => 'Donate',
+  'settings.version' => 'Version',
+  'settings.background_image' => 'Background Image',
+  'settings.trianglify' => 'Trianglify',
+  'settings.trianglify_seed' => 'Trianglify Random Seed',
+  'settings.window_target' => 'Link opens in',
+  'settings.window_target.current' => 'Open in this tab',
+  'settings.window_target.one' => 'Open in the same tab',
+  'settings.window_target.new' => 'Open in a new tab',
+  'settings.homepage_search' => 'Homepage Search',
+  'settings.search_provider' => 'Default Search Provider',
+  'settings.language' => 'Language',
+  'settings.reset' => 'Reset back to default',
+  'settings.remove' => 'Remove',
+  'settings.search' => 'search',
+  'settings.no_items' => 'No items found',
+  'settings.label' => 'Label',
+  'settings.value' => 'Value',
+  'settings.edit' => 'Edit',
+  'settings.view' => 'View',
+  'settings.custom_css' => 'Custom CSS',
+  'settings.custom_js' => 'Custom JavaScript',
+  'settings.treat_tags_as' => 'Treat Tags As:',
+  'settings.folders' => 'Folders',
+  'settings.tags' => 'Tags',
+  'settings.categories' => 'Categories',
+  'options.none' => '- not set -',
+  'options.google' => 'Google',
+  'options.ddg' => 'DuckDuckGo',
+  'options.bing' => 'Bing',
+  'options.qwant' => 'Qwant',
+  'options.startpage' => 'StartPage',
+  'options.yes' => 'Yes',
+  'options.no' => 'No',
+  'options.nzbhydra' => 'NZBHydra',
+  'options.jackett' => 'Jackett',
+  'buttons.save' => 'Save',
+  'buttons.cancel' => 'Cancel',
+  'buttons.add' => 'Add',
+  'buttons.upload' => 'Upload an icon',
+  'buttons.downloadapps' => 'Update Apps List',
+  'dash.pin_item' => 'Pin item to dashboard',
+  'dash.no_apps' => 'There are currently no pinned applications, :link1 or :link2',
+  'dash.link1' => 'Add an application here',
+  'dash.link2' => 'Pin an item to the dash',
+  'dash.pinned_items' => 'Pinned Items',
+  'apps.app_list' => 'Application list',
+  'apps.view_trash' => 'View trash',
+  'apps.add_application' => 'Add application',
+  'apps.application_name' => 'Application name',
+  'apps.colour' => 'Colour',
+  'apps.icon' => 'Icon',
+  'apps.pinned' => 'Pinned',
+  'apps.title' => 'Title',
+  'apps.hex' => 'Hex colour',
+  'apps.username' => 'Username',
+  'apps.password' => 'Password',
+  'apps.config' => 'Config',
+  'apps.apikey' => 'API Key',
+  'apps.enable' => 'Enable',
+  'apps.tag_list' => 'Tags list',
+  'apps.add_tag' => 'Add tag',
+  'apps.tag_name' => 'Tag name',
+  'apps.tags' => 'Tags',
+  'apps.override' => 'If different to main url',
+  'apps.preview' => 'Preview',
+  'apps.apptype' => 'Application Type',
+  'apps.website' => 'Website',
+  'apps.description' => 'Description',
+  'apps.only_admin_account' => 'Only if you have admin-account!',
+  'apps.autologin_url' => 'Auto login url',
+  'apps.show_deleted' => 'Showing Deleted Applications',
+  'app.import' => 'Import',
+  'dashboard' => 'Home dashboard',
+  'user.user_list' => 'Users',
+  'user.add_user' => 'Add user',
+  'user.username' => 'Username',
+  'user.avatar' => 'Avatar',
+  'user.email' => 'Email',
+  'user.password_confirm' => 'Confirm Password',
+  'user.secure_front' => 'Allow public access to front - Only enforced if a password is set.',
+  'user.autologin' => 'Allow logging in from a specific URL. Anyone with the link can login.',
+  'url' => 'URL',
+  'title' => 'Title',
+  'delete' => 'Delete',
+  'optional' => 'Optional',
+  'restore' => 'Restore',
+  'export' => 'Export',
+  'import' => 'Import',
+  'alert.success.item_created' => 'Item created successfully',
+  'alert.success.item_updated' => 'Item updated successfully',
+  'alert.success.item_deleted' => 'Item deleted successfully',
+  'alert.success.item_restored' => 'Item restored successfully',
+  'alert.success.updating' => 'Updating apps list',
+  'alert.success.tag_created' => 'Tag created successfully',
+  'alert.success.tag_updated' => 'Tag updated successfully',
+  'alert.success.tag_deleted' => 'Tag deleted successfully',
+  'alert.success.tag_restored' => 'Tag restored successfully',
+  'alert.success.setting_updated' => 'You have successfully edited this setting',
+  'alert.error.not_exist' => 'This setting does not exist.',
+  'alert.error.file_too_big' => 'File is too big.',
+  'alert.error.file_not_stored' => 'File could not be stored.',
+  'alert.success.user_created' => 'User created successfully',
+  'alert.success.user_updated' => 'User updated successfully',
+  'alert.success.user_deleted' => 'User deleted successfully',
+  'alert.success.user_restored' => 'User restored successfully',
+  'dashboard.reorder' => 'Reorder and pin items',
+  'dashboard.settings' => 'Settings',
+);

lang/en/validation.php

@@ -0,0 +1,191 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string' => 'The :attribute field must be a string.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
+    |
+    */
+
+    'attributes' => [],
+
+];