Merge branch 'v2.x' into v3.x

jpresutti · jpresutti · commit 4646990048e8 · 2022-12-07T19:18:02.000-05:00
diff --git a/BaseMapper.php b/BaseMapper.php
@@ -84,7 +84,7 @@ protected function map(array $row, array $dataTypes): BaseModel
                     ),
                     'int' => (int)$val,
                     'bool' => $this->getBoolValue($val),
-                    default => utf8_encode((string)$val)
+                    default => mb_convert_encoding((string)$val, 'UTF-8', ['ISO-8859-1', 'UTF-8'])
                 };
             }
         }
diff --git a/FeastTests/IdentityTest.php b/FeastTests/IdentityTest.php
@@ -18,7 +18,6 @@
 declare(strict_types=1);
 
 use Feast\Interfaces\ConfigInterface;
-use Feast\ServiceContainer\ServiceContainer;
 use Feast\Session\Identity;
 use Feast\Session\Session;
 use Mocks\MockUser;
diff --git a/HttpRequest/Response.php b/HttpRequest/Response.php
@@ -27,7 +27,6 @@
 
 class Response
 {
-
     public function __construct(protected string $rawResponse, protected ResponseCode $responseCode)
     {
     }
@@ -40,7 +39,7 @@ public function getResponseAsText(): string
     public function getResultAsJson(): stdClass|array|null
     {
         try {
-            /** @var stdClass|array */
+            /** @var stdClass */
             return json_decode(
                        mb_convert_encoding($this->rawResponse, 'UTF-8', ['ISO-8859-1', 'UTF-8']),
                 flags: JSON_THROW_ON_ERROR

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function map(array $row, array $dataTypes): BaseModel`
`84`	`84`	`),`
`85`	`85`	`'int' => (int)$val,`
`86`	`86`	`'bool' => $this->getBoolValue($val),`
`87`		`- default => utf8_encode((string)$val)`
	`87`	`+ default => mb_convert_encoding((string)$val, 'UTF-8', ['ISO-8859-1', 'UTF-8'])`
`88`	`88`	`};`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`class Response`
`29`	`29`	`{`
`30`		`-`
`31`	`30`	`public function __construct(protected string $rawResponse, protected ResponseCode $responseCode)`
`32`	`31`	`{`
`33`	`32`	`}`
`@@ -40,7 +39,7 @@ public function getResponseAsText(): string`
`40`	`39`	`public function getResultAsJson(): stdClass\|array\|null`
`41`	`40`	`{`
`42`	`41`	`try {`
`43`		`- /** @var stdClass\|array */`
	`42`	`+ /** @var stdClass */`
`44`	`43`	`return json_decode(`
`45`	`44`	`mb_convert_encoding($this->rawResponse, 'UTF-8', ['ISO-8859-1', 'UTF-8']),`
`46`	`45`	`flags: JSON_THROW_ON_ERROR`