Fix tables (#84)

* Disable masking of table attributes Previously table attributes like "class" were masked before processing by "pandoc" because such attributes broke whole table convertion process. Newer "pandoc" versions handle such attributes corrently, so no need to do masking anymore. * Remove redundant use statements * Remove unused unit tests * Fix readme pandoc note * Update README.md * Update README.md --------- Co-authored-by: akulbii <[email protected]> Co-authored-by: DvogelHallowelt <[email protected]>
hallowelt · Aug 31, 2023 · 9a4b0d1 · 9a4b0d1
1 parent b34104a
commit 9a4b0d1
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 443 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This is a command line tool to convert the contents of a Confluence space into a
 
 ## Prerequisites
 1. PHP >= 7.4 with the `xml` extension must be installed
-2. The `pandoc` tool must be installed and available in the `PATH` (https://pandoc.org/installing.html)
+2. `pandoc` => 3.1.6. The `pandoc` tool must be installed and available in the `PATH` (https://pandoc.org/installing.html).
 
 ## Installation
 1. Download `migrate-confluence.phar` from https://github.com/hallowelt/migrate-confluence/releases/tag/latest
@@ -135,7 +135,7 @@ In the case that the tool can not migrate content or functionality it will creat
 ## Creating a build
 1. Clone this repo
 2. Run `composer update --no-dev`
-3. Run `box build` to actually create the PHAR file  in `dist/`. See also https://github.com/humbug/box
+3. Run `box compile` to actually create the PHAR file  in `dist/`. See also https://github.com/humbug/box
 
 # TODO
 * Reduce multiple linebreaks (`<br />`) to one

diff --git a/src/Converter/ConfluenceConverter.php b/src/Converter/ConfluenceConverter.php
@@ -14,7 +14,6 @@
 use HalloWelt\MigrateConfluence\Converter\Postprocessor\FixLineBreakInHeadings;
 use HalloWelt\MigrateConfluence\Converter\Postprocessor\NestedHeadings;
 use HalloWelt\MigrateConfluence\Converter\Postprocessor\RestoreCode;
-use HalloWelt\MigrateConfluence\Converter\Postprocessor\RestoreTableAttributes;
 use HalloWelt\MigrateConfluence\Converter\Preprocessor\CDATAClosingFixer;
 use HalloWelt\MigrateConfluence\Converter\Processor\AttachmentLink;
 use HalloWelt\MigrateConfluence\Converter\Processor\ConvertInfoMacro;
@@ -30,7 +29,6 @@
 use HalloWelt\MigrateConfluence\Converter\Processor\Image;
 use HalloWelt\MigrateConfluence\Converter\Processor\PageLink;
 use HalloWelt\MigrateConfluence\Converter\Processor\PreserveCode;
-use HalloWelt\MigrateConfluence\Converter\Processor\PreserveTableAttributes;
 use HalloWelt\MigrateConfluence\Converter\Processor\StructuredMacroChildren;
 use HalloWelt\MigrateConfluence\Converter\Processor\StructuredMacroColumn;
 use HalloWelt\MigrateConfluence\Converter\Processor\StructuredMacroContenByLabel;
@@ -202,7 +200,6 @@ private function runProcessors( $dom ) {
 		$currentPageTitle = $this->getCurrentPageTitle();
 
 		$processors = [
-			new PreserveTableAttributes(),
 			new ConvertPlaceholderMacro(),
 			new ConvertInlineCommentMarkerMacro(),
 			new ConvertTipMacro(),
@@ -251,7 +248,6 @@ private function runProcessors( $dom ) {
 	 */
 	private function runPostProcessors() {
 		$postProcessors = [
-			new RestoreTableAttributes(),
 			new FixLineBreakInHeadings(),
 			new FixImagesWithExternalUrl(),
 			new RestoreCode(),

diff --git a/src/Converter/Postprocessor/RestoreTableAttributes.php b/src/Converter/Postprocessor/RestoreTableAttributes.php
diff --git a/src/Converter/Processor/PreserveTableAttributes.php b/src/Converter/Processor/PreserveTableAttributes.php
diff --git a/tests/phpunit/Converter/Postprocessor/RestoreTableAttributesTest.php b/tests/phpunit/Converter/Postprocessor/RestoreTableAttributesTest.php
diff --git a/tests/phpunit/Converter/Processor/PreserveTableAttributesTest.php b/tests/phpunit/Converter/Processor/PreserveTableAttributesTest.php