Merge pull request #185 from sphereio/segfault_fix

Segfault fix

Closes #98

Author: jayS-de

src/Model/Order/OrderState.php

@@ -12,6 +12,7 @@
 class OrderState
 {
     const OPEN = 'Open';
+    const CONFIRMED = 'Confirmed';
     const COMPLETE = 'Complete';
     const CANCELLED = 'Cancelled';
 }

tests/integration/ApiTestCase.php

@@ -834,10 +834,13 @@ protected function getChannelDraft()
         return $draft;
     }
 
-    protected function getChannel()
+    protected function getChannel($roles = null)
     {
         if (is_null($this->channel)) {
             $draft = $this->getChannelDraft();
+            if (is_array($roles)) {
+                $draft->setRoles($roles);
+            }
             $request = ChannelCreateRequest::ofDraft($draft);
             $response = $request->executeWithClient($this->getClient());
             $this->channel = $request->mapResponse($response);

tests/integration/Order/OrderUpdateRequestTest.php

@@ -108,7 +108,7 @@ public function testChangeState()
 
         $this->assertNotSame($order->getVersion(), $result->getVersion());
         $this->assertInstanceOf('\Commercetools\Core\Model\Order\Order', $result);
-        $this->assertSame(OrderState::COMPLETE, $result->getState());
+        $this->assertSame(OrderState::COMPLETE, $result->getOrderState());
     }
 
     public function testChangeShipmentState()
@@ -150,7 +150,7 @@ public function testUpdateSyncInfo()
         $cartDraft = $this->getCartDraft();
         $order = $this->createOrder($cartDraft);
 
-        $channel = $this->getChannel();
+        $channel = $this->getChannel(['OrderExport']);
         $syncedAt = new \DateTime();
         $request = OrderUpdateRequest::ofIdAndVersion($order->getId(), $order->getVersion())
             ->addAction(OrderUpdateSyncInfoAction::ofChannel($channel->getReference())->setSyncedAt($syncedAt))
@@ -264,12 +264,12 @@ public function testAddDelivery()
         $this->assertNotSame($order->getVersion(), $result->getVersion());
         $this->assertInstanceOf('\Commercetools\Core\Model\Order\Order', $result);
         $delivery = $result->getShippingInfo()->getDeliveries()->current();
-        $this->assertSame($lineItem->getId(), $delivery->getId());
+        $this->assertSame($lineItem->getId(), $delivery->getItems()->current()->getId());
         $order = $result;
 
         $request = OrderUpdateRequest::ofIdAndVersion($order->getId(), $order->getVersion())
             ->addAction(
-                OrderAddParcelToDeliveryAction::ofDeliveryId($delivery)
+                OrderAddParcelToDeliveryAction::ofDeliveryId($delivery->getId())
                     ->setMeasurements(
                         ParcelMeasurements::of()
                             ->setHeightInMillimeter(100)

tests/unit/ClientTest.php

@@ -17,7 +17,6 @@
 use Monolog\Logger;
 use Commercetools\Core\Client\JsonEndpoint;
 use Commercetools\Core\Client\OAuth\Token;
-use Commercetools\Core\Error\ApiException;
 use Commercetools\Core\Request\ClientRequestInterface;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
@@ -357,12 +356,10 @@ public function testLogDeprecatedMethod()
     }
 
     /**
-     * @expectedException \GuzzleHttp\Exception\ConnectException
+     * @expectedException \Commercetools\Core\Error\ApiException
      */
     public function testBatchException()
     {
-        $this->markTestSkipped('todo fix segfault');
-        return;
         $oauthMock = $this->getMock('\Commercetools\Core\Client\OAuth\Manager', ['getToken'], [$this->getConfig()]);
         $oauthMock->expects($this->any())
             ->method('getToken')
@@ -399,8 +396,6 @@ public function testBatchException()
 
     public function testBatchExceptionWithResponse()
     {
-        $this->markTestSkipped('todo fix segfault');
-        return;
         $oauthMock = $this->getMock('\Commercetools\Core\Client\OAuth\Manager', ['getToken'], [$this->getConfig()]);
         $oauthMock->expects($this->any())
             ->method('getToken')