Merge branch '2.17.x'

Author: jenschude

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.17.1-beta.1](https://github.com/commercetools/commercetools-php-sdk/compare/v2.17.0...v2.17.1-beta.1) (2022-02-23)
+
+### Bug Fixes
+
+* **JsonObject** fields are marked optional by default
+
 # [2.17.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.16.0...v2.17.0) (2022-02-07)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "2.17.0",
+  "version": "2.17.1-beta.1",
   "description": "commercetools PHP SDK changelog generator package description",
   "homepage": "https://github.com/commercetools/commercetools-php-sdk",
   "bugs": "https://github.com/commercetools/commercetools-php-sdk/issues",

src/Core/AbstractHttpClient.php

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '2.17.0';
+    const VERSION = '2.17.1-beta.1';
 
     /**
      * @var AdapterInterface

src/Core/Model/Common/JsonObject.php

@@ -192,7 +192,7 @@ protected function initialize($field)
 
     public function isOptional($field)
     {
-        return $this->fieldDefinitionValue($field, static::OPTIONAL, false);
+        return $this->fieldDefinitionValue($field, static::OPTIONAL, true);
     }
 
     protected function decorateField($field, $value)

tests/unit/Model/Common/JsonObjectTest.php

@@ -35,7 +35,7 @@ protected function getObject()
             ->will(
                 $this->returnValue(
                     [
-                        'key' => [JsonObject::TYPE => 'string'],
+                        'key' => [JsonObject::TYPE => 'string', JsonObject::OPTIONAL => false],
                         'dummy' => [JsonObject::TYPE => 'string'],
                         'true' => [JsonObject::TYPE => 'bool'],
                         'false' => [JsonObject::TYPE => 'bool'],
@@ -243,7 +243,7 @@ public function testOptional()
                 $this->returnValue('12345')
             );
 
-        $this->assertFalse($obj->isOptional('implicit'));
+        $this->assertTrue($obj->isOptional('implicit'));
         $this->assertTrue($obj->isOptional('optional'));
         $this->assertFalse($obj->isOptional('required'));
     }