QA: PHPMD fixes for tests; Some adjustment for Travis build

Author: ivanlanin

.travis.yml

@@ -52,13 +52,13 @@ script:
   ## PHP Copy/Paste Detector
   - phpcpd src/ tests/ --verbose
   ## PHP Mess Detector
-  - phpmd src/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
+  - phpmd src/,tests/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
   ## PHPLOC
   #- php phploc.phar src/
   ## PHPUnit
   - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
   ## PHPDocumentor
-  - vendor/bin/phpdoc.php -d ./src -t ./build/docs
+  - vendor/bin/phpdoc.php -d ./src -t ./build/docs -i ./src/PhpWord/Shared/PCLZip/
 
 after_script:
   ## PHPDocumentor

.travis_shell_after_success.sh

@@ -31,7 +31,7 @@ if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" ==
 
   echo "--DEBUG : Git"
   git add -f .
-  git commit -m "PHPDocumentor (Travis Build : $TRAVIS_BUILD_NUMBER  - Branch : $TRAVIS_BRANCH)"
+  git commit -m "PHPDocumentor (Travis Build: $TRAVIS_BUILD_NUMBER  - Branch: $TRAVIS_BRANCH)"
   git push -fq origin gh-pages > /dev/null
 
   echo -e "Published PHPDoc to gh-pages.\n"

CHANGELOG.md

@@ -4,7 +4,7 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
 
 ## 0.11.0 - Not yet released
 
-PHPWord license is changed from LGPL 2.1 to LGPL 3 in this release.
+This release changed PHPWord license from LGPL 2.1 to LGPL 3.
 
 ### Features
 

phpunit.xml.dist

@@ -21,4 +21,7 @@
             </exclude>
         </whitelist>
     </filter>
+    <logging>
+        <log type="coverage-html" target="./build/coverage" charset="UTF-8" highlight="true" />
+    </logging>
 </phpunit>

tests/PhpWord/Tests/Element/CellTest.php

@@ -219,7 +219,7 @@ public function testAddObjectException()
     {
         $src = __DIR__ . "/../_files/xsl/passthrough.xsl";
         $oCell = new Cell('section', 1);
-        $element = $oCell->addObject($src);
+        $oCell->addObject($src);
     }
 
     /**
@@ -255,7 +255,7 @@ public function testAddPreserveTextNotUTF8()
     public function testAddPreserveTextException()
     {
         $oCell = new Cell('section', 1);
-        $element = $oCell->addPreserveText('text');
+        $oCell->addPreserveText('text');
     }
 
     /**

tests/PhpWord/Tests/Element/ImageTest.php

@@ -107,6 +107,7 @@ public function testInvalidImageLocal()
     public function testInvalidImagePhp()
     {
         $object = new Image('test.php');
+        $object->getSource();
     }
 
     /**
@@ -117,6 +118,7 @@ public function testInvalidImagePhp()
     public function testUnsupportedImage()
     {
         $object = new Image('http://samples.libav.org/image-samples/RACECAR.BMP');
+        $object->getSource();
     }
 
     /**

tests/PhpWord/Tests/Element/ObjectTest.php

@@ -34,15 +34,14 @@ public function testConstructWithSupportedFiles()
 
     /**
      * Create new instance with non-supported files
+     *
+     * @expectedException \PhpOffice\PhpWord\Exception\InvalidObjectException
      */
     public function testConstructWithNotSupportedFiles()
     {
         $src = __DIR__ . "/../_files/xsl/passthrough.xsl";
         $oObject = new Object($src);
-
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
-        $this->assertEquals($oObject->getSource(), null);
-        $this->assertEquals($oObject->getStyle(), null);
+        $oObject->getSource();
     }
 
     /**

tests/PhpWord/Tests/Element/SectionTest.php

@@ -76,7 +76,7 @@ public function testAddElements()
     {
         $objectSource = __DIR__ . "/../_files/documents/reader.docx";
         $imageSource = __DIR__ . "/../_files/images/PhpWord.png";
-        $imageUrl = 'http://php.net//images/logos/php-med-trans-light.gif';
+        // $imageUrl = 'http://php.net//images/logos/php-med-trans-light.gif';
 
         $section = new Section(0);
         $section->setPhpWord(new PhpWord());
@@ -98,10 +98,10 @@ public function testAddElements()
         $elementTypes = array('Text', 'Link', 'TextBreak', 'PageBreak',
             'Table', 'ListItem', 'Object', 'Image',
             'Title', 'TextRun', 'Footnote', 'CheckBox', 'TOC');
-        $i = 0;
+        $elmCount = 0;
         foreach ($elementTypes as $elementType) {
-            $this->assertInstanceOf("PhpOffice\\PhpWord\\Element\\{$elementType}", $elementCollection[$i]);
-            $i++;
+            $this->assertInstanceOf("PhpOffice\\PhpWord\\Element\\{$elementType}", $elementCollection[$elmCount]);
+            $elmCount++;
         }
     }
 
@@ -166,6 +166,6 @@ public function testHasDifferentFirstPage()
     public function testAddHeaderException()
     {
         $object = new Section(1);
-        $header = $object->addHeader('ODD');
+        $object->addHeader('ODD');
     }
 }

tests/PhpWord/Tests/Element/TOCTest.php

@@ -48,7 +48,7 @@ public function testConstructWithStyleArray()
     public function testConstructWithStyleName()
     {
         $object = new TOC('Font Style');
-        $tocStyle = $object->getStyleTOC();
+        // $tocStyle = $object->getStyleTOC();
 
         $this->assertEquals('Font Style', $object->getStyleFont());
     }

tests/PhpWord/Tests/Element/TextRunTest.php

@@ -114,7 +114,7 @@ public function testAddLinkWithName()
     public function testAddTextBreak()
     {
         $oTextRun = new TextRun();
-        $element = $oTextRun->addTextBreak(2);
+        $oTextRun->addTextBreak(2);
 
         $this->assertCount(2, $oTextRun->getElements());
     }

tests/PhpWord/Tests/Shared/FontTest.php

@@ -25,8 +25,6 @@ class FontTest extends \PHPUnit_Framework_TestCase
      */
     public function testConversions()
     {
-        $phpWord = new PhpWord();
-
         $original = 1;
 
         $result = Font::fontSizeToPixels($original);

tests/PhpWord/Tests/Style/CellTest.php

@@ -56,7 +56,6 @@ public function testBorderColor()
     {
         $object = new Cell();
 
-        $default = '000000';
         $value = 'FF0000';
 
         $object->setStyleValue('borderColor', $value);

tests/PhpWord/Tests/Writer/PDF/DomPDFTest.php

@@ -48,7 +48,6 @@ public function testConstruct()
     public function testSetGetAbstractRendererProperties()
     {
         define('DOMPDF_ENABLE_AUTOLOAD', false);
-        $file = __DIR__ . "/../../_files/temp.pdf";
 
         $rendererName = Settings::PDF_RENDERER_DOMPDF;
         $rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/dompdf/dompdf');

tests/PhpWord/Tests/Writer/PDFTest.php

@@ -47,5 +47,6 @@ public function testConstruct()
     public function testConstructException()
     {
         $writer = new PDF(new PhpWord());
+        $writer->save();
     }
 }

tests/PhpWord/Tests/Writer/Word2007/Part/DocumentTest.php

@@ -361,11 +361,11 @@ public function testWriteParagraphStyle()
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         // Test the attributes
-        $i = 0;
+        $attributeCount = 0;
         foreach ($attributes as $key => $value) {
-            $i++;
+            $attributeCount++;
             $nodeName = ($key == 'align') ? 'jc' : $key;
-            $path = "/w:document/w:body/w:p[{$i}]/w:pPr/w:{$nodeName}";
+            $path = "/w:document/w:body/w:p[{$attributeCount}]/w:pPr/w:{$nodeName}";
             if ($key != 'align') {
                 $value = $value ? 1 : 0;
             }
@@ -416,7 +416,6 @@ public function testWriteFontStyle()
     public function testWriteTableStyle()
     {
         $phpWord = new PhpWord();
-        $tWidth = 120;
         $rHeight = 120;
         $cWidth = 120;
         $imageSrc = __DIR__ . "/../../../_files/images/earth.jpg";
@@ -511,7 +510,7 @@ public function testWriteGutterAndLineNumbering()
         $lineNumberingPath = '/w:document/w:body/w:sectPr/w:lnNumType';
 
         $phpWord = new PhpWord();
-        $section = $phpWord->addSection(array('gutter' => 240, 'lineNumbering' => array()));
+        $phpWord->addSection(array('gutter' => 240, 'lineNumbering' => array()));
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         $this->assertEquals(240, $doc->getElement($pageMarginPath)->getAttribute('w:gutter'));

tests/PhpWord/Tests/Writer/Word2007Test.php

@@ -171,7 +171,7 @@ public function testGetWriterPartNull()
     public function testSetGetUseDiskCaching()
     {
         $phpWord = new PhpWord();
-        $section = $phpWord->addSection();
+        $phpWord->addSection();
         $object = new Word2007($phpWord);
         $object->setUseDiskCaching(true, PHPWORD_TESTS_BASE_DIR);
         $writer = new Word2007($phpWord);