Merge branch 'hotfix/v1.1.1'

Jens Schulze · Jens Schulze · commit 5f432b457c15 · 2016-06-07T14:02:48.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.1.1"></a>
+## [1.1.1](https://github.com/sphereio/commercetools-php-sdk/compare/v1.1.0...v1.1.1) (2016-06-07)
+
+
+### Bug Fixes
+
+* **LocalizedEnumCollection:** use correct type for LocalizedEnumCollection elements ([9492a8c](https://github.com/sphereio/commercetools-php-sdk/commit/9492a8c)), closes [#218](https://github.com/sphereio/commercetools-php-sdk/issues/218)
+
+
+
 <a name="1.1.0"></a>
 # [1.1.0](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.1...v1.1.0) (2016-05-27)
 
diff --git a/src/AbstractHttpClient.php b/src/AbstractHttpClient.php
@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '1.1';
+    const VERSION = '1.1.1';
 
     /**
      * @var AdapterInterface
diff --git a/src/Model/Common/LocalizedEnumCollection.php b/src/Model/Common/LocalizedEnumCollection.php
@@ -21,7 +21,7 @@ class LocalizedEnumCollection extends Collection
 
     protected function indexRow($offset, $row)
     {
-        if ($row instanceof Enum) {
+        if ($row instanceof LocalizedEnum) {
             $key = $row->getKey();
         } else {
             $key = $row[static::KEY];
diff --git a/tools/package.json b/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "commercetools PHP SDK changelog generator package description",
   "homepage": "https://github.com/sphereio/commercetools-php-sdk",
   "bugs": "https://github.com/sphereio/commercetools-php-sdk/issues",

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`abstract class AbstractHttpClient`
`16`	`16`	`{`
`17`		`- const VERSION = '1.1';`
	`17`	`+ const VERSION = '1.1.1';`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @var AdapterInterface`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LocalizedEnumCollection extends Collection`
`21`	`21`
`22`	`22`	`protected function indexRow($offset, $row)`
`23`	`23`	`{`
`24`		`- if ($row instanceof Enum) {`
	`24`	`+ if ($row instanceof LocalizedEnum) {`
`25`	`25`	`$key = $row->getKey();`
`26`	`26`	`} else {`
`27`	`27`	`$key = $row[static::KEY];`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "commercetools-php-sdk-changelog",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"description": "commercetools PHP SDK changelog generator package description",`
`5`	`5`	`"homepage": "https://github.com/sphereio/commercetools-php-sdk",`
`6`	`6`	`"bugs": "https://github.com/sphereio/commercetools-php-sdk/issues",`