Code formatting for PSR1 & PSR2 - Part 2

Classes/PHPWord/HashTable.php

@@ -69,7 +69,7 @@ class PHPWord_HashTable
         // Check if an array was passed
         if ($pSource == null) {
             return;
-        } else if (!is_array($pSource)) {
+        } elseif (!is_array($pSource)) {
             throw new Exception('Invalid array parameter passed.');
         }
 
@@ -91,7 +91,7 @@ class PHPWord_HashTable
         $hashIndex = $pSource->getHashIndex();
         if (is_null($hashIndex)) {
             $hashCode = $pSource->getHashCode();
-        } else if (isset ($this->_keyMap[$hashIndex])) {
+        } elseif (isset ($this->_keyMap[$hashIndex])) {
             $hashCode = $this->_keyMap[$hashIndex];
         } else {
             $hashCode = $pSource->getHashCode();

Classes/PHPWord/Writer/ODText.php

@@ -161,7 +161,7 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
                     }
 
                     $objZip->addFromString('Pictures/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-                } else if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {
+                } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {
                     ob_start();
                     call_user_func(
                         $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),

Classes/PHPWord/Writer/ODText/Manifest.php

@@ -86,7 +86,7 @@ class PHPWord_Writer_ODText_Manifest extends PHPWord_Writer_ODText_WriterPart
                 $objWriter->writeAttribute('manifest:media-type', $mimeType);
                 $objWriter->writeAttribute('manifest:full-path', 'Pictures/' . str_replace(' ', '_', $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()));
                 $objWriter->endElement();
-            } else if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {
+            } elseif ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {
                 $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
                 $extension = explode('/', $extension);
                 $extension = $extension[1];

Tests/PHPWord/AutoloaderTest.php

@@ -29,4 +29,4 @@ class AutoloaderTest extends PHPUnit_Framework_TestCase
         Autoloader::autoload('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException'); // TODO change this class to the main PHPWord class when it is namespaced
         $this->assertTrue(in_array('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException', get_declared_classes()), 'PhpOffice\\PhpWord\\Autoloader::autoload() failed to autoload the PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException class');
     }
-}
+}

Tests/PHPWord/IOFactoryTest.php

@@ -59,4 +59,4 @@ class IOFactoryTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));
     }
-}
+}

Tests/PHPWord/MediaTest.php

@@ -25,4 +25,4 @@ class MediaTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertAttributeEquals(PHPWord_Media::getFooterMediaElements(), '_footerMedia', 'PHPWord_Media');
     }
-}
+}

Tests/PHPWord/Section/Footer/PreserveTextTest.php

@@ -30,4 +30,4 @@ class PreserveTextTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('PHPWord_Style_Font', $oPreserveText->getFontStyle());
         $this->assertInstanceOf('PHPWord_Style_Paragraph', $oPreserveText->getParagraphStyle());
     }
-}
+}

Tests/PHPWord/Section/FooterTest.php

@@ -118,4 +118,4 @@ class FooterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertInternalType('array', $oFooter->getElements());
     }
-}
+}

Tests/PHPWord/Section/FootnoteTest.php

@@ -61,4 +61,4 @@ class FootnoteTest extends \PHPUnit_Framework_TestCase
         $oFootnote = new PHPWord_Section_Footnote();
         $this->assertInternalType('array', $oFootnote->getElements());
     }
-}
+}

Tests/PHPWord/Section/HeaderTest.php

@@ -161,4 +161,4 @@ class HeaderTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($oHeader->getType(), PHPWord_Section_Header::EVEN);
     }
-}
+}

Tests/PHPWord/Section/ImageTest.php

@@ -65,4 +65,4 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $oImage->setIsWatermark(true);
         $this->assertEquals($oImage->getIsWatermark(), true);
     }
-}
+}

Tests/PHPWord/Section/LinkTest.php

@@ -45,4 +45,4 @@ class LinkTest extends \PHPUnit_Framework_TestCase
         $oLink->setRelationId($iVal);
         $this->assertEquals($oLink->getRelationId(), $iVal);
     }
-}
+}

Tests/PHPWord/Section/ListItemTest.php

@@ -29,4 +29,4 @@ class ListItemTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($oListItem->getDepth(), $iVal);
     }
-}
+}

Tests/PHPWord/Section/MemoryImageTest.php

@@ -92,4 +92,4 @@ class MemoryImageTest extends \PHPUnit_Framework_TestCase
         $oMemoryImage->setRelationId($iVal);
         $this->assertEquals($oMemoryImage->getRelationId(), $iVal);
     }
-}
+}

Tests/PHPWord/Section/ObjectTest.php

@@ -83,4 +83,4 @@ class ObjectTest extends \PHPUnit_Framework_TestCase
         $oObject->setObjectId($iVal);
         $this->assertEquals($oObject->getObjectId(), $iVal);
     }
-}
+}

Tests/PHPWord/Section/PageBreakTest.php

@@ -16,4 +16,4 @@ class PageBreakTest extends \PHPUnit_Framework_TestCase
 
         $this->assertInstanceOf('PHPWord_Section_PageBreak', $oPageBreak);
     }
-}
+}

Tests/PHPWord/Section/SettingsTest.php

@@ -233,4 +233,4 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $oSettings->setBreakType();
         $this->assertNull($oSettings->getBreakType());
     }
-}
+}

Tests/PHPWord/Section/Table/CellTest.php

@@ -201,4 +201,4 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
         $this->assertInternalType('array', $oCell->getElements());
     }
-}
+}

Tests/PHPWord/Section/Table/RowTest.php

@@ -36,4 +36,4 @@ class RowTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('PHPWord_Section_Table_Cell', $element);
         $this->assertCount(1, $oRow->getCells());
     }
-}
+}

Tests/PHPWord/Section/TableTest.php

@@ -54,4 +54,4 @@ class TableTest extends \PHPUnit_Framework_TestCase
         $element = $oTable->addCell();
         $this->assertInstanceOf('PHPWord_Section_Table_Cell', $element);
     }
-}
+}

Tests/PHPWord/Section/TextBreakTest.php

@@ -16,4 +16,4 @@ class TextBreakTest extends \PHPUnit_Framework_TestCase
 
         $this->assertInstanceOf('PHPWord_Section_TextBreak', $oTextBreak);
     }
-}
+}

Tests/PHPWord/Section/TextRunTest.php

@@ -95,4 +95,4 @@ class TextRunTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('PHPWord_Section_Footnote', $element);
         $this->assertCount(1, $oTextRun->getElements());
     }
-}
+}

Tests/PHPWord/Section/TextTest.php

@@ -40,4 +40,4 @@ class TextTest extends \PHPUnit_Framework_TestCase
         $oText->setParagraphStyle(array('align' => 'center', 'spaceAfter' => 100));
         $this->assertInstanceOf('PHPWord_Style_Paragraph', $oText->getParagraphStyle());
     }
-}
+}

Tests/PHPWord/Section/TitleTest.php

@@ -45,4 +45,4 @@ class TitleTest extends \PHPUnit_Framework_TestCase
         $oTitle->setBookmarkId($iVal);
         $this->assertEquals($oTitle->getBookmarkId(), $iVal);
     }
-}
+}

Tests/PHPWord/SectionTest.php

@@ -35,4 +35,4 @@ class SectionTest extends \PHPUnit_Framework_TestCase
         $oSection = new PHPWord_Section(0);
         $this->assertAttributeEquals($oSection->getElements(), '_elementCollection', new PHPWord_Section(0));
     }
-}
+}

Tests/PHPWord/Shared/DrawingTest.php

@@ -12,7 +12,6 @@ use PHPWord_Shared_Drawing;
  */
 class DrawingTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test unit conversion functions with various numbers
      */
@@ -65,5 +64,4 @@ class DrawingTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals($value[1], $result);
         }
     }
-
+}
-}

Tests/PHPWord/Shared/FileTest.php

@@ -12,13 +12,13 @@ use PHPWord_Shared_File;
  */
 class FileTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test file_exists()
      */
-    public function testFile_exists()
+    public function testFileExists()
     {
-        $dir = join(DIRECTORY_SEPARATOR,
+        $dir = join(
+            DIRECTORY_SEPARATOR,
             array(PHPWORD_TESTS_DIR_ROOT, '_files', 'templates')
         );
         chdir($dir);
@@ -30,12 +30,13 @@ class FileTest extends \PHPUnit_Framework_TestCase
      */
     public function testRealpath()
     {
-        $dir = join(DIRECTORY_SEPARATOR,
+        $dir = join(
-            array(PHPWORD_TESTS_DIR_ROOT, '_files', 'templates'));
+            DIRECTORY_SEPARATOR,
+            array(PHPWORD_TESTS_DIR_ROOT, '_files', 'templates')
+        );
         chdir($dir);
         $file = 'blank.docx';
         $expected = $dir . DIRECTORY_SEPARATOR . $file;
         $this->assertEquals($expected, PHPWord_Shared_File::realpath($file));
     }
-
 }

Tests/PHPWord/Shared/FontTest.php

@@ -43,4 +43,4 @@ class FontTest extends \PHPUnit_Framework_TestCase
         $result = PHPWord_Shared_Font::pointSizeToTwips($original);
         $this->assertEquals($original * 20, $result);
     }
-}
+}

Tests/PHPWord/Shared/StringTest.php

@@ -12,7 +12,6 @@ use PHPWord_Shared_String;
  */
 class StringTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test getIsMbstringEnabled() and getIsIconvEnabled()
      */
@@ -41,5 +40,4 @@ class StringTest extends \PHPUnit_Framework_TestCase
         $returned = PHPWord_Shared_String::FormatNumber('1022.1234');
         $this->assertEquals($expected, $returned);
     }
-
 }

Tests/PHPWord/Style/CellTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_Cell;
  */
 class CellTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test setting style with normal value
      */
@@ -75,4 +74,4 @@ class CellTest extends \PHPUnit_Framework_TestCase
         $object->setStyleValue('_borderSize', $value);
         $this->assertEquals($expected, $object->getBorderSize());
     }
-}
+}

Tests/PHPWord/Style/FontTest.php

@@ -114,4 +114,4 @@ class FontTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(720, $lineHeight);
         $this->assertEquals('auto', $lineRule);
     }
-}
+}

Tests/PHPWord/Style/ImageTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_Image;
  */
 class ImageTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test setting style with normal value
      */
@@ -67,5 +66,4 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $object = new PHPWord_Style_Image();
         $object->setWrappingStyle('foo');
     }
-
+}
-}

Tests/PHPWord/Style/ListItemTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_ListItem;
  */
 class ListItemTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test construct
      */
@@ -47,5 +46,4 @@ class ListItemTest extends \PHPUnit_Framework_TestCase
         $object->setListType($value);
         $this->assertEquals($value, $object->getListType());
     }
-
+}
-}

Tests/PHPWord/Style/ParagraphTest.php

@@ -133,5 +133,4 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
         $object->setLineHeight('12.5pt');
         $this->assertEquals(12.5, $object->getLineHeight());
     }
-
+}
-}

Tests/PHPWord/Style/RowTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_Row;
  */
 class RowTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test properties with normal value
      */
@@ -39,5 +38,4 @@ class RowTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals($expected, $object->$get());
         }
     }
-
 }

Tests/PHPWord/Style/TOCTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_TOC;
  */
 class TOCTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test properties with normal value
      */
@@ -37,5 +36,4 @@ class TOCTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals(null, $object->$get());
         }
     }
-
 }

Tests/PHPWord/Style/TableFullTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_TableFull;
  */
 class TableFullTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test class construction
      *
@@ -132,5 +131,4 @@ class TableFullTest extends \PHPUnit_Framework_TestCase
         }
         $this->assertEquals($values, $object->getCellMargin());
     }
-
 }

Tests/PHPWord/Style/TableTest.php

@@ -12,7 +12,6 @@ use PHPWord_Style_Table;
  */
 class TableTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test set style value
      */
@@ -50,5 +49,4 @@ class TableTest extends \PHPUnit_Framework_TestCase
         }
         $this->assertEquals($values, $object->getCellMargin());
     }
-
 }

Tests/PHPWord/Style/TabsTest.php

@@ -42,5 +42,4 @@ class TabsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(1440, $element->getAttribute('w:pos'));
         $this->assertEquals('dot', $element->getAttribute('w:leader'));
     }
-
 }

Tests/PHPWord/TemplateTest.php

@@ -115,4 +115,4 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
          */
         @$template->applyXslStyleSheet($xslDOMDocument);
     }
-}
+}

Tests/PHPWord/Writer/Word2007/BaseTest.php

@@ -20,7 +20,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         TestHelperDOCX::clear();
     }
 
-    public function testWriteImage_Position()
+    public function testWriteImagePosition()
     {
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
@@ -42,7 +42,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertRegExp('/position:absolute;/', $style);
     }
 
-    public function testWriteParagraphStyle_Align()
+    public function testWriteParagraphStyleAlign()
     {
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
@@ -55,34 +55,10 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('right', $element->getAttribute('w:val'));
     }
 
-    public function testWriteCellStyle_CellGridSpan()
-    {
-        $PHPWord = new PHPWord();
-        $section = $PHPWord->createSection();
-
-        $table = $section->addTable();
-
-        $table->addRow();
-        $cell = $table->addCell(200);
-        $cell->getStyle()->setGridSpan(5);
-
-        $table->addRow();
-        $table->addCell(40);
-        $table->addCell(40);
-        $table->addCell(40);
-        $table->addCell(40);
-        $table->addCell(40);
-
-        $doc = TestHelperDOCX::getDocument($PHPWord);
-        $element = $doc->getElement('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:gridSpan');
-
-        $this->assertEquals(5, $element->getAttribute('w:val'));
-    }
-
     /**
      * Test write paragraph pagination
      */
-    public function testWriteParagraphStyle_Pagination()
+    public function testWriteParagraphStylePagination()
     {
         // Create the doc
         $PHPWord = new PHPWord();
@@ -108,4 +84,28 @@ class BaseTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals($expected, $element->getAttribute('w:val'));
         }
     }
+
+    public function testWriteCellStyleCellGridSpan()
+    {
+        $PHPWord = new PHPWord();
+        $section = $PHPWord->createSection();
+
+        $table = $section->addTable();
+
+        $table->addRow();
+        $cell = $table->addCell(200);
+        $cell->getStyle()->setGridSpan(5);
+
+        $table->addRow();
+        $table->addCell(40);
+        $table->addCell(40);
+        $table->addCell(40);
+        $table->addCell(40);
+        $table->addCell(40);
+
+        $doc = TestHelperDOCX::getDocument($PHPWord);
+        $element = $doc->getElement('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:gridSpan');
+
+        $this->assertEquals(5, $element->getAttribute('w:val'));
+    }
 }

Tests/PHPWord/Writer/Word2007/DocumentTest.php

@@ -22,7 +22,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
         TestHelperDOCX::clear();
     }
 
-    public function testWriteEndSection_PageNumbering()
+    public function testWriteEndSectionPageNumbering()
     {
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
@@ -33,4 +33,4 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(2, $element->getAttribute('w:start'));
     }
-}
+}

Tests/PHPWord/Writer/Word2007/StylesTest.php

@@ -51,4 +51,4 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertEquals('Normal', $element->getAttribute('w:val'));
     }
-}
+}

Tests/_inc/TestHelperDOCX.php

@@ -15,8 +15,8 @@ class TestHelperDOCX
     public static function getDocument(PHPWord $PHPWord)
     {
         self::$file = tempnam(sys_get_temp_dir(), 'PHPWord');
-        if(!is_dir(sys_get_temp_dir().'/PHPWord_Unit_Test/')){
+        if (!is_dir(sys_get_temp_dir() . '/PHPWord_Unit_Test/')) {
-          mkdir(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+            mkdir(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
         }
 
         $objWriter = \PHPWord_IOFactory::createWriter($PHPWord, 'Word2007');
@@ -29,16 +29,16 @@ class TestHelperDOCX
             $zip->close();
         }
 
-        return new Xml_Document(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+        return new Xml_Document(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
     }
 
     public static function clear()
     {
-        if(file_exists(self::$file)){
+        if (file_exists(self::$file)) {
-          unlink(self::$file);
+            unlink(self::$file);
         }
-        if(is_dir(sys_get_temp_dir().'/PHPWord_Unit_Test/')){
+        if (is_dir(sys_get_temp_dir() . '/PHPWord_Unit_Test/')) {
-          self::deleteDir(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+            self::deleteDir(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
         }
     }
 
@@ -94,9 +94,9 @@ class Xml_Document
         }
 
         $this->xpath = null;
-        $this->file = $file;
+        $this->file  = $file;
 
-        $file = $this->path . '/' . $file;
+        $file      = $this->path . '/' . $file;
         $this->dom = new DOMDocument();
         $this->dom->load($file);
         return $this->dom;
@@ -121,4 +121,4 @@ class Xml_Document
         $elements = $this->xpath->query($path);
         return $elements->item(0);
     }
-}
+}