Merge branch 'master' into feature/live-preview

uttamukkoji · uttamukkoji · commit a74ba933f20d · 2021-12-06T17:02:17.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,5 @@ test/ImageTransformreport.html
 examples/index.php
 .DS_Store
 tmp/
-stdout
-test/result.json
+test/result.json
+stdout
diff --git a/examples/index.php b/examples/index.php
@@ -0,0 +1,33 @@
+<html>
+    <head>
+        <title>Contentstack PHP SDK</title>
+    </head>
+    <body>
+        <h1>Welcome to Contentstack PHP SDK</h1>
+    </body>
+</html>
+<?php
+ini_set('display_errors', 'On');
+require_once __DIR__ . '/../src/contentstack.php';
+
+use Contentstack\Contentstack;
+use Contentstack\Support\Utility;
+
+   $stack = Contentstack::Stack('', '', '');
+try {
+    // \Contentstack\Utility\debug($stack);
+      //  $result = $stack->getContentTypes('{"include_snippet_schema": "false"}'); 
+      // $result = $stack->ContentType('first_ct')->Query()->toJSON()->find(); 
+     // $result = $stack->ContentType('a')->Fetch();
+     // $result = $stack->ContentType('a')->Query()->includeSchema()->toJSON()->find();
+      // $result = $stack->ContentType('ctwithallfields')->Query()->addParam('include_dimensions', true)->toJSON()->find();
+     //  $result = $stack->ContentType('a')->Entry('blta07130f8b344b260')->includeContentType()->toJSON()->fetch();
+      $result = $stack->Assets()->Query()->includeFallback()->toJSON()->find();
+        //$result = $stack->Assets('blt9b5825dd804a9067')->addParam('include_dimension', 'true')->fetch();
+      Utility::debug(($result));
+
+} catch(Exception $e) {
+    echo "Message : ".$e->getMessage(); // returns message -> API -> error_message
+    echo "Code : ".$e->getCode(); // returns number -> API -> error_code
+    echo "Errors : ".print_r($e->getErrors()); // returns array -> API -> errors
+}
diff --git a/src/Stack/Stack.php b/src/Stack/Stack.php
@@ -137,7 +137,6 @@ public function ImageTrasform($url, $parameters)
         }                                   
     }
 
-
     public function LivePreviewQuery($parameters) {
         $this->live_preview['live_preview'] = $parameters['live_preview'] ?? 'init';
         $this->live_preview['content_type_uid'] = $parameters['content_type_uid'];
@@ -292,7 +291,6 @@ public function getEnvironment()
         return $this->environment;
     }
 
-
     /**
      * This function sets Branch.
      * 
diff --git a/src/Support/Utility.php b/src/Support/Utility.php
@@ -105,6 +105,7 @@ public static function isLivePreview($query) {
         }
         return false;
     }
+
     /**
      * Get the domain from the current object
      * 
@@ -129,7 +130,7 @@ public static function getDomain($query)
             $host = $stack->live_preview['host'];
         }
         return $stack->getProtocol()
-            .'://'.$host
+            .'://'.$stack->getHost()
             .':'
             .$stack->getPort().VERSION;
     }
diff --git a/test/EntriesTest.php b/test/EntriesTest.php
@@ -24,7 +24,6 @@ public static function setUpBeforeClass() : void {
         if (self::$rest->getHost() !== NULL) {
             self::$Stack->setHost(self::$rest->getHost());
         }
-
         self::$LivePreviewStack = Contentstack::Stack(self::$rest->getAPIKEY(), self::$rest->getAccessToken(),  self::$rest->getEnvironmentName(), array('live_preview' => array(
             'enable'=> true,
             'host' => 'preview.contentstack.com',
diff --git a/test/constants.php b/test/constants.php
@@ -11,4 +11,5 @@
 
 
 // fpr query test params
+define('CT_REF', 'reference');
 define('CT_ContentType', 'ctwithallfields');

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public function ImageTrasform($url, $parameters)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-`
`141`	`140`	`public function LivePreviewQuery($parameters) {`
`142`	`141`	`$this->live_preview['live_preview'] = $parameters['live_preview'] ?? 'init';`
`143`	`142`	`$this->live_preview['content_type_uid'] = $parameters['content_type_uid'];`
`@@ -292,7 +291,6 @@ public function getEnvironment()`
`292`	`291`	`return $this->environment;`
`293`	`292`	`}`
`294`	`293`
`295`		`-`
`296`	`294`	`/**`
`297`	`295`	`* This function sets Branch.`
`298`	`296`	`*`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public static function isLivePreview($query) {`
`105`	`105`	`}`
`106`	`106`	`return false;`
`107`	`107`	`}`
	`108`	`+`
`108`	`109`	`/**`
`109`	`110`	`* Get the domain from the current object`
`110`	`111`	`*`
`@@ -129,7 +130,7 @@ public static function getDomain($query)`
`129`	`130`	`$host = $stack->live_preview['host'];`
`130`	`131`	`}`
`131`	`132`	`return $stack->getProtocol()`
`132`		`- .'://'.$host`
	`133`	`+ .'://'.$stack->getHost()`
`133`	`134`	`.':'`
`134`	`135`	`.$stack->getPort().VERSION;`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public static function setUpBeforeClass() : void {`
`24`	`24`	`if (self::$rest->getHost() !== NULL) {`
`25`	`25`	`self::$Stack->setHost(self::$rest->getHost());`
`26`	`26`	`}`
`27`		`-`
`28`	`27`	`self::$LivePreviewStack = Contentstack::Stack(self::$rest->getAPIKEY(), self::$rest->getAccessToken(), self::$rest->getEnvironmentName(), array('live_preview' => array(`
`29`	`28`	`'enable'=> true,`
`30`	`29`	`'host' => 'preview.contentstack.com',`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`
`12`	`12`
`13`	`13`	`// fpr query test params`
	`14`	`+define('CT_REF', 'reference');`
`14`	`15`	`define('CT_ContentType', 'ctwithallfields');`