[MediaWiki-commits] [Gerrit] Revert "Introduces a JSON serialization for Page: pages" - change (mediawiki...ProofreadPage)

2014-06-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Introduces a JSON serialization for Page: pages"
..


Revert "Introduces a JSON serialization for Page: pages"

The change introduced various issues because the JSON serialization is sometime 
saved in the database.

This reverts commit 1bd97d9bcda3337f25f5c4ed67e2dc852dbe7806.

Change-Id: I3872d9ad1188a6f32300dc617ce864c9fe643e84
---
M ProofreadPage.body.php
M includes/page/PageContentHandler.php
M tests/includes/page/PageContentHandlerTest.php
3 files changed, 7 insertions(+), 175 deletions(-)

Approvals:
  Tpt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 2b025a0..b819fc2 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -694,7 +694,7 @@
$article = $editPage->getArticle();
$user = $article->getContext()->getUser();
$oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   $newContent = $contentHandler->unserializeContent( $text, 
$editPage->contentFormat );
+   $newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
if ( $oldContent === null ) {
$oldContent = $contentHandler->makeEmptyContent();
diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index c0cc343..f78889a 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -4,8 +4,6 @@
 
 use Content;
 use ContentHandler;
-use FormatJson;
-use MWContentSerializationException;
 use TextContentHandler;
 use Title;
 use User;
@@ -27,7 +25,7 @@
 * @param string $modelId
 */
public function __construct( $modelId = CONTENT_MODEL_PROOFREAD_PAGE ) {
-   parent::__construct( $modelId, array( CONTENT_FORMAT_WIKITEXT, 
CONTENT_FORMAT_JSON ) );
+   parent::__construct( $modelId, array( CONTENT_FORMAT_WIKITEXT ) 
);
$this->wikitextContentHandler = ContentHandler::getForModelID( 
CONTENT_MODEL_WIKITEXT );
}
 
@@ -37,37 +35,6 @@
public function serializeContent( Content $content, $format = null ) {
$this->checkFormat( $format );
 
-   switch( $format ) {
-   case CONTENT_FORMAT_JSON:
-   return $this->serializeContentInJson( $content 
);
-   default:
-   return $this->serializeContentInWikitext( 
$content );
-   }
-   }
-
-   /**
-* @param PageContent $content
-* @return string
-*/
-   private function serializeContentInJson( PageContent $content ) {
-   $level = $content->getLevel();
-
-   return FormatJson::encode( array(
-   'header' => $content->getHeader()->serialize(),
-   'body' => $content->getBody()->serialize(),
-   'footer' => $content->getFooter()->serialize(),
-   'level' => array(
-   'level' => $level->getLevel(),
-   'user' => $level->getUser()->getName()
-   )
-   ) );
-   }
-
-   /**
-* @param PageContent $content
-* @return string
-*/
-   private function serializeContentInWikitext( PageContent $content ) {
$level = $content->getLevel();
$text = 'handler = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE );
}
 
-   public function pageWikitextSerializationProvider() {
+   public function pageProvider( ) {
return array(
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, '1.2.3.4', '{{PageQuality|2|1.2.3.4}}Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', '{{PageQuality|2|Woot}}Experimental header' . 
"\n\n\n" . 'Experimental body'),
@@ -37,9 +35,9 @@
}
 
/**
-* @dataProvider pageWikitextSerializationProvider
+* @dataProvider pageProvider
 */
-   public function testSerializeContentInWikitext( $header, $body, 
$footer, $level, $proofreader ) {
+   public function testSerializeContent( $header, $body, $footer, $level, 
$proofreader ) {
$pageContent = PageContentTest::newContent( $header, $body, 
$footer, $level, $proofreader );
 
$serializedString = 'https://gerrit.wikimedia.org/r/138354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3872d9ad1188a6f32300dc617ce864c9fe643e84
Gerrit-PatchSet: 1

[MediaWiki-commits] [Gerrit] Revert "Introduces a JSON serialization for Page: pages" - change (mediawiki...ProofreadPage)

2014-06-09 Thread Tpt (Code Review) 
Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/138354

Change subject: Revert "Introduces a JSON serialization for Page: pages"
..

Revert "Introduces a JSON serialization for Page: pages"

The change introduced various issues because the JSON serialization is sometime 
saved in the database.

This reverts commit 1bd97d9bcda3337f25f5c4ed67e2dc852dbe7806.

Change-Id: I3872d9ad1188a6f32300dc617ce864c9fe643e84
---
M ProofreadPage.body.php
M includes/page/PageContentHandler.php
M tests/includes/page/PageContentHandlerTest.php
3 files changed, 7 insertions(+), 175 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/54/138354/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 2b025a0..b819fc2 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -694,7 +694,7 @@
$article = $editPage->getArticle();
$user = $article->getContext()->getUser();
$oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   $newContent = $contentHandler->unserializeContent( $text, 
$editPage->contentFormat );
+   $newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
if ( $oldContent === null ) {
$oldContent = $contentHandler->makeEmptyContent();
diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index c0cc343..f78889a 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -4,8 +4,6 @@
 
 use Content;
 use ContentHandler;
-use FormatJson;
-use MWContentSerializationException;
 use TextContentHandler;
 use Title;
 use User;
@@ -27,7 +25,7 @@
 * @param string $modelId
 */
public function __construct( $modelId = CONTENT_MODEL_PROOFREAD_PAGE ) {
-   parent::__construct( $modelId, array( CONTENT_FORMAT_WIKITEXT, 
CONTENT_FORMAT_JSON ) );
+   parent::__construct( $modelId, array( CONTENT_FORMAT_WIKITEXT ) 
);
$this->wikitextContentHandler = ContentHandler::getForModelID( 
CONTENT_MODEL_WIKITEXT );
}
 
@@ -37,37 +35,6 @@
public function serializeContent( Content $content, $format = null ) {
$this->checkFormat( $format );
 
-   switch( $format ) {
-   case CONTENT_FORMAT_JSON:
-   return $this->serializeContentInJson( $content 
);
-   default:
-   return $this->serializeContentInWikitext( 
$content );
-   }
-   }
-
-   /**
-* @param PageContent $content
-* @return string
-*/
-   private function serializeContentInJson( PageContent $content ) {
-   $level = $content->getLevel();
-
-   return FormatJson::encode( array(
-   'header' => $content->getHeader()->serialize(),
-   'body' => $content->getBody()->serialize(),
-   'footer' => $content->getFooter()->serialize(),
-   'level' => array(
-   'level' => $level->getLevel(),
-   'user' => $level->getUser()->getName()
-   )
-   ) );
-   }
-
-   /**
-* @param PageContent $content
-* @return string
-*/
-   private function serializeContentInWikitext( PageContent $content ) {
$level = $content->getLevel();
$text = 'handler = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE );
}
 
-   public function pageWikitextSerializationProvider() {
+   public function pageProvider( ) {
return array(
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, '1.2.3.4', '{{PageQuality|2|1.2.3.4}}Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', '{{PageQuality|2|Woot}}Experimental header' . 
"\n\n\n" . 'Experimental body'),
@@ -37,9 +35,9 @@
}
 
/**
-* @dataProvider pageWikitextSerializationProvider
+* @dataProvider pageProvider
 */
-   public function testSerializeContentInWikitext( $header, $body, 
$footer, $level, $proofreader ) {
+   public function testSerializeContent( $header, $body, $footer, $level, 
$proofreader ) {
$pageContent = PageContentTest::newContent( $header, $body, 
$footer, $level, $proofreader );
 
$serializedString = 'https://gerrit.wikimedia.org/r/138354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-I