made changes in global fields

Author: rohitmishra209

src/lib/models/base_query.php

@@ -183,6 +183,7 @@ public function exists($field_uid = '') {
      * */
     public function includeSchema() {
         $this->queryObject->_query = call_user_func('contentstackAddBoolean', 'include_schema', $this->queryObject->_query);
+        
         return $this->queryObject;
     }
 

src/lib/models/content_type.php

@@ -6,6 +6,7 @@
 
 use Contentstack\Stack\ContentType\Entry\Entry;
 use Contentstack\Stack\ContentType\Query\Query;
+//use Contentstack\Stack\ContentType\Query\Fetch;
 
 require_once __DIR__.'/entry.php';
 require_once __DIR__.'/query.php';
@@ -14,6 +15,7 @@
  * Class ContentType
  * */
 class ContentType {
+    
     var $uid = '';
     var $stack = '';
 
@@ -42,9 +44,11 @@ public function Entry($entry_uid = '') {
      * fetch
      * Fetch the specific contenttypes
      * */
-    public function fetch($params) {
-          $myArray = json_decode($params, true);
-          $this->_query = $myArray;
+    public function Fetch($params = null) {
+          if($params) {
+            $myArray = json_decode($params, true);
+            $this->_query = $myArray;
+          }        
           return \Contentstack\Utility\contentstackRequest($this);
      }
     /*
@@ -53,6 +57,7 @@ public function fetch($params) {
      * @returns Query
      * */
     public function Query() {
+        \Contentstack\Utility\debug(("sndkcxcx cx n"));
         return new Query($this, $this->type);
     }
 }

src/lib/utility.php

@@ -96,10 +96,18 @@ function contentstackUrl($queryObject = '', $type = '') {
                 $URL = getDomain($queryObject).ASSETS;
                 break;                      
             default:
-            $URL = getDomain($queryObject).CONTENT_TYPES.$queryObject->contentType->uid.ENTRIES;                    
+
+            if($queryObject->_query && $queryObject->_query['include_global_field_schema'] || !$queryObject->contentType) {
+                $URL = getDomain($queryObject).CONTENT_TYPES.$queryObject->uid;    
+            } else {
+                $URL = getDomain($queryObject).CONTENT_TYPES.$queryObject->contentType->uid.ENTRIES;                    
+            }
             if(isset($queryObject->entryUid)) $URL.=$queryObject->entryUid;
         }
+        
         $queryParams = generateQueryParams($queryObject);
+        // \Contentstack\Utility\debug(($URL));
+        // \Contentstack\Utility\debug(($queryParams));
         return $URL.'?'.$queryParams;
 
     }
@@ -218,6 +226,10 @@ function wrapResult($result = '', $queryObject = '') {
                         $wrapper = (!$flag) ? new Result($result['entry']) : $result['entry'];
                     if(isKeySet($result, 'asset'))
                         $wrapper = (!$flag) ? new Result($result['asset']) : $result['asset'];
+                    if(\Contentstack\Utility\isKeySet($result, 'schema')) 
+                        array_push($wrapper, $result['schema']);
+                    if(\Contentstack\Utility\isKeySet($result, 'content_type')) 
+                        array_push($wrapper, $result['content_type']);    
                     break;
                 case 'find':
                     $wrapper = array();
@@ -273,7 +285,6 @@ function contentstackRequest($queryObject = '', $type = ''){
             // receive server response ...
             curl_setopt($http, CURLOPT_RETURNTRANSFER, TRUE);
             $response = curl_exec($http);
-
 
             // status code extraction
             $httpcode = curl_getinfo($http, CURLINFO_HTTP_CODE);