replaced league with spatie url

This commit is contained in:
Masroor Ehsan 2024-12-31 16:51:28 +06:00
parent 3ea6ec64d9
commit 5095a7b7dd
2 changed files with 19 additions and 19 deletions

View File

@ -2,33 +2,33 @@
namespace App\Services\Pacs; namespace App\Services\Pacs;
use League\Url\Url; use Spatie\Url\Url;
final class PacsUrlGen final class PacsUrlGen
{ {
public static function stoneViewer(string $study_uid): string public static function stoneViewer(string $study_uid): string
{ {
$url = Url::createFromUrl(config('pacs.viewer.stone.endpoint')); $url = Url::fromString(config('pacs.viewer.stone.endpoint'))
$url->setPath('/stone-webviewer/index.html'); ->withPath('/stone-webviewer/index.html')
$url->setQuery(['study' => $study_uid]); ->withQueryParameters(['study' => $study_uid]);
return (string) $url; return (string) $url;
} }
public static function ohifViewer(string $study_uid): string public static function ohifViewer(string $study_uid): string
{ {
$url = Url::createFromUrl(config('pacs.viewer.ohif.endpoint')); $url = Url::fromString(config('pacs.viewer.ohif.endpoint'))
$url->setPath('/ohif/viewer'); ->withPath('/ohif/viewer')
$url->setQuery(['StudyInstanceUIDs' => $study_uid]); ->withQueryParameters(['StudyInstanceUIDs' => $study_uid]);
return (string) $url; return (string) $url;
} }
public static function ohifViewerMpr(string $study_uid): string public static function ohifViewerMpr(string $study_uid): string
{ {
$url = Url::createFromUrl(config('pacs.viewer.ohif.endpoint')); $url = Url::fromString(config('pacs.viewer.ohif.endpoint'))
$url->setPath('/ohif/viewer'); ->withPath('/ohif/viewer')
$url->setQuery([ ->withQueryParameters([
'hangingprotocolId' => 'mprAnd3DVolumeViewport', 'hangingprotocolId' => 'mprAnd3DVolumeViewport',
'StudyInstanceUIDs' => $study_uid, 'StudyInstanceUIDs' => $study_uid,
]); ]);
@ -38,17 +38,17 @@ public static function ohifViewerMpr(string $study_uid): string
public static function ohifSegmentation(string $study_uid): string public static function ohifSegmentation(string $study_uid): string
{ {
$url = Url::createFromUrl(config('pacs.viewer.ohif.endpoint')); $url = Url::fromString(config('pacs.viewer.ohif.endpoint'))
$url->setPath('/ohif/segmentation'); ->withPath('/ohif/segmentation')
$url->setQuery(['StudyInstanceUIDs' => $study_uid]); ->withQueryParameters(['StudyInstanceUIDs' => $study_uid]);
return (string) $url; return (string) $url;
} }
public static function archive(string $study_uid): string public static function archive(string $study_uid): string
{ {
$url = Url::createFromUrl(config('pacs.api.endpoint')); $url = Url::fromString(config('pacs.api.endpoint'))
$url->setPath('/studies/'.$study_uid.'/archive'); ->withPath('/studies/'.$study_uid.'/archive');
return (string) $url; return (string) $url;
} }

View File

@ -14,7 +14,6 @@
"laravel/jetstream": "^5.3", "laravel/jetstream": "^5.3",
"laravel/sanctum": "^4.0", "laravel/sanctum": "^4.0",
"laravel/tinker": "^2.9", "laravel/tinker": "^2.9",
"league/url": "^3.3",
"livewire/livewire": "^3.0", "livewire/livewire": "^3.0",
"phpoffice/phpword": "^1.3", "phpoffice/phpword": "^1.3",
"propaganistas/laravel-phone": "^5.3", "propaganistas/laravel-phone": "^5.3",
@ -22,6 +21,7 @@
"rawilk/laravel-settings": "^3.4", "rawilk/laravel-settings": "^3.4",
"sentry/sentry-laravel": "^4.10", "sentry/sentry-laravel": "^4.10",
"spatie/laravel-permission": "^6.10", "spatie/laravel-permission": "^6.10",
"spatie/url": "^2.4",
"vinkla/hashids": "^12.0", "vinkla/hashids": "^12.0",
"yajra/laravel-datatables-oracle": "^11.1" "yajra/laravel-datatables-oracle": "^11.1"
}, },