Merge "don't die producing xml files if rev text export conversion fails"

diff --combined includes/export/XmlDumpWriter.php
index 3c0b569,5a44040..6ca8853
--- 1/includes/export/XmlDumpWriter.php
--- 2/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@@ -22,29 -22,13 +22,29 @@@
   *
   * @file
   */
 -
  use MediaWiki\MediaWikiServices;
 +use MediaWiki\Revision\RevisionStore;
 +use MediaWiki\Storage\SqlBlobStore;
  
  /**
   * @ingroup Dump
   */
  class XmlDumpWriter {
 +      /**
 +       * @var string[] the schema versions supported for output
 +       * @final
 +       */
 +      public static $supportedSchemas = [
 +              XML_DUMP_SCHEMA_VERSION_10,
 +      ];
 +
 +      /**
 +       * Title of the currently processed page
 +       *
 +       * @var Title|null
 +       */
 +      private $currentTitle = null;
 +
        /**
         * Opens the XML output stream's root "<mediawiki>" element.
         * This does not include an xml directive, so is safe to include
@@@ -175,13 -159,12 +175,13 @@@
         */
        public function openPage( $row ) {
                $out = "  <page>\n";
 -              $title = Title::makeTitle( $row->page_namespace, $row->page_title );
 -              $out .= '    ' . Xml::elementClean( 'title', [], self::canonicalTitle( $title ) ) . "\n";
 +              $this->currentTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
 +              $canonicalTitle = self::canonicalTitle( $this->currentTitle );
 +              $out .= '    ' . Xml::elementClean( 'title', [], $canonicalTitle ) . "\n";
                $out .= '    ' . Xml::element( 'ns', [], strval( $row->page_namespace ) ) . "\n";
                $out .= '    ' . Xml::element( 'id', [], strval( $row->page_id ) ) . "\n";
                if ( $row->page_is_redirect ) {
 -                      $page = WikiPage::factory( $title );
 +                      $page = WikiPage::factory( $this->currentTitle );
                        $redirect = $page->getRedirectTarget();
                        if ( $redirect instanceof Title && $redirect->isValidRedirectTarget() ) {
                                $out .= '    ';
@@@ -195,7 -178,7 +195,7 @@@
                                strval( $row->page_restrictions ) ) . "\n";
                }
  
 -              Hooks::run( 'XmlDumpWriterOpenPage', [ $this, &$out, $row, $title ] );
 +              Hooks::run( 'XmlDumpWriterOpenPage', [ $this, &$out, $row, $this->currentTitle ] );
  
                return $out;
        }
@@@ -210,20 -193,6 +210,20 @@@
                return "  </page>\n";
        }
  
 +      /**
 +       * @return RevisionStore
 +       */
 +      private function getRevisionStore() {
 +              return MediaWikiServices::getInstance()->getRevisionStore();
 +      }
 +
 +      /**
 +       * @return SqlBlobStore
 +       */
 +      private function getBlobStore() {
 +              return MediaWikiServices::getInstance()->getBlobStore();
 +      }
 +
        /**
         * Dumps a "<revision>" section on the output stream, with
         * data filled in from the given database row.
@@@ -259,17 -228,16 +259,17 @@@
                        }
                }
  
 +              // TODO: rev_content_model no longer exists with MCR, see T174031
                if ( isset( $row->rev_content_model ) && !is_null( $row->rev_content_model ) ) {
                        $content_model = strval( $row->rev_content_model );
                } else {
                        // probably using $wgContentHandlerUseDB = false;
 -                      $title = Title::makeTitle( $row->page_namespace, $row->page_title );
 -                      $content_model = ContentHandler::getDefaultModelFor( $title );
 +                      $content_model = ContentHandler::getDefaultModelFor( $this->currentTitle );
                }
  
                $content_handler = ContentHandler::getForModelID( $content_model );
  
 +              // TODO: rev_content_format no longer exists with MCR, see T174031
                if ( isset( $row->rev_content_format ) && !is_null( $row->rev_content_format ) ) {
                        $content_format = strval( $row->rev_content_format );
                } else {
@@@ -286,48 -254,20 +286,53 @@@
                } elseif ( isset( $row->old_text ) ) {
                        // Raw text from the database may have invalid chars
                        $text = strval( Revision::getRevisionText( $row ) );
-                       $text = $content_handler->exportTransform( $text, $content_format );
+                       try {
+                               $text = $content_handler->exportTransform( $text, $content_format );
+                       }
+                       catch ( MWException $ex ) {
+                               // leave text as is; that's the way it goes
+                       }
                        $out .= "      " . Xml::elementClean( 'text',
                                [ 'xml:space' => 'preserve', 'bytes' => intval( $row->rev_len ) ],
                                strval( $text ) ) . "\n";
 -              } else {
 -                      // Stub output
 +              } elseif ( isset( $row->_load_content ) ) {
 +                      // TODO: make this fully MCR aware, see T174031
 +                      $rev = $this->getRevisionStore()->newRevisionFromRow( $row, 0, $this->currentTitle );
 +                      $slot = $rev->getSlot( 'main' );
 +                      $content = $slot->getContent();
 +
 +                      if ( $content instanceof TextContent ) {
 +                              // HACK: For text based models, bypass the serialization step.
 +                              // This allows extensions (like Flow)that use incompatible combinations
 +                              // of serialization format and content model.
 +                              $text = $content->getNativeData();
 +                      } else {
 +                              $text = $content->serialize( $content_format );
 +                      }
 +
 +                      $text = $content_handler->exportTransform( $text, $content_format );
 +                      $out .= "      " . Xml::elementClean( 'text',
 +                              [ 'xml:space' => 'preserve', 'bytes' => intval( $slot->getSize() ) ],
 +                              strval( $text ) ) . "\n";
 +              } elseif ( isset( $row->rev_text_id ) ) {
 +                      // Stub output for pre-MCR schema
 +                      // TODO: MCR: rev_text_id only exists in the pre-MCR schema. Remove this when
 +                      // we drop support for the old schema.
                        $out .= "      " . Xml::element( 'text',
                                [ 'id' => $row->rev_text_id, 'bytes' => intval( $row->rev_len ) ],
                                "" ) . "\n";
 +              } else {
 +                      // Backwards-compatible stub output for MCR aware schema
 +                      // TODO: MCR: emit content addresses instead of text ids, see T174031, T199121
 +                      $rev = $this->getRevisionStore()->newRevisionFromRow( $row, 0, $this->currentTitle );
 +                      $slot = $rev->getSlot( 'main' );
 +
 +                      // Note that this is currently the ONLY reason we have a BlobStore here at all.
 +                      // When removing this line, check whether the BlobStore has become unused.
 +                      $textId = $this->getBlobStore()->getTextIdFromAddress( $slot->getAddress() );
 +                      $out .= "      " . Xml::element( 'text',
 +                                      [ 'id' => $textId, 'bytes' => intval( $slot->getSize() ) ],
 +                                      "" ) . "\n";
                }
  
                if ( isset( $row->rev_sha1 )