From 98b2c11496ae89f02e9b886d5ff7046dcb3004e9 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 14:11:14 -0400 Subject: [PATCH 01/21] Create .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9c8629bd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: php +php: + - '5.4' + - '5.5' + - '5.6' + - '7.0' + - '7.1' + - hhvm # on Trusty only + - nightly From 80643b5a6b85a376647616cf0a691da827266e1b Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 14:24:44 -0400 Subject: [PATCH 02/21] Update .travis.yml --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c8629bd..645aea3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,3 +7,10 @@ php: - '7.1' - hhvm # on Trusty only - nightly +install: + - composer install + - npm install +before_script: + - npm start 1>&2 +script: + - ./vendor/bin/phpunit From 5cf5705330c5165bc41da3dbf2e21a6bf7e3f53e Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 14:29:45 -0400 Subject: [PATCH 03/21] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 645aea3c..a175f12c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ php: - nightly install: - composer install + - nvm use 6 - npm install before_script: - npm start 1>&2 From 19ce323d279a2ddc2e906d4b61bc0ab3675569df Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 14:36:27 -0400 Subject: [PATCH 04/21] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a175f12c..c6e01cba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ php: - nightly install: - composer install + - brew install nvm - nvm use 6 - npm install before_script: From 4abad2ca1dcfc31af44cf01024841b1a86a144cf Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 11:54:23 -0700 Subject: [PATCH 05/21] Calling nvm in 'before_install' --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6e01cba..f68ce785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,10 @@ php: - '7.1' - hhvm # on Trusty only - nightly +before_install: + - nvm install 6.0 install: - composer install - - brew install nvm - - nvm use 6 - npm install before_script: - npm start 1>&2 From 44a2f12b039db2e60823d5a40c9dbb99a06d0c28 Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 12:14:00 -0700 Subject: [PATCH 06/21] using string instead of 'class' property for php 5.4 --- tests/Parse/AddOperationTest.php | 4 ++-- tests/Parse/AddUniqueOperationTest.php | 4 ++-- tests/Parse/IncrementOperationTest.php | 2 +- tests/Parse/ParseClientTest.php | 4 ++-- tests/Parse/ParseCurlTest.php | 14 +++++++------- tests/Parse/ParseInstallationTest.php | 8 ++++---- tests/Parse/ParsePushTest.php | 10 +++++----- tests/Parse/ParseQueryTest.php | 4 ++-- tests/Parse/ParseRelationOperationTest.php | 12 ++++++------ tests/Parse/ParseRoleTest.php | 4 ++-- tests/Parse/ParseSchemaTest.php | 8 ++++---- tests/Parse/ParseSessionStorageAltTest.php | 2 +- tests/Parse/ParseStreamHttpClientTest.php | 2 +- tests/Parse/RemoveOperationTest.php | 4 ++-- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tests/Parse/AddOperationTest.php b/tests/Parse/AddOperationTest.php index 3c28bcfe..3ff30827 100644 --- a/tests/Parse/AddOperationTest.php +++ b/tests/Parse/AddOperationTest.php @@ -40,7 +40,7 @@ public function testAddOperation() */ public function testBadObjects() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'AddOperation requires an array.'); new AddOperation('not an array'); @@ -84,7 +84,7 @@ public function testMergePrevious() */ public function testInvalidMerge() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Operation is invalid after previous operation.'); $addOp = new AddOperation([ 'key1' => 'value1' diff --git a/tests/Parse/AddUniqueOperationTest.php b/tests/Parse/AddUniqueOperationTest.php index ab120ec2..629fbbba 100644 --- a/tests/Parse/AddUniqueOperationTest.php +++ b/tests/Parse/AddUniqueOperationTest.php @@ -50,7 +50,7 @@ public function testAddUniqueOp() */ public function testBadObjects() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'AddUniqueOperation requires an array.'); $addUnique = new AddUniqueOperation('not-an-array'); @@ -114,7 +114,7 @@ public function testMergePrevious() */ public function testInvalidMerge() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Operation is invalid after previous operation.'); $addOp = new AddUniqueOperation([ 'key1' => 'value1' diff --git a/tests/Parse/IncrementOperationTest.php b/tests/Parse/IncrementOperationTest.php index dd0f000d..76601971 100644 --- a/tests/Parse/IncrementOperationTest.php +++ b/tests/Parse/IncrementOperationTest.php @@ -62,7 +62,7 @@ public function testMergePrevious() */ public function testInvalidMerge() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Operation is invalid after previous operation.'); $addOp = new IncrementOperation(); $addOp->_mergeWithPrevious(new AddOperation(['key' => 'value'])); diff --git a/tests/Parse/ParseClientTest.php b/tests/Parse/ParseClientTest.php index 910171ac..eacfe0ee 100644 --- a/tests/Parse/ParseClientTest.php +++ b/tests/Parse/ParseClientTest.php @@ -71,7 +71,7 @@ public function testParseNotInitialized() { * @group client-not-initialized */ public function testAppNotNotInitialized() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'You must call Parse::initialize(..., $accountKey) before making any app requests. '. 'Your account key must not be null or empty.' ); @@ -508,7 +508,7 @@ public function testStreamCAFile() */ public function testBadApiResponse() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Bad Request. Could not decode Response: (4) Syntax error'); $httpClient = ParseClient::getHttpClient(); diff --git a/tests/Parse/ParseCurlTest.php b/tests/Parse/ParseCurlTest.php index 45b2e7bf..f92b6396 100644 --- a/tests/Parse/ParseCurlTest.php +++ b/tests/Parse/ParseCurlTest.php @@ -16,7 +16,7 @@ class ParseCurlTest extends \PHPUnit_Framework_TestCase { public function testBadExec() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -26,7 +26,7 @@ public function testBadExec() public function testBadSetOption() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -36,7 +36,7 @@ public function testBadSetOption() public function testBadSetOptionsArray() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -46,7 +46,7 @@ public function testBadSetOptionsArray() public function testBadGetInfo() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -56,7 +56,7 @@ public function testBadGetInfo() public function testBadGetError() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -66,7 +66,7 @@ public function testBadGetError() public function testBadErrorCode() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); @@ -76,7 +76,7 @@ public function testBadErrorCode() public function testBadClose() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'You must call ParseCurl::init first'); $parseCurl = new ParseCurl(); diff --git a/tests/Parse/ParseInstallationTest.php b/tests/Parse/ParseInstallationTest.php index 3c732de4..bfef41c9 100644 --- a/tests/Parse/ParseInstallationTest.php +++ b/tests/Parse/ParseInstallationTest.php @@ -23,7 +23,7 @@ public function tearDown() */ public function testMissingIdentifyingField() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'at least one ID field (deviceToken, installationId) must be specified in this operation'); (new ParseInstallation())->save(); @@ -34,7 +34,7 @@ public function testMissingIdentifyingField() */ public function testMissingDeviceType() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'deviceType must be specified in this operation'); $installation = new ParseInstallation(); @@ -48,7 +48,7 @@ public function testMissingDeviceType() */ public function testClientsCannotFindWithoutMasterKey() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Clients aren\'t allowed to perform the find operation on the installation collection.'); $query = ParseInstallation::query(); @@ -66,7 +66,7 @@ public function testClientsCannotDestroyWithoutMasterKey() $installation->set('deviceType', 'android'); $installation->save(); - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', "Clients aren't allowed to perform the delete operation on the installation collection."); // try destroying, without using the master key diff --git a/tests/Parse/ParsePushTest.php b/tests/Parse/ParsePushTest.php index 68f1679f..0675cbe8 100644 --- a/tests/Parse/ParsePushTest.php +++ b/tests/Parse/ParsePushTest.php @@ -21,7 +21,7 @@ public function tearDown() } public function testNoMasterKey() { - $this->setExpectedException(ParseException::class); + $this->setExpectedException('\Parse\ParseException'); ParsePush::send( [ @@ -46,7 +46,7 @@ public function testBasicPush() */ public function testMissingWhereAndChannels() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', "Sending a push requires either \"channels\" or a \"where\" query."); ParsePush::send([ @@ -62,7 +62,7 @@ public function testMissingWhereAndChannels() */ public function testWhereAndChannels() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', "Channels and query can not be set at the same time."); $query = ParseInstallation::query(); @@ -108,7 +108,7 @@ public function testPushToQueryWithoutWhere() public function testNonQueryWhere() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Where parameter for Parse Push must be of type ParseQuery'); ParsePush::send( [ @@ -133,7 +133,7 @@ public function testPushDates() public function testExpirationTimeAndIntervalSet() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Both expiration_time and expiration_interval can\'t be set.'); ParsePush::send( [ diff --git a/tests/Parse/ParseQueryTest.php b/tests/Parse/ParseQueryTest.php index bea05d25..73a680c0 100644 --- a/tests/Parse/ParseQueryTest.php +++ b/tests/Parse/ParseQueryTest.php @@ -2243,7 +2243,7 @@ public function testAscendingByArray() { public function testOrQueriesVaryingClasses() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'All queries must be for the same class'); ParseQuery::orQueries([ new ParseQuery('Class1'), @@ -2275,7 +2275,7 @@ public function testSetConditions() public function testBadConditions() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', "Conditions must be in an array"); $query = new ParseQuery('TestObject'); diff --git a/tests/Parse/ParseRelationOperationTest.php b/tests/Parse/ParseRelationOperationTest.php index 2f52605b..fe4b5a9f 100644 --- a/tests/Parse/ParseRelationOperationTest.php +++ b/tests/Parse/ParseRelationOperationTest.php @@ -30,7 +30,7 @@ public function tearDown() */ public function testMissingObjects() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Cannot create a ParseRelationOperation with no objects.'); new ParseRelationOperation(null, null); @@ -41,7 +41,7 @@ public function testMissingObjects() */ public function testMixedClasses() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'All objects in a relation must be of the same class.'); $objects = []; @@ -78,7 +78,7 @@ public function testSingleObjects() */ public function testApplyDifferentClassRelation() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Related object object must be of class ' .'Class1, but DifferentClass' .' was passed in.'); @@ -96,7 +96,7 @@ public function testApplyDifferentClassRelation() */ public function testInvalidApply() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Operation is invalid after previous operation.'); $addObj = new ParseObject('Class1'); $op = new ParseRelationOperation($addObj, null); @@ -120,7 +120,7 @@ public function testMergeNone() */ public function testMergeDifferentClass() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Related object object must be of class ' .'Class1, but AnotherClass' .' was passed in.'); @@ -140,7 +140,7 @@ public function testMergeDifferentClass() */ public function testInvalidMerge() { - $this->setExpectedException(\Exception::class, + $this->setExpectedException('\Exception', 'Operation is invalid after previous operation.'); $obj = new ParseObject('Class1'); $op = new ParseRelationOperation($obj, null); diff --git a/tests/Parse/ParseRoleTest.php b/tests/Parse/ParseRoleTest.php index e2b82ff2..0ee7c347 100644 --- a/tests/Parse/ParseRoleTest.php +++ b/tests/Parse/ParseRoleTest.php @@ -235,7 +235,7 @@ public function createEden() public function testSettingNonStringAsName() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', "A role's name must be a string."); $role = new ParseRole(); $role->setName(12345); @@ -247,7 +247,7 @@ public function testSettingNonStringAsName() */ public function testSavingWithoutName() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Roles must have a name.'); $role = new ParseRole(); $role->setACL(new ParseACL()); diff --git a/tests/Parse/ParseSchemaTest.php b/tests/Parse/ParseSchemaTest.php index 75c90bf6..3c13c3f8 100644 --- a/tests/Parse/ParseSchemaTest.php +++ b/tests/Parse/ParseSchemaTest.php @@ -334,7 +334,7 @@ public function testInvalidTypeException() */ public function testBadSchemaGet() { - $this->setExpectedException(ParseException::class); + $this->setExpectedException('\Parse\ParseException'); $user = new ParseUser(); $user->setUsername('schema-user'); @@ -351,7 +351,7 @@ public function testBadSchemaGet() */ public function testBadSchemaSave() { - $this->setExpectedException(ParseException::class); + $this->setExpectedException('\Parse\ParseException'); $user = new ParseUser(); $user->setUsername('schema-user'); @@ -368,7 +368,7 @@ public function testBadSchemaSave() */ public function testBadSchemaUpdate() { - $this->setExpectedException(ParseException::class); + $this->setExpectedException('\Parse\ParseException'); $user = new ParseUser(); $user->setUsername('schema-user'); @@ -385,7 +385,7 @@ public function testBadSchemaUpdate() */ public function testBadSchemaDelete() { - $this->setExpectedException(ParseException::class); + $this->setExpectedException('\Parse\ParseException'); $user = new ParseUser(); $user->setUsername('schema-user'); diff --git a/tests/Parse/ParseSessionStorageAltTest.php b/tests/Parse/ParseSessionStorageAltTest.php index 6ebdd013..7d66a1f1 100644 --- a/tests/Parse/ParseSessionStorageAltTest.php +++ b/tests/Parse/ParseSessionStorageAltTest.php @@ -19,7 +19,7 @@ class ParseSessionStorageAltTest extends \PHPUnit_Framework_TestCase */ public function testNoSessionActive() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'PHP session_start() must be called first.'); new ParseSessionStorage(); diff --git a/tests/Parse/ParseStreamHttpClientTest.php b/tests/Parse/ParseStreamHttpClientTest.php index e98a9952..2637afa8 100644 --- a/tests/Parse/ParseStreamHttpClientTest.php +++ b/tests/Parse/ParseStreamHttpClientTest.php @@ -34,7 +34,7 @@ public function testInvalidUrl() { $url = 'http://example.com/lots of spaces here'; - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Url may not contain spaces for stream client: ' .$url); diff --git a/tests/Parse/RemoveOperationTest.php b/tests/Parse/RemoveOperationTest.php index d0eabce3..577fa6f1 100644 --- a/tests/Parse/RemoveOperationTest.php +++ b/tests/Parse/RemoveOperationTest.php @@ -22,7 +22,7 @@ class RemoveOperationTest extends \PHPUnit_Framework_TestCase */ public function testMissingArray() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'RemoveOperation requires an array.'); new RemoveOperation('not an array'); @@ -65,7 +65,7 @@ public function testMergePrevious() */ public function testInvalidMerge() { - $this->setExpectedException(ParseException::class, + $this->setExpectedException('\Parse\ParseException', 'Operation is invalid after previous operation.'); $removeOp = new RemoveOperation([ 'key1' => 'value1' From acd5bdf77e3c55a8b513d03b981337fb108b6032 Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 12:30:54 -0700 Subject: [PATCH 07/21] Utilizing customary method for accessing json_last_error_msg, in case it doesn't exist (php 5.4) --- src/Parse/ParseClient.php | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Parse/ParseClient.php b/src/Parse/ParseClient.php index 7f439d87..c71c4736 100755 --- a/src/Parse/ParseClient.php +++ b/src/Parse/ParseClient.php @@ -497,7 +497,7 @@ public static function _request( if(!isset($decoded) && $response !== '') { throw new ParseException( 'Bad Request. Could not decode Response: '. - '('.json_last_error().') '.json_last_error_msg(), + '('.json_last_error().') '.self::getLastJSONErrorMsg(), -1 ); @@ -522,6 +522,32 @@ public static function _request( } + /** + * Returns the last error message from a failed json_decode call + * + * @return string + */ + private static function getLastJSONErrorMsg() + { + if (!function_exists('json_last_error_msg')) { + $error_strings = array( + JSON_ERROR_NONE => 'No error', + JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', + JSON_ERROR_STATE_MISMATCH => 'State mismatch (invalid or malformed JSON)', + JSON_ERROR_CTRL_CHAR => 'Control character error, potentially incorrectly encoded', + JSON_ERROR_SYNTAX => 'Syntax error', + JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, potentially incorrectly encoded' + ); + + $error = json_last_error(); + return isset($error_strings[$error]) ? $error_strings[$error] : 'Unknown error'; + + } + + return json_last_error_msg(); + + } + /** * ParseClient::setStorage, will update the storage object used for * persistence. From 82192f33a659d79001ef1505414804fe3ddcf6aa Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 12:41:07 -0700 Subject: [PATCH 08/21] Forced installation of 'process-nextick-args' for travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f68ce785..2ebe5ef1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: - nvm install 6.0 install: - composer install + - npm i -g process-nextick-args util-deprecate - npm install before_script: - npm start 1>&2 From a6f27a0da9fe6f6af821e01c0d0bf3a2326cab53 Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 13:02:02 -0700 Subject: [PATCH 09/21] Additional comments + force travis to rebuild --- src/Parse/ParseClient.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Parse/ParseClient.php b/src/Parse/ParseClient.php index c71c4736..6fd38c1c 100755 --- a/src/Parse/ParseClient.php +++ b/src/Parse/ParseClient.php @@ -529,7 +529,9 @@ public static function _request( */ private static function getLastJSONErrorMsg() { + // check if json_last_error_msg is defined (>= 5.5.0) if (!function_exists('json_last_error_msg')) { + // return custom error messages for each code $error_strings = array( JSON_ERROR_NONE => 'No error', JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', @@ -544,6 +546,7 @@ private static function getLastJSONErrorMsg() } + // use existing function return json_last_error_msg(); } From 5b0ff46072e458df6bbd4c716066438b5b9a4a5c Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 13:29:41 -0700 Subject: [PATCH 10/21] Local install only --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ebe5ef1..699b95a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: - nvm install 6.0 install: - composer install - - npm i -g process-nextick-args util-deprecate + - npm i process-nextick-args util-deprecate - npm install before_script: - npm start 1>&2 From 45fb886524e360b9abe010bb47782d18a5f86b8a Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 13:38:27 -0700 Subject: [PATCH 11/21] Added missing 'isarray' module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 699b95a5..e08e6c1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: - nvm install 6.0 install: - composer install - - npm i process-nextick-args util-deprecate + - npm install process-nextick-args util-deprecate isarray - npm install before_script: - npm start 1>&2 From 59515ca5d7e0d65a0f2ca2804f4d8d7ab4184771 Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Tue, 20 Jun 2017 13:50:24 -0700 Subject: [PATCH 12/21] Shifted travis related dependencies into package.json --- .travis.yml | 1 - package.json | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e08e6c1b..f68ce785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ before_install: - nvm install 6.0 install: - composer install - - npm install process-nextick-args util-deprecate isarray - npm install before_script: - npm start 1>&2 diff --git a/package.json b/package.json index 26373e40..77cf26e4 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,9 @@ "license": "https://github.com/parse-community/parse-php-sdk/blob/master/LICENSE", "homepage": "https://github.com/montymxb/parse-server-test#readme", "dependencies": { - "parse-server-test": "*" + "parse-server-test": "*", + "process-nextick-args" : "*", + "util-deprecate" : "*", + "isarray" : "*" } } From 5d6f8e71ce810369d0c4d80a13ab93a341719c65 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 16:56:46 -0400 Subject: [PATCH 13/21] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f68ce785..014e4f6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ php: - hhvm # on Trusty only - nightly before_install: - - nvm install 6.0 + - nvm install 6.11 install: - composer install - npm install From 54d782a9ed0b8edc39f33663a139c57509643cae Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 16:57:07 -0400 Subject: [PATCH 14/21] Update package.json --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 77cf26e4..26373e40 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,6 @@ "license": "https://github.com/parse-community/parse-php-sdk/blob/master/LICENSE", "homepage": "https://github.com/montymxb/parse-server-test#readme", "dependencies": { - "parse-server-test": "*", - "process-nextick-args" : "*", - "util-deprecate" : "*", - "isarray" : "*" + "parse-server-test": "*" } } From 80223837a7bf7457484d24f9e3c5f2743612316d Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:16:49 -0400 Subject: [PATCH 15/21] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 014e4f6b..de295a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ install: - composer install - npm install before_script: - - npm start 1>&2 + - npm start 1>&2 & script: - ./vendor/bin/phpunit From def89d731071e9ab53bbb93e67b3a649ee8b976b Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:22:35 -0400 Subject: [PATCH 16/21] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index de295a0d..98c9fb80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,10 @@ before_install: - nvm install 6.11 install: - composer install + - npm install -g mongodb-runner - npm install before_script: + - mongodb-runner --start - npm start 1>&2 & script: - ./vendor/bin/phpunit From ce180f7f5e53d6ccd222ee1d11d17065068f112d Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:31:52 -0400 Subject: [PATCH 17/21] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 98c9fb80..1d5854de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,6 @@ install: before_script: - mongodb-runner --start - npm start 1>&2 & + - sleep 5 script: - ./vendor/bin/phpunit From 835c022444ca2539f29c89c7d4dfeb7cea8c7da6 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:32:46 -0400 Subject: [PATCH 18/21] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d5854de..93a53159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,5 @@ install: - npm install before_script: - mongodb-runner --start - - npm start 1>&2 & - - sleep 5 script: - - ./vendor/bin/phpunit + - npm start 1>&2 & && sleep 5 && ./vendor/bin/phpunit From baedd7cdc2e6c4813fae62d3b01b0abb24be8cce Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:46:10 -0400 Subject: [PATCH 19/21] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93a53159..6e52e400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,6 @@ install: before_script: - mongodb-runner --start script: - - npm start 1>&2 & && sleep 5 && ./vendor/bin/phpunit + - nohup npm start 1>&2 & + - sleep 5 + - ./vendor/bin/phpunit From 33120cf123071ce34bfa24ebbf2a74277d0092ec Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 17:51:14 -0400 Subject: [PATCH 20/21] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e52e400..30ce3134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,7 @@ before_script: - mongodb-runner --start script: - nohup npm start 1>&2 & - - sleep 5 + - sleep 10 - ./vendor/bin/phpunit +after_script: + - cat nohup.out From 66986d02b8c3ae8055499d474b44c4cd1d0badf6 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 20 Jun 2017 18:09:17 -0400 Subject: [PATCH 21/21] Update .travis.yml --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30ce3134..21f0facd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ php: - '5.6' - '7.0' - '7.1' - - hhvm # on Trusty only - - nightly +# - hhvm # on Trusty only +# - nightly before_install: - nvm install 6.11 install: @@ -19,5 +19,3 @@ script: - nohup npm start 1>&2 & - sleep 10 - ./vendor/bin/phpunit -after_script: - - cat nohup.out