Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
wiki.techinc.nl/tests/phpunit/integration/includes/parser/Parsoid/HtmlToContentTransformTest.php

373 lines
13 KiB
PHP
Raw Normal View History

Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
<?php
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
namespace MediaWiki\Tests\Parser\Parsoid;
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
Don't hardcode Parsoid HTML version number in tests * Without this fix, the test fails vendor patches whenever Parsoid's default version number is bumped in the Parsoid repo. Change-Id: Icce7b61dfbbbbd57b4f1ed76a32d160e92b48b15
2022-08-12 15:02:12 +00:00
use Composer\Semver\Semver;
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
use JsonContent;
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use LogicException;
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
use MediaWiki\Page\PageIdentityValue;
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
use MediaWiki\Parser\Parsoid\Config\PageConfig;
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
use MediaWiki\Parser\Parsoid\HtmlToContentTransform;
Introduce HtmlInputTransformHelper The HtmlInputTransformHelper is intended to provide code sharing between VisualEditor's DirectParsoidClient and the ParsoidHandler base class used by TransformHandler. Bug: T310376 Change-Id: I9c15f075cfc5f198e290758fc23d25990b47a185
2022-08-30 19:19:53 +00:00
use MediaWiki\Revision\MutableRevisionRecord;
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
use MediaWiki\Revision\SlotRecord;
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
use MediaWikiIntegrationTestCase;
use Wikimedia\Parsoid\Core\ClientError;
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
use Wikimedia\Parsoid\Core\SelserData;
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
use Wikimedia\Parsoid\Parsoid;
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
use Wikimedia\Parsoid\Utils\ContentUtils;
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
use Wikimedia\TestingAccessWrapper;
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
use WikitextContent;
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
/**
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
* @covers \MediaWiki\Parser\Parsoid\HtmlToContentTransform
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
* @group Database
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
*/
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
class HtmlToContentTransformTest extends MediaWikiIntegrationTestCase {
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
private const MODIFIED_HTML = '<html><head>' .
'<meta charset="utf-8"/><meta property="mw:htmlVersion" content="2.4.0"/></head>' .
'<body>Modified HTML</body></html>';
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
private const ORIG_BODY = '<body>Original Content</body>';
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
private const ORIG_HTML = '<html>' . self::ORIG_BODY . '</html>';
private const ORIG_DATA_MW = [ 'ids' => [ 'mwAQ' => [] ] ];
private const ORIG_DATA_PARSOID = [ 'ids' => [ 'mwAQ' => [ 'pi' => [ [ [ 'k' => '1' ] ] ] ] ] ];
private const MODIFIED_DATA_MW = [ 'ids' => [ 'mwAQ' => [
'parts' => [ [
'template' => [
'target' => [ 'wt' => '1x', 'href' => './Template:1x' ],
'params' => [ '1' => [ 'wt' => 'hi' ] ],
'i' => 0
]
] ]
] ] ];
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
private function setOriginalData( HtmlToContentTransform $transform ) {
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalRevisionId( 1 );
$transform->setOriginalSchemaVersion( '2.4.0' );
$transform->setOriginalHtml( self::ORIG_HTML );
$transform->setOriginalDataMW( self::ORIG_DATA_MW );
$transform->setOriginalDataParsoid( self::ORIG_DATA_PARSOID );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
private function createHtmlToContentTransform( $html = '' ) {
return new HtmlToContentTransform(
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$html ?? self::ORIG_HTML,
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
PageIdentityValue::localIdentity( 7, NS_MAIN, 'Test' ),
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
new Parsoid(
$this->getServiceContainer()->getParsoidSiteConfig(),
$this->getServiceContainer()->getParsoidDataAccess()
),
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
MainConfigSchema::getDefaultValue( MainConfigNames::ParsoidSettings ),
$this->getServiceContainer()->getParsoidPageConfigFactory(),
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
$this->getServiceContainer()->getContentHandlerFactory()
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
);
}
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
private function createHtmlToContentTransformWithOriginalData( $html = '' ) {
$transform = $this->createHtmlToContentTransform( $html );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
// Set some options to assert on $transform object.
$transform->setOptions( [
Rest: offsetType is not in the options sub-array This patch fixes an issue that happened when the assumption was made that offsetType is in the opts sub-array but it's really not part of it. It's directly in attributes, copied from envOptions, which causes the offset type to always be byte. Change-Id: I5d1a8a7cdfe13c22a2afa70128203050a4b5f98a
2022-07-26 10:33:42 +00:00
'contentmodel' => 'wikitext',
'offsetType' => 'byte',
] );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$this->setOriginalData( $transform );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
return $transform;
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
public function testGetOriginalBodyRequiresValidDataParsoid() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::ORIG_HTML );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalSchemaVersion( '2.4.0' );
$transform->setOriginalHtml( self::ORIG_HTML );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
// Invalid data-parsoid structure!
$transform->setOriginalDataParsoid( [ 'foo' => 'bar' ] );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$exception = new ClientError( 'Invalid data-parsoid was provided.' );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
$this->expectException( get_class( $exception ) );
$this->expectExceptionMessage( $exception->getMessage() );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
// Should throw because setOriginalDataParsoid got bad data.
// Note that setOriginalDataParsoid can't validate immediately, because it
// may not know the schema version. The order in which the setters are called
// should not matter. All checks happen in getters.
$transform->getOriginalBody();
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
public function testHasOriginalHtml() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML );
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertFalse( $transform->hasOriginalHtml() );
$transform->setOriginalDataParsoid( self::ORIG_DATA_PARSOID );
$this->assertFalse( $transform->hasOriginalHtml() );
$transform->setOriginalHtml( self::ORIG_HTML );
$this->assertTrue( $transform->hasOriginalHtml() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
public function testGetOriginalSchemaVersion() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::ORIG_HTML ); // no version inline
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( Parsoid::defaultHTMLVersion(), $transform->getOriginalSchemaVersion() );
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML ); // has version inline
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( '2.4.0', $transform->getOriginalSchemaVersion() );
$transform->setOriginalSchemaVersion( '2.3.0' );
$this->assertSame( '2.3.0', $transform->getOriginalSchemaVersion() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
public function testGetSchemaVersion() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::ORIG_HTML ); // no version inline
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( Parsoid::defaultHTMLVersion(), $transform->getSchemaVersion() );
// Should have an effect, since the HTML has no version specified inline
$transform->setOriginalSchemaVersion( '2.3.0' );
$this->assertSame( '2.3.0', $transform->getSchemaVersion() );
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML ); // has version inline
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( '2.4.0', $transform->getSchemaVersion() );
// Should have no impact, since the HTML has a version specified inline
$transform->setOriginalSchemaVersion( '2.3.0' );
$this->assertSame( '2.4.0', $transform->getSchemaVersion() );
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
}
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
public function testHasOriginalDataParsoid() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML );
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertFalse( $transform->hasOriginalDataParsoid() );
$transform->setOriginalDataParsoid( self::ORIG_DATA_PARSOID );
$this->assertTrue( $transform->hasOriginalDataParsoid() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
public function testGetOriginalHtml() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML );
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertFalse( $transform->hasOriginalHtml() );
$transform->setOriginalSchemaVersion( '2.4.0' );
$transform->setOriginalHtml( self::ORIG_HTML );
$this->assertTrue( $transform->hasOriginalHtml() );
$this->assertSame( self::ORIG_HTML, $transform->getOriginalHtml() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
public function testGetOriginalBody() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::MODIFIED_HTML );
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$transform->setOriginalSchemaVersion( '2.4.0' );
$transform->setOriginalHtml( self::ORIG_HTML );
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
$this->assertSame(
self::ORIG_BODY,
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
ContentUtils::toXML( $transform->getOriginalBody() )
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
);
}
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
private function assertTransformHasOriginalContent( HtmlToContentTransform $transform, $text ) {
$this->assertTrue( $transform->knowsOriginalContent() );
$access = TestingAccessWrapper::newFromObject( $transform );
/** @var PageConfig $pageConfig */
$pageConfig = $access->getPageConfig();
$this->assertSame( $text, $pageConfig->getPageMainContent() );
/** @var ?SelserData $selserData */
$selserData = $access->getSelserData();
$this->assertNotNull( $selserData );
}
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
public function testOldId() {
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
$text = 'Lorem Ipsum';
$rev = $this->editPage( __METHOD__, $text )->getValue()['revision-record'];
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransformWithOriginalData();
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
$transform->setOriginalRevisionId( $rev->getId() );
$this->assertSame( $rev->getId(), $transform->getOriginalRevisionId() );
$this->assertTransformHasOriginalContent( $transform, $text );
Introduce HtmlInputTransformHelper The HtmlInputTransformHelper is intended to provide code sharing between VisualEditor's DirectParsoidClient and the ParsoidHandler base class used by TransformHandler. Bug: T310376 Change-Id: I9c15f075cfc5f198e290758fc23d25990b47a185
2022-08-30 19:19:53 +00:00
}
public function testSetOriginalRevision() {
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
$text = 'Lorem Ipsum';
Introduce HtmlInputTransformHelper The HtmlInputTransformHelper is intended to provide code sharing between VisualEditor's DirectParsoidClient and the ParsoidHandler base class used by TransformHandler. Bug: T310376 Change-Id: I9c15f075cfc5f198e290758fc23d25990b47a185
2022-08-30 19:19:53 +00:00
$page = PageIdentityValue::localIdentity( 17, NS_MAIN, 'Test' );
$rev = new MutableRevisionRecord( $page );
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
$rev->setContent( SlotRecord::MAIN, new WikitextContent( $text ) );
Introduce HtmlInputTransformHelper The HtmlInputTransformHelper is intended to provide code sharing between VisualEditor's DirectParsoidClient and the ParsoidHandler base class used by TransformHandler. Bug: T310376 Change-Id: I9c15f075cfc5f198e290758fc23d25990b47a185
2022-08-30 19:19:53 +00:00
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransformWithOriginalData();
Introduce HtmlInputTransformHelper The HtmlInputTransformHelper is intended to provide code sharing between VisualEditor's DirectParsoidClient and the ParsoidHandler base class used by TransformHandler. Bug: T310376 Change-Id: I9c15f075cfc5f198e290758fc23d25990b47a185
2022-08-30 19:19:53 +00:00
$transform->setOriginalRevision( $rev );
$this->assertSame( $rev->getId(), $transform->getOriginalRevisionId() );
Stash original wikitext when rendering unsaved content. When visual editor switches from source mode to visual mode, we need to stash the wikitext. Otherwise, we later lack the proper context to convert the modified HTML back to wikitext. Bug: T321862 Change-Id: Id611e6e022bf8d9d774ca1a3a214220ada713285
2022-10-29 18:52:23 +00:00
$this->assertTransformHasOriginalContent( $transform, $text );
}
public function testSetOriginalText() {
$text = 'Lorem Ipsum';
$transform = $this->createHtmlToContentTransformWithOriginalData();
$transform->setOriginalText( $text );
$this->assertTransformHasOriginalContent( $transform, $text );
}
public function testSetOriginalContent() {
$text = 'Lorem Ipsum';
$transform = $this->createHtmlToContentTransformWithOriginalData();
$transform->setOriginalContent( new JsonContent( $text ) );
$this->assertTransformHasOriginalContent( $transform, $text );
$this->assertSame( CONTENT_MODEL_JSON, $transform->getContentModel() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
public function testGetContentModel() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransformWithOriginalData();
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( 'wikitext', $transform->getContentModel() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
public function testGetEnvOpts() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransformWithOriginalData();
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertSame( 'byte', $transform->getOffsetType() );
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
private function getTextFromFile( string $name ): string {
return trim( file_get_contents( __DIR__ . "/data/Transform/$name" ) );
}
public function testDowngrade() {
$html = $this->getTextFromFile( 'Minimal.html' ); // Uses profile version 2.4.0
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalSchemaVersion( '999.0.0' );
$transform->setOriginalHtml( $html );
$transform->setOriginalDataParsoid( self::ORIG_DATA_PARSOID );
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
// should automatically apply downgrade
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$oldBody = $transform->getOriginalBody();
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
// all getters should now reflect the state after the downgrade.
Don't hardcode Parsoid HTML version number in tests * Without this fix, the test fails vendor patches whenever Parsoid's default version number is bumped in the Parsoid repo. Change-Id: Icce7b61dfbbbbd57b4f1ed76a32d160e92b48b15
2022-08-12 15:02:12 +00:00
// we expect a version >= 2.4.0 and < 3.0.0. So use ^2.4.0
HTMLTransform: add more tests This improves test coverage by testing the interaction of getters and setters. Change-Id: I90506d73e5571fda6c26eb72359e41951b3950c1
2022-08-04 14:09:20 +00:00
$this->assertTrue( Semver::satisfies( $transform->getOriginalSchemaVersion(), '^2.4.0' ) );
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$this->assertNotSame( $html, $transform->getOriginalHtml() );
$this->assertNotSame( $oldBody, ContentUtils::toXML( $transform->getOriginalBody() ) );
Move dowgrade logic into HTMLTransformInput Moving lazy initialization logic into HTMLTransformInput to clarify flow of information. DEPLOY: Mention that we've fixed $htmlSize and it will affect metrics graphs when this roles out. Change-Id: If09afc4b933ec99561ac9e4d53383bd42a856eaa
2022-07-22 10:26:39 +00:00
}
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
public function testModifiedDataMW() {
$html = $this->getTextFromFile( 'Minimal-999.html' ); // Uses profile version 2.4.0
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalHtml( self::ORIG_HTML );
$transform->setOriginalDataParsoid( self::ORIG_DATA_PARSOID );
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$transform->setModifiedDataMW( self::MODIFIED_DATA_MW );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
// should automatically apply downgrade
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$doc = $transform->getModifiedDocument();
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
$html = ContentUtils::toXML( $doc );
// all getters should now reflect the state after the downgrade.
$this->assertNotSame( '"hi"', $html );
}
public function testMetrics() {
$html = '<html><body>xyz</body></html>'; // no schema version!
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
$metrics = $this->createNoOpMock( StatsdDataFactoryInterface::class, [ 'increment' ] );
$metrics->expects( $this->atLeastOnce() )->method( 'increment' );
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$transform->setMetrics( $metrics );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
// getSchemaVersion should ioncrement the html2wt.original.version.notinline counter
// because the input HTML doesn't contain a schema version.
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$transform->getSchemaVersion();
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
}
public function testHtmlSize() {
ParsoidHandler: measure input size in characters In If09afc4b933 we made ParsoidHandler measure input size in bytes consistently, rather than using sometimes bytes, and sometimes characters. However, that was going to cause input limits to trigger early for languages that use a lot of multibyte characters. So now we are switching everything to measuring in characters. NOTE: this may cause the html2wt.timePerInputKB to report worse values. It also makes the name slightly misleading, since it's no longer in KB, it's in kilo-chars. Change-Id: I41872db6d1f5d96776fef54624428cc3ee5f21b3
2022-07-30 23:04:02 +00:00
$html = '<html><body>hällö</body></html>'; // use some multi-byte characters
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
ParsoidHandler: measure input size in characters In If09afc4b933 we made ParsoidHandler measure input size in bytes consistently, rather than using sometimes bytes, and sometimes characters. However, that was going to cause input limits to trigger early for languages that use a lot of multibyte characters. So now we are switching everything to measuring in characters. NOTE: this may cause the html2wt.timePerInputKB to report worse values. It also makes the name slightly misleading, since it's no longer in KB, it's in kilo-chars. Change-Id: I41872db6d1f5d96776fef54624428cc3ee5f21b3
2022-07-30 23:04:02 +00:00
// make sure it counts characters, not bytes
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$this->assertSame( 31, $transform->getModifiedHtmlSize() );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
}
public function testSetOriginalHTML() {
$html = '<html><body>xyz</body></html>'; // no schema version!
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
// mainly check that this doesn't explode.
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalSchemaVersion( '999.0.0' );
$transform->setOriginalHtml( 'hi' );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$this->assertTrue( $transform->hasOriginalHtml() );
$this->assertFalse( $transform->hasOriginalDataParsoid() );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
}
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
public function testSetOriginalDataParsoidAfterGetModified() {
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
// Use HTML that contains a schema version!
// Otherwise, we won't trigger the right error.
$html = $this->getTextFromFile( 'Minimal.html' );
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $html );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
$transform->getModifiedDocument();
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
$this->expectException( LogicException::class );
$this->expectExceptionMessage( 'getModifiedDocument()' );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalDataParsoid( [] );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
}
public function testOffsetTypeMismatch() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::ORIG_HTML );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$this->setOriginalData( $transform );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Move transformHtmlToWikitext() and getSelserData() to HTMLTransform This patch moves remaining transformation logic to a renamed (from HTMLTransformInput -> HTMLTransform) class. Also, the HTMLTransform class is moved to the correct directory, hence namespace (including tests). Some data files have been copied over to it's own sub-directory in the correct place since HTMLTransformTest needs it. ParsoidHandler class is fine where it is because its operation is what happens in the REST land. NOTE: The 2 remaining methods moved into HTMLTransform are the last ones we intended to move into this class to make the refactoring of html2wt() method complete in this context. Change-Id: I8929931e1b0acf247abe9d826eef57f3e0d4e132
2022-08-04 21:14:47 +00:00
// Set some options to assert on $transform.
$transform->setOptions( [
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
'contentmodel' => 'wikitext',
'offsetType' => 'byte',
] );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$dataParsoid = self::ORIG_DATA_PARSOID;
$dataParsoid['offsetType'] = 'UCS2';
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->setOriginalDataParsoid( $dataParsoid );
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
$this->expectException( ClientError::class );
Split `setOriginalData( ... )` to more related setters for encapsulation By splitting the setOriginalData methods into several setters, we remove any knowledge about the structure of the request body from HTMLTransform. It also allows us to be specific about which data to operate on. This also removes the concept of page bundles from the public interface of HTMLTransform. PageBundle objects are used only internally. Change-Id: If97a74ce251f281b7d980928a01b764d6ec0d0a4
2022-08-02 14:51:10 +00:00
$transform->getOriginalBody();
Move DOM transformations into HTMLTransformInput getters. This moved the logic for applying page bundle data into the getters that return DOM elements. It also makes the application of version downgrades implicit. NOTE: This patch changes the expected value of one of the phpunit tests to a version that has no closing </div> tags. This appears to be the original and expected behavior, per the corresponding test in the parsoid extension's Parsoid.js test suite. Change-Id: If2d7b06d8ba92fb63e6955ec7587ed4aea557251
2022-07-26 19:41:03 +00:00
}
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
public function testHtmlToWikitextContent() {
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( self::ORIG_HTML );
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
// Set some options to assert on $transform.
$transform->setOptions( [
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
'contentmodel' => null,
'offsetType' => 'byte',
] );
$content = $transform->htmlToContent();
$this->assertInstanceOf( WikitextContent::class, $content );
$this->assertStringContainsString( 'Original Content', $content->getText() );
}
public function testHtmlToJsonContent() {
$jsonConfigHtml = $this->getTextFromFile( 'JsonConfig.html' );
Rename HTMLTransform to HtmlToContentTransform * We will have several kinds of HTML transformations. Rename HTMLTransform to indicate that its for converting HTML to Content objects. * Using Naming Convention 'Html' instead of 'HTML' Change-Id: I506f3303ae8f9e4db17299211366bef1558f142c
2022-10-16 21:44:53 +00:00
$transform = $this->createHtmlToContentTransform( $jsonConfigHtml );
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
// Set some options to assert on $transform.
$transform->setOptions( [
'contentmodel' => CONTENT_MODEL_JSON,
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
'offsetType' => 'byte',
] );
HTMLTransform: do not presume wikitext Parsoid supports other source formats besides wikitext. This patch improves support for non-wikitext content by removing assumptions about the source type. Change-Id: I5480ff200a93026cea7f1542e12834b06ac6f730
2022-09-21 10:20:11 +00:00
$content = $transform->htmlToContent();
$this->assertInstanceOf( JsonContent::class, $content );
REST: make ParsoidHandler use HTMLTransformFactory This also moves the creation of PageConfig from HTMLTransformFactory into HTMLTransform, to ensure all relevant info, particularly the page language, is known. Change-Id: Id354862d6497816e0c007b9cb3b0d183c9d4b719
2022-08-26 20:07:48 +00:00
}
Move knowledge about the attribs array out of TransformContext This renames TransformContext to HTMLTransformInput. It is becoming a wrapper around the input HTML, with a bunch of optional context data attached. This introduces a factory method for HTMLTransformInput, so we can extract knowledge about the structure of the $attribs array from HTMLTransformInput. This also allows us to inject Document objects and perhaps PageBundle objects, instead of just arrays. Change-Id: I66f9c5dbb50c6bf1f582adad7766422216482402
2022-07-20 18:19:59 +00:00
}
Reference in a new issue Copy permalink