Merge branch 'v1.x' into v2.x

Author: jpresutti

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'])
                 };
             }
         }

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;
@@ -63,16 +62,14 @@ public function testSaveUser(): void
     {
         di(null, \Feast\Enums\ServiceContainer::CLEAR_CONTAINER);
         $session = $this->createStub(Session::class);
-        $namespace = new stdClass();
-        $session->Feast_Login = $namespace;
 
         $config = $this->createStub(ConfigInterface::class);
         $config->method('getSetting')->willReturn('test');
 
         $testUser = new MockUser();
         $testUser->user = 'testUser';
-        $namespace->identity = $testUser;
-        $identity = new Identity($config,$session);
+        $identity = new Identity($config, $session);
+
         $user = $identity->getUser();
         $this->assertEquals(null, $user);
 
@@ -85,8 +82,6 @@ public function testDestroyUser(): void
     {
         di(null, \Feast\Enums\ServiceContainer::CLEAR_CONTAINER);
         $session = $this->createStub(Session::class);
-        $namespace = new stdClass();
-        $session->Feast_Login = $namespace;
 
         $config = $this->createStub(ConfigInterface::class);
         $config->method('getSetting')->willReturn('test');

HttpRequest/Response.php

@@ -27,27 +27,30 @@
 
 class Response
 {
-    
     public function __construct(protected string $rawResponse, protected ResponseCode $responseCode)
     {
-        
     }
-    
-    public function getResponseAsText(): string {
+
+    public function getResponseAsText(): string
+    {
         return $this->rawResponse;
     }
 
     public function getResultAsJson(): stdClass|array|null
     {
         try {
-            /** @var stdClass|array */
-            return json_decode(utf8_encode($this->rawResponse), flags: JSON_THROW_ON_ERROR);
+            /** @var stdClass */
+            return json_decode(
+                       mb_convert_encoding($this->rawResponse, 'UTF-8', ['ISO-8859-1', 'UTF-8']),
+                flags: JSON_THROW_ON_ERROR
+            );
         } catch (Exception) {
             return null;
         }
     }
-    
-    public function getResultAsXml(): ?SimpleXMLElement {
+
+    public function getResultAsXml(): ?SimpleXMLElement
+    {
         try {
             return new SimpleXMLElement($this->rawResponse, LIBXML_NOERROR | LIBXML_NOWARNING);
         } catch (Exception) {