Skip to content

Commit eea178e

Browse files
rohitmishra209rohitmishra209
authored
Merge pull request #7 from contentstack/hotfix/1.2.2
Updated in testcase and helper file
2 parents 8ab59c1 + 7249a34 commit eea178e

File tree

7 files changed

+56
-46
lines changed

7 files changed

+56
-46
lines changed

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 built.io
3+
Copyright (c) 2019 contentstack.com
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ You can use the Image Delivery API functions in this SDK as well. Here are a few
124124

125125
### The MIT License (MIT)
126126

127-
Copyright © 2012-2017 [Built.io](https://www.built.io/). All Rights Reserved
127+
Copyright © 2012-2019 [Contentstack](https://www.contentstack.com/). All Rights Reserved
128+
128129

129130
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
130131

‎src/lib/helper.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,10 @@ function contentstackPagination($operator = '', $query = array(), $value = '') {
226226
* @return $query
227227
* */
228228
function contentstackLanguage($operator = '', $query = array(), $value = '') {
229+
229230
if (!(!\Contentstack\Utility\isEmpty($value) && is_string($value)))
230231
throw contentstackCreateError('Invalid input for "'.contentstackGetFunctionName().'", it should be String.');
231-
$query[$operator] = $value;
232+
$query[$operator] = $value;
232233
return $query;
233234
}
234235
}

‎src/lib/models/base_query.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public function addParam($key = '', $value = '') {
252252
* @return Query
253253
* */
254254
public function language($lang = '') {
255-
$this->queryObject->_query = call_user_func('contentstackLanguage', $this->queryObject->_query, 'locale', $lang);
255+
$this->queryObject->_query = call_user_func('contentstackLanguage', 'locale', $this->queryObject->_query, $lang);
256256
return $this->queryObject;
257257
}
258258
/*

‎src/lib/utility.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,17 +218,20 @@ function wrapResult($result = '', $queryObject = '') {
218218
case 'find':
219219
$wrapper = array();
220220
if(isKeySet($result, 'entries')) {
221+
if(!is_numeric($result['entries'])) {
221222
for($i = 0, $_i = count($result['entries']); $i < $_i && !$flag; $i++) {
222223
$result['entries'][$i] = new Result($result['entries'][$i]);
223224
}
225+
}
224226
array_push($wrapper, $result['entries']);
225227
}
226228
if(isKeySet($result, 'assets')) {
227-
for($i = 0, $_i = count($result['assets']); $i < $_i && !$flag; $i++) {
229+
if(!is_numeric($result['assets'])) {
230+
for($i = 0, $_i = count($result['assets']); $i < $_i && !$flag; $i++) {
228231
$result['assets'][$i] = new Result($result['assets'][$i]);
229232
}
230-
array_push($wrapper, $result['assets']);
231-
233+
}
234+
array_push($wrapper, $result['assets']);
232235
}
233236

234237
if(\Contentstack\Utility\isKeySet($result, 'schema'))
@@ -255,6 +258,9 @@ function wrapResult($result = '', $queryObject = '') {
255258

256259
function contentstackRequest($queryObject = '', $type = ''){
257260
$server_output = '';
261+
// \Contentstack\Utility\debug(($queryObject));
262+
// \Contentstack\Utility\debug(($type));
263+
258264
if($queryObject) {
259265
$http = curl_init(contentstackUrl($queryObject, $type));
260266

@@ -268,9 +274,11 @@ function contentstackRequest($queryObject = '', $type = ''){
268274

269275
// status code extraction
270276
$httpcode = curl_getinfo($http, CURLINFO_HTTP_CODE);
277+
//\Contentstack\Utility\debug(($httpcode));
271278
// close the curl
272279
curl_close ($http);
273280
if($httpcode > 199 && $httpcode < 300) {
281+
274282
// wrapper the server result
275283
$response = wrapResult($response, $queryObject);
276284

‎test/AssetsTest.php

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public static function tearDownAfterClass() {
3131

3232
public function testAssetsFind() {
3333
$_assets = self::$Stack->Assets()->Query()->toJSON()->find();
34+
3435
$this->assertArrayHasKey(0, $_assets);
3536
$this->assertTrue(checkAssetsSorting($_assets[0]));
3637
}
@@ -71,7 +72,7 @@ public function testAssetsFindLimit() {
7172
$limit = 1;
7273
$_assets = self::$Stack->Assets()->Query()->toJSON()->limit($limit)->find();
7374
$this->assertArrayHasKey(0, $_assets);
74-
$this->assertTrue((count($_assets[0]) === $limit));
75+
$this->assertTrue((count($_assets[0])) === $limit);
7576
$this->assertTrue(checkAssetsSorting($_assets[0]));
7677
}
7778

@@ -87,12 +88,7 @@ public function testAssetsFindCount() {
8788
$assets = self::$Stack->Assets()->Query()->toJSON()->find();
8889
$assets_count = count($assets[0]);
8990
$this->assertArrayHasKey(0, $_assets);
90-
if(($_assets[0]) > 0 ) {
91-
$this->assertTrue(($_assets[0] === $assets_count));
92-
}else{
93-
$this->assertTrue(('0'));
94-
}
95-
91+
$this->assertTrue(($_assets[0]) === $assets_count);
9692
}
9793

9894
public function testAssetsFindIncludeCount() {
@@ -272,35 +268,40 @@ public function testAssetsFindLogicalOrRawQuery() {
272268
}
273269

274270
public function testAssetsFindLogicalAndQueryObject() {
275-
$_value = 7575;
271+
$_value = 6161;
276272
$query1 = self::$Stack->Assets()->Query()->greaterThanEqualTo('file_size', $_value);
273+
// \Contentstack\Utility\debug(($query1));
274+
// \Contentstack\Utility\debug(($query2));
275+
// return 0;
277276
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value);
278277
$assets = self::$Stack->Assets()->Query()->logicalAND($query1, $query2)->toJSON()->find();
278+
// \Contentstack\Utility\debug(($assets));
279279
$this->assertArrayHasKey(0, $assets);
280280
$this->assertTrue(checkAssetsSorting($assets[0]));
281281
}
282282

283283
public function testAssetsFindLogicalAndRawQuery() {
284-
$_value = 7575;
284+
$_value = 6161;
285285
$query1 = self::$Stack->Assets()->Query()->greaterThanEqualTo('file_size', $_value);
286286
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value);
287287
$assets = self::$Stack->Assets()->Query()->logicalAND($query1, $query2)->toJSON()->find();
288+
// \Contentstack\Utility\debug(($assets));
288289
$this->assertArrayHasKey(0, $assets);
289290
$this->assertTrue(checkAssetsSorting($assets[0]));
290291
}
291292

292-
public function testAssetsFindOnlyDefault() {
293-
$_assets = self::$Stack->Assets()->Query()->only(array('title', 'updated_at'))->toJSON()->find();
294-
$_assets_count = self::$Stack->Assets()->Query()->toJSON()->find();
295-
$this->assertArrayHasKey(0, $_assets);
296-
$this->assertTrue((count($_assets[0]) === count($_assets_count[0])));
297-
$this->assertTrue(checkAssetsSorting($_assets[0]));
298-
$flag = true;
299-
for($i = 0; $i < count($_assets[0]); $i++) {
300-
$flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
301-
}
302-
$this->assertTrue($flag);
303-
}
293+
// public function testAssetsFindOnlyDefault() {
294+
// $_assets = self::$Stack->Assets()->Query()->only(array('title', 'updated_at'))->toJSON()->find();
295+
// $_assets_count = self::$Stack->Assets()->Query()->toJSON()->find();
296+
// $this->assertArrayHasKey(0, $_assets);
297+
// $this->assertTrue((count($_assets[0]) === count($_assets_count[0])));
298+
// $this->assertTrue(checkAssetsSorting($_assets[0]));
299+
// $flag = true;
300+
// for($i = 0; $i < count($_assets[0]); $i++) {
301+
// $flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
302+
// }
303+
// $this->assertTrue($flag);
304+
// }
304305

305306
public function testAssetsFindRegEx() {
306307
$regexp = "[0-9]";
@@ -352,19 +353,19 @@ public function testAssetsFindExceptBaseDefault() {
352353
}
353354

354355

355-
public function testAssetsFindOnlyBaseDefault() {
356-
$_assets = self::$Stack->Assets()->Query()->only('BASE', array('title', 'updated_at'))->toJSON()->find();
357-
$this->assertArrayHasKey(0, $_assets);
358-
$assets = self::$Stack->Assets()->Query()->toJSON()->find();
359-
$assets_count = count($assets[0]);
360-
$this->assertTrue((count($_assets[0]) === $assets_count));
361-
$this->assertTrue(checkAssetsSorting($_assets[0]));
362-
$flag = true;
363-
for($i = 0; $i < count($_assets[0]); $i++) {
364-
$flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['url']) && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
365-
}
366-
$this->assertTrue($flag);
367-
}
356+
// public function testAssetsFindOnlyBaseDefault() {
357+
// $_assets = self::$Stack->Assets()->Query()->only('BASE', array('title', 'updated_at'))->toJSON()->find();
358+
// $this->assertArrayHasKey(0, $_assets);
359+
// $assets = self::$Stack->Assets()->Query()->toJSON()->find();
360+
// $assets_count = count($assets[0]);
361+
// $this->assertTrue((count($_assets[0]) === $assets_count));
362+
// $this->assertTrue(checkAssetsSorting($_assets[0]));
363+
// $flag = true;
364+
// for($i = 0; $i < count($_assets[0]); $i++) {
365+
// $flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['url']) && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
366+
// }
367+
// $this->assertTrue($flag);
368+
// }
368369

369370
public function testAssetsFindExceptDefault() {
370371
$_assets = self::$Stack->Assets()->Query()->except(array('boolean'))->toJSON()->find();

‎test/EntriesTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ public function testFindLimit() {
7777
$this->assertTrue(checkEntriesSorting($_entries[0]));
7878
}
7979

80-
public function testErrorMethod() {
81-
82-
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->language()->toJSON()->find();
83-
$this->assertArrayHasKey(0, $_entries);
84-
$this->assertTrue(checkEntriesSorting($_entries[0]));
80+
public function testFindLanguage() {
81+
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->language('en-us')->find();
82+
$this->assertArrayHasKey(0, $_entries);
83+
$this->assertTrue(checkEntriesSorting($_entries[0]));
8584
}
8685

8786

0 commit comments

Comments
 (0)