Author: chabotc
Date: Tue Dec 9 06:34:55 2008
New Revision: 724713
URL: http://svn.apache.org/viewvc?rev=724713&view=rev
Log:
Fixes an error with xml output / to strict type checking
Modified:
incubator/shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php
incubator/shindig/trunk/php/src/social/converters/OutputXmlConverter.php
Modified:
incubator/shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php?rev=724713&r1=724712&r2=724713&view=diff
==============================================================================
---
incubator/shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php
(original)
+++
incubator/shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php
Tue Dec 9 06:34:55 2008
@@ -30,7 +30,7 @@
* @param array $entryTypes the map of entries
* @return string the request type
*/
- public function getRequestType($requestItem, $entryTypes) {
+ public static function getRequestType($requestItem, $entryTypes) {
// map the Request URL to the content type to use
$params = $requestItem->getParameters();
if (! is_array($params)) {
@@ -60,7 +60,7 @@
* @param string $nameSpace optional namespace to use when creating node
* @return DOMElement node
*/
- public function addNode(DOMDocument $doc, DOMElement $node, $name, $value =
'', $attributes = false, $nameSpace = false) {
+ public static function addNode(DOMDocument $doc, $node, $name, $value = '',
$attributes = false, $nameSpace = false) {
if ($nameSpace) {
$childNode = $node->appendChild($doc->createElementNS($nameSpace,
$name));
} else {
@@ -90,7 +90,7 @@
* @param string $nameSpace if specified, the node is created using this
namespace
* @return DOMElement returns newly created element
*/
- public function addData(DOMDocument $doc, DOMElement $element, $name, $data,
$nameSpace = false) {
+ public static function addData(DOMDocument $doc, DOMElement $element, $name,
$data, $nameSpace = false) {
if ($nameSpace) {
$newElement = $element->appendChild($doc->createElementNS($nameSpace,
$name));
} else {
Modified:
incubator/shindig/trunk/php/src/social/converters/OutputXmlConverter.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/converters/OutputXmlConverter.php?rev=724713&r1=724712&r2=724713&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/converters/OutputXmlConverter.php
(original)
+++ incubator/shindig/trunk/php/src/social/converters/OutputXmlConverter.php
Tue Dec 9 06:34:55 2008
@@ -79,7 +79,7 @@
* @param array $attributes optional array of attributes, false by default.
If set attributes are added to the node using the key => val pairs
* @return DOMElement node
*/
- private function addNode(DOMElement $node, $name, $value = '', $attributes =
false) {
+ private function addNode($node, $name, $value = '', $attributes = false) {
return OutputBasicXmlConverter::addNode($this->doc, $node, $name, $value,
$attributes);
}