Merge branch 'release/v1.3.0'

Author: Jens Schulze

.travis.yml

@@ -27,7 +27,8 @@ before_script:
   - if [ $PHP == '5.4' ] ; then ./set_guzzle5.sh; fi
   - composer global require hirak/prestissimo
   - composer self-update
-  - composer install -o --prefer-dist
+  - if [ $PHP == '5.4' ] ; then composer update -o --prefer-dist --prefer-lowest; fi
+  - if [ $PHP != '5.4' ] ; then composer install -o --prefer-dist; fi
 
 script:
   - ant phpcs-ci

CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="1.3.0"></a>
+# [1.3.0](https://github.com/sphereio/commercetools-php-sdk/compare/v1.2.3...v1.3.0) (2016-08-10)
+
+### Features
+
+* **Address:** add fax field to address ([cb1dda2](https://github.com/sphereio/commercetools-php-sdk/commit/cb1dda2)), closes [#236](https://github.com/sphereio/commercetools-php-sdk/issues/236)
+* **Channel:** add Address field to Channel ([66a40a9](https://github.com/sphereio/commercetools-php-sdk/commit/66a40a9)), closes [#237](https://github.com/sphereio/commercetools-php-sdk/issues/237)
+* **Localization:** add setLocale action to cart, order and customer ([17c5672](https://github.com/sphereio/commercetools-php-sdk/commit/17c5672)), closes [#235](https://github.com/sphereio/commercetools-php-sdk/issues/235)
+* **Order:** add actions to update customer email, shipping and billing address for orders ([23e0193](https://github.com/sphereio/commercetools-php-sdk/commit/23e0193)), closes [#238](https://github.com/sphereio/commercetools-php-sdk/issues/238)
+* **Order:** import order with stock update ([a824dae](https://github.com/sphereio/commercetools-php-sdk/commit/a824dae)), closes [#234](https://github.com/sphereio/commercetools-php-sdk/issues/234)
+* **Product:** support assets ([43f8dd6](https://github.com/sphereio/commercetools-php-sdk/commit/43f8dd6)), closes [#241](https://github.com/sphereio/commercetools-php-sdk/issues/241)
+* **Project:** add messages field to project ([4deb11f](https://github.com/sphereio/commercetools-php-sdk/commit/4deb11f)), closes [#239](https://github.com/sphereio/commercetools-php-sdk/issues/239)
+* **Search:** add subtree filter model ([9fa6527](https://github.com/sphereio/commercetools-php-sdk/commit/9fa6527)), closes [#244](https://github.com/sphereio/commercetools-php-sdk/issues/244)
+
+
+
 <a name="1.2.3"></a>
 ## [1.2.3](https://github.com/sphereio/commercetools-php-sdk/compare/v1.2.2...v1.2.3) (2016-07-14)
 

composer.json

@@ -35,9 +35,9 @@
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0",
-    "phpunit/phpunit": "^5.0 || ^4.0",
+    "phpunit/phpunit": "^5.0 || ^4.8",
     "phpmd/phpmd": "@stable",
-    "squizlabs/php_codesniffer": "@stable",
+    "squizlabs/php_codesniffer": "^2.6",
     "sebastian/phpcpd": "@stable",
     "pdepend/pdepend": "@stable",
     "phploc/phploc": "^2.0",
@@ -50,7 +50,7 @@
     "symfony/yaml": "*",
     "cache/array-adapter": "^0.4.0",
     "cache/filesystem-adapter": "^0.3.0",
-    "incenteev/composer-parameter-handler": "^2.0"
+    "incenteev/composer-parameter-handler": "^2.1"
   },
   "scripts": {
     "updateConfig": [

docroot/annotations.php

@@ -7,7 +7,7 @@
 
 use Commercetools\Core\Helper\Annotate\AnnotationGenerator;
 
-require '../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 $path = __DIR__ . '/../src/';
 

docroot/index.php

@@ -16,7 +16,7 @@
 use Commercetools\Core\Request\Products\ProductProjectionSearchRequest;
 use Symfony\Component\Yaml\Yaml;
 
-require '../vendor/autoload.php';
+require __DIR__ . '../vendor/autoload.php';
 
 $appConfig = Yaml::parse(file_get_contents('myapp.yml'));
 $context = Context::of()->setLanguages(['en'])->setGraceful(true);

features/bootstrap/FeatureContext.php

@@ -22,10 +22,10 @@ public static function setup()
     {
         if (isset($_SERVER['BEHAT_COVERAGE']) && $_SERVER['BEHAT_COVERAGE'] == true) {
             $filter = new \PHP_CodeCoverage_Filter();
-            $filter->addDirectoryToBlacklist(__DIR__ . "/../vendor");
-            $filter->addDirectoryToBlacklist(__DIR__ . "/../tests");
-            $filter->addDirectoryToBlacklist(__DIR__ . "/../features");
-            $filter->addDirectoryToWhitelist(__DIR__ . "/../src");
+            $filter->addDirectoryToBlacklist(__DIR__ . '/../vendor');
+            $filter->addDirectoryToBlacklist(__DIR__ . '/../tests');
+            $filter->addDirectoryToBlacklist(__DIR__ . '/../features');
+            $filter->addDirectoryToWhitelist(__DIR__ . '/../src');
 
             static::$coverage = new \PHP_CodeCoverage(null, $filter);
             static::$coverage->start('Behat Test');
@@ -44,7 +44,7 @@ public static function teardown()
 
             echo 'Generating code coverage report in Clover XML format ... ';
             $writer = new \PHP_CodeCoverage_Report_Clover();
-            $writer->process(static::$coverage, __DIR__ . "/../../build/logs/behat-clover.cov");
+            $writer->process(static::$coverage, __DIR__ . '/../../build/logs/behat-clover.cov');
             echo 'done' . PHP_EOL;
 
 //            echo 'Generating code coverage report in HTML format ... ';

src/AbstractHttpClient.php

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '1.2.3';
+    const VERSION = '1.3.0';
 
     /**
      * @var AdapterInterface
@@ -87,9 +87,7 @@ public function getHttpClient($options = [])
                 ],
                 $options
             );
-            $class = $this->getAdapterFactory()->getClass($this->getConfig()->getAdapter());
-
-            $this->httpClient = new $class($options);
+            $this->httpClient = $this->getAdapterFactory()->getAdapter($this->getConfig()->getAdapter(), $options);
         }
 
         return $this->httpClient;

src/Client.php

@@ -9,6 +9,7 @@
 use Commercetools\Core\Response\ErrorResponse;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Commercetools\Core\Client\Adapter\AdapterInterface;
 use Commercetools\Core\Error\InvalidTokenException;
@@ -124,7 +125,7 @@
  *
  * @package Commercetools\Core
  */
-class Client extends AbstractHttpClient
+class Client extends AbstractHttpClient implements LoggerAwareInterface
 {
     const DEPRECATION_HEADER = 'X-DEPRECATION-NOTICE';
 
@@ -182,7 +183,7 @@ protected function setOauthManager(Manager $oauthManager)
      * @param LoggerInterface $logger
      * @return $this
      */
-    protected function setLogger(LoggerInterface $logger = null)
+    public function setLogger(LoggerInterface $logger = null)
     {
         if ($logger instanceof LoggerInterface) {
             $this->logger = $logger;

src/Client/Adapter/AdapterFactory.php

@@ -31,6 +31,7 @@ public function register($name, $adapterClass)
     }
 
     /**
+     * @internal
      * @param string $name
      * @return string
      */
@@ -49,4 +50,17 @@ public function getClass($name = null)
 
         throw new InvalidArgumentException();
     }
+
+    /**
+     * @param $name
+     * @param $options
+     * @return AdapterInterface
+     */
+    public function getAdapter($name, $options)
+    {
+        $adapterClass = $this->getClass($name);
+        $adapter = new $adapterClass($options);
+
+        return $adapter;
+    }
 }

src/Client/Adapter/AdapterInterface.php

@@ -7,12 +7,15 @@
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 
-interface AdapterInterface
+interface AdapterInterface extends LoggerAwareInterface
 {
     public function setLogger(LoggerInterface $logger);
 
+    public function addHandler($handler);
+
     /**
      * @param RequestInterface $request
      * @return ResponseInterface