maxbeckers / amazon-alexa-php

src/Validation/RequestValidator.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
 /**
  * This is a validator for amazon echo requests. It validates the timestamp of the request and the request signature.
  */
-class RequestValidator
-{
+class RequestValidator {
     /**
      * Basic value for timestamp validation. 150 seconds is suggested by amazon.
      */

Switch Indentation +115 added lines, -115 removed lines

@@ -1,73 +1,73 @@ 
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Validation;
+    namespace MaxBeckers\AmazonAlexa\Validation;
 
-use GuzzleHttp\Client;
-use MaxBeckers\AmazonAlexa\Exception\OutdatedCertExceptionException;
-use MaxBeckers\AmazonAlexa\Exception\RequestInvalidSignatureException;
-use MaxBeckers\AmazonAlexa\Exception\RequestInvalidTimestampException;
-use MaxBeckers\AmazonAlexa\Request\Request;
+    use GuzzleHttp\Client;
+    use MaxBeckers\AmazonAlexa\Exception\OutdatedCertExceptionException;
+    use MaxBeckers\AmazonAlexa\Exception\RequestInvalidSignatureException;
+    use MaxBeckers\AmazonAlexa\Exception\RequestInvalidTimestampException;
+    use MaxBeckers\AmazonAlexa\Request\Request;
 
 /**
  * This is a validator for amazon echo requests. It validates the timestamp of the request and the request signature.
  */
-class RequestValidator
-{
-    /**
+    class RequestValidator
+    {
+        /**
      * Basic value for timestamp validation. 150 seconds is suggested by amazon.
      */
-    public const TIMESTAMP_VALID_TOLERANCE_SECONDS = 150;
+        public const TIMESTAMP_VALID_TOLERANCE_SECONDS = 150;
 
-    /**
+        /**
      * @param int $timestampTolerance Timestamp tolerance in seconds
      * @param Client $client HTTP client for fetching certificates
      */
-    public function __construct(
-        protected int $timestampTolerance = self::TIMESTAMP_VALID_TOLERANCE_SECONDS,
-        public Client $client = new Client(),
-    ) {
-    }
+        public function __construct(
+            protected int $timestampTolerance = self::TIMESTAMP_VALID_TOLERANCE_SECONDS,
+            public Client $client = new Client(),
+        ) {
+        }
 
-    /**
+        /**
      * Validate request data.
      *
      * @throws OutdatedCertExceptionException
      * @throws RequestInvalidSignatureException
      * @throws RequestInvalidTimestampException
      */
-    public function validate(Request $request): void
-    {
-        $this->validateTimestamp($request);
-        try {
-            $this->validateSignature($request);
-        } catch (OutdatedCertExceptionException $e) {
-            // load cert again and validate because temp file was outdated.
-            $this->validateSignature($request);
+        public function validate(Request $request): void
+        {
+            $this->validateTimestamp($request);
+            try {
+                $this->validateSignature($request);
+            } catch (OutdatedCertExceptionException $e) {
+                // load cert again and validate because temp file was outdated.
+                $this->validateSignature($request);
+            }
         }
-    }
 
-    /**
+        /**
      * Validate request timestamp. Request tolerance should be 150 seconds.
      * For more details @see https://developer.amazon.com/public/solutions/alexa/alexa-skills-kit/docs/developing-an-alexa-skill-as-a-web-service#timestamp.
      *
      * @throws RequestInvalidTimestampException
      */
-    private function validateTimestamp(Request $request): void
-    {
-        if (null === $request->request || !$request->request->validateTimestamp()) {
-            return;
-        }
+        private function validateTimestamp(Request $request): void
+        {
+            if (null === $request->request || !$request->request->validateTimestamp()) {
+                return;
+            }
 
-        $differenceInSeconds = time() - $request->request->timestamp?->getTimestamp();
+            $differenceInSeconds = time() - $request->request->timestamp?->getTimestamp();
 
-        if ($differenceInSeconds > $this->timestampTolerance) {
-            throw new RequestInvalidTimestampException('Invalid timestamp.');
+            if ($differenceInSeconds > $this->timestampTolerance) {
+                throw new RequestInvalidTimestampException('Invalid timestamp.');
+            }
         }
-    }
 
-    /**
+        /**
      * Validate request signature. The steps for signature validation are described at developer page.
      *
      * @see https://developer.amazon.com/public/solutions/alexa/alexa-skills-kit/docs/developing-an-alexa-skill-as-a-web-service#checking-the-signature-of-the-request
@@ -75,117 +75,117 @@ 
      * @throws OutdatedCertExceptionException
      * @throws RequestInvalidSignatureException
      */
-    private function validateSignature(Request $request): void
-    {
-        if (null === $request->request || !$request->request->validateSignature()) {
-            return;
-        }
+        private function validateSignature(Request $request): void
+        {
+            if (null === $request->request || !$request->request->validateSignature()) {
+                return;
+            }
 
-        // validate cert url
-        $this->validateCertUrl($request);
+            // validate cert url
+            $this->validateCertUrl($request);
 
-        // generate local cert path
-        $localCertPath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . md5($request->signatureCertChainUrl) . '.pem';
+            // generate local cert path
+            $localCertPath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . md5($request->signatureCertChainUrl) . '.pem';
 
-        // check if pem file is already downloaded to temp or download.
-        $certData = $this->fetchCertData($request, $localCertPath);
+            // check if pem file is already downloaded to temp or download.
+            $certData = $this->fetchCertData($request, $localCertPath);
 
-        // openssl cert validation
-        $this->verifyCert($request, $certData);
+            // openssl cert validation
+            $this->verifyCert($request, $certData);
 
-        // parse cert
-        $certContent = $this->parseCertData($certData);
+            // parse cert
+            $certContent = $this->parseCertData($certData);
 
-        // validate cert
-        $this->validateCertContent($certContent, $localCertPath);
-    }
+            // validate cert
+            $this->validateCertContent($certContent, $localCertPath);
+        }
 
-    /**
+        /**
      * @throws RequestInvalidSignatureException
      */
-    private function validateCertUrl(Request $request): void
-    {
-        if (false === (bool) preg_match("/https:\/\/s3.amazonaws.com(\:443)?\/echo.api\/*/i", $request->signatureCertChainUrl)) {
-            throw new RequestInvalidSignatureException('Invalid cert url.');
+        private function validateCertUrl(Request $request): void
+        {
+            if (false === (bool) preg_match("/https:\/\/s3.amazonaws.com(\:443)?\/echo.api\/*/i", $request->signatureCertChainUrl)) {
+                throw new RequestInvalidSignatureException('Invalid cert url.');
+            }
         }
-    }
 
-    /**
+        /**
      * @throws RequestInvalidSignatureException
      */
-    private function fetchCertData(Request $request, string $localCertPath): string
-    {
-        if (!file_exists($localCertPath)) {
-            $response = $this->client->request('GET', $request->signatureCertChainUrl);
-
-            if ($response->getStatusCode() !== 200) {
-                throw new RequestInvalidSignatureException('Can\'t fetch cert from URL.');
+        private function fetchCertData(Request $request, string $localCertPath): string
+        {
+            if (!file_exists($localCertPath)) {
+                $response = $this->client->request('GET', $request->signatureCertChainUrl);
+
+                if ($response->getStatusCode() !== 200) {
+                    throw new RequestInvalidSignatureException('Can\'t fetch cert from URL.');
+                }
+
+                $certData = $response->getBody()->getContents();
+                @file_put_contents($localCertPath, $certData);
+            } else {
+                $certData = @file_get_contents($localCertPath);
             }
 
-            $certData = $response->getBody()->getContents();
-            @file_put_contents($localCertPath, $certData);
-        } else {
-            $certData = @file_get_contents($localCertPath);
+            return $certData;
         }
 
-        return $certData;
-    }
-
-    /**
+        /**
      * @throws RequestInvalidSignatureException
      */
-    private function verifyCert(Request $request, string $certData): void
-    {
-        if (1 !== @openssl_verify($request->amazonRequestBody, base64_decode($request->signature, true), $certData, 'sha1')) {
-            throw new RequestInvalidSignatureException('Cert ssl verification failed.');
+        private function verifyCert(Request $request, string $certData): void
+        {
+            if (1 !== @openssl_verify($request->amazonRequestBody, base64_decode($request->signature, true), $certData, 'sha1')) {
+                throw new RequestInvalidSignatureException('Cert ssl verification failed.');
+            }
         }
-    }
 
-    /**
+        /**
      * @throws RequestInvalidSignatureException
      */
-    private function parseCertData(string $certData): array
-    {
-        $certContent = @openssl_x509_parse($certData);
-        if (empty($certContent)) {
-            throw new RequestInvalidSignatureException('Parse cert failed.');
-        }
+        private function parseCertData(string $certData): array
+        {
+            $certContent = @openssl_x509_parse($certData);
+            if (empty($certContent)) {
+                throw new RequestInvalidSignatureException('Parse cert failed.');
+            }
 
-        return $certContent;
-    }
+            return $certContent;
+        }
 
-    /**
+        /**
      * @throws OutdatedCertExceptionException
      * @throws RequestInvalidSignatureException
      */
-    private function validateCertContent(array $cert, string $localCertPath): void
-    {
-        $this->validateCertSubject($cert);
-        $this->validateCertValidTime($cert, $localCertPath);
-    }
+        private function validateCertContent(array $cert, string $localCertPath): void
+        {
+            $this->validateCertSubject($cert);
+            $this->validateCertValidTime($cert, $localCertPath);
+        }
 
-    /**
+        /**
      * @throws RequestInvalidSignatureException
      */
-    private function validateCertSubject(array $cert): void
-    {
-        if (false === isset($cert['extensions']['subjectAltName']) ||
-            false === stristr($cert['extensions']['subjectAltName'], 'echo-api.amazon.com')
-        ) {
-            throw new RequestInvalidSignatureException('Cert subject error.');
+        private function validateCertSubject(array $cert): void
+        {
+            if (false === isset($cert['extensions']['subjectAltName']) ||
+                false === stristr($cert['extensions']['subjectAltName'], 'echo-api.amazon.com')
+            ) {
+                throw new RequestInvalidSignatureException('Cert subject error.');
+            }
         }
-    }
 
-    /**
+        /**
      * @throws OutdatedCertExceptionException
      */
-    private function validateCertValidTime(array $cert, string $localCertPath): void
-    {
-        if (false === isset($cert['validTo_time_t']) || time() > $cert['validTo_time_t'] || false === isset($cert['validFrom_time_t']) || time() < $cert['validFrom_time_t']) {
-            if (file_exists($localCertPath)) {
-                /* @scrutinizer ignore-unhandled */ @unlink($localCertPath);
+        private function validateCertValidTime(array $cert, string $localCertPath): void
+        {
+            if (false === isset($cert['validTo_time_t']) || time() > $cert['validTo_time_t'] || false === isset($cert['validFrom_time_t']) || time() < $cert['validFrom_time_t']) {
+                if (file_exists($localCertPath)) {
+                    /* @scrutinizer ignore-unhandled */ @unlink($localCertPath);
+                }
+                throw new OutdatedCertExceptionException('Cert is outdated.');
             }
-            throw new OutdatedCertExceptionException('Cert is outdated.');
         }
-    }
 }

src/Response/Directives/APL/Document/Settings.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 class Settings implements \JsonSerializable
 {
     public function __construct(
-        public int|float|null $idleTimeout = null,
+        public int | float | null $idleTimeout = null,
         public ?PseudoLocalization $pseudoLocalization = null,
         public bool $supportsResizing = false,
     ) {

Switch Indentation +25 added lines, -25 removed lines

@@ -1,32 +1,32 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-class Settings implements \JsonSerializable
-{
-    public function __construct(
-        public int|float|null $idleTimeout = null,
-        public ?PseudoLocalization $pseudoLocalization = null,
-        public bool $supportsResizing = false,
-    ) {
-    }
-
-    public function jsonSerialize(): array
+    class Settings implements \JsonSerializable
     {
-        $data = [];
-
-        if ($this->idleTimeout !== null) {
-            $data['idleTimeout'] = $this->idleTimeout;
-        }
-        if ($this->pseudoLocalization !== null) {
-            $data['pseudoLocalization'] = $this->pseudoLocalization;
-        }
-        if ($this->supportsResizing) {
-            $data['supportsResizing'] = $this->supportsResizing;
+        public function __construct(
+            public int|float|null $idleTimeout = null,
+            public ?PseudoLocalization $pseudoLocalization = null,
+            public bool $supportsResizing = false,
+        ) {
         }
 
-        return $data;
-    }
+        public function jsonSerialize(): array
+        {
+            $data = [];
+
+            if ($this->idleTimeout !== null) {
+                $data['idleTimeout'] = $this->idleTimeout;
+            }
+            if ($this->pseudoLocalization !== null) {
+                $data['pseudoLocalization'] = $this->pseudoLocalization;
+            }
+            if ($this->supportsResizing) {
+                $data['supportsResizing'] = $this->supportsResizing;
+            }
+
+            return $data;
+        }
 }

src/Response/Directives/APL/Document/Role.php

Switch Indentation +5 added lines, -5 removed lines

@@ -29,9 +29,9 @@
     case SPINBUTTON = 'spinbutton';
     case SUMMARY = 'summary';
     case SWITCH = 'switch';
-    case TAB = 'tab';
-    case TABLIST = 'tablist';
-    case TEXT = 'text';
-    case TIMER = 'timer';
-    case TOOLBAR = 'toolbar';
+        case TAB = 'tab';
+        case TABLIST = 'tablist';
+        case TEXT = 'text';
+        case TIMER = 'timer';
+        case TOOLBAR = 'toolbar';
 }

src/Response/Directives/APL/Document/SwipeAction.php

Switch Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-enum SwipeAction: string
-{
-    case REVEAL = 'reveal';
-    case SLIDE = 'slide';
-    case COVER = 'cover';
+    enum SwipeAction: string
+    {
+        case REVEAL = 'reveal';
+        case SLIDE = 'slide';
+        case COVER = 'cover';
 }

src/Response/Directives/APL/Document/Value.php

Switch Indentation +23 added lines, -23 removed lines

@@ -1,35 +1,35 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-class Value implements \JsonSerializable
-{
-    /**
+    class Value implements \JsonSerializable
+    {
+        /**
      * @param string $property The property to animate
      * @param int|float $to Target value for the animation
      * @param int|float|null $from Starting value (optional). Null means: use current runtime value as implicit start.
      */
-    public function __construct(
-        public string $property,
-        public int|float $to,
-        public int|float|null $from = null,
-    ) {
-    }
+        public function __construct(
+            public string $property,
+            public int|float $to,
+            public int|float|null $from = null,
+        ) {
+        }
 
-    public function jsonSerialize(): array
-    {
-        $out = [
-            'property' => $this->property,
-        ];
+        public function jsonSerialize(): array
+        {
+            $out = [
+                'property' => $this->property,
+            ];
 
-        if ($this->from !== null) {
-            $out['from'] = $this->from;
-        }
+            if ($this->from !== null) {
+                $out['from'] = $this->from;
+            }
 
-        $out['to'] = $this->to;
+            $out['to'] = $this->to;
 
-        return $out;
-    }
+            return $out;
+        }
 }

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
      */
     public function __construct(
         public string $property,
-        public int|float $to,
-        public int|float|null $from = null,
+        public int | float $to,
+        public int | float | null $from = null,
     ) {
     }
 

src/Response/Directives/APL/Document/Import.php

Switch Indentation +39 added lines, -39 removed lines

@@ -1,12 +1,12 @@ 
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-class Import implements \JsonSerializable
-{
-    /**
+    class Import implements \JsonSerializable
+    {
+        /**
      * @param string $name Package name property
      * @param string $version Package version property
      * @param string|null $accept Package accept property (APL 2024.3 and later)
@@ -15,40 +15,40 @@ 
      * @param ImportType|null $type Polymorphic type property
      * @param bool $when When false, ignore this import
      */
-    public function __construct(
-        public string $name,
-        public string $version,
-        public ?string $accept = null,
-        public ?array $loadAfter = null,
-        public ?string $source = null,
-        public ?ImportType $type = null,
-        public bool $when = true,
-    ) {
-    }
+        public function __construct(
+            public string $name,
+            public string $version,
+            public ?string $accept = null,
+            public ?array $loadAfter = null,
+            public ?string $source = null,
+            public ?ImportType $type = null,
+            public bool $when = true,
+        ) {
+        }
 
-    public function jsonSerialize(): array
-    {
-        $data = [
-            'name' => $this->name,
-            'version' => $this->version,
-        ];
+        public function jsonSerialize(): array
+        {
+            $data = [
+                'name' => $this->name,
+                'version' => $this->version,
+            ];
 
-        if ($this->accept !== null && $this->accept !== '') {
-            $data['accept'] = $this->accept;
-        }
-        if ($this->loadAfter !== null && $this->loadAfter !== []) {
-            $data['loadAfter'] = $this->loadAfter;
-        }
-        if ($this->source !== null && $this->source !== '') {
-            $data['source'] = $this->source;
-        }
-        if ($this->type !== null) {
-            $data['type'] = $this->type->value;
-        }
-        if (!$this->when) {
-            $data['when'] = $this->when;
-        }
+            if ($this->accept !== null && $this->accept !== '') {
+                $data['accept'] = $this->accept;
+            }
+            if ($this->loadAfter !== null && $this->loadAfter !== []) {
+                $data['loadAfter'] = $this->loadAfter;
+            }
+            if ($this->source !== null && $this->source !== '') {
+                $data['source'] = $this->source;
+            }
+            if ($this->type !== null) {
+                $data['type'] = $this->type->value;
+            }
+            if (!$this->when) {
+                $data['when'] = $this->when;
+            }
 
-        return $data;
-    }
+            return $data;
+        }
 }

src/Response/Directives/APL/Document/AlignItems.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,14 +1,14 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-enum AlignItems: string
-{
-    case STRETCH = 'stretch';
-    case CENTER = 'center';
-    case START = 'start';
-    case END = 'end';
-    case BASELINE = 'baseline';
+    enum AlignItems: string
+    {
+        case STRETCH = 'stretch';
+        case CENTER = 'center';
+        case START = 'start';
+        case END = 'end';
+        case BASELINE = 'baseline';
 }

src/Response/Directives/APL/Document/Scale.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,14 +1,14 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-enum Scale: string
-{
-    case BEST_FIT = 'best-fit';
-    case BEST_FILL = 'best-fill';
-    case BEST_FIT_DOWN = 'best-fit-down';
-    case FILL = 'fill';
-    case NONE = 'none';
+    enum Scale: string
+    {
+        case BEST_FIT = 'best-fit';
+        case BEST_FILL = 'best-fill';
+        case BEST_FIT_DOWN = 'best-fit-down';
+        case FILL = 'fill';
+        case NONE = 'none';
 }

src/Response/Directives/APL/Document/SubmitKeyType.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,14 +1,14 @@
-<?php
+    <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
+    namespace MaxBeckers\AmazonAlexa\Response\Directives\APL\Document;
 
-enum SubmitKeyType: string
-{
-    case DONE = 'done';
-    case GO = 'go';
-    case NEXT = 'next';
-    case SEARCH = 'search';
-    case SEND = 'send';
+    enum SubmitKeyType: string
+    {
+        case DONE = 'done';
+        case GO = 'go';
+        case NEXT = 'next';
+        case SEARCH = 'search';
+        case SEND = 'send';
 }