Merge branch 'feature/content-branching' into feature/live-preview

Author: uttamukkoji

src/Contentstack.php

@@ -46,7 +46,7 @@ abstract class Contentstack
     public static function Stack($api_key = '',
         $access_token = '',
         $environment = '',
-        $config = array('region'=> '', 'live_preview' => array('enable' => false, 'host' => 'api.contentstack.io'))
+        $config = array('region'=> '', 'branch'=> '', 'live_preview' => array('enable' => false, 'host' => 'api.contentstack.io'))
     ) {
         return new Stack($api_key, $access_token, $environment, $config);
     }

src/Stack/BaseQuery.php

@@ -307,6 +307,23 @@ public function includeFallback()
 
         return $this->queryObject;
     }
+
+    /** 
+     * To include branch of publish content.
+     * 
+     * @return Query
+    */
+    public function includeBranch() 
+    {
+        $this->queryObject->_query = call_user_func(
+            'contentstackAddBoolean', 
+            'include_branch', 
+            $this->queryObject->_query
+        );
+        
+        return $this->queryObject;
+    }
+
     /**
      * To include schema along with entries
      * 

src/Stack/Stack.php

@@ -55,7 +55,7 @@ public function __construct(
         $api_key = '', 
         $delivery_token = '', 
         $environment = '', 
-        $config = array('region'=> '', 'live_preview' => array())
+        $config = array('region'=> '', 'branch'=> '', 'live_preview' => array())
     ) {
 
         if ($config && $config !== "undefined" && array_key_exists('region', $config) && $config['region'] !== "undefined" && $config['region'] =="eu" ) {
@@ -65,7 +65,8 @@ public function __construct(
             'stack', array('api_key' => $api_key, 
             'access_token' => $delivery_token, 
             'environment' => $environment, 
-            'region' => $config['region'] ?? '')
+            'region' => $config['region'] ?? '',
+            'branch' => $config['branch'] ?? '')
         );
         $this->environment = $this->header['environment'];
         unset($this->header['environment']);
@@ -225,7 +226,7 @@ public function getPort()
     /**
      * This function sets API Key.
      * 
-     * @param string $api_key - Name of Environment
+     * @param string $api_key - API Key
      * 
      * @return Stack
      * */
@@ -238,7 +239,7 @@ public function setAPIKEY($api_key = '')
     /**
      * This function sets Delivery Token.
      * 
-     * @param string $delivery_token - Name of Environment
+     * @param string $delivery_token - Delivery Token
      * 
      * @return Stack
      * */
@@ -291,6 +292,31 @@ public function getEnvironment()
         return $this->environment;
     }
 
+
+    /**
+     * This function sets Branch.
+     * 
+     * @param string $branch - Name of branch
+     * 
+     * @return Stack
+     * */
+    public function setBranch($branch = '')
+    {
+        Utility::validateInput('branch', $branch);
+        $this->header['branch'] = $branch;
+        return $this;
+    }
+
+    /**
+     * This function returns Branch.
+     * 
+     * @return string
+     * */
+    public function Branch()
+    {
+        return $this->header['branch'];
+    }
+
     /**
      * This call returns comprehensive information of all 
      * the content types available in a particular stack in your account.

src/Support/Utility.php

@@ -395,6 +395,9 @@ public static function contentstackRequest($queryObject = '', $type = '')
             }else {
                 $request_headers[] = 'access_token: '.$Headers["access_token"];
             }
+            if ($Headers["branch"] !== '' && $Headers["branch"] !== "undefined") {
+                $request_headers[] = 'branch: '.$Headers["branch"];
+            }
             curl_setopt($http, CURLOPT_HTTPHEADER, $request_headers);
 
             curl_setopt($http, CURLOPT_HEADER, false);