diff --git a/src/DolbyApi.php b/src/DolbyApi.php index fb144f8..7b1a737 100644 --- a/src/DolbyApi.php +++ b/src/DolbyApi.php @@ -5,11 +5,9 @@ namespace DolbyApi; use DolbyApi\Exceptions\ApiTypeException; -use Generator; -use Saloon\Http\Connector; -use Saloon\Contracts\Request; -use DolbyApi\Responses\DolbyResponse; use DolbyApi\Resource\MediaApiResource; +use DolbyApi\Responses\DolbyResponse; +use Saloon\Http\Connector; class DolbyApi extends Connector { @@ -27,8 +25,6 @@ public function __construct(string $token) /** * Resolve the base URL of the service. - * - * @return string */ public function resolveBaseUrl(): string { @@ -62,7 +58,7 @@ protected function defaultConfig(): array public function api(string $apiType): MediaApiResource { - return match($apiType) { + return match ($apiType) { 'media' => new MediaApiResource($this), default => throw new ApiTypeException(sprintf('The %s API type is invalid', $apiType)), }; diff --git a/src/Requests/MediaApi/GetAnalyzeMusicStatus.php b/src/Requests/MediaApi/GetAnalyzeMusicStatus.php index 4429dda..fbf3568 100644 --- a/src/Requests/MediaApi/GetAnalyzeMusicStatus.php +++ b/src/Requests/MediaApi/GetAnalyzeMusicStatus.php @@ -11,14 +11,13 @@ class GetAnalyzeMusicStatus extends Request { /** * HTTP Method - * - * @var Method */ protected Method $method = Method::GET; public function __construct( protected string $jobId, - ){} + ) { + } protected function defaultQuery(): array { @@ -33,8 +32,6 @@ protected function defaultQuery(): array * For a given job_id, this method will check if the processing task has completed. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-music-get - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetAnalyzeSpeechStatus.php b/src/Requests/MediaApi/GetAnalyzeSpeechStatus.php index 8d2920c..ad8a6f8 100644 --- a/src/Requests/MediaApi/GetAnalyzeSpeechStatus.php +++ b/src/Requests/MediaApi/GetAnalyzeSpeechStatus.php @@ -11,14 +11,13 @@ class GetAnalyzeSpeechStatus extends Request { /** * HTTP Method - * - * @var Method */ protected Method $method = Method::GET; public function __construct( protected string $jobId, - ){} + ) { + } protected function defaultQuery(): array { @@ -33,8 +32,6 @@ protected function defaultQuery(): array * For a given job_id, this method will check if the processing task has completed. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-speech-get - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetAnalyzeStatus.php b/src/Requests/MediaApi/GetAnalyzeStatus.php index 6bb0bc9..eb33970 100644 --- a/src/Requests/MediaApi/GetAnalyzeStatus.php +++ b/src/Requests/MediaApi/GetAnalyzeStatus.php @@ -11,14 +11,13 @@ class GetAnalyzeStatus extends Request { /** * HTTP Method - * - * @var Method */ protected Method $method = Method::GET; public function __construct( protected string $jobId, - ){} + ) { + } protected function defaultQuery(): array { @@ -33,8 +32,6 @@ protected function defaultQuery(): array * For a given job_id, this method will check if the processing task has completed. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-get - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetDiagnoseStatus.php b/src/Requests/MediaApi/GetDiagnoseStatus.php index bed7804..e0972e1 100644 --- a/src/Requests/MediaApi/GetDiagnoseStatus.php +++ b/src/Requests/MediaApi/GetDiagnoseStatus.php @@ -11,14 +11,13 @@ class GetDiagnoseStatus extends Request { /** * HTTP Method - * - * @var Method */ protected Method $method = Method::GET; public function __construct( protected string $jobId, - ){} + ) { + } protected function defaultQuery(): array { @@ -33,8 +32,6 @@ protected function defaultQuery(): array * For a given job_id, this method will check if the processing task has completed. * * @see https://docs.dolby.io/media-apis/reference/media-diagnose-get - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetDownloadUrl.php b/src/Requests/MediaApi/GetDownloadUrl.php index 325dbb0..a7db941 100644 --- a/src/Requests/MediaApi/GetDownloadUrl.php +++ b/src/Requests/MediaApi/GetDownloadUrl.php @@ -15,14 +15,13 @@ class GetDownloadUrl extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; public function __construct( protected string $url, - ){} + ) { + } protected function defaultBody(): array { @@ -37,8 +36,6 @@ protected function defaultBody(): array * Download media you previously uploaded with /media/input or media that was generated through another Dolby Media API. * * @see https://docs.dolby.io/media-apis/reference/media-output-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetEnhanceStatus.php b/src/Requests/MediaApi/GetEnhanceStatus.php index 75ba970..6bb6b4d 100644 --- a/src/Requests/MediaApi/GetEnhanceStatus.php +++ b/src/Requests/MediaApi/GetEnhanceStatus.php @@ -11,14 +11,13 @@ class GetEnhanceStatus extends Request { /** * HTTP Method - * - * @var Method */ protected Method $method = Method::GET; public function __construct( protected string $jobId, - ){} + ) { + } protected function defaultQuery(): array { @@ -33,8 +32,6 @@ protected function defaultQuery(): array * For a given job_id, this method will check if the processing task has completed. * * @see https://docs.dolby.io/media-apis/reference/media-enhance-get - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/GetUploadUrl.php b/src/Requests/MediaApi/GetUploadUrl.php index 7b41c7b..b46c3c0 100644 --- a/src/Requests/MediaApi/GetUploadUrl.php +++ b/src/Requests/MediaApi/GetUploadUrl.php @@ -15,14 +15,13 @@ class GetUploadUrl extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; public function __construct( protected string $url, - ){} + ) { + } protected function defaultBody(): array { @@ -37,8 +36,6 @@ protected function defaultBody(): array * Return a pre-signed url you can use to PUT and upload your media file. * * @see https://docs.dolby.io/media-apis/reference/media-input-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/StartAnalyze.php b/src/Requests/MediaApi/StartAnalyze.php index aed541d..ca768ba 100644 --- a/src/Requests/MediaApi/StartAnalyze.php +++ b/src/Requests/MediaApi/StartAnalyze.php @@ -15,8 +15,6 @@ class StartAnalyze extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; @@ -25,7 +23,8 @@ public function __construct( protected string $output, protected array $loudness, protected array $content, - ){} + ) { + } protected function defaultBody(): array { @@ -43,8 +42,6 @@ protected function defaultBody(): array * Start analyzing to learn about your media. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/StartAnalyzeMusic.php b/src/Requests/MediaApi/StartAnalyzeMusic.php index b636c4a..ba7d911 100644 --- a/src/Requests/MediaApi/StartAnalyzeMusic.php +++ b/src/Requests/MediaApi/StartAnalyzeMusic.php @@ -15,8 +15,6 @@ class StartAnalyzeMusic extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; @@ -24,7 +22,8 @@ public function __construct( protected string $input, protected string $output, protected array $onComplete, - ){} + ) { + } protected function defaultBody(): array { @@ -41,8 +40,6 @@ protected function defaultBody(): array * Start analyzing to learn about music in your media. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-music-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/StartAnalyzeSpeech.php b/src/Requests/MediaApi/StartAnalyzeSpeech.php index 03d55cc..5838b5a 100644 --- a/src/Requests/MediaApi/StartAnalyzeSpeech.php +++ b/src/Requests/MediaApi/StartAnalyzeSpeech.php @@ -15,8 +15,6 @@ class StartAnalyzeSpeech extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; @@ -24,7 +22,8 @@ public function __construct( protected string $input, protected string $output, protected array $onComplete, - ){} + ) { + } protected function defaultBody(): array { @@ -41,8 +40,6 @@ protected function defaultBody(): array * Start analyzing to learn about speech in your media. * * @see https://docs.dolby.io/media-apis/reference/media-analyze-speech-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/StartDiagnose.php b/src/Requests/MediaApi/StartDiagnose.php index 401f8b9..2d5fdef 100644 --- a/src/Requests/MediaApi/StartDiagnose.php +++ b/src/Requests/MediaApi/StartDiagnose.php @@ -15,15 +15,14 @@ class StartDiagnose extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; public function __construct( protected string $input, protected array $content, - ){} + ) { + } protected function defaultBody(): array { @@ -39,8 +38,6 @@ protected function defaultBody(): array * Quick diagnosis for discovering audio quality issues with your media. * * @see https://docs.dolby.io/media-apis/reference/media-diagnose-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Requests/MediaApi/StartEnhance.php b/src/Requests/MediaApi/StartEnhance.php index 2251ea2..3740047 100644 --- a/src/Requests/MediaApi/StartEnhance.php +++ b/src/Requests/MediaApi/StartEnhance.php @@ -15,15 +15,14 @@ class StartEnhance extends Request implements HasBody /** * HTTP Method - * - * @var Method */ protected Method $method = Method::POST; public function __construct( protected string $input, protected string $output, - ){} + ) { + } protected function defaultBody(): array { @@ -39,8 +38,6 @@ protected function defaultBody(): array * Start enhancing to improve your media. * * @see https://docs.dolby.io/media-apis/reference/media-enhance-post - * - * @return string */ public function resolveEndpoint(): string { diff --git a/src/Resource/CommunicationApiResource.php b/src/Resource/CommunicationApiResource.php index 288c497..d29f783 100644 --- a/src/Resource/CommunicationApiResource.php +++ b/src/Resource/CommunicationApiResource.php @@ -2,9 +2,7 @@ namespace DolbyApi\Resource; -use DolbyApi\Responses\DolbyResponse as Response; - class CommunicationApiResource extends Resource { - // todo + // todo } diff --git a/src/Resource/MediaApiResource.php b/src/Resource/MediaApiResource.php index 2925d81..75e8f3f 100644 --- a/src/Resource/MediaApiResource.php +++ b/src/Resource/MediaApiResource.php @@ -18,63 +18,63 @@ class MediaApiResource extends Resource { - public function enhance(string $input, string $output): Response - { - return $this->connector->send(new StartEnhance($input, $output)); - } + public function enhance(string $input, string $output): Response + { + return $this->connector->send(new StartEnhance($input, $output)); + } - public function enhanceStatus(string $jobId): Response - { - return $this->connector->send(new GetEnhanceStatus($jobId)); - } + public function enhanceStatus(string $jobId): Response + { + return $this->connector->send(new GetEnhanceStatus($jobId)); + } - public function getDownloadUrl(string $url): Response - { - return $this->connector->send(new GetDownloadUrl($url)); - } + public function getDownloadUrl(string $url): Response + { + return $this->connector->send(new GetDownloadUrl($url)); + } - public function getUploadUrl(string $url): Response - { - return $this->connector->send(new GetUploadUrl($url)); - } + public function getUploadUrl(string $url): Response + { + return $this->connector->send(new GetUploadUrl($url)); + } - public function diagnose(string $input, array $content): Response - { - return $this->connector->send(new StartDiagnose($input, $content)); - } + public function diagnose(string $input, array $content): Response + { + return $this->connector->send(new StartDiagnose($input, $content)); + } - public function diagnoseStatus(string $jobId): Response - { - return $this->connector->send(new GetDiagnoseStatus($jobId)); - } + public function diagnoseStatus(string $jobId): Response + { + return $this->connector->send(new GetDiagnoseStatus($jobId)); + } - public function analyze(string $input, string $output, array $loudness, array $content = ['type' => '']): Response - { - return $this->connector->send(new StartAnalyze($input, $output, $loudness, $content)); - } + public function analyze(string $input, string $output, array $loudness, array $content = ['type' => '']): Response + { + return $this->connector->send(new StartAnalyze($input, $output, $loudness, $content)); + } - public function analyzeStatus(string $jobId): Response - { - return $this->connector->send(new GetAnalyzeStatus($jobId)); - } + public function analyzeStatus(string $jobId): Response + { + return $this->connector->send(new GetAnalyzeStatus($jobId)); + } - public function analyzeSpeech(string $input, string $output, array $onComplete): Response - { - return $this->connector->send(new StartAnalyzeSpeech($input, $output, $onComplete)); - } + public function analyzeSpeech(string $input, string $output, array $onComplete): Response + { + return $this->connector->send(new StartAnalyzeSpeech($input, $output, $onComplete)); + } - public function analyzeSpeechStatus(string $jobId): Response - { - return $this->connector->send(new GetAnalyzeSpeechStatus($jobId)); - } + public function analyzeSpeechStatus(string $jobId): Response + { + return $this->connector->send(new GetAnalyzeSpeechStatus($jobId)); + } - public function analyzeMusic(string $input, string $output, array $onComplete): Response - { - return $this->connector->send(new StartAnalyzeMusic($input, $output, $onComplete)); - } + public function analyzeMusic(string $input, string $output, array $onComplete): Response + { + return $this->connector->send(new StartAnalyzeMusic($input, $output, $onComplete)); + } - public function analyzeMusicStatus(string $jobId): Response - { - return $this->connector->send(new GetAnalyzeMusicStatus($jobId)); - } + public function analyzeMusicStatus(string $jobId): Response + { + return $this->connector->send(new GetAnalyzeMusicStatus($jobId)); + } } diff --git a/src/Resource/StreamingApiResource.php b/src/Resource/StreamingApiResource.php index f74eaab..886959a 100644 --- a/src/Resource/StreamingApiResource.php +++ b/src/Resource/StreamingApiResource.php @@ -2,9 +2,7 @@ namespace DolbyApi\Resource; -use DolbyApi\Responses\DolbyResponse as Response; - class StreamingApiResource extends Resource { - // todo + // todo } diff --git a/tests/Feature/Requests/GetAnalyzeMusicStatusTest.php b/tests/Feature/Requests/GetAnalyzeMusicStatusTest.php index 12826d3..bf1ba16 100644 --- a/tests/Feature/Requests/GetAnalyzeMusicStatusTest.php +++ b/tests/Feature/Requests/GetAnalyzeMusicStatusTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetAnalyzeMusicStatus - && $response->body() == "{\"path\":\"/media/analyze/music\",\"status\":\"Success\",\"progress\":100,\"api_version\":\"b1.0\",\"result\":{}}"; + && $response->body() == '{"path":"/media/analyze/music","status":"Success","progress":100,"api_version":"b1.0","result":{}}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/GetAnalyzeSpeechStatusTest.php b/tests/Feature/Requests/GetAnalyzeSpeechStatusTest.php index 9f4ce97..d5f29dc 100644 --- a/tests/Feature/Requests/GetAnalyzeSpeechStatusTest.php +++ b/tests/Feature/Requests/GetAnalyzeSpeechStatusTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetAnalyzeSpeechStatus - && $response->body() == "{\"path\":\"/media/analyze/speech\",\"status\":\"Success\",\"progress\":100,\"api_version\":\"b1.0\",\"result\":{}}"; + && $response->body() == '{"path":"/media/analyze/speech","status":"Success","progress":100,"api_version":"b1.0","result":{}}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/GetAnalyzeStatusTest.php b/tests/Feature/Requests/GetAnalyzeStatusTest.php index 2ac444c..56a1e3f 100644 --- a/tests/Feature/Requests/GetAnalyzeStatusTest.php +++ b/tests/Feature/Requests/GetAnalyzeStatusTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetAnalyzeStatus - && $response->body() == "{\"path\":\"/media/analyze\",\"status\":\"Success\",\"progress\":100,\"api_version\":\"b1.4\",\"result\":{}}"; + && $response->body() == '{"path":"/media/analyze","status":"Success","progress":100,"api_version":"b1.4","result":{}}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/GetDiagnoseStatusTest.php b/tests/Feature/Requests/GetDiagnoseStatusTest.php index 65cacf4..23ebc57 100644 --- a/tests/Feature/Requests/GetDiagnoseStatusTest.php +++ b/tests/Feature/Requests/GetDiagnoseStatusTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetDiagnoseStatus - && $response->body() == "{\"path\":\"/media/diagnose\",\"status\":\"Success\",\"progress\":100,\"api_version\":\"b1.0\",\"result\":{\"media_info\":{\"container\":{\"kind\":\"mp4\",\"duration\":10.45,\"bitrate\":822169,\"size\":1073958},\"audio\":{\"codec\":\"aac\",\"channels\":2,\"sample_rate\":44100,\"duration\":10.45,\"bitrate\":96000},\"video\":{\"codec\":\"h264\",\"frame_rate\":30,\"height\":360,\"width\":640,\"duration\":10.45,\"bitrate\":711452}},\"audio\":{\"quality_score\":{\"average\":3.7,\"distribution\":[{\"lower_bound\":0,\"upper_bound\":1,\"duration\":0,\"percentage\":0},{\"lower_bound\":1,\"upper_bound\":2,\"duration\":0,\"percentage\":0},{\"lower_bound\":2,\"upper_bound\":3,\"duration\":2.5,\"percentage\":26.3},{\"lower_bound\":3,\"upper_bound\":4,\"duration\":3,\"percentage\":31.6},{\"lower_bound\":4,\"upper_bound\":5,\"duration\":4,\"percentage\":42.1},{\"lower_bound\":5,\"upper_bound\":6,\"duration\":0,\"percentage\":0},{\"lower_bound\":6,\"upper_bound\":7,\"duration\":0,\"percentage\":0},{\"lower_bound\":7,\"upper_bound\":8,\"duration\":0,\"percentage\":0},{\"lower_bound\":8,\"upper_bound\":9,\"duration\":0,\"percentage\":0},{\"lower_bound\":9,\"upper_bound\":10,\"duration\":0,\"percentage\":0}],\"worst_segment\":{\"start\":3.5,\"end\":8.5,\"score\":3.3}},\"noise_score\":{\"average\":0.9,\"distribution\":[{\"lower_bound\":0,\"upper_bound\":1,\"duration\":7,\"percentage\":73.7},{\"lower_bound\":1,\"upper_bound\":2,\"duration\":0.5,\"percentage\":5.3},{\"lower_bound\":2,\"upper_bound\":3,\"duration\":0.5,\"percentage\":5.3},{\"lower_bound\":3,\"upper_bound\":4,\"duration\":1,\"percentage\":10.5},{\"lower_bound\":4,\"upper_bound\":5,\"duration\":0.5,\"percentage\":5.3},{\"lower_bound\":5,\"upper_bound\":6,\"duration\":0,\"percentage\":0},{\"lower_bound\":6,\"upper_bound\":7,\"duration\":0,\"percentage\":0},{\"lower_bound\":7,\"upper_bound\":8,\"duration\":0,\"percentage\":0},{\"lower_bound\":8,\"upper_bound\":9,\"duration\":0,\"percentage\":0},{\"lower_bound\":9,\"upper_bound\":10,\"duration\":0,\"percentage\":0}]},\"clipping\":{\"events\":0},\"loudness\":{\"measured\":-14.91,\"range\":2.26,\"gating_mode\":\"speech\",\"sample_peak\":-0.82,\"true_peak\":-0.81},\"music\":{\"percentage\":0},\"silence\":{\"percentage\":0,\"at_beginning\":0,\"at_end\":0,\"num_sections\":0,\"silent_channels\":[]},\"speech\":{\"percentage\":100,\"events\":{\"plosive\":6,\"sibilance\":0}}}}}"; + && $response->body() == '{"path":"/media/diagnose","status":"Success","progress":100,"api_version":"b1.0","result":{"media_info":{"container":{"kind":"mp4","duration":10.45,"bitrate":822169,"size":1073958},"audio":{"codec":"aac","channels":2,"sample_rate":44100,"duration":10.45,"bitrate":96000},"video":{"codec":"h264","frame_rate":30,"height":360,"width":640,"duration":10.45,"bitrate":711452}},"audio":{"quality_score":{"average":3.7,"distribution":[{"lower_bound":0,"upper_bound":1,"duration":0,"percentage":0},{"lower_bound":1,"upper_bound":2,"duration":0,"percentage":0},{"lower_bound":2,"upper_bound":3,"duration":2.5,"percentage":26.3},{"lower_bound":3,"upper_bound":4,"duration":3,"percentage":31.6},{"lower_bound":4,"upper_bound":5,"duration":4,"percentage":42.1},{"lower_bound":5,"upper_bound":6,"duration":0,"percentage":0},{"lower_bound":6,"upper_bound":7,"duration":0,"percentage":0},{"lower_bound":7,"upper_bound":8,"duration":0,"percentage":0},{"lower_bound":8,"upper_bound":9,"duration":0,"percentage":0},{"lower_bound":9,"upper_bound":10,"duration":0,"percentage":0}],"worst_segment":{"start":3.5,"end":8.5,"score":3.3}},"noise_score":{"average":0.9,"distribution":[{"lower_bound":0,"upper_bound":1,"duration":7,"percentage":73.7},{"lower_bound":1,"upper_bound":2,"duration":0.5,"percentage":5.3},{"lower_bound":2,"upper_bound":3,"duration":0.5,"percentage":5.3},{"lower_bound":3,"upper_bound":4,"duration":1,"percentage":10.5},{"lower_bound":4,"upper_bound":5,"duration":0.5,"percentage":5.3},{"lower_bound":5,"upper_bound":6,"duration":0,"percentage":0},{"lower_bound":6,"upper_bound":7,"duration":0,"percentage":0},{"lower_bound":7,"upper_bound":8,"duration":0,"percentage":0},{"lower_bound":8,"upper_bound":9,"duration":0,"percentage":0},{"lower_bound":9,"upper_bound":10,"duration":0,"percentage":0}]},"clipping":{"events":0},"loudness":{"measured":-14.91,"range":2.26,"gating_mode":"speech","sample_peak":-0.82,"true_peak":-0.81},"music":{"percentage":0},"silence":{"percentage":0,"at_beginning":0,"at_end":0,"num_sections":0,"silent_channels":[]},"speech":{"percentage":100,"events":{"plosive":6,"sibilance":0}}}}}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/GetDownloadUrlTest.php b/tests/Feature/Requests/GetDownloadUrlTest.php index d1dbc29..722a106 100644 --- a/tests/Feature/Requests/GetDownloadUrlTest.php +++ b/tests/Feature/Requests/GetDownloadUrlTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetDownloadUrl - && $response->body() == "{\"url\":\"https://media-api-proxfyprug.s3-accelerate.amazonaws.com/1129d723-42e6-40c6-a35d-07986d1be4af/example_out?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIA2N2ZL3VQJGFYC2XN%2F20230228%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230228T180833Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2...uciW1Zjouk%3D&X-Amz-Signature=2cd8a66224c1b44096782d8ac90a3614e79d65d0fb2&X-Amz-SignedHeaders=host&x-id=GetObject\"}"; + && $response->body() == '{"url":"https://media-api-proxfyprug.s3-accelerate.amazonaws.com/1129d723-42e6-40c6-a35d-07986d1be4af/example_out?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIA2N2ZL3VQJGFYC2XN%2F20230228%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230228T180833Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2...uciW1Zjouk%3D&X-Amz-Signature=2cd8a66224c1b44096782d8ac90a3614e79d65d0fb2&X-Amz-SignedHeaders=host&x-id=GetObject"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/GetEnhanceStatusTest.php b/tests/Feature/Requests/GetEnhanceStatusTest.php index c3caecb..c05e3d1 100644 --- a/tests/Feature/Requests/GetEnhanceStatusTest.php +++ b/tests/Feature/Requests/GetEnhanceStatusTest.php @@ -21,9 +21,8 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetEnhanceStatus - && $response->body() == "{\"path\":\"/media/enhance\",\"status\":\"Success\",\"progress\":100,\"api_version\":\"v1.1.2\",\"result\":{}}\""; + && $response->body() == '{"path":"/media/enhance","status":"Success","progress":100,"api_version":"v1.1.2","result":{}}"'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); }); - diff --git a/tests/Feature/Requests/GetUploadUrlTest.php b/tests/Feature/Requests/GetUploadUrlTest.php index 38de4c5..dd47521 100644 --- a/tests/Feature/Requests/GetUploadUrlTest.php +++ b/tests/Feature/Requests/GetUploadUrlTest.php @@ -21,7 +21,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof GetUploadUrl - && $response->body() == "{\"url\":\"https:\\/\\/media-api-proxfyprug.s3-accelerate.amazonaws.com\\/1129d723-42e6-40c6-a35d-07986d1be4af\\/input\\/file.wav?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIA2N2ZL3VQGKHMR3VL%2F20230228%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230228T184217Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2VjENgE1Y7Ha79hu...CNX%2BH%2BV8%3D&X-Amz-Signature=d866b39b680172ae5a0e084c2d08c54008d18970&X-Amz-SignedHeaders=host&x-id=PutObject\"}"; + && $response->body() == '{"url":"https:\\/\\/media-api-proxfyprug.s3-accelerate.amazonaws.com\\/1129d723-42e6-40c6-a35d-07986d1be4af\\/input\\/file.wav?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIA2N2ZL3VQGKHMR3VL%2F20230228%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230228T184217Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2VjENgE1Y7Ha79hu...CNX%2BH%2BV8%3D&X-Amz-Signature=d866b39b680172ae5a0e084c2d08c54008d18970&X-Amz-SignedHeaders=host&x-id=PutObject"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/StartAnalyzeMusicTest.php b/tests/Feature/Requests/StartAnalyzeMusicTest.php index b29f469..8c7c0c0 100644 --- a/tests/Feature/Requests/StartAnalyzeMusicTest.php +++ b/tests/Feature/Requests/StartAnalyzeMusicTest.php @@ -15,7 +15,7 @@ $input = 'https://dolbyio.s3-us-west-1.amazonaws.com/public/shelby/tunnel.original.mp4'; $output = 'dlb://analyze_music_out'; - $onComplete = ["url" => "https://docs.dolby.io/"]; + $onComplete = ['url' => 'https://docs.dolby.io/']; $response = $dolbyApi->send(new StartAnalyzeMusic($input, $output, $onComplete)); @@ -23,7 +23,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof StartAnalyzeMusic - && $response->body() == "{\"job_id\":\"fn708637-9f78-4023-32la-1285r04627ac\"}"; + && $response->body() == '{"job_id":"fn708637-9f78-4023-32la-1285r04627ac"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/StartAnalyzeSpeechTest.php b/tests/Feature/Requests/StartAnalyzeSpeechTest.php index 5ec6619..81ca1e4 100644 --- a/tests/Feature/Requests/StartAnalyzeSpeechTest.php +++ b/tests/Feature/Requests/StartAnalyzeSpeechTest.php @@ -15,7 +15,7 @@ $input = 'https://dolbyio.s3-us-west-1.amazonaws.com/public/shelby/tunnel.original.mp4'; $output = 'dlb://analyze_speech_out'; - $onComplete = ["url" => "https://docs.dolby.io/"]; + $onComplete = ['url' => 'https://docs.dolby.io/']; $response = $dolbyApi->send(new StartAnalyzeSpeech($input, $output, $onComplete)); @@ -23,7 +23,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof StartAnalyzeSpeech - && $response->body() == "{\"job_id\":\"sn708637-9t78-4023-32la-1285r04652ac\"}"; + && $response->body() == '{"job_id":"sn708637-9t78-4023-32la-1285r04652ac"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/StartAnalyzeTest.php b/tests/Feature/Requests/StartAnalyzeTest.php index 4f7b27b..3eba36c 100644 --- a/tests/Feature/Requests/StartAnalyzeTest.php +++ b/tests/Feature/Requests/StartAnalyzeTest.php @@ -15,7 +15,7 @@ $input = 'https://dolbyio.s3-us-west-1.amazonaws.com/public/shelby/tunnel.original.mp4'; $output = 'dlb://analyze_out'; - $loudness = ["profile" => "service_amazon"]; + $loudness = ['profile' => 'service_amazon']; $content = ['type' => '']; $response = $dolbyApi->send(new StartAnalyze($input, $output, $loudness, $content)); @@ -24,7 +24,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof StartAnalyze - && $response->body() == "{\"job_id\":\"fn708637-9f78-4023-32la-1285r04627ac\"}"; + && $response->body() == '{"job_id":"fn708637-9f78-4023-32la-1285r04627ac"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/StartDiagnoseTest.php b/tests/Feature/Requests/StartDiagnoseTest.php index 7600dae..66f1593 100644 --- a/tests/Feature/Requests/StartDiagnoseTest.php +++ b/tests/Feature/Requests/StartDiagnoseTest.php @@ -22,7 +22,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof StartDiagnose - && $response->body() == "{\"job_id\":\"sn708637-9t78-4023-32la-1285r04652ac\"}"; + && $response->body() == '{"job_id":"sn708637-9t78-4023-32la-1285r04652ac"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Feature/Requests/StartEnhanceTest.php b/tests/Feature/Requests/StartEnhanceTest.php index 897e859..e646346 100644 --- a/tests/Feature/Requests/StartEnhanceTest.php +++ b/tests/Feature/Requests/StartEnhanceTest.php @@ -22,7 +22,7 @@ $mockClient->assertSent(function (Request $request, Response $response) { return $request instanceof StartEnhance - && $response->body() == "{\"job_id\":\"5879da3d-ad3c-4798-h2f8-21eb61573d2e\"}"; + && $response->body() == '{"job_id":"5879da3d-ad3c-4798-h2f8-21eb61573d2e"}'; }); expect($response)->toBeInstanceOf(DolbyResponse::class); diff --git a/tests/Pest.php b/tests/Pest.php index 7cbc1c0..e0ba3ac 100644 --- a/tests/Pest.php +++ b/tests/Pest.php @@ -26,8 +26,8 @@ | */ -use Saloon\Http\Faking\MockClient; use Saloon\Contracts\PendingRequest; +use Saloon\Http\Faking\MockClient; use Saloon\Http\Faking\MockResponse; expect()->extend('toBeOne', function () {