You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/11/12 02:15:43 UTC

[38/45] incubator-usergrid git commit: Merge branch 'master' of https://github.com/apps4u/incubator-usergrid

Merge branch 'master' of https://github.com/apps4u/incubator-usergrid

# By Apps4u
# Via Apps4u
* 'master' of https://github.com/apps4u/incubator-usergrid:
  updated readME correct mark down
  changed the access_token from required True to false as the SDK puts the token in the header on uri
  typo
  added example to show how to get nested values using fetch as all results and the entities property are PHP Collections
  typo had shops instead of users as collection name in users manifest file

Conflicts:
	sdks/php5/apache-usergrid/Examples/collections/users.php


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e57f8535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e57f8535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e57f8535

Branch: refs/heads/master
Commit: e57f8535dd09d25422655554f4850d777427eacb
Parents: c660772 eac1627
Author: Jason Kristian <ja...@apps4u.com.au>
Authored: Mon Nov 10 13:34:39 2014 +1000
Committer: Jason Kristian <ja...@apps4u.com.au>
Committed: Mon Nov 10 13:34:39 2014 +1000

----------------------------------------------------------------------
 sdks/php5/apache-usergrid/Examples/collections/users.php     | 7 ++++---
 sdks/php5/apache-usergrid/README.md                          | 2 +-
 sdks/php5/apache-usergrid/src/Manifests/1.0.1/Management.php | 2 +-
 sdks/php5/apache-usergrid/src/Manifests/1.0.1/Users.php      | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e57f8535/sdks/php5/apache-usergrid/Examples/collections/users.php
----------------------------------------------------------------------
diff --cc sdks/php5/apache-usergrid/Examples/collections/users.php
index eb99fdd,a6791d9..f1c529d
--- a/sdks/php5/apache-usergrid/Examples/collections/users.php
+++ b/sdks/php5/apache-usergrid/Examples/collections/users.php
@@@ -87,9 -87,9 +87,10 @@@ var_dump($find_user_by_uuid->entities)
  
  // AS all results as PHP Collections and the entities propery is always returned as a PHP Collection you can fetch nested records
  $user_addr = Usergrid::users()->findById(['uuid' => 'Jason']);
--echo $user_addr->entities->fetch('adr.addr1');
++echo $user_addr->entities->fetch('adr');
  //or
- echo $user_addr->entities->fetch('adr.street');
++
+ echo $user_addr->entities->fetch('adr.addr1');
  
  // add user to group
  //$user_to_group = Usergrid::groups()->addUser(['entity_name_or_uuid' => 'group_name_or_uuid', 'user_name_or_uuid' => 'user name or uuid']);