Code formatting for PSR1 & PSR2 - Part 2

ivanlanin · ivanlanin · commit d2a231799de1 · 2014-03-11T21:44:54.000+07:00
diff --git a/Classes/PHPWord/HashTable.php b/Classes/PHPWord/HashTable.php
@@ -69,7 +69,7 @@ public function addFromSource($pSource = null)
         // 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 @@ public function add(PHPWord_IComparable $pSource = null)
         $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();
diff --git a/Classes/PHPWord/Writer/ODText.php b/Classes/PHPWord/Writer/ODText.php
@@ -161,7 +161,7 @@ public function save($pFilename = null)
                     }
 
                     $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(),
diff --git a/Classes/PHPWord/Writer/ODText/Manifest.php b/Classes/PHPWord/Writer/ODText/Manifest.php
@@ -86,7 +86,7 @@ public function writeManifest(PHPWord $pPHPWord = null)
                 $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];
diff --git a/Tests/PHPWord/AutoloaderTest.php b/Tests/PHPWord/AutoloaderTest.php
@@ -29,4 +29,4 @@ public function testAutoload()
         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');
     }
-}
+}
diff --git a/Tests/PHPWord/IOFactoryTest.php b/Tests/PHPWord/IOFactoryTest.php
@@ -59,4 +59,4 @@ public function testCreateWriter()
 
         $this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));
     }
-}
+}
diff --git a/Tests/PHPWord/MediaTest.php b/Tests/PHPWord/MediaTest.php
@@ -25,4 +25,4 @@ public function testGetFooterMediaElements()
     {
         $this->assertAttributeEquals(PHPWord_Media::getFooterMediaElements(), '_footerMedia', 'PHPWord_Media');
     }
-}
+}
diff --git a/Tests/PHPWord/Section/Footer/PreserveTextTest.php b/Tests/PHPWord/Section/Footer/PreserveTextTest.php
@@ -30,4 +30,4 @@ public function testConstructWithArray()
         $this->assertInstanceOf('PHPWord_Style_Font', $oPreserveText->getFontStyle());
         $this->assertInstanceOf('PHPWord_Style_Paragraph', $oPreserveText->getParagraphStyle());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/FooterTest.php b/Tests/PHPWord/Section/FooterTest.php
@@ -118,4 +118,4 @@ public function testGetElements()
 
         $this->assertInternalType('array', $oFooter->getElements());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/FootnoteTest.php b/Tests/PHPWord/Section/FootnoteTest.php
@@ -61,4 +61,4 @@ public function testGetElements()
         $oFootnote = new PHPWord_Section_Footnote();
         $this->assertInternalType('array', $oFootnote->getElements());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/HeaderTest.php b/Tests/PHPWord/Section/HeaderTest.php
@@ -161,4 +161,4 @@ public function testEvenPage()
 
         $this->assertEquals($oHeader->getType(), PHPWord_Section_Header::EVEN);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/ImageTest.php b/Tests/PHPWord/Section/ImageTest.php
@@ -65,4 +65,4 @@ public function testWatermark()
         $oImage->setIsWatermark(true);
         $this->assertEquals($oImage->getIsWatermark(), true);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/LinkTest.php b/Tests/PHPWord/Section/LinkTest.php
@@ -45,4 +45,4 @@ public function testRelationId()
         $oLink->setRelationId($iVal);
         $this->assertEquals($oLink->getRelationId(), $iVal);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/ListItemTest.php b/Tests/PHPWord/Section/ListItemTest.php
@@ -29,4 +29,4 @@ public function testDepth()
 
         $this->assertEquals($oListItem->getDepth(), $iVal);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/MemoryImageTest.php b/Tests/PHPWord/Section/MemoryImageTest.php
@@ -92,4 +92,4 @@ public function testRelationID()
         $oMemoryImage->setRelationId($iVal);
         $this->assertEquals($oMemoryImage->getRelationId(), $iVal);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/ObjectTest.php b/Tests/PHPWord/Section/ObjectTest.php
@@ -83,4 +83,4 @@ public function testObjectId()
         $oObject->setObjectId($iVal);
         $this->assertEquals($oObject->getObjectId(), $iVal);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/PageBreakTest.php b/Tests/PHPWord/Section/PageBreakTest.php
@@ -16,4 +16,4 @@ public function testConstruct()
 
         $this->assertInstanceOf('PHPWord_Section_PageBreak', $oPageBreak);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/SettingsTest.php b/Tests/PHPWord/Section/SettingsTest.php
@@ -233,4 +233,4 @@ public function testBreakType()
         $oSettings->setBreakType();
         $this->assertNull($oSettings->getBreakType());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/Table/CellTest.php b/Tests/PHPWord/Section/Table/CellTest.php
@@ -201,4 +201,4 @@ public function testGetElements()
 
         $this->assertInternalType('array', $oCell->getElements());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/Table/RowTest.php b/Tests/PHPWord/Section/Table/RowTest.php
@@ -36,4 +36,4 @@ public function testAddCell()
         $this->assertInstanceOf('PHPWord_Section_Table_Cell', $element);
         $this->assertCount(1, $oRow->getCells());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/TableTest.php b/Tests/PHPWord/Section/TableTest.php
@@ -54,4 +54,4 @@ public function testCell()
         $element = $oTable->addCell();
         $this->assertInstanceOf('PHPWord_Section_Table_Cell', $element);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/TextBreakTest.php b/Tests/PHPWord/Section/TextBreakTest.php
@@ -16,4 +16,4 @@ public function testConstruct()
 
         $this->assertInstanceOf('PHPWord_Section_TextBreak', $oTextBreak);
     }
-}
+}
diff --git a/Tests/PHPWord/Section/TextRunTest.php b/Tests/PHPWord/Section/TextRunTest.php
@@ -95,4 +95,4 @@ public function testCreateFootnote()
         $this->assertInstanceOf('PHPWord_Section_Footnote', $element);
         $this->assertCount(1, $oTextRun->getElements());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/TextTest.php b/Tests/PHPWord/Section/TextTest.php
@@ -40,4 +40,4 @@ public function testParagraph()
         $oText->setParagraphStyle(array('align' => 'center', 'spaceAfter' => 100));
         $this->assertInstanceOf('PHPWord_Style_Paragraph', $oText->getParagraphStyle());
     }
-}
+}
diff --git a/Tests/PHPWord/Section/TitleTest.php b/Tests/PHPWord/Section/TitleTest.php
@@ -45,4 +45,4 @@ public function testBookmarkID()
         $oTitle->setBookmarkId($iVal);
         $this->assertEquals($oTitle->getBookmarkId(), $iVal);
     }
-}
+}
diff --git a/Tests/PHPWord/SectionTest.php b/Tests/PHPWord/SectionTest.php
@@ -35,4 +35,4 @@ public function testGetElements()
         $oSection = new PHPWord_Section(0);
         $this->assertAttributeEquals($oSection->getElements(), '_elementCollection', new PHPWord_Section(0));
     }
-}
+}
diff --git a/Tests/PHPWord/Shared/DrawingTest.php b/Tests/PHPWord/Shared/DrawingTest.php
@@ -12,7 +12,6 @@
  */
 class DrawingTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test unit conversion functions with various numbers
      */
@@ -65,5 +64,4 @@ public function testHtmlToRGB()
             $this->assertEquals($value[1], $result);
         }
     }
-
-}
+}
diff --git a/Tests/PHPWord/Shared/FileTest.php b/Tests/PHPWord/Shared/FileTest.php
@@ -12,13 +12,13 @@
  */
 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 @@ public function testFile_exists()
      */
     public function testRealpath()
     {
-        $dir = join(DIRECTORY_SEPARATOR,
-            array(PHPWORD_TESTS_DIR_ROOT, '_files', 'templates'));
+        $dir = join(
+            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));
     }
-
 }
diff --git a/Tests/PHPWord/Shared/FontTest.php b/Tests/PHPWord/Shared/FontTest.php
@@ -43,4 +43,4 @@ public function testConversions()
         $result = PHPWord_Shared_Font::pointSizeToTwips($original);
         $this->assertEquals($original * 20, $result);
     }
-}
+}
diff --git a/Tests/PHPWord/Shared/StringTest.php b/Tests/PHPWord/Shared/StringTest.php
@@ -12,7 +12,6 @@
  */
 class StringTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test getIsMbstringEnabled() and getIsIconvEnabled()
      */
@@ -41,5 +40,4 @@ public function testFormatNumber()
         $returned = PHPWord_Shared_String::FormatNumber('1022.1234');
         $this->assertEquals($expected, $returned);
     }
-
 }
diff --git a/Tests/PHPWord/Style/CellTest.php b/Tests/PHPWord/Style/CellTest.php
@@ -12,7 +12,6 @@
  */
 class CellTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test setting style with normal value
      */
@@ -75,4 +74,4 @@ public function testBorderSize()
         $object->setStyleValue('_borderSize', $value);
         $this->assertEquals($expected, $object->getBorderSize());
     }
-}
+}
diff --git a/Tests/PHPWord/Style/FontTest.php b/Tests/PHPWord/Style/FontTest.php
@@ -114,4 +114,4 @@ public function testLineHeight()
         $this->assertEquals(720, $lineHeight);
         $this->assertEquals('auto', $lineRule);
     }
-}
+}
diff --git a/Tests/PHPWord/Style/ImageTest.php b/Tests/PHPWord/Style/ImageTest.php
@@ -12,7 +12,6 @@
  */
 class ImageTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test setting style with normal value
      */
@@ -67,5 +66,4 @@ public function testSetWrappingStyleException()
         $object = new PHPWord_Style_Image();
         $object->setWrappingStyle('foo');
     }
-
-}
+}
diff --git a/Tests/PHPWord/Style/ListItemTest.php b/Tests/PHPWord/Style/ListItemTest.php
@@ -12,7 +12,6 @@
  */
 class ListItemTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test construct
      */
@@ -47,5 +46,4 @@ public function testListType()
         $object->setListType($value);
         $this->assertEquals($value, $object->getListType());
     }
-
-}
+}
diff --git a/Tests/PHPWord/Style/ParagraphTest.php b/Tests/PHPWord/Style/ParagraphTest.php
@@ -133,5 +133,4 @@ public function testLineHeightValidation()
         $object->setLineHeight('12.5pt');
         $this->assertEquals(12.5, $object->getLineHeight());
     }
-
-}
+}
diff --git a/Tests/PHPWord/Style/RowTest.php b/Tests/PHPWord/Style/RowTest.php
@@ -12,7 +12,6 @@
  */
 class RowTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test properties with normal value
      */
@@ -39,5 +38,4 @@ public function testProperties()
             $this->assertEquals($expected, $object->$get());
         }
     }
-
 }
diff --git a/Tests/PHPWord/Style/TOCTest.php b/Tests/PHPWord/Style/TOCTest.php
@@ -12,7 +12,6 @@
  */
 class TOCTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test properties with normal value
      */
@@ -37,5 +36,4 @@ public function testProperties()
             $this->assertEquals(null, $object->$get());
         }
     }
-
 }
diff --git a/Tests/PHPWord/Style/TableFullTest.php b/Tests/PHPWord/Style/TableFullTest.php
@@ -12,7 +12,6 @@
  */
 class TableFullTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test class construction
      *
@@ -132,5 +131,4 @@ public function testCellMargin()
         }
         $this->assertEquals($values, $object->getCellMargin());
     }
-
 }
diff --git a/Tests/PHPWord/Style/TableTest.php b/Tests/PHPWord/Style/TableTest.php
@@ -12,7 +12,6 @@
  */
 class TableTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test set style value
      */
@@ -50,5 +49,4 @@ public function testCellMargin()
         }
         $this->assertEquals($values, $object->getCellMargin());
     }
-
 }
diff --git a/Tests/PHPWord/Style/TabsTest.php b/Tests/PHPWord/Style/TabsTest.php
@@ -42,5 +42,4 @@ public function testTabsStyle()
         $this->assertEquals(1440, $element->getAttribute('w:pos'));
         $this->assertEquals('dot', $element->getAttribute('w:leader'));
     }
-
 }
diff --git a/Tests/PHPWord/TemplateTest.php b/Tests/PHPWord/TemplateTest.php
@@ -115,4 +115,4 @@ final public function testXslStyleSheetCanNotBeAppliedOnFailureOfLoadingXmlFromT
          */
         @$template->applyXslStyleSheet($xslDOMDocument);
     }
-}
+}
diff --git a/Tests/PHPWord/Writer/Word2007/BaseTest.php b/Tests/PHPWord/Writer/Word2007/BaseTest.php
diff --git a/Tests/PHPWord/Writer/Word2007/DocumentTest.php b/Tests/PHPWord/Writer/Word2007/DocumentTest.php
diff --git a/Tests/PHPWord/Writer/Word2007/StylesTest.php b/Tests/PHPWord/Writer/Word2007/StylesTest.php
diff --git a/Tests/_inc/TestHelperDOCX.php b/Tests/_inc/TestHelperDOCX.php

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function save($pFilename = null)`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`$objZip->addFromString('Pictures/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);`
`164`		`- } else if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {`
	`164`	`+ } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_MemoryDrawing) {`
`165`	`165`	`ob_start();`
`166`	`166`	`call_user_func(`
`167`	`167`	`$this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ public function testAutoload()`
`29`	`29`	`Autoloader::autoload('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException'); // TODO change this class to the main PHPWord class when it is namespaced`
`30`	`30`	`$this->assertTrue(in_array('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException', get_declared_classes()), 'PhpOffice\\PhpWord\\Autoloader::autoload() failed to autoload the PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException class');`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,4 @@ public function testCreateWriter()`
`59`	`59`
`60`	`60`	`$this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));`
`61`	`61`	`}`
`62`		`-}`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public function testGetFooterMediaElements()`
`25`	`25`	`{`
`26`	`26`	`$this->assertAttributeEquals(PHPWord_Media::getFooterMediaElements(), '_footerMedia', 'PHPWord_Media');`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ public function testConstructWithArray()`
`30`	`30`	`$this->assertInstanceOf('PHPWord_Style_Font', $oPreserveText->getFontStyle());`
`31`	`31`	`$this->assertInstanceOf('PHPWord_Style_Paragraph', $oPreserveText->getParagraphStyle());`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -118,4 +118,4 @@ public function testGetElements()`
`118`	`118`
`119`	`119`	`$this->assertInternalType('array', $oFooter->getElements());`
`120`	`120`	`}`
`121`		`-}`
	`121`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,4 @@ public function testGetElements()`
`61`	`61`	`$oFootnote = new PHPWord_Section_Footnote();`
`62`	`62`	`$this->assertInternalType('array', $oFootnote->getElements());`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,4 @@ public function testEvenPage()`
`161`	`161`
`162`	`162`	`$this->assertEquals($oHeader->getType(), PHPWord_Section_Header::EVEN);`
`163`	`163`	`}`
`164`		`-}`
	`164`	`+}`