Changeset 1017

Show
Ignore:
Timestamp:
11/09/07 17:51:41 (8 months ago)
Author:
mikey
Message:

use UTF-8 as default encoding for XML handling

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/xml/stubDomXMLStreamWriter.php

    r849 r1017  
    6262     * @param string $encoding 
    6363     */ 
    64     public function __construct($xmlVersion = '1.0', $encoding = 'ISO-8859-1') { 
     64    public function __construct($xmlVersion = '1.0', $encoding = 'UTF-8') { 
    6565        $this->xmlVersion = $xmlVersion; 
    6666        $this->encoding = $encoding; 

  • trunk/src/main/php/net/stubbles/xml/stubLibXmlXMLStreamWriter.php

    r678 r1017  
    5353     * @param string $encoding 
    5454     */ 
    55     public function __construct($xmlVersion = '1.0', $encoding = 'ISO-8859-1') { 
     55    public function __construct($xmlVersion = '1.0', $encoding = 'UTF-8') { 
    5656        $this->xmlVersion = $xmlVersion; 
    5757        $this->encoding = $encoding; 

  • trunk/src/test/php/net/stubbles/xml/serializer/stubXMLSerializerStrategyTestCase.php

    r851 r1017  
    122122        $writer = new stubDomXMLStreamWriter(); 
    123123        $this->serializer->serialize($obj, $writer); 
    124         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
     124        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
    125125 
    126126        // STRATEGY_ALL 
    127127        $writer = new stubDomXMLStreamWriter(); 
    128128        $this->serializer->serialize($obj, $writer, array(stubXMLSerializer::OPT_STRATEGY => stubXMLSerializer::STRATEGY_ALL)); 
    129         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
     129        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
    130130 
    131131        // STRATEGY_NONE 
    132132        $writer = new stubDomXMLStreamWriter(); 
    133133        $this->serializer->serialize($obj, $writer, array(stubXMLSerializer::OPT_STRATEGY => stubXMLSerializer::STRATEGY_NONE)); 
    134         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testXMLSerializerStrategyDefault/>', $writer->asXML()); 
     134        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testXMLSerializerStrategyDefault/>', $writer->asXML()); 
    135135 
    136136        // STRATEGY_PROPS 
    137137        $writer = new stubDomXMLStreamWriter(); 
    138138        $this->serializer->serialize($obj, $writer, array(stubXMLSerializer::OPT_STRATEGY => stubXMLSerializer::STRATEGY_PROPS)); 
    139         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo></testXMLSerializerStrategyDefault>', $writer->asXML()); 
     139        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testXMLSerializerStrategyDefault><foo>foo</foo></testXMLSerializerStrategyDefault>', $writer->asXML()); 
    140140 
    141141        // STRATEGY_METHODS 
    142142        $writer = new stubDomXMLStreamWriter(); 
    143143        $this->serializer->serialize($obj, $writer, array(stubXMLSerializer::OPT_STRATEGY => stubXMLSerializer::STRATEGY_METHODS)); 
    144         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testXMLSerializerStrategyDefault><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
     144        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testXMLSerializerStrategyDefault><getBar>bar</getBar></testXMLSerializerStrategyDefault>', $writer->asXML()); 
    145145    } 
    146146 
    …… 
    153153        $writer = new stubDomXMLStreamWriter(); 
    154154        $this->serializer->serialize($obj, $writer); 
    155         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<obj><prop>propValue</prop><method>return</method></obj>', $writer->asXML()); 
     155        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<obj><prop>propValue</prop><method>return</method></obj>', $writer->asXML()); 
    156156    } 
    157157 
    …… 
    164164        $writer = new stubDomXMLStreamWriter(); 
    165165        $this->serializer->serialize($obj, $writer); 
    166         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<obj><prop>propValue</prop></obj>', $writer->asXML()); 
     166        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<obj><prop>propValue</prop></obj>', $writer->asXML()); 
    167167    } 
    168168 
    …… 
    175175        $writer = new stubDomXMLStreamWriter(); 
    176176        $this->serializer->serialize($obj, $writer); 
    177         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<obj><method>return</method></obj>', $writer->asXML()); 
     177        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<obj><method>return</method></obj>', $writer->asXML()); 
    178178    } 
    179179 
    …… 
    186186        $writer = new stubDomXMLStreamWriter(); 
    187187        $this->serializer->serialize($obj, $writer); 
    188         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<obj/>', $writer->asXML()); 
     188        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<obj/>', $writer->asXML()); 
    189189    } 
    190190} 

  • trunk/src/test/php/net/stubbles/xml/serializer/stubXMLSerializerTestCase.php

    r851 r1017  
    260260        $writer = new stubDomXMLStreamWriter(); 
    261261        $this->serializer->serialize(null, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    262         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><null/></root>', $writer->asXML()); 
     262        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root><null/></root>', $writer->asXML()); 
    263263    } 
    264264 
    …… 
    269269        $writer = new stubDomXMLStreamWriter(); 
    270270        $this->serializer->serialize('This is a string.', $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    271         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>This is a string.</root>', $writer->asXML()); 
     271        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root>This is a string.</root>', $writer->asXML()); 
    272272    } 
    273273 
    …… 
    278278        $writer = new stubDomXMLStreamWriter(); 
    279279        $this->serializer->serialize(45, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    280         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>45</root>', $writer->asXML()); 
     280        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root>45</root>', $writer->asXML()); 
    281281    } 
    282282 
    …… 
    287287        $writer = new stubDomXMLStreamWriter(); 
    288288        $this->serializer->serialize(2.352, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    289         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>2.352</root>', $writer->asXML()); 
     289        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root>2.352</root>', $writer->asXML()); 
    290290    } 
    291291 
    …… 
    296296        $writer = new stubDomXMLStreamWriter(); 
    297297        $this->serializer->serialize(true, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    298         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>true</root>', $writer->asXML()); 
     298        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root>true</root>', $writer->asXML()); 
    299299    } 
    300300 
    …… 
    309309                 ); 
    310310        $this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    311         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three>four</three></root>', $writer->asXML()); 
     311        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root><one>two</one><three>four</three></root>', $writer->asXML()); 
    312312    } 
    313313 
    …… 
    319319        $array = array('one', 'two', 'three'); 
    320320        $this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    321         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><string>one</string><string>two</string><string>three</string></root>', $writer->asXML()); 
     321        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root><string>one</string><string>two</string><string>three</string></root>', $writer->asXML()); 
    322322    } 
    323323 
    …… 
    332332                 ); 
    333333        $this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root')); 
    334         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three><four>five</four></three></root>', $writer->asXML()); 
     334        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<root><one>two</one><three><four>five</four></three></root>', $writer->asXML()); 
    335335    } 
    336336 
    …… 
    342342        $obj = new XMLSerializerFoo(); 
    343343        $this->serializer->serialize($obj, $writer); 
    344         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar>42</bar></foo>', $writer->asXML()); 
     344        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<foo bar="test"><bar>42</bar></foo>', $writer->asXML()); 
    345345    } 
    346346 
    …… 
    353353        $obj->bar = new XMLSerializerFoo(); 
    354354        $this->serializer->serialize($obj, $writer); 
    355         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar bar="test"><bar>42</bar></bar></foo>', $writer->asXML()); 
     355        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<foo bar="test"><bar bar="test"><bar>42</bar></bar></foo>', $writer->asXML()); 
    356356    } 
    357357 
    …… 
    363363        $obj = new XMLSerializerList(); 
    364364        $this->serializer->serialize($obj, $writer); 
    365         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<container><list><item>one</item><item>two</item><item>three</item></list></container>', $writer->asXML()); 
     365        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<container><list><item>one</item><item>two</item><item>three</item></list></container>', $writer->asXML()); 
    366366 
    367367        $writer = new stubDomXMLStreamWriter(); 
    368368        $obj = new XMLSerializerList2(); 
    369369        $this->serializer->serialize($obj, $writer); 
    370         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<container><item>one</item><item>two</item><item>three</item></container>', $writer->asXML()); 
     370        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<container><item>one</item><item>two</item><item>three</item></container>', $writer->asXML()); 
    371371    } 
    372372 
    …… 
    378378        $obj = new XMLSerializerMethods(); 
    379379        $this->serializer->serialize($obj, $writer); 
    380         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<class method="returned"/>', $writer->asXML()); 
     380        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<class method="returned"/>', $writer->asXML()); 
    381381    } 
    382382 
    …… 
    388388        $obj = new XMLSerializerPropertyMatcher(); 
    389389        $this->serializer->serialize($obj, $writer); 
    390         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testObject><one>one</one><two>two</two></testObject>', $writer->asXML()); 
     390        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testObject><one>one</one><two>two</two></testObject>', $writer->asXML()); 
    391391    } 
    392392 
    …… 
    398398        $obj = new XMLSerializerMethodMatcher(); 
    399399        $this->serializer->serialize($obj, $writer); 
    400         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testObject><foo>foo</foo></testObject>', $writer->asXML()); 
     400        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<testObject><foo>foo</foo></testObject>', $writer->asXML()); 
    401401    } 
    402402 
    …… 
    408408        $obj = new XMLSerializerFragmentTest(); 
    409409        $this->serializer->serialize($obj, $writer); 
    410         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<test><xml><foo>bar</foo></xml><foo>bar</foo></test>', $writer->asXML()); 
     410        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<test><xml><foo>bar</foo></xml><foo>bar</foo></test>', $writer->asXML()); 
    411411    } 
    412412 
    …… 
    418418        $obj = new XMLSerializerAttributeTest(); 
    419419        $this->serializer->serialize($obj, $writer); 
    420         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<test emptyProp2="" emptyMethod2=""/>', $writer->asXML()); 
     420        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<test emptyProp2="" emptyMethod2=""/>', $writer->asXML()); 
    421421    } 
    422422 
    …… 
    428428        $obj = new XMLSerializerUmlautTest(); 
    429429        $this->serializer->serialize($obj, $writer); 
    430         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<test bar="Hühnchen"><foo>Hähnchen</foo></test>', $writer->asXML()); 
     430        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . utf8_encode('<test bar="Hühnchen"><foo>Hähnchen</foo></test>'), $writer->asXML()); 
    431431    } 
    432432} 

  • trunk/src/test/php/net/stubbles/xml/stubDomXMLStreamWriterTestCase.php

    r833 r1017  
    2323    public function testEmptyDocument() { 
    2424        $writer = new stubDomXMLStreamWriter(); 
    25         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>', $writer->asXML()); 
     25        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>', $writer->asXML()); 
    2626    } 
    2727 
    …… 
    3838        $writer->writeEndElement(); 
    3939 
    40         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n<root><foo/><bar/></root>" , $writer->asXML()); 
     40        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n<root><foo/><bar/></root>" , $writer->asXML()); 
    4141    } 
    4242 
    …… 
    4848        $writer->writeElement('foo', array('att' => 'value'), 'content'); 
    4949 
    50         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo att="value">content</foo>', $writer->asXML()); 
     50        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<foo att="value">content</foo>', $writer->asXML()); 
    5151    } 
    5252 
    …… 
    6262        $writer->writeEndElement(); 
    6363 
    64         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="42"/></root>', $writer->asXML()); 
     64        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo bar="42"/></root>', $writer->asXML()); 
    6565    } 
    6666 
    …… 
    7474        $writer->writeEndElement(); 
    7575 
    76         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root>This is text.</root>', $writer->asXML()); 
     76        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root>This is text.</root>', $writer->asXML()); 
    7777    } 
    7878 
    …… 
    8686        $writer->writeEndElement(); 
    8787 
    88         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root>This is text containg äöü.</root>', $writer->asXML()); 
     88        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root>This is text containg ' . utf8_encode('äöü') . '.</root>', $writer->asXML()); 
    8989    } 
    9090 
    …… 
    9898        $writer->writeEndElement(); 
    9999 
    100         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><![CDATA[This is text.]]></root>', $writer->asXML()); 
     100        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><![CDATA[This is text.]]></root>', $writer->asXML()); 
    101101    } 
    102102 
    …… 
    110110        $writer->writeEndElement(); 
    111111 
    112         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><!--This is a comment.--></root>', $writer->asXML()); 
     112        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><!--This is a comment.--></root>', $writer->asXML()); 
    113113    } 
    114114 
    …… 
    122122        $writer->writeEndElement(); 
    123123 
    124         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><?php phpinfo();?></root>', $writer->asXML()); 
     124        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><?php phpinfo();?></root>', $writer->asXML()); 
    125125    } 
    126126 
    …… 
    134134        $writer->writeEndElement(); 
    135135 
    136         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="true"/></root>', $writer->asXML()); 
     136        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo bar="true"/></root>', $writer->asXML()); 
    137137    } 
    138138 
    …… 
    154154        $writer->writeEndElement(); 
    155155 
    156         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo><bar/></foo></root>', $writer->asXML()); 
     156        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo><bar/></foo></root>', $writer->asXML()); 
    157157    } 
    158158 
    …… 
    164164        $writer->writeElement('foo'); 
    165165        $writer->clear(); 
    166         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>', $writer->asXML()); 
     166        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>', $writer->asXML()); 
    167167    } 
    168168 

  • trunk/src/test/php/net/stubbles/xml/stubLibXmlXMLStreamWriterTestCase.php

    r429 r1017  
    2323    public function testEmptyDocument() { 
    2424        $writer = new stubLibXmlXMLStreamWriter(); 
    25         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>', $writer->asXML()); 
     25        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>', $writer->asXML()); 
    2626    } 
    2727 
    …… 
    3838        $writer->writeEndElement(); 
    3939 
    40         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n<root><foo/><bar/></root>" , $writer->asXML()); 
     40        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n<root><foo/><bar/></root>" , $writer->asXML()); 
    4141    } 
    4242 
    …… 
    4848        $writer->writeElement('foo', array('att' => 'value'), 'content'); 
    4949 
    50         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo att="value">content</foo>', $writer->asXML()); 
     50        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<foo att="value">content</foo>', $writer->asXML()); 
    5151    } 
    5252 
    …… 
    6262        $writer->writeEndElement(); 
    6363 
    64         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="42"/></root>' , $writer->asXML()); 
     64        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo bar="42"/></root>' , $writer->asXML()); 
    6565    } 
    6666 
    …… 
    7474        $writer->writeEndElement(); 
    7575 
    76         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root>This is text.</root>' , $writer->asXML()); 
     76        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root>This is text.</root>' , $writer->asXML()); 
    7777    } 
    7878 
    …… 
    8686        $writer->writeEndElement(); 
    8787 
    88         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><![CDATA[This is text.]]></root>', $writer->asXML()); 
     88        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><![CDATA[This is text.]]></root>', $writer->asXML()); 
    8989    } 
    9090 
    …… 
    9898        $writer->writeEndElement(); 
    9999 
    100         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><!--This is a comment.--></root>' , $writer->asXML()); 
     100        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><!--This is a comment.--></root>' , $writer->asXML()); 
    101101    } 
    102102 
    …… 
    110110        $writer->writeEndElement(); 
    111111 
    112         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><?php phpinfo();?></root>' , $writer->asXML()); 
     112        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><?php phpinfo();?></root>' , $writer->asXML()); 
    113113    } 
    114114 
    …… 
    122122        $writer->writeEndElement(); 
    123123 
    124         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="true"/></root>' , $writer->asXML()); 
     124        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo bar="true"/></root>' , $writer->asXML()); 
    125125    } 
    126126 
    …… 
    143143        $writer->writeEndElement(); 
    144144 
    145         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo><bar/></foo></root>' , $writer->asXML()); 
     145        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>' . "\n". '<root><foo><bar/></foo></root>' , $writer->asXML()); 
    146146    } 
    147147    */ 
    …… 
    154154        $writer->writeElement('foo'); 
    155155        $writer->clear(); 
    156         $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>', $writer->asXML()); 
     156        $this->assertEqual('<?xml version="1.0" encoding="UTF-8"?>', $writer->asXML()); 
    157157    } 
    158158