Skip to content

Commit 638a58b

Browse files
uttamukkojiuttamukkoji
committed
fix: 🐛 Test case issues resolved
1 parent 7d4f61d commit 638a58b

File tree

7 files changed

+39
-50
lines changed

7 files changed

+39
-50
lines changed

‎src/Stack/Assets.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function Query()
8181
public function fetch()
8282
{
8383
$this->operation = __FUNCTION__;
84-
return Utility::contentstackRequest($this, 'asset');
84+
return Utility::contentstackRequest($this->stack, $this, 'asset');
8585
}
8686
}
8787

‎src/Stack/ContentType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function fetch($params = null)
7676
$myArray = json_decode($params, true);
7777
$this->_query = $myArray;
7878
}
79-
return Utility::contentstackRequest($this);
79+
return Utility::contentstackRequest($this->stack, $this);
8080
}
8181
/**
8282
* Query object to create the "Query" on the specified ContentType

‎src/Stack/ContentType/Entry.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ public function __construct($entryUid = '', $contentType = '')
6060
public function fetch()
6161
{
6262
$this->operation = __FUNCTION__;
63-
return Utility::contentstackRequest($this);
63+
return Utility::contentstackRequest($this->contentType->stack, $this);
6464
}
6565
}

‎src/Stack/ContentType/Query.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public function find()
5656
{
5757
$this->operation = __FUNCTION__;
5858
if ($this->type == 'assets') {
59-
return Utility::contentstackRequest($this, 'assets');
59+
return Utility::contentstackRequest($this->assets->stack, $this, 'assets');
6060
} else if ($this->type == 'contentType') {
61-
return Utility::contentstackRequest($this);
61+
return Utility::contentstackRequest($this->contentType->stack, $this);
6262
}
6363
}
6464

@@ -75,9 +75,9 @@ public function findOne()
7575
$this->operation = __FUNCTION__;
7676
$this->_query['limit'] = 1;
7777
if ($this->type == 'assets') {
78-
return Utility::contentstackRequest($this, 'assets');
78+
return Utility::contentstackRequest($this->assets->stack, $this, 'assets');
7979
} elseif ($this->type == 'contentType') {
80-
return Utility::contentstackRequest($this);
80+
return Utility::contentstackRequest($this->contentType->stack, $this);
8181
}
8282
}
8383
}

‎src/Stack/Stack.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public function getContentTypes($params)
337337
$this->_query = $myArray;
338338
}
339339

340-
return Utility::contentstackRequest($this, "getcontentTypes");
340+
return Utility::contentstackRequest($this, $this, "getcontentTypes");
341341
}
342342

343343
/**
@@ -352,6 +352,6 @@ public function sync($params)
352352
if ($params && $params !== "undefined") {
353353
$this->_query = $params;
354354
}
355-
return Utility::contentstackRequest($this, "sync");
355+
return Utility::contentstackRequest($this, $this, "sync");
356356
}
357357
}

‎src/Support/Utility.php‎

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,11 @@ public static function wrapResult($result = '', $queryObject = '')
375375
*
376376
* @return Result
377377
* */
378-
public static function send_request($queryObject = '', $type = '')
378+
public static function contentstackRequest($stack, $queryObject = '', $type = '', $count = 0)
379379
{
380-
$server_output = '';
381-
380+
$retryDelay = $stack->retryDelay;
381+
$retryLimit = $stack->retryLimit;
382+
$errorRetry = $stack->errorRetry;
382383
if ($queryObject) {
383384
if (Utility::isLivePreview($queryObject)) {
384385
$queryObject->_query['live_preview'] = ($queryObject->contentType->stack->live_preview['live_preview'] ?? 'init');
@@ -400,8 +401,8 @@ public static function send_request($queryObject = '', $type = '')
400401
$request_headers[] = 'branch: '.$Headers["branch"];
401402
}
402403

403-
$proxy_details = $queryObject->contentType->stack->proxy;
404-
$timeout = $queryObject->contentType->stack->timeout;
404+
$proxy_details = $stack->proxy;
405+
$timeout = $stack->timeout;
405406

406407
curl_setopt($http, CURLOPT_HTTPHEADER, $request_headers);
407408

@@ -439,37 +440,23 @@ public static function send_request($queryObject = '', $type = '')
439440

440441
// close the curl
441442
curl_close($http);
442-
if ($httpcode > 199 && $httpcode < 300) {
443-
// wrapper the server result
444-
$response = Utility::wrapResult($response, $queryObject);
445-
446-
}elseif($httpcode == 0){
447-
$response = array( 'error_message' => 'cURL couldn’t hook up with the proxy IP address and port used', 'error_code' => '407');
448-
}
449-
else{
450-
$response = Utility::wrapResult($response, $httpcode);
451-
}
452-
}
453-
$response += ['httpcode' => $httpcode];
454-
return $response;
455-
}
456-
457-
public static function contentstackRequest($queryObject = '', $type = '', $count = 0)
458-
{
459-
$retryDelay = $queryObject->contentType->stack->retryDelay;
460-
$retryLimit = $queryObject->contentType->stack->retryLimit;
461-
$errorRetry = $queryObject->contentType->stack->errorRetry;
462-
$response = Utility::send_request($queryObject, $type);
463-
464-
if(in_array( $response['httpcode'] ,$errorRetry)){
465-
if($count < $retryLimit){
466-
$retryDelay = round($retryDelay/1000); //converting retry_delay from milliseconds into seconds
467-
sleep($retryDelay); //sleep method requires time in seconds
468-
$count += 1;
469-
$response = Utility::contentstackRequest($queryObject, $type, $count);
443+
if(in_array($httpcode,$errorRetry)){
444+
if($count < $retryLimit){
445+
$retryDelay = round($retryDelay/1000); //converting retry_delay from milliseconds into seconds
446+
sleep($retryDelay); //sleep method requires time in seconds
447+
$count += 1;
448+
return Utility::contentstackRequest($stack, $queryObject, $type, $count);
449+
}
450+
} else {
451+
if ($httpcode > 199 && $httpcode < 300) {
452+
// wrapper the server result
453+
$response = Utility::wrapResult($response, $queryObject);
454+
}
455+
else{
456+
throw new CSException($response, $httpcode);
457+
}
470458
}
471459
}
472-
unset($response['httpcode']);
473460
return $response;
474461
}
475462

‎test/EntriesTest.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public function testLivePreviewEntrywithQuery () {
6666
try {
6767
self::$LivePreviewStack->livePreviewQuery(array('content_type_uid' => CT_ContentType));
6868
$_entry = self::$LivePreviewStack->ContentType(CT_ContentType)->Entry(self::$_uid)->toJSON()->fetch();
69-
7069
} catch (Exception $e) {
7170
$this->assertTrue(true);
7271
}
@@ -178,9 +177,8 @@ public function testFindIncludeContentType() {
178177

179178
public function testFindIncludeEmbeddedItems() {
180179
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->includeEmbeddedItems()->find();
181-
182180
for($i = 0; $i < count($_entries[0]); $i++) {
183-
if ($_entries[0][$i]["rich_text_editor"]) {
181+
if (array_key_exists('rich_text_editor', $_entries[0][$i])) {
184182
$embedded = Contentstack::renderContent($_entries[0][$i]["rich_text_editor"], new Option($_entries[0][$i]));
185183
}
186184
}
@@ -340,12 +338,16 @@ public function testFindDescending() {
340338
public function testGetContentTypes() {
341339
$globalfield = '{"include_global_field_schema": "true"}';
342340
$content_type = self::$Stack->getContentTypes($globalfield);
343-
for($i = 0; $i < count($content_type['content_types'][1]['schema']); $i++) {
344-
if($content_type['content_types'][1]['schema'][$i]['data_type'] === 'global_field') {
345-
$flag = (isset($content_type['content_types'][1]['schema'][$i]['schema']));
346-
$this->assertTrue($flag);
341+
for ($j = 0; $j < count($content_type['content_types']); $j++)
342+
{
343+
for($i = 0; $i < count($content_type['content_types'][$j]['schema']); $i++) {
344+
if($content_type['content_types'][$j]['schema'][$i]['data_type'] === 'global_field') {
345+
$flag = (isset($content_type['content_types'][$j]['schema'][$i]['schema']));
346+
$this->assertTrue($flag);
347+
}
347348
}
348349
}
350+
349351
}
350352

351353
public function testFindLogicalOrQueryObject() {

0 commit comments

Comments
 (0)