feat(Extension): support API extensions

Closes #365

Author: Jens Schulze

bin/ctp-tlscheck.php

@@ -3,7 +3,16 @@
 
 class Tls12Checker
 {
-    const API_URI = 'api.escemo.com';
+    const API_URI = 'api-tls12.commercetools.com';
+
+    const URIS = [
+        'auth-tls12.commercetools.com',
+        'api-tls12.commercetools.com',
+        'auth-tls12.commercetools.co',
+        'api-tls12.commercetools.co',
+        'api.sphere.io',
+        'api.commercetools.co',
+    ];
 
     public function allowedCiphers()
     {
@@ -59,12 +68,14 @@ private function checkCiphers()
     }
 
     /**
-     * @throws \Exception
+     * @param string $apiUri
+     * @param string $cipher
+     * @throws Exception
      */
-    private function checkApiConnection($cipher = null)
+    private function checkApiConnection($apiUri = self::API_URI, $cipher = null)
     {
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, 'https://' . self::API_URI);
+        curl_setopt($ch, CURLOPT_URL, 'https://' . $apiUri);
         curl_setopt($ch, CURLOPT_SSLVERSION, 6);
         if (!is_null($cipher)) {
             curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $cipher);
@@ -102,7 +113,9 @@ public function check()
         echo "Checking TLS 1.2 connection ... ";
         try {
             $this->checkCiphers();
-            $this->checkApiConnection();
+            foreach (self::URIS as $uri) {
+                $this->checkApiConnection($uri);
+            }
         } catch (\Exception $exception) {
             echo "\033[31mFailed\033[0m" . PHP_EOL;
             echo $exception->getMessage() . PHP_EOL;
@@ -114,33 +127,33 @@ public function check()
         return 0;
     }
 
-    private function availableCiphers()
-    {
-        $localCiphers = explode(' ', exec('openssl ciphers \'ALL:eNULL\' | tr \':\' \' \''));
-        $allowedCiphers = [];
-        foreach ($localCiphers as $localCipher) {
-            exec('echo -n | openssl s_client -connect ' . self::API_URI . ':443 -cipher ' . $localCipher . ' -tls1_2 2>&1', $dummy, $status);
-            if ($status === 0) {
-                $allowedCiphers[] = $localCipher;
-            }
-        }
-
-        return $allowedCiphers;
-    }
-
-    private function checkAvailableCiphers()
-    {
-        $availableCiphers = $this->availableCiphers();
-        foreach ($availableCiphers as $cipher) {
-            echo 'Testing ' . $cipher . '...';
-            try {
-                $this->checkApiConnection($cipher);
-                echo "\033[32mOK\033[0m" . PHP_EOL;
-            } catch (\Exception $exception) {
-                echo "\033[31mFailed\033[0m" . PHP_EOL;
-            }
-        }
-    }
+//    private function availableCiphers()
+//    {
+//        $localCiphers = explode(' ', exec('openssl ciphers \'ALL:eNULL\' | tr \':\' \' \''));
+//        $allowedCiphers = [];
+//        foreach ($localCiphers as $localCipher) {
+//            exec('echo -n | openssl s_client -connect ' . self::API_URI . ':443 -cipher ' . $localCipher . ' -tls1_2 2>&1', $dummy, $status);
+//            if ($status === 0) {
+//                $allowedCiphers[] = $localCipher;
+//            }
+//        }
+//
+//        return $allowedCiphers;
+//    }
+//
+//    private function checkAvailableCiphers()
+//    {
+//        $availableCiphers = $this->availableCiphers();
+//        foreach ($availableCiphers as $cipher) {
+//            echo 'Testing ' . $cipher . '...';
+//            try {
+//                $this->checkApiConnection(self::API_URI, $cipher);
+//                echo "\033[32mOK\033[0m" . PHP_EOL;
+//            } catch (\Exception $exception) {
+//                echo "\033[31mFailed\033[0m" . PHP_EOL;
+//            }
+//        }
+//    }
 }
 
 $checker = new Tls12Checker();

build.xml

@@ -64,7 +64,7 @@
         <exec executable="${toolsdir}phpcs${execPostfix}" failonerror="true">
             <arg value="--standard=PSR2" />
             <arg value="--extensions=php" />
-            <arg value="--ignore=autoload.php" />
+            <arg value="--ignore=autoload.php,src/Core/Builder" />
             <arg path="${basedir}/src" />
             <arg path="${basedir}/tests" />
         </exec>
@@ -76,7 +76,7 @@
         <exec executable="${toolsdir}phpcs${execPostfix}" failonerror="true">
             <arg value="--standard=PSR2" />
             <arg value="--extensions=php" />
-            <arg value="--ignore=autoload.php" />
+            <arg value="--ignore=autoload.php,src/Core/Builder" />
             <arg path="${basedir}/src" />
         </exec>
     </target>

composer.json

@@ -30,7 +30,7 @@
   "require": {
     "php": ">=5.6",
     "psr/log": "^1.0",
-    "guzzlehttp/guzzle": "^6.0 || ^5.3.1",
+    "guzzlehttp/guzzle": "^6.0 || ^5.3.3",
     "guzzlehttp/psr7": "^1.1",
     "psr/cache": "^1.0",
     "psr/simple-cache": "^1.0",

set_guzzle5.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 SRC='"guzzlehttp/guzzle": "^6.0"'
-DST='"guzzlehttp/guzzle": "^5.3.1", "react/promise": "^2.2.0"'
+DST='"guzzlehttp/guzzle": "^5.3.3", "react/promise": "^2.2.0"'
 sed -ibak -e "s|$SRC|$DST|g" composer.json

src/Core/Builder/Request/CartDiscountRequestBuilder.php

@@ -1,61 +1,78 @@
 <?php
-/**
- * @author @jenschude <[email protected]>
- */
-
+// phpcs:disable Generic.Files.LineLength
 namespace Commercetools\Core\Builder\Request;
 
-use Commercetools\Core\Model\CartDiscount\CartDiscount;
-use Commercetools\Core\Model\CartDiscount\CartDiscountDraft;
 use Commercetools\Core\Request\CartDiscounts\CartDiscountByIdGetRequest;
 use Commercetools\Core\Request\CartDiscounts\CartDiscountCreateRequest;
+use Commercetools\Core\Model\CartDiscount\CartDiscountDraft;
 use Commercetools\Core\Request\CartDiscounts\CartDiscountDeleteRequest;
+use Commercetools\Core\Model\CartDiscount\CartDiscount;
 use Commercetools\Core\Request\CartDiscounts\CartDiscountQueryRequest;
 use Commercetools\Core\Request\CartDiscounts\CartDiscountUpdateRequest;
 
 class CartDiscountRequestBuilder
 {
-    /**
-     * @return CartDiscountQueryRequest
-     */
-    public function query()
-    {
-        return CartDiscountQueryRequest::of();
-    }
 
     /**
-     * @param CartDiscount $cartDiscount
-     * @return CartDiscountUpdateRequest
+     * @link https://docs.commercetools.com/http-api-projects-cartDiscounts.html#get-cartdiscount-by-id
+     * @param string $id
+     * @return CartDiscountByIdGetRequest
      */
-    public function update(CartDiscount $cartDiscount)
+    public function getById($id)
     {
-        return CartDiscountUpdateRequest::ofIdAndVersion($cartDiscount->getId(), $cartDiscount->getVersion());
+        $request = CartDiscountByIdGetRequest::ofId($id);
+        return $request;
     }
 
     /**
+     * @link https://docs.commercetools.com/http-api-projects-cartDiscounts.html#create-a-cartdiscount
      * @param CartDiscountDraft $cartDiscountDraft
      * @return CartDiscountCreateRequest
      */
     public function create(CartDiscountDraft $cartDiscountDraft)
     {
-        return CartDiscountCreateRequest::ofDraft($cartDiscountDraft);
+        $request = CartDiscountCreateRequest::ofDraft($cartDiscountDraft);
+        return $request;
     }
 
     /**
+     * @link https://docs.commercetools.com/http-api-projects-cartDiscounts.html#delete-cartdiscount
      * @param CartDiscount $cartDiscount
      * @return CartDiscountDeleteRequest
      */
     public function delete(CartDiscount $cartDiscount)
     {
-        return CartDiscountDeleteRequest::ofIdAndVersion($cartDiscount->getId(), $cartDiscount->getVersion());
+        $request = CartDiscountDeleteRequest::ofIdAndVersion($cartDiscount->getId(), $cartDiscount->getVersion());
+        return $request;
     }
 
     /**
-     * @param string $id
-     * @return CartDiscountByIdGetRequest
+     * @link https://docs.commercetools.com/http-api-projects-cartDiscounts.html#query-cartdiscounts
+     *
+     * @return CartDiscountQueryRequest
      */
-    public function getById($id)
+    public function query()
+    {
+        $request = CartDiscountQueryRequest::of();
+        return $request;
+    }
+
+    /**
+     * @link https://docs.commercetools.com/http-api-projects-cartDiscounts.html#update-cartdiscount
+     * @param CartDiscount $cartDiscount
+     * @return CartDiscountUpdateRequest
+     */
+    public function update(CartDiscount $cartDiscount)
+    {
+        $request = CartDiscountUpdateRequest::ofIdAndVersion($cartDiscount->getId(), $cartDiscount->getVersion());
+        return $request;
+    }
+
+    /**
+     * @return CartDiscountRequestBuilder
+     */
+    public function of()
     {
-        return CartDiscountByIdGetRequest::ofId($id);
+        return new self();
     }
 }

src/Core/Builder/Request/CartRequestBuilder.php

@@ -1,77 +1,102 @@
 <?php
-/**
- * @author @jenschude <[email protected]>
- */
-
+// phpcs:disable Generic.Files.LineLength
 namespace Commercetools\Core\Builder\Request;
 
-use Commercetools\Core\Model\Cart\Cart;
-use Commercetools\Core\Model\Cart\CartDraft;
 use Commercetools\Core\Request\Carts\CartByCustomerIdGetRequest;
 use Commercetools\Core\Request\Carts\CartByIdGetRequest;
 use Commercetools\Core\Request\Carts\CartCreateRequest;
+use Commercetools\Core\Model\Cart\CartDraft;
 use Commercetools\Core\Request\Carts\CartDeleteRequest;
+use Commercetools\Core\Model\Cart\Cart;
 use Commercetools\Core\Request\Carts\CartQueryRequest;
 use Commercetools\Core\Request\Carts\CartReplicateRequest;
 use Commercetools\Core\Request\Carts\CartUpdateRequest;
 
 class CartRequestBuilder
 {
+
     /**
-     * @return CartQueryRequest
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#get-cart-by-customer-id
+     * @param string $customerId
+     * @return CartByCustomerIdGetRequest
      */
-    public function query()
+    public function getByCustomerId($customerId)
     {
-        return CartQueryRequest::of();
+        $request = CartByCustomerIdGetRequest::ofCustomerId($customerId);
+        return $request;
     }
 
     /**
-     * @param Cart $cart
-     * @return CartUpdateRequest
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#get-cart-by-id
+     * @param string $id
+     * @return CartByIdGetRequest
      */
-    public function update(Cart $cart)
+    public function getById($id)
     {
-        return CartUpdateRequest::ofIdAndVersion($cart->getId(), $cart->getVersion());
+        $request = CartByIdGetRequest::ofId($id);
+        return $request;
     }
 
     /**
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#create-cart
      * @param CartDraft $cartDraft
      * @return CartCreateRequest
      */
     public function create(CartDraft $cartDraft)
     {
-        return CartCreateRequest::ofDraft($cartDraft);
+        $request = CartCreateRequest::ofDraft($cartDraft);
+        return $request;
     }
 
     /**
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#delete-cart
      * @param Cart $cart
      * @return CartDeleteRequest
      */
     public function delete(Cart $cart)
     {
-        return CartDeleteRequest::ofIdAndVersion($cart->getId(), $cart->getVersion());
+        $request = CartDeleteRequest::ofIdAndVersion($cart->getId(), $cart->getVersion());
+        return $request;
     }
 
     /**
-     * @param string $id
-     * @return CartByIdGetRequest
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#query-carts
+     *
+     * @return CartQueryRequest
      */
-    public function getById($id)
+    public function query()
     {
-        return CartByIdGetRequest::ofId($id);
+        $request = CartQueryRequest::of();
+        return $request;
     }
 
     /**
-     * @param string $customerId
-     * @return CartByCustomerIdGetRequest
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#replicate-existing-cart-or-order-to-a-new-cart
+     * @param string $cartId
+     * @return CartReplicateRequest
      */
-    public function getByCustomerId($customerId)
+    public function replicate($cartId)
     {
-        return CartByCustomerIdGetRequest::ofCustomerId($customerId);
+        $request = CartReplicateRequest::ofCartId($cartId);
+        return $request;
     }
 
-    public function replicate($cartId)
+    /**
+     * @link https://docs.commercetools.com/http-api-projects-carts.html#update-cart
+     * @param Cart $cart
+     * @return CartUpdateRequest
+     */
+    public function update(Cart $cart)
+    {
+        $request = CartUpdateRequest::ofIdAndVersion($cart->getId(), $cart->getVersion());
+        return $request;
+    }
+
+    /**
+     * @return CartRequestBuilder
+     */
+    public function of()
     {
-        return CartReplicateRequest::ofCartId($cartId);
+        return new self();
     }
 }