Merge branch 'release/v1.0.0-RC5'

Author: Jens Schulze

CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="1.0.0-RC5"></a>
+# [1.0.0-RC5](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC4...v1.0.0-RC5) (2015-10-07)
+
+
+### Features
+
+* **LineItems:** add update actions for custom types on line items ([c64fad0](https://github.com/sphereio/commercetools-php-sdk/commit/c64fad0))
+* **Payment:** add payment update actions for cart ([13e1860](https://github.com/sphereio/commercetools-php-sdk/commit/13e1860))
+
+
+
 <a name="1.0.0-RC4"></a>
 # [1.0.0-RC4](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC3...v1.0.0-RC4) (2015-10-05)
 

README.md

@@ -1,6 +1,6 @@
 # <img src="build/theme/resources/CT_cube_200px.png" width="40" align="center"></img> commercetools PHP SDK
 
->  STATUS: Release Candidate 3.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
+>  STATUS: Release Candidate 5.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
 >
 > See the [Milestone Plan](https://github.com/sphereio/commercetools-php-sdk/milestones?direction=desc&sort=completeness&state=open) for details of what's planned in detail. We love feedback and [Issue reports](https://github.com/sphereio/commercetools-php-sdk/issues?q=is%3Aopen+is%3Aissue+sort%3Acreated-asc)!
 > Up-to-Date planning status can be found on this [Waffle Board](https://waffle.io/sphereio/commercetools-php-sdk)

src/AbstractHttpClient.php

@@ -15,7 +15,7 @@
 abstract class AbstractHttpClient
 {
 
-    const VERSION = '1.0.0-RC4';
+    const VERSION = '1.0.0-RC5';
 
     /**
      * @var AdapterInterface

src/Client.php

@@ -6,7 +6,6 @@
 
 namespace Commercetools\Core;
 
-
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;

src/Config.php

@@ -102,11 +102,11 @@ class Config implements ContextAwareInterface
 
     /**
      * @param array $configValues
-     * @return Config
+     * @return static
      */
     public static function fromArray(array $configValues)
     {
-        $config = Config::of();
+        $config = static::of();
         array_walk(
             $configValues,
             function ($value, $key) use ($config) {

src/Helper/Annotate/ClassAnnotator.php

@@ -209,7 +209,10 @@ protected function annotate()
     {
         $classHead = [];
         $classHead[] = 'namespace ' . $this->class->getNamespace() . ';';
-        $classHead[] = '';
+
+        if (count($this->class->getUses()) > 0) {
+            $classHead[] = '';
+        }
 
         foreach ($this->class->getUses() as $use) {
             $classHead[] = 'use ' . $use['class'] . (isset($use['alias']) ? ' as ' . $use['alias'] : '') . ';';

src/Model/Common/AbstractJsonDeserializeObject.php

@@ -58,8 +58,7 @@ protected function hasInterface($type, $interfaceName)
         $cacheKey = $interfaceName . '-' . $type;
         if (!isset(static::$interfaces[$cacheKey])) {
             $interface = false;
-            if (
-                $this->isPrimitive($type) === false
+            if ($this->isPrimitive($type) === false
                 && isset(class_implements($type)[$interfaceName])
             ) {
                 $interface = true;

src/Model/Common/Address.php

@@ -6,7 +6,6 @@
 
 namespace Commercetools\Core\Model\Common;
 
-
 /**
  * @package Commercetools\Core\Model\Common
  * @apidoc http://dev.sphere.io/http-api-types.html#address

src/Model/Common/AddressCollection.php

@@ -5,7 +5,6 @@
 
 namespace Commercetools\Core\Model\Common;
 
-
 /**
  * @package Commercetools\Core\Model\Common
  * @method Address current()

src/Model/Common/Attribute.php

@@ -21,19 +21,6 @@ class Attribute extends JsonObject
 {
     // identifiers for the Api Product Attribute Types:
     const T_UNKNOWN = 'unknown';  // zero, should evaluate to false
-    const T_TEXTLIKE = 'string'; //includes date, datetime, time as these are JSON Strings, too
-    const T_LTEXT = '\Commercetools\Core\Model\Common\LocalizedString';
-    const T_NUMBER = 'float';
-    const T_BOOLEAN = 'bool';
-    const T_ENUM = '\Commercetools\Core\Model\Common\Enum';
-    const T_LENUM = '\Commercetools\Core\Model\Common\LocalizedEnum';
-    const T_MONEY = '\Commercetools\Core\Model\Common\Money';
-    const T_SET = '\Commercetools\Core\Model\Common\Set';
-    const T_NESTED = '\Commercetools\Core\Model\Common\AttributeCollection';
-    const T_REFERENCE = '\Commercetools\Core\Model\Common\Reference';
-    const T_DATETIME = '\DateTime';
-    const T_DATETIME_DECORATOR = '\Commercetools\Core\Model\Common\DateTimeDecorator';
-
 
     const PROP_VALUE = "value";
     const PROP_KEY = "key";
@@ -60,24 +47,33 @@ class Attribute extends JsonObject
 
     protected static $types = [];
 
-    protected $attributeDefinition;
-    protected $valueType;
-    protected $valueElementType;
-    protected $valueDecorator;
-
     public function fieldDefinitions()
     {
         return [
             static::PROP_NAME => [self::TYPE => 'string'],
-            static::PROP_VALUE => [
-                self::TYPE => $this->valueType,
-                self::DECORATOR => $this->valueDecorator,
-                self::ELEMENT_TYPE => $this->valueElementType,
-                self::OPTIONAL => true
-            ],
+            static::PROP_VALUE => [],
         ];
     }
 
+    public function fieldDefinition($field)
+    {
+        if ($field == static::PROP_VALUE) {
+            if (isset(static::$types[$this->getName()])) {
+                $fieldDefinition = static::$types[$this->getName()];
+                if (!$fieldDefinition instanceof AttributeDefinition) {
+                    return null;
+                }
+                $fieldType = $fieldDefinition->getType();
+                if (!$fieldType instanceof AttributeType) {
+                    return null;
+                }
+                return $fieldType->fieldTypeDefinition();
+            }
+            return null;
+        }
+        return parent::fieldDefinition($field);
+    }
+
     /**
      * @param $attributeName
      * @param $value
@@ -86,71 +82,29 @@ public function fieldDefinitions()
     protected function getApiType($attributeName, $value)
     {
         if (isset(static::$types[$attributeName])) {
-            $this->setAttributeDefinition(static::$types[$attributeName]);
             return static::$types[$attributeName];
         }
 
         $apiType = $this->guessApiType($value);
         $definition = AttributeDefinition::of($this->getContextCallback());
         $definition->setName($attributeName);
-        $definition->setType(AttributeType::of()->setName($apiType));
+        $definition->setType(AttributeType::fromArray(['name' => $apiType]));
 
         if ($apiType == static::API_SET) {
             $elementType = $this->guessApiType(current($value));
-            $definition->getType()->setElementType(AttributeType::of()->setName($elementType));
+            $definition->getType()->setElementType(AttributeType::fromArray(['name' => $elementType]));
         }
         $this->setAttributeDefinition($definition);
-        static::$types[$attributeName] = $definition;
-
         return static::$types[$attributeName];
     }
 
-    public static function getTypeByApiType($apiType)
-    {
-        $typeMapping = [
-            static::API_BOOL => static::T_BOOLEAN,
-            static::API_NUMBER => static::T_NUMBER,
-            static::API_TEXT => static::T_TEXTLIKE,
-            static::API_LTEXT => static::T_LTEXT,
-            static::API_LENUM => static::T_LENUM,
-            static::API_ENUM => static::T_ENUM,
-            static::API_MONEY => static::T_MONEY,
-            static::API_DATE => static::T_DATETIME,
-            static::API_TIME => static::T_DATETIME,
-            static::API_DATETIME => static::T_DATETIME,
-            static::API_SET => static::T_SET,
-            static::API_NESTED => static::T_NESTED,
-            static::API_REFERENCE => static::T_REFERENCE
-        ];
-
-
-        return isset($typeMapping[$apiType]) ? $typeMapping[$apiType] : null;
-    }
-
     /**
      * @param AttributeDefinition $definition
      * @return $this
      */
     public function setAttributeDefinition(AttributeDefinition $definition)
     {
         static::$types[$definition->getName()] = $definition;
-        $this->attributeDefinition = $definition;
-        $apiType = $definition->getType()->getName();
-        $this->valueType = static::getTypeByApiType($apiType);
-        $this->valueElementType = null;
-        $this->valueDecorator = null;
-
-        switch ($apiType) {
-            case static::API_SET:
-                $this->valueElementType = static::getTypeByApiType(
-                    $definition->getType()->getElementType()->getName()
-                );
-                break;
-            case static::API_TIME:
-            case static::API_DATETIME:
-            case static::API_DATE:
-                $this->valueDecorator = static::T_DATETIME_DECORATOR;
-        }
 
         return $this;
     }