@@ -13,7 +13,7 @@ |
||
| 13 | 13 | |
| 14 | 14 | /** @var Directive[] */ |
| 15 | 15 | public function __construct( |
| 16 | - public OutputSpeech|string|null $outputSpeech = null, |
|
| 16 | + public OutputSpeech | string | null $outputSpeech = null, |
|
| 17 | 17 | public ?Card $card = null, |
| 18 | 18 | public ?Reprompt $reprompt = null, |
| 19 | 19 | public ?bool $shouldEndSession = null, |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | public static function createByText(string $text): self |
| 20 | 20 | { |
| 21 | - return new self(text: $text); |
|
| 21 | + return new self(text : $text); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public static function createBySsml(string $ssml): self |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | return $data[$key] ?? null; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public static function checkNullValueStringOrInt(array $data, string $key): string|int|null |
|
| 22 | + public static function checkNullValueStringOrInt(array $data, string $key): string | int | null |
|
| 23 | 23 | { |
| 24 | 24 | return $data[$key] ?? null; |
| 25 | 25 | } |
@@ -63,15 +63,15 @@ |
||
| 63 | 63 | return new self( |
| 64 | 64 | experiences: $experiences, |
| 65 | 65 | mode: isset($amazonRequest['mode']) ? ViewportMode::tryFrom($amazonRequest['mode']) : null, |
| 66 | - shape: isset($amazonRequest['shape']) ? ViewportShape::tryFrom($amazonRequest['shape']) : null, |
|
| 67 | - pixelWidth: $amazonRequest['pixelWidth'] ?? null, |
|
| 68 | - pixelHeight: $amazonRequest['pixelHeight'] ?? null, |
|
| 69 | - dpi: $amazonRequest['dpi'] ?? null, |
|
| 70 | - currentPixelWidth: $amazonRequest['currentPixelWidth'] ?? null, |
|
| 71 | - currentPixelHeight: $amazonRequest['currentPixelHeight'] ?? null, |
|
| 72 | - touch: $touch, |
|
| 73 | - keyboard: $keyboard, |
|
| 74 | - video: isset($amazonRequest['video']) ? Video::fromAmazonRequest($amazonRequest['video']) : null, |
|
| 66 | + shape : isset($amazonRequest['shape']) ? ViewportShape::tryFrom($amazonRequest['shape']) : null, |
|
| 67 | + pixelWidth : $amazonRequest['pixelWidth'] ?? null, |
|
| 68 | + pixelHeight : $amazonRequest['pixelHeight'] ?? null, |
|
| 69 | + dpi : $amazonRequest['dpi'] ?? null, |
|
| 70 | + currentPixelWidth : $amazonRequest['currentPixelWidth'] ?? null, |
|
| 71 | + currentPixelHeight : $amazonRequest['currentPixelHeight'] ?? null, |
|
| 72 | + touch : $touch, |
|
| 73 | + keyboard : $keyboard, |
|
| 74 | + video : isset($amazonRequest['video']) ? Video::fromAmazonRequest($amazonRequest['video']) : null, |
|
| 75 | 75 | ); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -30,9 +30,9 @@ |
||
| 30 | 30 | public static function fromAmazonRequest(array $amazonRequest): self |
| 31 | 31 | { |
| 32 | 32 | return new self( |
| 33 | - token: PropertyHelper::checkNullValueString($amazonRequest, 'token'), |
|
| 34 | - offsetInMilliseconds: PropertyHelper::checkNullValueInt($amazonRequest, 'offsetInMilliseconds'), |
|
| 35 | - playerActivity: PropertyHelper::checkNullValueString($amazonRequest, 'playerActivity'), |
|
| 33 | + token : PropertyHelper::checkNullValueString($amazonRequest, 'token'), |
|
| 34 | + offsetInMilliseconds : PropertyHelper::checkNullValueInt($amazonRequest, 'offsetInMilliseconds'), |
|
| 35 | + playerActivity : PropertyHelper::checkNullValueString($amazonRequest, 'playerActivity'), |
|
| 36 | 36 | ); |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -25,11 +25,11 @@ |
||
| 25 | 25 | public static function fromAmazonRequest(array $amazonRequest): self |
| 26 | 26 | { |
| 27 | 27 | return new self( |
| 28 | - itemCount: $amazonRequest['itemCount'] ?? null, |
|
| 29 | - highestIndexSeen: $amazonRequest['highestIndexSeen'] ?? null, |
|
| 30 | - highestOrdinalSeen: $amazonRequest['highestOrdinalSeen'] ?? null, |
|
| 31 | - lowestIndexSeen: $amazonRequest['lowestIndexSeen'] ?? null, |
|
| 32 | - lowestOrdinalSeen: $amazonRequest['lowestOrdinalSeen'] ?? null, |
|
| 28 | + itemCount : $amazonRequest['itemCount'] ?? null, |
|
| 29 | + highestIndexSeen : $amazonRequest['highestIndexSeen'] ?? null, |
|
| 30 | + highestOrdinalSeen : $amazonRequest['highestOrdinalSeen'] ?? null, |
|
| 31 | + lowestIndexSeen : $amazonRequest['lowestIndexSeen'] ?? null, |
|
| 32 | + lowestOrdinalSeen : $amazonRequest['lowestOrdinalSeen'] ?? null, |
|
| 33 | 33 | ); |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -45,13 +45,13 @@ |
||
| 45 | 45 | |
| 46 | 46 | return new self( |
| 47 | 47 | system: isset($amazonRequest['System']) ? System::fromAmazonRequest($amazonRequest['System']) : null, |
| 48 | - audioPlayer: isset($amazonRequest['AudioPlayer']) ? AudioPlayer::fromAmazonRequest($amazonRequest['AudioPlayer']) : null, |
|
| 49 | - geolocation: isset($amazonRequest['Geolocation']) ? Geolocation::fromAmazonRequest($amazonRequest['Geolocation']) : null, |
|
| 50 | - advertising: isset($amazonRequest['Advertising']) ? Advertising::fromAmazonRequest($amazonRequest['Advertising']) : null, |
|
| 51 | - viewport: isset($amazonRequest['Viewport']) ? Viewport::fromAmazonRequest($amazonRequest['Viewport']) : null, |
|
| 52 | - viewports: $viewports, |
|
| 53 | - apl: isset($amazonRequest['Alexa.Presentation.APL']) ? AlexaPresentationAPL::fromAmazonRequest($amazonRequest['Alexa.Presentation.APL']) : null, |
|
| 54 | - extensions: $amazonRequest['Extensions'] ?? null, |
|
| 48 | + audioPlayer : isset($amazonRequest['AudioPlayer']) ? AudioPlayer::fromAmazonRequest($amazonRequest['AudioPlayer']) : null, |
|
| 49 | + geolocation : isset($amazonRequest['Geolocation']) ? Geolocation::fromAmazonRequest($amazonRequest['Geolocation']) : null, |
|
| 50 | + advertising : isset($amazonRequest['Advertising']) ? Advertising::fromAmazonRequest($amazonRequest['Advertising']) : null, |
|
| 51 | + viewport : isset($amazonRequest['Viewport']) ? Viewport::fromAmazonRequest($amazonRequest['Viewport']) : null, |
|
| 52 | + viewports : $viewports, |
|
| 53 | + apl : isset($amazonRequest['Alexa.Presentation.APL']) ? AlexaPresentationAPL::fromAmazonRequest($amazonRequest['Alexa.Presentation.APL']) : null, |
|
| 54 | + extensions : $amazonRequest['Extensions'] ?? null, |
|
| 55 | 55 | ); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -110,10 +110,10 @@ |
||
| 110 | 110 | $request = new self( |
| 111 | 111 | version: PropertyHelper::checkNullValueString($amazonRequest, 'version'), |
| 112 | 112 | session: isset($amazonRequest['session']) ? Session::fromAmazonRequest($amazonRequest['session']) : null, |
| 113 | - context: isset($amazonRequest['context']) ? Context::fromAmazonRequest($amazonRequest['context']) : null, |
|
| 114 | - amazonRequestBody: $amazonRequestBody, |
|
| 115 | - signatureCertChainUrl: $signatureCertChainUrl, |
|
| 116 | - signature: $signature, |
|
| 113 | + context : isset($amazonRequest['context']) ? Context::fromAmazonRequest($amazonRequest['context']) : null, |
|
| 114 | + amazonRequestBody : $amazonRequestBody, |
|
| 115 | + signatureCertChainUrl : $signatureCertChainUrl, |
|
| 116 | + signature : $signature, |
|
| 117 | 117 | ); |
| 118 | 118 | |
| 119 | 119 | $request->setRequest($amazonRequest); |
@@ -48,11 +48,11 @@ |
||
| 48 | 48 | allowNext: $amazonRequest['allowNext'] ?? null, |
| 49 | 49 | allowPrevious: $amazonRequest['allowPrevious'] ?? null, |
| 50 | 50 | audioTrack: isset($amazonRequest['audioTrack']) ? AudioTrack::tryFrom($amazonRequest['audioTrack']) : null, |
| 51 | - entities: $entities, |
|
| 52 | - muted: $amazonRequest['muted'] ?? null, |
|
| 53 | - positionInMilliseconds: $amazonRequest['positionInMilliseconds'] ?? null, |
|
| 54 | - state: isset($amazonRequest['state']) ? MediaState::tryFrom($amazonRequest['state']) : null, |
|
| 55 | - url: $amazonRequest['url'] ?? null, |
|
| 51 | + entities : $entities, |
|
| 52 | + muted : $amazonRequest['muted'] ?? null, |
|
| 53 | + positionInMilliseconds : $amazonRequest['positionInMilliseconds'] ?? null, |
|
| 54 | + state : isset($amazonRequest['state']) ? MediaState::tryFrom($amazonRequest['state']) : null, |
|
| 55 | + url : $amazonRequest['url'] ?? null, |
|
| 56 | 56 | ); |
| 57 | 57 | } |
| 58 | 58 | } |