silverstripe / silverstripe-documentconverter

src/SettingsField.php

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,7 @@ 
             HeaderField::create(
                 'FileWarningHeader',
                 _t(
-                    __CLASS__ . '.FileWarningHeader',
+                    __CLASS__.'.FileWarningHeader',
                     'Warning: import will remove all content and subpages of this page.'
                 ),
                 4
@@ -53,41 +53,41 @@ 
             $splitHeader = DropdownField::create(
                 'DocumentConversionSettings-SplitHeader',
                 _t(
-                    __CLASS__ . '.SplitHeader',
+                    __CLASS__.'.SplitHeader',
                     'Split document into pages'
                 ),
                 [
-                    0 => _t(__CLASS__ . '.No', 'no'),
-                    1 => _t(__CLASS__ . '.EachH1', 'for each heading 1'),
-                    2 => _t(__CLASS__ . '.EachH2', 'for each heading 2')
+                    0 => _t(__CLASS__.'.No', 'no'),
+                    1 => _t(__CLASS__.'.EachH1', 'for each heading 1'),
+                    2 => _t(__CLASS__.'.EachH2', 'for each heading 2')
                 ]
             ),
             $keepSource = CheckboxField::create(
                 'DocumentConversionSettings-KeepSource',
                 _t(
-                    __CLASS__ . '.KeepSource',
+                    __CLASS__.'.KeepSource',
                     'Keep the original document. Adds a link to it on TOC, if enabled.'
                 )
             ),
             $chosenFolderID = TreeDropdownField::create(
                 'DocumentConversionSettings-ChosenFolderID',
-                _t(__CLASS__ . '.ChooseFolder', 'Choose a folder to save this file'),
+                _t(__CLASS__.'.ChooseFolder', 'Choose a folder to save this file'),
                 Folder::class
             ),
             $includeTOC = CheckboxField::create(
                 'DocumentConversionSettings-IncludeTOC',
-                _t(__CLASS__ . '.IncludeTOC', 'Replace this page with a Table of Contents.')
+                _t(__CLASS__.'.IncludeTOC', 'Replace this page with a Table of Contents.')
             ),
             $publishPages = CheckboxField::create(
                 'DocumentConversionSettings-PublishPages',
                 _t(
-                    __CLASS__ . '.publishPages',
+                    __CLASS__.'.publishPages',
                     'Publish modified pages (not recommended unless you are sure about the conversion outcome)'
                 )
             ),
             $this->innerField = ImportField::create(
                 'ImportedFromFile',
-                _t(__CLASS__ . '.ImportedFromFile', 'Import content from a word document')
+                _t(__CLASS__.'.ImportedFromFile', 'Import content from a word document')
             )
         ]);
 

src/ImportField.php

Spacing +26 added lines, -27 removed lines

@@ -94,11 +94,11 @@ 
 
         if (!$return['error']) {
             // Get options for this import.
-            $splitHeader = (int)$request->postVar('SplitHeader');
-            $keepSource = (bool)$request->postVar('KeepSource');
-            $chosenFolderID = (int)$request->postVar('ChosenFolderID');
-            $publishPages = (bool)$request->postVar('PublishPages');
-            $includeTOC = (bool)$request->postVar('IncludeTOC');
+            $splitHeader = (int) $request->postVar('SplitHeader');
+            $keepSource = (bool) $request->postVar('KeepSource');
+            $chosenFolderID = (int) $request->postVar('ChosenFolderID');
+            $publishPages = (bool) $request->postVar('PublishPages');
+            $includeTOC = (bool) $request->postVar('IncludeTOC');
 
             // Process the document and write the page.
             $preservedDocument = null;
@@ -154,9 +154,9 @@ 
         if ($page) {
             if ($page->Children()->Count() > 0) {
                 foreach ($page->Children() as $child) {
-                    $content .= '<li><a href="' . $child->Link() . '">' . $child->Title . '</a></li>';
+                    $content .= '<li><a href="'.$child->Link().'">'.$child->Title.'</a></li>';
                 }
-                $page->Content = $content . '</ul>';
+                $page->Content = $content.'</ul>';
             } else {
                 $doc = new DOMDocument();
                 $doc->loadHTML($page->Content);
@@ -165,30 +165,30 @@ 
                 $h1 = $h2 = 1;
                 while ($node) {
                     if ($node instanceof DOMElement && $node->tagName == 'h1') {
-                        $content .= '<li><a href="#h1.' . $h1 . '">' .
-                            trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))) .
+                        $content .= '<li><a href="#h1.'.$h1.'">'.
+                            trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))).
                             '</a></li>';
                         $node->setAttributeNode(new DOMAttr("id", "h1.".$h1));
                         $h1++;
                     } elseif ($node instanceof DOMElement && $node->tagName == 'h2') {
-                        $content .= '<li class="menu-h2"><a href="#h2.' . $h2 . '">' .
-                            trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))) .
+                        $content .= '<li class="menu-h2"><a href="#h2.'.$h2.'">'.
+                            trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))).
                             '</a></li>';
                         $node->setAttributeNode(new DOMAttr("id", "h2.".$h2));
                         $h2++;
                     }
                     $node = $node->nextSibling;
                 }
-                $page->Content = $content . '</ul>' . $doc->saveHTML();
+                $page->Content = $content.'</ul>'.$doc->saveHTML();
             }
 
             // Add in the link to the original document, if provided.
             if ($preservedDocument) {
-                $page->Content = '<a href="' .
-                    $preservedDocument->Link() .
-                    '" title="download original document">download original document (' .
-                    $preservedDocument->getSize() .
-                    ')</a>' .
+                $page->Content = '<a href="'.
+                    $preservedDocument->Link().
+                    '" title="download original document">download original document ('.
+                    $preservedDocument->getSize().
+                    ')</a>'.
                     $page->Content;
             }
 
@@ -245,7 +245,7 @@ 
             }
 
             unset($this->unusedChildren[$page->ID]);
-            file_put_contents(ASSETS_PATH . '/index-' . $sort . '.html', $this->getBodyText($subdoc, $subnode));
+            file_put_contents(ASSETS_PATH.'/index-'.$sort.'.html', $this->getBodyText($subdoc, $subnode));
 
             if ($sort) {
                 $page->Sort = $sort;
@@ -315,20 +315,20 @@ 
 
         // make sure any images are added as Image records with a relative link to assets
         $chosenFolder = ($this->chosenFolderID) ? DataObject::get_by_id(Folder::class, $this->chosenFolderID) : null;
-        $folderName = ($chosenFolder) ? '/' . $chosenFolder->Name : '';
+        $folderName = ($chosenFolder) ? '/'.$chosenFolder->Name : '';
         $imgs = $xpath->query('//img');
         for ($i = 0; $i < $imgs->length; $i++) {
             $img = $imgs->item($i);
-            $originalPath = 'assets/' . $folderName . '/' . $img->getAttribute('src');
+            $originalPath = 'assets/'.$folderName.'/'.$img->getAttribute('src');
             $name = FileNameFilter::create()->filter(basename($originalPath));
 
             $image = Image::get()->filter([
                 'Name' => $name,
-                'ParentID' => (int)$chosenFolderID
+                'ParentID' => (int) $chosenFolderID
             ])->first();
             if (!($image && $image->exists())) {
                 $image = Image::create();
-                $image->ParentID = (int)$chosenFolderID;
+                $image->ParentID = (int) $chosenFolderID;
                 $image->Name = $name;
                 $image->write();
             }
@@ -364,8 +364,7 @@ 
                 if ($parenttag) {
                     $parent = $doc->createElement($parenttag);
                     $node->nextSibling ?
-                        $node->parentNode->insertBefore($parent, $node->nextSibling) :
-                        $node->parentNode->appendChild($parent);
+                        $node->parentNode->insertBefore($parent, $node->nextSibling) : $node->parentNode->appendChild($parent);
                 }
 
                 while ($node->firstChild) {
@@ -399,7 +398,7 @@ 
             // Empty paragraphs
             '//p[not(descendant-or-self::text() | descendant-or-self::img)]',
             // Empty headers
-            '//*[' . implode(' | ', $headingXPath) . '][not(descendant-or-self::text() | descendant-or-self::img)]',
+            '//*['.implode(' | ', $headingXPath).'][not(descendant-or-self::text() | descendant-or-self::img)]',
             // Anchors
             '//a[not(@href)]',
             // BR tags
@@ -432,7 +431,7 @@ 
 
         $documentImporterFieldError = false;
 
-        $documentImporterFieldErrorHandler = function (
+        $documentImporterFieldErrorHandler = function(
             $errno,
             $errstr,
             $errfile,
@@ -457,7 +456,7 @@ 
         $sort = 1;
         if ($splitHeader == 1 || $splitHeader == 2) {
             while ($node && !$documentImporterFieldError) {
-                if ($node instanceof DOMElement && $node->tagName == 'h' . $splitHeader) {
+                if ($node instanceof DOMElement && $node->tagName == 'h'.$splitHeader) {
                     if ($subnode->hasChildNodes()) {
                         $this->writeContent($subtitle, $subdoc, $subnode, $sort, $publishPages);
                         $sort++;

tests/SettingsFieldTest.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         ];
         foreach ($settingsFields as $fieldName => $className) {
             $field = $fields->fieldByName(
-                'DocumentConversionSettings-' . $fieldName
+                'DocumentConversionSettings-'.$fieldName
             );
             $this->assertInstanceOf($className, $field);
             $this->assertContains('no-change-track', $field->extraClass());

src/PageExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
          */
         $fields->findOrMakeTab(
             'Root.Import',
-            _t(__CLASS__ . '.ImportTab', 'Import')
+            _t(__CLASS__.'.ImportTab', 'Import')
         );
         $fields->addFieldToTab('Root.Import', SettingsField::create());
     }

src/ServiceConnector.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
             return $fromConfig;
         }
 
-        $fromEnv = Environment::getEnv('DOCVERT_' . strtoupper($detail));
+        $fromEnv = Environment::getEnv('DOCVERT_'.strtoupper($detail));
         if ($fromEnv) {
             return $fromEnv;
         }
@@ -147,9 +147,9 @@ 
         ]);
 
         $chosenFolder = ($this->chosenFolderID) ? DataObject::get_by_id(Folder::class, $this->chosenFolderID) : null;
-        $folderName = ($chosenFolder) ? '/' . $chosenFolder->Name : '';
+        $folderName = ($chosenFolder) ? '/'.$chosenFolder->Name : '';
         $outname = tempnam(ASSETS_PATH, 'convert');
-        $outzip = $outname . '.zip';
+        $outzip = $outname.'.zip';
         $out = fopen($outzip, 'w');
         curl_setopt($ch, CURLOPT_FILE, $out);
         $returnValue = curl_exec($ch);
@@ -160,8 +160,8 @@ 
 
         if (!$returnValue || ($status != 200)) {
             return ['error' => _t(
-                __CLASS__ . '.SERVERUNREACHABLE',
-                'Could not contact document conversion server. Please try again later ' .
+                __CLASS__.'.SERVERUNREACHABLE',
+                'Could not contact document conversion server. Please try again later '.
                     'or contact your system administrator.',
                 'Document Converter process Word documents into HTML.'
             )];
@@ -172,7 +172,7 @@ 
         $zip = new ZipArchive();
 
         if ($zip->open($outzip)) {
-            $zip->extractTo(ASSETS_PATH .$folderName);
+            $zip->extractTo(ASSETS_PATH.$folderName);
             $zip->close();
         }
 
@@ -180,17 +180,17 @@ 
         unlink($outname);
         unlink($outzip);
 
-        if (!file_exists(ASSETS_PATH . $folderName . '/index.html')) {
+        if (!file_exists(ASSETS_PATH.$folderName.'/index.html')) {
             return ['error' =>  _t(
-                __CLASS__ . '.PROCESSFAILED',
+                __CLASS__.'.PROCESSFAILED',
                 'Could not process document, please double-check you uploaded a .doc or .docx format.',
                 'Document Converter processes Word documents into HTML.'
             )];
         }
 
-        $content = file_get_contents(ASSETS_PATH . $folderName . '/index.html');
+        $content = file_get_contents(ASSETS_PATH.$folderName.'/index.html');
 
-        unlink(ASSETS_PATH . $folderName . '/index.html');
+        unlink(ASSETS_PATH.$folderName.'/index.html');
 
         return $content;
     }