adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating docblocks and code formatting in XML classes, adding test change to previous commit.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8089 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2009-03-11 04:09:35 +00:00
parent 80d4dfa306
commit 92cc331341
3 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/view/helpers/xml.php
View file

@ -148,12 +148,16 @@ class XmlHelper extends AppHelper {
* Serializes a model resultset into XML
*
* @param mixed $data The content to be converted to XML
* @param array $options The data formatting options
* @param array $options The data formatting options. For a list of valid options, see
* XmlNode::__construct().
* @return string A copy of $data in XML format
* @see XmlNode
*/
function serialize($data, $options = array()) {
$data =& new Xml($data, array_merge(array('attributes' => false, 'format' => 'attributes'), $options));
return $data->toString(array_merge(array('header' => false), $options));
$options += array('attributes' => false, 'format' => 'attributes');
$data =& new Xml($data, $options);
return $data->toString($options + array('header' => false));
}
}
?>

36
cake/libs/xml.php
View file

@ -188,7 +188,7 @@ class XmlNode extends Object {
return $object;
}
$name = null;
$options = array_merge(array('format' => 'attributes'), $options);
$options += array('format' => 'attributes');
if ($keyName !== null && !is_numeric($keyName)) {
$name = $keyName;
@ -769,8 +769,8 @@ class Xml extends XmlNode {
var $__header = null;
/**
* Default array keys/object properties to use as tag names when converting objects or array structures to XML.
* Set by passing $options['tags'] to this object's constructor.
* Default array keys/object properties to use as tag names when converting objects or array
* structures to XML. Set by passing $options['tags'] to this object's constructor.
*
* @var array
* @access private
@ -797,8 +797,20 @@ class Xml extends XmlNode {
* Constructor. Sets up the XML parser with options, gives it this object as
* its XML object, and sets some variables.
*
* @param string $input What should be used to set up
* @param array $options Options to set up with
* @param mixed $input The content with which this XML document should be initialized. Can be a
* string, array or object. If a string is specified, it may be a literal XML
* document, or a URL or file path to read from.
* @param array $options Options to set up with, valid options are as follows:
* - 'root': The name of the root element, defaults to '#document'
* - 'version': The XML version, defaults to '1.0'
* - 'encoding': Document encoding, defaults to 'UTF-8'
* - 'namespaces': An array of namespaces (as strings) used in this document
* - 'format': Specifies the format this document converts to when parsed or
* rendered out as text, either 'attributes' or 'tags',
* defaults to 'attributes'
* - 'tags': An array specifying any tag-specific formatting options, indexed
* by tag name. See XmlNode::normalize().
* @see XmlNode::normalize()
*/
function __construct($input = null, $options = array()) {
$defaults = array(
@ -820,7 +832,6 @@ class Xml extends XmlNode {
$this->append($input, $options);
}
}
// if (Configure::read('App.encoding') !== null) {
// $this->encoding = Configure::read('App.encoding');
// }
@ -863,7 +874,11 @@ class Xml extends XmlNode {
*/
function parse() {
$this->__initParser();
$this->__header = trim(str_replace(a('<' . '?', '?' . '>'), a('', ''), substr(trim($this->__rawData), 0, strpos($this->__rawData, "\n"))));
$this->__header = trim(str_replace(
a('<' . '?', '?' . '>'),
a('', ''),
substr(trim($this->__rawData), 0, strpos($this->__rawData, "\n"))
));
xml_parse_into_struct($this->__parser, $this->__rawData, $vals);
$xml =& $this;
@ -871,7 +886,8 @@ class Xml extends XmlNode {
for ($i = 0; $i < $count; $i++) {
$data = $vals[$i];
$data = array_merge(array('tag' => null, 'value' => null, 'attributes' => array()), $data);
$data += array('tag' => null, 'value' => null, 'attributes' => array());
switch ($data['type']) {
case "open" :
$xml =& $xml->createElement($data['tag'], $data['value'], $data['attributes']);
@ -906,8 +922,8 @@ class Xml extends XmlNode {
/**
* Returns a string representation of the XML object
*
* @param mixed $options If boolean: whether to include the XML header with the document (defaults to true); if array:
* overrides the default XML generation options
* @param mixed $options If boolean: whether to include the XML header with the document
* (defaults to true); if an array, overrides the default XML generation options
* @return string XML data
* @access public
* @deprecated

2
cake/tests/cases/libs/model/behaviors/translate.test.php
View file

@ -677,7 +677,7 @@ class TranslateTest extends CakeTestCase {
$this->loadFixtures('Translate', 'TranslatedItem');
$TestModel =& new TranslatedItem();
$Behavior = $TestModel->Behaviors->Translate;
$Behavior =& $this->Model->Behaviors->Translate;
$TestModel->unbindTranslation();
$translations = array('title' => 'Title', 'content' => 'Content');