NEW phpoffice/phpword support

README.md

@@ -19,12 +19,29 @@ Install with [composer](https://getcomposer.org/) by running `composer require s
 
 ## Configuration
 
-You will need to set the following three environment variables:
+**Note:** Using of of docvert is primarily designed for Common Web Platform (CWP) clients
+
+If you are using docver then you will need to set the following three environment variables:
 - `DOCVERT_USERNAME`
 - `DOCVERT_PASSWORD`
 - `DOCVERT_URL`
 
-**Note:** This module is primarily designed for Common Web Platform (CWP) clients. There will be additional setup required to use this module as intended, if you are not using the CWP government edition.
+If do not have the cwp/cwp-core module installed then enable document converter with the following configuration - note will be automatically applied if you also have the cwp/cwp-core module installed and the `DOCVERT_USERNAME` environment variable set.
+
+```yaml
+Page:
+  extensions:
+    - SilverStripe\DocumentConverter\PageExtension
+```
+
+By default this module will use docvert, though it's highly recommend you instead use the phpoffice/phpword module instead. Enable this with the following configuration:
+
+```yaml
+SilverStripe\DocumentConverter\ImportField:
+  importer_class: SilverStripe\DocumentConverter\PHPWordImporter
+```
+
+docvert support is now deprecated and will be removed in the next major version
 
 ## User Guide
 

composer.json

@@ -10,7 +10,8 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "silverstripe/cms": "^4",
-        "silverstripe/asset-admin": "^1"
+        "silverstripe/asset-admin": "^1",
+        "phpoffice/phpword": "^1.1"
     },
     "require-dev": {
         "ext-curl": "*",

src/ImportField.php

@@ -13,7 +13,6 @@
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Image;
 use SilverStripe\Assets\Upload;
-use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Control\Director;
@@ -286,6 +285,7 @@ public function importFromPOST($tmpFile, $splitHeader = false, $publishPages = f
 
         $sourcePage = $this->form->getRecord();
         $importerClass = $this->config()->get('importer_class');
+        /** @var Importer $importer */
         $importer = Injector::inst()->create($importerClass, $fileDescriptor, $chosenFolderID);
         $content = $importer->import();
 

src/Importer.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace SilverStripe\DocumentConverter;
+
+interface Importer
+{
+    public function __construct($fileDescriptor, $chosenFolderID = null);
+
+    public function import();
+}

src/PHPWordImporter.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace SilverStripe\DocumentConverter;
+
+use GraphQL\Exception\InvalidArgument;
+use SilverStripe\ORM\DataObject;
+
+class PHPWordImporter implements Importer
+{
+    private array $fileDescriptor;
+    private ?int $chosenFolderID;
+
+    /**
+     * @param array $fileDescriptor
+     * @param int|null $chosenFolderID
+     */
+    public function __construct($fileDescriptor, $chosenFolderID = null)
+    {
+        if (!is_array($fileDescriptor)) {
+            throw new InvalidArgument('fileDescriptor must be an array');
+        }
+        if (!is_int($chosenFolderID) && !is_null($chosenFolderID)) {
+            throw new InvalidArgument('chosenFolderID must be an int or null');
+        }
+        $this->fileDescriptor = $fileDescriptor;
+        $this->chosenFolderID = $chosenFolderID;
+    }
+
+    /**
+     * @return string
+     */
+    public function import()
+    {
+        // read word doc
+        $source = $this->fileDescriptor['path'];
+        $ext = pathinfo($this->fileDescriptor['name'], PATHINFO_EXTENSION);
+        $readerName = 'Word2007';
+        if ($ext === 'doc') {
+            // Word 1997
+            $readerName = 'MsDoc';
+        }
+        $phpWord = \PhpOffice\PhpWord\IOFactory::load($source, $readerName);
+        // write it out as HTML
+        $chosenFolder = ($this->chosenFolderID) ? DataObject::get_by_id(Folder::class, $this->chosenFolderID) : null;
+        $folderName = ($chosenFolder) ? '/' . $chosenFolder->Name : '';
+        $path = ASSETS_PATH . $folderName . '/index.html';
+        $objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'HTML');
+        $objWriter->save($path);
+        $content = file_get_contents($path);
+        return $content;
+    }
+}

src/ServiceConnector.php

@@ -11,6 +11,8 @@
 use ZipArchive;
 
 /**
+ * This class uses the legacy docvert service
+ *
  * Utility class hiding the specifics of the document conversion process.
  */
 class ServiceConnector