silverstripe / silverstripe-documentconverter

tests/DocumentConverterDecoratorTest.php

Indentation +13 added lines, -13 removed lines

@@ -2,18 +2,18 @@
 
 class DocumentConverterDecoratorTest extends SapphireTest
 {
-    protected $requiredExtensions = array(
-        'SiteTree' => array(
-            'DocumentConverterDecorator',
-        ),
-    );
+	protected $requiredExtensions = array(
+		'SiteTree' => array(
+			'DocumentConverterDecorator',
+		),
+	);
 
-    public function testFieldListHasDocumentImportField()
-    {
-        $fields = (new SiteTree)->getCMSFields();
-        $this->assertInstanceOf(
-            'DocumentImportField',
-            $fields->fieldByName('Root.Import')->Fields()->First()
-        );
-    }
+	public function testFieldListHasDocumentImportField()
+	{
+		$fields = (new SiteTree)->getCMSFields();
+		$this->assertInstanceOf(
+			'DocumentImportField',
+			$fields->fieldByName('Root.Import')->Fields()->First()
+		);
+	}
 }

tests/DocumentImportFieldTest.php

Indentation +46 added lines, -46 removed lines

@@ -2,50 +2,50 @@
 
 class DocumentImportFieldTest extends SapphireTest
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorThrowsExceptionWhenGivenString()
-    {
-        new DocumentImportField('exception time!');
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorThrowsExceptionWhenGivenChildren()
-    {
-        new DocumentImportField(['i', 'don\'t', 'like', 'kids']);
-    }
-
-    public function testFieldAddsJavascriptRequirements()
-    {
-        // Start with a clean slate (no global state interference)
-        Requirements::backend()->clear();
-
-        new DocumentImportField();
-        $javascript = Requirements::backend()->get_javascript();
-        $this->assertNotEmpty($javascript);
-    }
-
-    public function testFieldListGeneration()
-    {
-        $importField = new DocumentImportField();
-
-        $fields = $importField->getChildren();
-        $this->assertInstanceOf('FieldList', $fields);
-
-        // We don't need to check that all of the fields are there, but just check a couple
-        $this->assertInstanceOf('HeaderField', $fields->fieldByName('FileWarningHeader'));
-        $innerField = $fields->fieldByName('ImportedFromFile');
-        $this->assertInstanceOf('DocumentImportInnerField', $innerField);
-
-        // Check the getter works
-        $this->assertSame($innerField, $importField->getInnerField());
-
-        // Check the fields have been given has the change tracker disabled
-        $splitHeader = $fields->fieldByName('DocumentImportField-SplitHeader');
-        $this->assertInstanceOf('DropdownField', $splitHeader);
-        $this->assertContains('no-change-track', $splitHeader->extraClass());
-    }
+	/**
+	 * @expectedException InvalidArgumentException
+	 */
+	public function testConstructorThrowsExceptionWhenGivenString()
+	{
+		new DocumentImportField('exception time!');
+	}
+
+	/**
+	 * @expectedException InvalidArgumentException
+	 */
+	public function testConstructorThrowsExceptionWhenGivenChildren()
+	{
+		new DocumentImportField(['i', 'don\'t', 'like', 'kids']);
+	}
+
+	public function testFieldAddsJavascriptRequirements()
+	{
+		// Start with a clean slate (no global state interference)
+		Requirements::backend()->clear();
+
+		new DocumentImportField();
+		$javascript = Requirements::backend()->get_javascript();
+		$this->assertNotEmpty($javascript);
+	}
+
+	public function testFieldListGeneration()
+	{
+		$importField = new DocumentImportField();
+
+		$fields = $importField->getChildren();
+		$this->assertInstanceOf('FieldList', $fields);
+
+		// We don't need to check that all of the fields are there, but just check a couple
+		$this->assertInstanceOf('HeaderField', $fields->fieldByName('FileWarningHeader'));
+		$innerField = $fields->fieldByName('ImportedFromFile');
+		$this->assertInstanceOf('DocumentImportInnerField', $innerField);
+
+		// Check the getter works
+		$this->assertSame($innerField, $importField->getInnerField());
+
+		// Check the fields have been given has the change tracker disabled
+		$splitHeader = $fields->fieldByName('DocumentImportField-SplitHeader');
+		$this->assertInstanceOf('DropdownField', $splitHeader);
+		$this->assertContains('no-change-track', $splitHeader->extraClass());
+	}
 }

src/DocumentImporterField.php

Braces +35 added lines, -12 removed lines

@@ -60,11 +60,15 @@ 
 	 * Process the document immediately upon upload.
 	 */
 	public function upload(HTTPRequest $request) {
-		if($this->isDisabled() || $this->isReadonly()) return $this->httpError(403);
+		if($this->isDisabled() || $this->isReadonly()) {
+			return $this->httpError(403);
+		}
 
 		// Protect against CSRF on destructive action
 		$token = $this->getForm()->getSecurityToken();
-		if(!$token->checkRequest($request)) return $this->httpError(400);
+		if(!$token->checkRequest($request)) {
+			return $this->httpError(400);
+		}
 
 		$name = $this->getName();
 		$tmpfile = $request->postVar($name);
@@ -91,7 +95,9 @@ 
 
 			// Process the document and write the page.
 			$preservedDocument = null;
-			if ($keepSource) $preservedDocument = $this->preserveSourceDocument($tmpfile, $chosenFolderID);
+			if ($keepSource) {
+				$preservedDocument = $this->preserveSourceDocument($tmpfile, $chosenFolderID);
+			}
 
 			$importResult = $this->importFromPOST($tmpfile, $splitHeader, $publishPages, $chosenFolderID);
 			if (is_array($importResult) && isset($importResult['error'])) {
@@ -142,7 +148,7 @@ 
 					$content .= '<li><a href="' . $child->Link() . '">' . $child->Title . '</a></li>';
 				}
 				$page->Content = $content . '</ul>';
-			}  else {
+			} else {
 				$doc = new DOMDocument();
 				$doc->loadHTML($page->Content);
 				$body = $doc->getElementsByTagName('body')->item(0);
@@ -171,7 +177,9 @@ 
 
 			// Store the result
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if($publishPages) {
+				$page->doPublish();
+			}
 		}
 	}
 
@@ -217,16 +225,22 @@ 
 			unset($this->unusedChildren[$page->ID]);
 			file_put_contents(ASSETS_PATH . '/index-' . $sort . '.html', $this->getBodyText($subdoc, $subnode));
 
-			if ($sort) $page->Sort = $sort;
+			if ($sort) {
+				$page->Sort = $sort;
+			}
 			$page->Content = $this->getBodyText($subdoc, $subnode);
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if($publishPages) {
+				$page->doPublish();
+			}
 		} else {
 			// Write to the master page.
 			$record->Content = $this->getBodyText($subdoc, $subnode);
 			$record->write();
 
-			if($publishPages) $record->doPublish();
+			if($publishPages) {
+				$record->doPublish();
+			}
 		}
 
 	}
@@ -313,7 +327,9 @@ 
 			}
 
 			$nodes = array();
-			foreach($xpath->query($rule) as $node) $nodes[] = $node;
+			foreach($xpath->query($rule) as $node) {
+				$nodes[] = $node;
+			}
 
 			foreach($nodes as $node) {
 				$parent = $node->parentNode;
@@ -323,7 +339,9 @@ 
 					$node->nextSibling ? $node->parentNode->insertBefore($parent, $node->nextSibling) : $node->parentNode->appendChild($parent);
 				}
 
-				while($node->firstChild) $parent->appendChild($node->firstChild);
+				while($node->firstChild) {
+					$parent->appendChild($node->firstChild);
+				}
 				$node->parentNode->removeChild($node);
 			}
 		}
@@ -351,10 +369,15 @@ 
 			// First get all the nodes. Need to build array, as they'll disappear from the nodelist while we're deleteing them, causing the indexing
 			// to screw up.
 			$nodes = array();
-			foreach($xpath->query($query) as $node) $nodes[] = $node;
+			foreach($xpath->query($query) as $node) {
+				$nodes[] = $node;
+			}
 
 			// Then remove them all
-			foreach ($nodes as $node) { if ($node->parentNode) $node->parentNode->removeChild($node); }
+			foreach ($nodes as $node) { if ($node->parentNode) {
+				$node->parentNode->removeChild($node);
+			}
+			}
 		}
 
 		// Now split the document into portions by H1

src/DocumentConversionField.php

Braces +6 added lines, -2 removed lines

@@ -29,8 +29,12 @@
 	 * @param $children FieldSet/array Any additional children.
 	 */
 	public function __construct($children = null) {
-		if (is_string($children)) throw new InvalidArgumentException('DocumentConversionField::__construct does not accept a name as its parameter, it defaults to "ImportedFromFile" instead. Use DocumentConversionField::getInnerField()->setName() if you want to change it.');
-		if ($children) throw new InvalidArgumentException('DocumentConversionField::__construct provides its own fields and does not accept additional children.');
+		if (is_string($children)) {
+			throw new InvalidArgumentException('DocumentConversionField::__construct does not accept a name as its parameter, it defaults to "ImportedFromFile" instead. Use DocumentConversionField::getInnerField()->setName() if you want to change it.');
+		}
+		if ($children) {
+			throw new InvalidArgumentException('DocumentConversionField::__construct provides its own fields and does not accept additional children.');
+		}
 
 		// Add JS specific to this field.
 		Requirements::javascript('silverstripe/documentconverter: javascript/DocumentConversionField.js');

tests/DocumentConverterTest.php

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@
 
 class DocumentConverterTest extends SapphireTest
 {
-    protected $usesDatabase = true;
+	protected $usesDatabase = true;
 
-    public function testExtensionAppliesAppropriateFields() {
-        $this->markTestIncomplete();
-    }
+	public function testExtensionAppliesAppropriateFields() {
+		$this->markTestIncomplete();
+	}
 }
\ No newline at end of file