@voxgig/sdkgen 0.36.0 → 0.37.0

package/project/.sdk/tm/php/utility/Fetcher.php

@@ -40,8 +40,12 @@ class ProjectNameFetcher
         $status_text = '';
         $resp_headers = [];
 
-        if (isset($http_response_header) && is_array($http_response_header)) {
-            foreach ($http_response_header as $header) {
+        $response_headers = function_exists('http_get_last_response_headers')
+            ? http_get_last_response_headers()
+            : ($http_response_header ?? []);
+
+        if (is_array($response_headers)) {
+            foreach ($response_headers as $header) {
                 if (preg_match('/^HTTP\/\S+\s+(\d+)\s+(.*)$/i', $header, $matches)) {
                     $status = (int)$matches[1];
                     $status_text = trim($matches[2]);

package/project/.sdk/tm/php/utility/MakeOptions.php

@@ -65,7 +65,11 @@ class ProjectNameMakeOptions
             'clean' => ['keys' => 'key,token,id'],
         ];
 
-        $merged = \Voxgig\Struct\Struct::merge([(object)[], $cfgopts, $opts]);
+        // Empty [] would be treated as a list and clobber the map under merge;
+        // substitute an empty stdClass to preserve map semantics.
+        $cfgopts_merge = empty($cfgopts) ? new \stdClass() : $cfgopts;
+        $opts_merge = empty($opts) ? new \stdClass() : $opts;
+        $merged = \Voxgig\Struct\Struct::merge([(object)[], $cfgopts_merge, $opts_merge]);
         $validated = \Voxgig\Struct\Struct::validate($merged, $optspec);
         $opts = self::to_array_deep($validated);
         if (!is_array($opts)) {

package/project/.sdk/tm/php/utility/MakeResult.php

@@ -33,6 +33,9 @@ class ProjectNameMakeResult
                 $entities = [];
                 foreach ($resdata as $entry) {
                     $ent = $entity->make();
+                    if ($entry instanceof \stdClass) {
+                        $entry = (array)$entry;
+                    }
                     if (is_array($entry)) {
                         $ent->data_set($entry);
                     }

package/project/.sdk/tm/php/utility/Param.php

@@ -35,32 +35,34 @@ class ProjectNameParam
             }
         }
 
+        $undef = '__UNDEFINED__';
+
         $val = \Voxgig\Struct\Struct::getprop($reqmatch, $key);
-        if ($val === null) {
+        if ($val === null || $val === $undef) {
             $val = \Voxgig\Struct\Struct::getprop($match_val, $key);
         }
 
-        if ($val === null && $akey !== '') {
+        if (($val === null || $val === $undef) && $akey !== '') {
             if ($spec) {
                 $spec->alias_map[$akey] = $key;
             }
             $val = \Voxgig\Struct\Struct::getprop($reqmatch, $akey);
         }
 
-        if ($val === null) {
+        if ($val === null || $val === $undef) {
             $val = \Voxgig\Struct\Struct::getprop($reqdata, $key);
         }
-        if ($val === null) {
+        if ($val === null || $val === $undef) {
             $val = \Voxgig\Struct\Struct::getprop($data, $key);
         }
 
-        if ($val === null && $akey !== '') {
+        if (($val === null || $val === $undef) && $akey !== '') {
             $val = \Voxgig\Struct\Struct::getprop($reqdata, $akey);
-            if ($val === null) {
+            if ($val === null || $val === $undef) {
                 $val = \Voxgig\Struct\Struct::getprop($data, $akey);
             }
         }
 
-        return $val;
+        return ($val === $undef) ? null : $val;
     }
 }