Merge "Handle missing width nicely in thumb.php"

[lhc/web/wiklou.git] / includes / api / ApiFormatWddx.php

diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php
index a08c3ab..8662a64 100644 (file)
--- a/includes/api/ApiFormatWddx.php
+++ b/includes/api/ApiFormatWddx.php
@@ -26,6 +26,7 @@
 
 /**
  * API WDDX output formatter
+ * @deprecated since 1.24
  * @ingroup API
  */
 class ApiFormatWddx extends ApiFormatBase {
@@ -37,24 +38,16 @@ class ApiFormatWddx extends ApiFormatBase {
        public function execute() {
                $this->markDeprecated();
 
-               // Some versions of PHP have a broken wddx_serialize_value, see
-               // PHP bug 45314. Test encoding an affected character (U+00A0)
-               // to avoid this.
-               $expected =
-                       "<wddxPacket version='1.0'><header/><data><string>\xc2\xa0</string></data></wddxPacket>";
-               if ( function_exists( 'wddx_serialize_value' )
-                       && !$this->getIsHtml()
-                       && wddx_serialize_value( "\xc2\xa0" ) == $expected
-               ) {
+               if ( !$this->getIsHtml() && !static::useSlowPrinter() ) {
                        $this->printText( wddx_serialize_value( $this->getResultData() ) );
                } else {
                        // Don't do newlines and indentation if we weren't asked
                        // for pretty output
                        $nl = ( $this->getIsHtml() ? "\n" : '' );
-                       $indstr = ' ';
+                       $indstr = ( $this->getIsHtml() ? ' ' : '' );
                        $this->printText( "<?xml version=\"1.0\"?>$nl" );
                        $this->printText( "<wddxPacket version=\"1.0\">$nl" );
-                       $this->printText( "$indstr<header/>$nl" );
+                       $this->printText( "$indstr<header />$nl" );
                        $this->printText( "$indstr<data>$nl" );
                        $this->slowWddxPrinter( $this->getResultData(), 4 );
                        $this->printText( "$indstr</data>$nl" );
@@ -62,6 +55,44 @@ class ApiFormatWddx extends ApiFormatBase {
                }
        }
 
+       public static function useSlowPrinter() {
+               if ( !function_exists( 'wddx_serialize_value' ) ) {
+                       return true;
+               }
+
+               // Some versions of PHP have a broken wddx_serialize_value, see
+               // PHP bug 45314. Test encoding an affected character (U+00A0)
+               // to avoid this.
+               $expected =
+                       "<wddxPacket version='1.0'><header/><data><string>\xc2\xa0</string></data></wddxPacket>";
+               if ( wddx_serialize_value( "\xc2\xa0" ) !== $expected ) {
+                       return true;
+               }
+
+               // Some versions of HHVM don't correctly encode ampersands.
+               $expected =
+                       "<wddxPacket version='1.0'><header/><data><string>&amp;</string></data></wddxPacket>";
+               if ( wddx_serialize_value( '&' ) !== $expected ) {
+                       return true;
+               }
+
+               // Some versions of HHVM don't correctly encode empty arrays as subvalues.
+               $expected =
+                       "<wddxPacket version='1.0'><header/><data><array length='1'><array length='0'></array></array></data></wddxPacket>";
+               if ( wddx_serialize_value( array( array() ) ) !== $expected ) {
+                       return true;
+               }
+
+               // Some versions of HHVM don't correctly encode associative arrays with numeric keys.
+               $expected =
+                       "<wddxPacket version='1.0'><header/><data><struct><var name='2'><number>1</number></var></struct></data></wddxPacket>";
+               if ( wddx_serialize_value( array( 2 => 1 ) ) !== $expected ) {
+                       return true;
+               }
+
+               return false;
+       }
+
        /**
         * Recursively go through the object and output its data in WDDX format.
         * @param mixed $elemValue
@@ -103,12 +134,14 @@ class ApiFormatWddx extends ApiFormatBase {
                        $this->printText( $indstr . Xml::element( 'boolean',
                                array( 'value' => $elemValue ? 'true' : 'false' ) ) . $nl
                        );
+               } elseif ( $elemValue === null ) {
+                       $this->printText( $indstr . Xml::element( 'null', array() ) . $nl );
                } else {
                        ApiBase::dieDebug( __METHOD__, 'Unknown type ' . gettype( $elemValue ) );
                }
        }
 
-       public function getDescription() {
-               return 'DEPRECATED! Output data in WDDX format' . parent::getDescription();
+       public function isDeprecated() {
+               return true;
        }
 }