Upgrade to Laravel 9 (#4413)

Co-authored-by: DaneEveritt <dane@daneeveritt.com>
This commit is contained in:
Matthew Penner 2022-10-14 10:59:20 -06:00 committed by GitHub
parent 95e15d2c8a
commit cbcf62086f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
573 changed files with 4387 additions and 9411 deletions

View file

@ -4,7 +4,7 @@ namespace Pterodactyl\Services\Helpers;
use Illuminate\Support\Arr;
use Illuminate\Filesystem\FilesystemManager;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Filesystem\Filesystem;
class AssetHashService
{
@ -13,34 +13,20 @@ class AssetHashService
*/
public const MANIFEST_PATH = './assets/manifest.json';
/**
* @var \Illuminate\Contracts\Filesystem\Filesystem
*/
private $filesystem;
private Filesystem $filesystem;
/**
* @var \Illuminate\Contracts\Foundation\Application
*/
private $application;
/**
* @var array|null
*/
protected static $manifest;
protected static mixed $manifest;
/**
* AssetHashService constructor.
*/
public function __construct(Application $application, FilesystemManager $filesystem)
public function __construct(FilesystemManager $filesystem)
{
$this->application = $application;
$this->filesystem = $filesystem->createLocalDriver(['root' => public_path()]);
}
/**
* Modify a URL to append the asset hash.
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function url(string $resource): string
{
@ -52,8 +38,6 @@ class AssetHashService
/**
* Return the data integrity hash for a resource.
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function integrity(string $resource): string
{
@ -65,8 +49,6 @@ class AssetHashService
/**
* Return a built CSS import using the provided URL.
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function css(string $resource): string
{
@ -92,8 +74,6 @@ class AssetHashService
/**
* Return a built JS import using the provided URL.
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function js(string $resource): string
{
@ -116,8 +96,6 @@ class AssetHashService
/**
* Get the asset manifest and store it in the cache for quicker lookups.
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
protected function manifest(): array
{