SDK-1746 Return stdClass after jsonSerialize (#265)

LuborRod · Rodion Liuborets · web-flow · commit c05ee1ef5eaa · 2022-02-10T12:25:39.000+02:00
Co-authored-by: Rodion Liuborets &lt;rodion.liuborets@yoti.com&gt;
diff --git a/src/Aml/Address.php b/src/Aml/Address.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\Aml;
 
+use stdClass;
 use Yoti\Util\Json;
 
 class Address implements \JsonSerializable
@@ -52,11 +53,11 @@ public function getPostcode(): ?string
     /**
      * Get address data.
      *
-     * @return array<string, string|Country|null>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             self::POSTCODE_ATTR => $this->getPostcode(),
             self::COUNTRY_ATTR => $this->getCountry(),
         ];
diff --git a/src/Aml/Profile.php b/src/Aml/Profile.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\Aml;
 
+use stdClass;
 use Yoti\Util\Json;
 
 class Profile implements \JsonSerializable
@@ -92,11 +93,11 @@ public function getAmlAddress(): Address
     /**
      * Get Aml profile data.
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             self::GIVEN_NAMES_ATTR  => $this->getGivenNames(),
             self::FAMILY_NAME_ATTR  => $this->getFamilyName(),
             self::SSN_ATTR => $this->getSsn(),
diff --git a/src/DocScan/Session/Create/Check/Contracts/RequestedWatchlistAdvancedCaConfig.php b/src/DocScan/Session/Create/Check/Contracts/RequestedWatchlistAdvancedCaConfig.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\DocScan\Session\Create\Check\Contracts;
 
+use stdClass;
 use Yoti\DocScan\Session\Create\Check\Contracts\Advanced\RequestedCaMatchingStrategy;
 use Yoti\DocScan\Session\Create\Check\Contracts\Advanced\RequestedCaSources;
 use Yoti\DocScan\Session\Create\Check\RequestedCheckConfigInterface;
@@ -75,11 +76,11 @@ public function getMatchingStrategy(): RequestedCaMatchingStrategy
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             'remove_deceased' => $this->getRemoveDeceased(),
             'share_url' => $this->getShareUrl(),
             'sources' => $this->getSources(),
diff --git a/src/DocScan/Session/Create/Check/RequestedCheck.php b/src/DocScan/Session/Create/Check/RequestedCheck.php
@@ -5,16 +5,17 @@
 namespace Yoti\DocScan\Session\Create\Check;
 
 use JsonSerializable;
+use stdClass;
 use Yoti\Util\Json;
 
 abstract class RequestedCheck implements JsonSerializable
 {
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return Json::withoutNullValues([
+        return (object) Json::withoutNullValues([
             'type' => $this->getType(),
             'config' => $this->getConfig()
         ]);
diff --git a/src/DocScan/Session/Create/Check/RequestedDocumentAuthenticityCheckConfig.php b/src/DocScan/Session/Create/Check/RequestedDocumentAuthenticityCheckConfig.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\DocScan\Session\Create\Check;
 
+use stdClass;
 use Yoti\Util\Json;
 
 class RequestedDocumentAuthenticityCheckConfig implements RequestedCheckConfigInterface
@@ -29,9 +30,9 @@ public function __construct(?string $manualCheck, ?IssuingAuthoritySubCheck $iss
     }
 
     /**
-     * @return \stdClass
+     * @return stdClass
      */
-    public function jsonSerialize(): \stdClass
+    public function jsonSerialize(): stdClass
     {
         return (object) Json::withoutNullValues([
             'manual_check' => $this->getManualCheck(),
diff --git a/src/DocScan/Session/Create/Check/RequestedFaceMatchCheckConfig.php b/src/DocScan/Session/Create/Check/RequestedFaceMatchCheckConfig.php
@@ -4,6 +4,8 @@
 
 namespace Yoti\DocScan\Session\Create\Check;
 
+use stdClass;
+
 class RequestedFaceMatchCheckConfig implements RequestedCheckConfigInterface
 {
     /**
@@ -17,11 +19,11 @@ public function __construct(string $manualCheck)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             'manual_check' => $this->getManualCheck(),
         ];
     }
diff --git a/src/DocScan/Session/Create/Check/RequestedLivenessConfig.php b/src/DocScan/Session/Create/Check/RequestedLivenessConfig.php
@@ -4,6 +4,8 @@
 
 namespace Yoti\DocScan\Session\Create\Check;
 
+use stdClass;
+
 class RequestedLivenessConfig implements RequestedCheckConfigInterface
 {
     /**
@@ -23,11 +25,11 @@ public function __construct(string $livenessType, int $maxRetries)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             'liveness_type' => $this->getLivenessType(),
             'max_retries' => $this->getMaxRetries(),
         ];
diff --git a/src/DocScan/Session/Create/Check/RequestedWatchlistScreeningConfig.php b/src/DocScan/Session/Create/Check/RequestedWatchlistScreeningConfig.php
@@ -4,6 +4,8 @@
 
 namespace Yoti\DocScan\Session\Create\Check;
 
+use stdClass;
+
 /**
  * Class RequestedWatchlistScreeningConfig
  * @package Yoti\DocScan\Session\Create\Check
@@ -25,11 +27,11 @@ public function __construct(array $categories)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object) [
             'categories' => $this->categories,
         ];
     }
diff --git a/src/DocScan/Session/Create/SessionSpecification.php b/src/DocScan/Session/Create/SessionSpecification.php
@@ -5,6 +5,7 @@
 namespace Yoti\DocScan\Session\Create;
 
 use JsonSerializable;
+use stdClass;
 use Yoti\DocScan\Session\Create\Check\RequestedCheck;
 use Yoti\DocScan\Session\Create\Filters\RequiredDocument;
 use Yoti\DocScan\Session\Create\Task\RequestedTask;
@@ -107,11 +108,11 @@ public function __construct(
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return Json::withoutNullValues([
+        return (object) Json::withoutNullValues([
             'client_session_token_ttl' => $this->getClientSessionTokenTtl(),
             'session_deadline' => $this->getSessionDeadline(),
             'resources_ttl' => $this->getResourcesTtl(),
diff --git a/src/DocScan/Session/Create/Task/RequestedTask.php b/src/DocScan/Session/Create/Task/RequestedTask.php
@@ -5,16 +5,17 @@
 namespace Yoti\DocScan\Session\Create\Task;
 
 use JsonSerializable;
+use stdClass;
 use Yoti\Util\Json;
 
 abstract class RequestedTask implements JsonSerializable
 {
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return Json::withoutNullValues([
+        return (object)Json::withoutNullValues([
             'type' => $this->getType(),
             'config' => $this->getConfig()
         ]);
diff --git a/src/DocScan/Session/Create/Task/RequestedTextExtractionTaskConfig.php b/src/DocScan/Session/Create/Task/RequestedTextExtractionTaskConfig.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\DocScan\Session\Create\Task;
 
+use stdClass;
 use Yoti\Util\Json;
 
 class RequestedTextExtractionTaskConfig implements RequestedTaskConfigInterface
@@ -29,11 +30,11 @@ public function __construct(string $manualCheck, ?string $chipData = null)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return Json::withoutNullValues([
+        return (object)Json::withoutNullValues([
             'manual_check' => $this->getManualCheck(),
             'chip_data' => $this->getChipData(),
         ]);
diff --git a/src/Profile/ExtraData/AttributeDefinition.php b/src/Profile/ExtraData/AttributeDefinition.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\Profile\ExtraData;
 
+use stdClass;
 use Yoti\Util\Json;
 
 class AttributeDefinition implements \JsonSerializable
@@ -32,11 +33,11 @@ public function getName(): string
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'name' => $this->getName(),
         ];
     }
diff --git a/src/ShareUrl/DynamicScenario.php b/src/ShareUrl/DynamicScenario.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\ShareUrl;
 
+use stdClass;
 use Yoti\ShareUrl\Extension\Extension;
 use Yoti\ShareUrl\Policy\DynamicPolicy;
 use Yoti\Util\Json;
@@ -51,11 +52,11 @@ public function __construct(string $callbackEndpoint, DynamicPolicy $dynamicPoli
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'callback_endpoint' => $this->callbackEndpoint,
             'policy' => $this->dynamicPolicy,
             'extensions' => $this->extensions,
diff --git a/src/ShareUrl/Extension/Extension.php b/src/ShareUrl/Extension/Extension.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\ShareUrl\Extension;
 
+use stdClass;
 use Yoti\Util\Json;
 use Yoti\Util\Validation;
 
@@ -37,11 +38,11 @@ public function __construct(string $type, $content)
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'type' => $this->type,
             'content' => $this->content,
         ];
diff --git a/src/ShareUrl/Extension/LocationConstraintContent.php b/src/ShareUrl/Extension/LocationConstraintContent.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\ShareUrl\Extension;
 
+use stdClass;
 use Yoti\Util\Json;
 use Yoti\Util\Validation;
 
@@ -62,11 +63,11 @@ public function __construct(float $latitude, float $longitude, float $radius, fl
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'expected_device_location' => [
                 'latitude' => $this->latitude,
                 'longitude' => $this->longitude,
diff --git a/src/ShareUrl/Extension/ThirdPartyAttributeContent.php b/src/ShareUrl/Extension/ThirdPartyAttributeContent.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\ShareUrl\Extension;
 
+use stdClass;
 use Yoti\Profile\ExtraData\AttributeDefinition;
 use Yoti\Util\Json;
 use Yoti\Util\Validation;
@@ -38,11 +39,11 @@ public function __construct(\DateTime $expiryDate, array $definitions)
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'expiry_date' => $this->expiryDate
                 ->setTimezone(new \DateTimeZone('UTC'))
                 ->format(\DateTime::RFC3339_EXTENDED),
diff --git a/src/ShareUrl/Policy/DynamicPolicy.php b/src/ShareUrl/Policy/DynamicPolicy.php
@@ -4,6 +4,7 @@
 
 namespace Yoti\ShareUrl\Policy;
 
+use stdClass;
 use Yoti\Util\Json;
 use Yoti\Util\Validation;
 
@@ -51,11 +52,11 @@ public function __construct(
     /**
      * @inheritDoc
      *
-     * @return array<string, mixed>
+     * @return stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): stdClass
     {
-        return [
+        return (object)[
             'wanted' => $this->wantedAttributes,
             'wanted_auth_types' => $this->wantedAuthTypes,
             'wanted_remember_me' => $this->wantedRememberMe,
diff --git a/src/ShareUrl/Policy/SourceConstraint.php b/src/ShareUrl/Policy/SourceConstraint.php
diff --git a/src/ShareUrl/Policy/WantedAnchor.php b/src/ShareUrl/Policy/WantedAnchor.php
diff --git a/tests/Aml/AddressTest.php b/tests/Aml/AddressTest.php
diff --git a/tests/Aml/ProfileTest.php b/tests/Aml/ProfileTest.php
diff --git a/tests/DocScan/DocScanClientTest.php b/tests/DocScan/DocScanClientTest.php
diff --git a/tests/DocScan/ServiceTest.php b/tests/DocScan/ServiceTest.php
diff --git a/tests/DocScan/Session/Create/SessionSpecificationBuilderTest.php b/tests/DocScan/Session/Create/SessionSpecificationBuilderTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Yoti\DocScan\Session\Create\Check;`
`6`	`6`
	`7`	`+use stdClass;`
	`8`	`+`
`7`	`9`	`class RequestedFaceMatchCheckConfig implements RequestedCheckConfigInterface`
`8`	`10`	`{`
`9`	`11`	`/**`
`@@ -17,11 +19,11 @@ public function __construct(string $manualCheck)`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`/**`
`20`		`- * @return array<string, mixed>`
	`22`	`+ * @return stdClass`
`21`	`23`	`*/`
`22`		`- public function jsonSerialize(): array`
	`24`	`+ public function jsonSerialize(): stdClass`
`23`	`25`	`{`
`24`		`- return [`
	`26`	`+ return (object) [`
`25`	`27`	`'manual_check' => $this->getManualCheck(),`
`26`	`28`	`];`
`27`	`29`	`}`