You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ch...@apache.org on 2008/08/30 00:12:04 UTC
svn commit: r690407 - in /incubator/shindig/trunk/php:
src/social-api/canonical/ src/social-api/converters/
src/social-api/dataservice/ src/social-api/samplecontainer/ test/social-api/
Author: chabotc
Date: Fri Aug 29 15:12:03 2008
New Revision: 690407
URL: http://svn.apache.org/viewvc?rev=690407&view=rev
Log:
Mixed casing for RestfulCollection broke stuff, lower case F seems the better choice
Modified:
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
incubator/shindig/trunk/php/src/social-api/converters/OutputAtomConverter.php
incubator/shindig/trunk/php/src/social-api/converters/OutputXmlConverter.php
incubator/shindig/trunk/php/src/social-api/dataservice/RestfulCollection.php
incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicActivitiesService.php
incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicAppDataService.php
incubator/shindig/trunk/php/test/social-api/RestFulCollectionTest.php
Modified: incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php (original)
+++ incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php Fri Aug 29 15:12:03 2008
@@ -379,7 +379,7 @@
{
$activities = $this->getActivities($userId, $groupId, null, null, $token);
$activities = $activities->getResponse();
- if ($activities instanceof RestFulCollection) {
+ if ($activities instanceof RestfulCollection) {
$activities = $activities->getEntry();
foreach ($activities as $activity) {
if ($activity['id'] == $activityId) {
Modified: incubator/shindig/trunk/php/src/social-api/converters/OutputAtomConverter.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/converters/OutputAtomConverter.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/converters/OutputAtomConverter.php (original)
+++ incubator/shindig/trunk/php/src/social-api/converters/OutputAtomConverter.php Fri Aug 29 15:12:03 2008
@@ -46,7 +46,7 @@
// Check to see if this is a single entry, or a collection, and construct either an atom
// feed (collection) or an entry (single)
- if ($responseItem->getResponse() instanceof RestFulCollection) {
+ if ($responseItem->getResponse() instanceof RestfulCollection) {
$totalResults = $responseItem->getResponse()->getTotalResults();
$itemsPerPage = $requestItem->getCount();
$startIndex = $requestItem->getStartIndex();
@@ -117,7 +117,7 @@
$this->addData($content, $requestType, $data, self::$osNameSpace);
}
$xml = $doc->saveXML();
- if ($responseItem->getResponse() instanceof RestFulCollection) {
+ if ($responseItem->getResponse() instanceof RestfulCollection) {
//FIXME dirty hack until i find a way to add multiple name spaces using DomXML functions
$xml = str_replace('<feed xmlns="http://www.w3.org/2005/Atom">', '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:osearch="http://a9.com/-/spec/opensearch/1.1">', $xml);
}
Modified: incubator/shindig/trunk/php/src/social-api/converters/OutputXmlConverter.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/converters/OutputXmlConverter.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/converters/OutputXmlConverter.php (original)
+++ incubator/shindig/trunk/php/src/social-api/converters/OutputXmlConverter.php Fri Aug 29 15:12:03 2008
@@ -39,7 +39,7 @@
// Check to see if this is a single entry, or a collection, and construct either an xml
// feed (collection) or an entry (single)
- if ($responseItem->getResponse() instanceof RestFulCollection) {
+ if ($responseItem->getResponse() instanceof RestfulCollection) {
$totalResults = $responseItem->getResponse()->getTotalResults();
$itemsPerPage = $requestItem->getCount();
$startIndex = $requestItem->getStartIndex();
Modified: incubator/shindig/trunk/php/src/social-api/dataservice/RestfulCollection.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/dataservice/RestfulCollection.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/dataservice/RestfulCollection.php (original)
+++ incubator/shindig/trunk/php/src/social-api/dataservice/RestfulCollection.php Fri Aug 29 15:12:03 2008
@@ -21,7 +21,7 @@
* This class represents a RESTful social data response
*
*/
-class RestFulCollection {
+class RestfulCollection {
public $entry;
public $startIndex;
@@ -29,7 +29,7 @@
public static function createFromEntry($entry)
{
- return new RestFulCollection($entry, 0, count($entry));
+ return new RestfulCollection($entry, 0, count($entry));
}
public function __construct($entry, $startIndex, $totalResults)
Modified: incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicActivitiesService.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicActivitiesService.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicActivitiesService.php (original)
+++ incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicActivitiesService.php Fri Aug 29 15:12:03 2008
@@ -23,7 +23,7 @@
{
$activities = $this->getActivities($userId, $groupId, $token);
$activities = $activities->getResponse();
- if ($activities instanceof RestFulCollection) {
+ if ($activities instanceof RestfulCollection) {
$activities = $activities->getEntry();
foreach ($activities as $activity) {
if ($activity->getId() == $activityId) {
Modified: incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicAppDataService.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicAppDataService.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicAppDataService.php (original)
+++ incubator/shindig/trunk/php/src/social-api/samplecontainer/BasicAppDataService.php Fri Aug 29 15:12:03 2008
@@ -71,7 +71,7 @@
$data[$id] = $personData;
}
}
- return new ResponseItem(null, null, RestFulCollection::createFromEntry($data));
+ return new ResponseItem(null, null, RestfulCollection::createFromEntry($data));
}
public function updatePersonData(UserID $userId, GroupId $groupId, $fields, $values, $appId, SecurityToken $token)
Modified: incubator/shindig/trunk/php/test/social-api/RestFulCollectionTest.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/social-api/RestFulCollectionTest.php?rev=690407&r1=690406&r2=690407&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/social-api/RestFulCollectionTest.php (original)
+++ incubator/shindig/trunk/php/test/social-api/RestFulCollectionTest.php Fri Aug 29 15:12:03 2008
@@ -33,7 +33,7 @@
protected function setUp()
{
parent::setUp();
- $this->RestFulCollection = new RestFulCollection($entry, 1, 1);
+ $this->RestFulCollection = new RestfulCollection($entry, 1, 1);
}
/**