Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 46 insertions, 0 deletions

diff --git a/tests/phpunit/mocks/content/DummyNonTextContentHandler.php b/tests/phpunit/mocks/content/DummyNonTextContentHandler.php
new file mode 100644
index 00000000..6995ae78
--- /dev/null
+++ b/tests/phpunit/mocks/content/DummyNonTextContentHandler.php
@@ -0,0 +1,46 @@
+<?php
+
+class DummyNonTextContentHandler extends DummyContentHandlerForTesting {
+
+	public function __construct( $dataModel ) {
+		parent::__construct( $dataModel, array( "testing-nontext" ) );
+	}
+
+	/**
+	 * @see ContentHandler::serializeContent
+	 *
+	 * @param Content $content
+	 * @param string $format
+	 *
+	 * @return string
+	 */
+	public function serializeContent( Content $content, $format = null ) {
+		return $content->serialize();
+	}
+
+	/**
+	 * @see ContentHandler::unserializeContent
+	 *
+	 * @param string $blob
+	 * @param string $format Unused.
+	 *
+	 * @return Content
+	 */
+	public function unserializeContent( $blob, $format = null ) {
+		$d = unserialize( $blob );
+
+		return new DummyNonTextContent( $d );
+	}
+
+	/**
+	 * Creates an empty Content object of the type supported by this ContentHandler.
+	 */
+	public function makeEmptyContent() {
+		return new DummyNonTextContent( '' );
+	}
+
+	public function supportsDirectApiEditing() {
+		return true;
+	}
+
+}