Code formatting for PSR1 & PSR2 - Part 3

ivanlanin · ivanlanin · commit 92cfa12d7169 · 2014-03-12T13:30:02.000+07:00
diff --git a/Classes/PHPWord/Exceptions/InvalidImageException.php b/Classes/PHPWord/Exceptions/InvalidImageException.php
@@ -12,4 +12,4 @@
  */
 class InvalidImageException extends Exception
 {
-}
+}
diff --git a/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php b/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php
@@ -12,4 +12,4 @@
  */
 class UnsupportedImageTypeException extends Exception
 {
-}
+}
diff --git a/Tests/PHPWord/AutoloaderTest.php b/Tests/PHPWord/AutoloaderTest.php
@@ -16,17 +16,35 @@ public function testRegister()
 
     public function testAutoloadLegacy()
     {
-        $this->assertNull(PHPWord_Autoloader::load('Foo'), 'PHPWord_Autoloader::load() is trying to load classes outside of the PHPWord namespace');
-        $this->assertTrue(PHPWord_Autoloader::load('PHPWord'), 'PHPWord_Autoloader::load() failed to autoload the PHPWord class');
+        $this->assertNull(
+            PHPWord_Autoloader::load('Foo'),
+            'PHPWord_Autoloader::load() is trying to load classes outside of the PHPWord namespace'
+        );
+        $this->assertTrue(
+            PHPWord_Autoloader::load('PHPWord'),
+            'PHPWord_Autoloader::load() failed to autoload the PHPWord class'
+        );
     }
 
     public function testAutoload()
     {
         $declared = get_declared_classes();
         $declaredCount = count($declared);
         Autoloader::autoload('Foo');
-        $this->assertEquals($declaredCount, count(get_declared_classes()), 'PhpOffice\\PhpWord\\Autoloader::autoload() is trying to load classes outside of the PhpOffice\\PhpWord namespace');
-        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');
+        $this->assertEquals(
+            $declaredCount,
+            count(get_declared_classes()),
+            'PhpOffice\\PhpWord\\Autoloader::autoload() is trying to load classes ' .
+            'outside of the PhpOffice\\PhpWord namespace'
+        );
+        // TODO change this class to the main PHPWord class when it is namespaced
+        Autoloader::autoload(
+            'PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException'
+        );
+        $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
@@ -16,7 +16,11 @@ class IOFactoryTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetSearchLocations()
     {
-        $this->assertAttributeEquals(PHPWord_IOFactory::getSearchLocations(), '_searchLocations', 'PHPWord_IOFactory');
+        $this->assertAttributeEquals(
+            PHPWord_IOFactory::getSearchLocations(),
+            '_searchLocations',
+            'PHPWord_IOFactory'
+        );
     }
 
     public function testSetSearchLocationsWithArray()
@@ -38,7 +42,11 @@ public function testAddSearchLocation()
     {
         PHPWord_IOFactory::setSearchLocations(array());
         PHPWord_IOFactory::addSearchLocation('type', 'location', 'classname');
-        $this->assertAttributeEquals(array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')), '_searchLocations', 'PHPWord_IOFactory');
+        $this->assertAttributeEquals(
+            array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')),
+            '_searchLocations',
+            'PHPWord_IOFactory'
+        );
     }
 
     /**
@@ -57,6 +65,9 @@ public function testCreateWriter()
     {
         $oPHPWord = new PHPWord();
 
-        $this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));
+        $this->assertEquals(
+            PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'),
+            new PHPWord_Writer_Word2007($oPHPWord)
+        );
     }
 }
diff --git a/Tests/PHPWord/Section/Footer/PreserveTextTest.php b/Tests/PHPWord/Section/Footer/PreserveTextTest.php
@@ -26,7 +26,11 @@ public function testConstructWithString()
 
     public function testConstructWithArray()
     {
-        $oPreserveText = new PHPWord_Section_Footer_PreserveText('text', array('align' => 'center'), array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600));
+        $oPreserveText = new PHPWord_Section_Footer_PreserveText(
+            'text',
+            array('align' => 'center'),
+            array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)
+        );
         $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
@@ -87,7 +87,9 @@ public function testAddImage()
     public function testAddMemoryImage()
     {
         $oFooter = new PHPWord_Section_Footer(1);
-        $element = $oFooter->addMemoryImage('https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png');
+        $element = $oFooter->addMemoryImage(
+            'https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png'
+        );
 
         $this->assertCount(1, $oFooter->getElements());
         $this->assertInstanceOf('PHPWord_Section_MemoryImage', $element);
diff --git a/Tests/PHPWord/Section/HeaderTest.php b/Tests/PHPWord/Section/HeaderTest.php
@@ -83,7 +83,9 @@ public function testAddImage()
     public function testAddMemoryImage()
     {
         $oHeader = new PHPWord_Section_Header(1);
-        $element = $oHeader->addMemoryImage('https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png');
+        $element = $oHeader->addMemoryImage(
+            'https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png'
+        );
 
         $this->assertCount(1, $oHeader->getElements());
         $this->assertInstanceOf('PHPWord_Section_MemoryImage', $element);
diff --git a/Tests/PHPWord/Section/ImageTest.php b/Tests/PHPWord/Section/ImageTest.php
@@ -28,7 +28,11 @@ public function testConstructWithStyle()
             \DIRECTORY_SEPARATOR,
             array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'images', 'firefox.png')
         );
-        $oImage = new PHPWord_Section_Image($src, array('width' => 210, 'height' => 210, 'align' => 'center', 'wrappingStyle' => \PHPWord_Style_Image::WRAPPING_STYLE_BEHIND));
+        $oImage = new PHPWord_Section_Image(
+            $src,
+            array('width' => 210, 'height' => 210, 'align' => 'center',
+                'wrappingStyle' => \PHPWord_Style_Image::WRAPPING_STYLE_BEHIND)
+        );
 
         $this->assertInstanceOf('PHPWord_Style_Image', $oImage->getStyle());
     }
diff --git a/Tests/PHPWord/Section/LinkTest.php b/Tests/PHPWord/Section/LinkTest.php
@@ -20,7 +20,12 @@ public function testConstructDefault()
 
     public function testConstructWithParamsArray()
     {
-        $oLink = new PHPWord_Section_Link('http://www.google.com', 'Search Engine', array('color' => '0000FF', 'underline' => PHPWord_Style_Font::UNDERLINE_SINGLE), array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600));
+        $oLink = new PHPWord_Section_Link(
+            'http://www.google.com',
+            'Search Engine',
+            array('color' => '0000FF', 'underline' => PHPWord_Style_Font::UNDERLINE_SINGLE),
+            array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)
+        );
 
         $this->assertInstanceOf('PHPWord_Section_Link', $oLink);
         $this->assertEquals($oLink->getLinkSrc(), 'http://www.google.com');
diff --git a/Tests/PHPWord/Section/ListItemTest.php b/Tests/PHPWord/Section/ListItemTest.php
@@ -16,7 +16,12 @@ public function testText()
 
     public function testStyle()
     {
-        $oListItem = new PHPWord_Section_ListItem('text', 1, null, array('listType' => PHPWord_Style_ListItem::TYPE_NUMBER));
+        $oListItem = new PHPWord_Section_ListItem(
+            'text',
+            1,
+            null,
+            array('listType' => PHPWord_Style_ListItem::TYPE_NUMBER)
+        );
 
         $this->assertInstanceOf('PHPWord_Style_ListItem', $oListItem->getStyle());
         $this->assertEquals($oListItem->getStyle()->getListType(), PHPWord_Style_ListItem::TYPE_NUMBER);
diff --git a/Tests/PHPWord/Section/Table/CellTest.php b/Tests/PHPWord/Section/Table/CellTest.php
@@ -130,7 +130,9 @@ public function testAddImageFooter()
     public function testAddMemoryImageSection()
     {
         $oCell = new PHPWord_Section_Table_Cell('section', 1);
-        $element = $oCell->addMemoryImage('https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png');
+        $element = $oCell->addMemoryImage(
+            'https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png'
+        );
 
         $this->assertCount(1, $oCell->getElements());
         $this->assertInstanceOf('PHPWord_Section_MemoryImage', $element);
@@ -139,7 +141,9 @@ public function testAddMemoryImageSection()
     public function testAddMemoryImageHeader()
     {
         $oCell = new PHPWord_Section_Table_Cell('header', 1);
-        $element = $oCell->addMemoryImage('https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png');
+        $element = $oCell->addMemoryImage(
+            'https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png'
+        );
 
         $this->assertCount(1, $oCell->getElements());
         $this->assertInstanceOf('PHPWord_Section_MemoryImage', $element);
@@ -148,7 +152,9 @@ public function testAddMemoryImageHeader()
     public function testAddMemoryImageFooter()
     {
         $oCell = new PHPWord_Section_Table_Cell('footer', 1);
-        $element = $oCell->addMemoryImage('https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png');
+        $element = $oCell->addMemoryImage(
+            'https://assets.mozillalabs.com/Brands-Logos/Thunderbird/logo-only/thunderbird_logo-only_RGB.png'
+        );
 
         $this->assertCount(1, $oCell->getElements());
         $this->assertInstanceOf('PHPWord_Section_MemoryImage', $element);
diff --git a/Tests/PHPWord/Section/Table/RowTest.php b/Tests/PHPWord/Section/Table/RowTest.php
@@ -22,7 +22,12 @@ public function testConstructWithParams()
     {
         $iVal = rand(1, 1000);
         $iVal2 = rand(1, 1000);
-        $oRow = new PHPWord_Section_Table_Row('section', $iVal, $iVal2, array('borderBottomSize' => 18, 'borderBottomColor' => '0000FF', 'bgColor' => '66BBFF'));
+        $oRow = new PHPWord_Section_Table_Row(
+            'section',
+            $iVal,
+            $iVal2,
+            array('borderBottomSize' => 18, 'borderBottomColor' => '0000FF', 'bgColor' => '66BBFF')
+        );
 
         $this->assertEquals($oRow->getHeight(), $iVal2);
         $this->assertInstanceOf('PHPWord_Style_Row', $oRow->getStyle());
diff --git a/Tests/PHPWord/Section/TableTest.php b/Tests/PHPWord/Section/TableTest.php
@@ -26,7 +26,11 @@ public function testStyleText()
 
     public function testStyleArray()
     {
-        $oTable = new PHPWord_Section_Table('section', 1, array('borderSize' => 6, 'borderColor' => '006699', 'cellMargin' => 80));
+        $oTable = new PHPWord_Section_Table(
+            'section',
+            1,
+            array('borderSize' => 6, 'borderColor' => '006699', 'cellMargin' => 80)
+        );
 
         $this->assertInstanceOf('PHPWord_Style_Table', $oTable->getStyle());
     }
diff --git a/Tests/PHPWord/Writer/Word2007/BaseTest.php b/Tests/PHPWord/Writer/Word2007/BaseTest.php
@@ -20,42 +20,50 @@ public function tearDown()
         TestHelperDOCX::clear();
     }
 
-    public function testWriteImage_Position()
+    public function testWriteParagraphStyleAlign()
     {
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
-        $section->addImage(
-            PHPWORD_TESTS_DIR_ROOT . '/_files/images/earth.jpg',
-            array(
-                'marginTop' => -1,
-                'marginLeft' => -1,
-                'wrappingStyle' => 'behind'
-            )
-        );
 
-        $doc = TestHelperDOCX::getDocument($PHPWord);
-        $element = $doc->getElement('/w:document/w:body/w:p/w:r/w:pict/v:shape');
+        $section->addText('This is my text', null, array('align' => 'right'));
 
-        $style = $element->getAttribute('style');
+        $doc = TestHelperDOCX::getDocument($PHPWord);
+        $element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:jc');
 
-        $this->assertRegExp('/z\-index:\-[0-9]*/', $style);
-        $this->assertRegExp('/position:absolute;/', $style);
+        $this->assertEquals('right', $element->getAttribute('w:val'));
     }
 
-    public function testWriteParagraphStyle_Align()
+    /**
+     * Test write paragraph pagination
+     */
+    public function testWriteParagraphStylePagination()
     {
+        // Create the doc
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
-
-        $section->addText('This is my text', null, array('align' => 'right'));
-
+        $attributes = array(
+            'widowControl' => false,
+            'keepNext' => true,
+            'keepLines' => true,
+            'pageBreakBefore' => true,
+        );
+        foreach ($attributes as $attribute => $value) {
+            $section->addText('Test', null, array($attribute => $value));
+        }
         $doc = TestHelperDOCX::getDocument($PHPWord);
-        $element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:jc');
 
-        $this->assertEquals('right', $element->getAttribute('w:val'));
+        // Test the attributes
+        $i = 0;
+        foreach ($attributes as $key => $value) {
+            $i++;
+            $path = "/w:document/w:body/w:p[{$i}]/w:pPr/w:{$key}";
+            $element = $doc->getElement($path);
+            $expected = $value ? 1 : 0;
+            $this->assertEquals($expected, $element->getAttribute('w:val'));
+        }
     }
 
-    public function testWriteCellStyle_CellGridSpan()
+    public function testWriteCellStyleCellGridSpan()
     {
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
@@ -79,34 +87,26 @@ public function testWriteCellStyle_CellGridSpan()
         $this->assertEquals(5, $element->getAttribute('w:val'));
     }
 
-    /**
-     * Test write paragraph pagination
-     */
-    public function testWriteParagraphStyle_Pagination()
+    public function testWriteImagePosition()
     {
-        // Create the doc
         $PHPWord = new PHPWord();
         $section = $PHPWord->createSection();
-        $attributes = array(
-            'widowControl' => false,
-            'keepNext' => true,
-            'keepLines' => true,
-            'pageBreakBefore' => true,
+        $section->addImage(
+            PHPWORD_TESTS_DIR_ROOT . '/_files/images/earth.jpg',
+            array(
+                'marginTop' => -1,
+                'marginLeft' => -1,
+                'wrappingStyle' => 'behind'
+            )
         );
-        foreach ($attributes as $attribute => $value) {
-            $section->addText('Test', null, array($attribute => $value));
-        }
+
         $doc = TestHelperDOCX::getDocument($PHPWord);
+        $element = $doc->getElement('/w:document/w:body/w:p/w:r/w:pict/v:shape');
 
-        // Test the attributes
-        $i = 0;
-        foreach ($attributes as $key => $value) {
-            $i++;
-            $path = "/w:document/w:body/w:p[{$i}]/w:pPr/w:{$key}";
-            $element = $doc->getElement($path);
-            $expected = $value ? 1 : 0;
-            $this->assertEquals($expected, $element->getAttribute('w:val'));
-        }
+        $style = $element->getAttribute('style');
+
+        $this->assertRegExp('/z\-index:\-[0-9]*/', $style);
+        $this->assertRegExp('/position:absolute;/', $style);
     }
 
     public function testWritePreserveText()
@@ -123,4 +123,4 @@ public function testWritePreserveText()
         $this->assertEquals('PAGE', $preserve->nodeValue);
         $this->assertEquals('preserve', $preserve->getAttribute('xml:space'));
     }
-}
+}
diff --git a/Tests/_inc/TestHelperDOCX.php b/Tests/_inc/TestHelperDOCX.php
diff --git a/Tests/_inc/XmlDocument.php b/Tests/_inc/XmlDocument.php

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`*/`
`13`	`13`	`class InvalidImageException extends Exception`
`14`	`14`	`{`
`15`		`-}`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ class IOFactoryTest extends \PHPUnit_Framework_TestCase`
`16`	`16`	`{`
`17`	`17`	`public function testGetSearchLocations()`
`18`	`18`	`{`
`19`		`- $this->assertAttributeEquals(PHPWord_IOFactory::getSearchLocations(), '_searchLocations', 'PHPWord_IOFactory');`
	`19`	`+ $this->assertAttributeEquals(`
	`20`	`+ PHPWord_IOFactory::getSearchLocations(),`
	`21`	`+ '_searchLocations',`
	`22`	`+ 'PHPWord_IOFactory'`
	`23`	`+ );`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`public function testSetSearchLocationsWithArray()`
`@@ -38,7 +42,11 @@ public function testAddSearchLocation()`
`38`	`42`	`{`
`39`	`43`	`PHPWord_IOFactory::setSearchLocations(array());`
`40`	`44`	`PHPWord_IOFactory::addSearchLocation('type', 'location', 'classname');`
`41`		`- $this->assertAttributeEquals(array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')), '_searchLocations', 'PHPWord_IOFactory');`
	`45`	`+ $this->assertAttributeEquals(`
	`46`	`+ array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')),`
	`47`	`+ '_searchLocations',`
	`48`	`+ 'PHPWord_IOFactory'`
	`49`	`+ );`
`42`	`50`	`}`
`43`	`51`
`44`	`52`	`/**`
`@@ -57,6 +65,9 @@ public function testCreateWriter()`
`57`	`65`	`{`
`58`	`66`	`$oPHPWord = new PHPWord();`
`59`	`67`
`60`		`- $this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));`
	`68`	`+ $this->assertEquals(`
	`69`	`+ PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'),`
	`70`	`+ new PHPWord_Writer_Word2007($oPHPWord)`
	`71`	`+ );`
`61`	`72`	`}`
`62`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ public function testConstructWithString()`
`26`	`26`
`27`	`27`	`public function testConstructWithArray()`
`28`	`28`	`{`
`29`		`- $oPreserveText = new PHPWord_Section_Footer_PreserveText('text', array('align' => 'center'), array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600));`
	`29`	`+ $oPreserveText = new PHPWord_Section_Footer_PreserveText(`
	`30`	`+ 'text',`
	`31`	`+ array('align' => 'center'),`
	`32`	`+ array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)`
	`33`	`+ );`
`30`	`34`	`$this->assertInstanceOf('PHPWord_Style_Font', $oPreserveText->getFontStyle());`
`31`	`35`	`$this->assertInstanceOf('PHPWord_Style_Paragraph', $oPreserveText->getParagraphStyle());`
`32`	`36`	`}`