You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/05 03:20:47 UTC
[1/3] git commit: Fixing parse errors
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 754aa1f52 -> 631f02d5a
refs/pull/60/head 338ed4c69 -> 8e22ba1c4
refs/pull/63/merge [deleted] 526aeb9b0
Fixing parse errors
When trying to run your example I encountered these two errors immediately:
PHP Parse error: syntax error, unexpected '[' in /lib/vendor/Apigee/Usergrid/Collection.php on line 285
PHP Parse error: syntax error, unexpected '}' in /lib/vendor/Apigee/Usergrid/Collection.php on line 290
Which are caused a missing semi-colon on line 289 and attempting to create an array with [] instead of the constructor function array() on line 285.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d72910d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d72910d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d72910d3
Branch: refs/heads/master
Commit: d72910d33e4e8e2f0e454b13da6d27148cc3fe66
Parents: f368246
Author: Ben Brooks <be...@benbrooks.net>
Authored: Fri Feb 28 14:10:03 2014 -0800
Committer: Ben Brooks <be...@benbrooks.net>
Committed: Fri Feb 28 14:10:03 2014 -0800
----------------------------------------------------------------------
sdks/php/lib/vendor/Apigee/Usergrid/Collection.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d72910d3/sdks/php/lib/vendor/Apigee/Usergrid/Collection.php
----------------------------------------------------------------------
diff --git a/sdks/php/lib/vendor/Apigee/Usergrid/Collection.php b/sdks/php/lib/vendor/Apigee/Usergrid/Collection.php
index 9b49d38..6942cfb 100644
--- a/sdks/php/lib/vendor/Apigee/Usergrid/Collection.php
+++ b/sdks/php/lib/vendor/Apigee/Usergrid/Collection.php
@@ -282,11 +282,11 @@ class Collection {
$data->previous = $this->previous;
$data->next = $this->next;
$data->cursor = $this->cursor;
- $data->list=[];
+ $data->list = array();
$this->reset_entity_pointer();
while ($this->has_next_entity()) {
$entity = $this->get_next_entity();
- array_push($data->list, $entity->get_json())
+ array_push($data->list, $entity->get_json());
}
return json_encode($data);
}
[3/3] git commit: Merge pull request #63 from bbrooks/patch-1
Posted by sn...@apache.org.
Merge pull request #63 from bbrooks/patch-1
Fixing parse errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/631f02d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/631f02d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/631f02d5
Branch: refs/heads/master
Commit: 631f02d5a691823a0bc8b806f3be44a5f9a59fbc
Parents: 754aa1f d72910d
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Tue Mar 4 19:11:53 2014 -0700
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Tue Mar 4 19:11:53 2014 -0700
----------------------------------------------------------------------
sdks/php/lib/vendor/Apigee/Usergrid/Collection.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Fixed all tests,
and code. Tomcat issue still persists.
Posted by sn...@apache.org.
Fixed all tests, and code. Tomcat issue still persists.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8e22ba1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8e22ba1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8e22ba1c
Branch: refs/pull/60/head
Commit: 8e22ba1c4a58a47c01e8c952a718a312f5469cbd
Parents: 338ed4c
Author: grey <gr...@apigee.com>
Authored: Tue Mar 4 17:26:02 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 4 17:26:02 2014 -0800
----------------------------------------------------------------------
.../management/organizations/applications/ApplicationResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8e22ba1c/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index 9f4fa4a..1d1daf2 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -243,7 +243,7 @@ public class ApplicationResource extends AbstractContextResource {
.entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) ).build();
}
- return Response.status( SC_ACCEPTED ).entity( jobUUID ).build();
+ return Response.status( SC_ACCEPTED ).entity( uuidRet ).build();
}
@POST