Merge remote-tracking branch 'upstream/develop' into develop

Tests/PHPWord/AutoloaderTest.php

@@ -1,11 +1,10 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Autoloader;
 use PHPWord_Autoloader as Autoloader;
 
-class AutoloaderTest extends PHPUnit_Framework_TestCase
+class AutoloaderTest extends \PHPUnit_Framework_TestCase
 {
     public function testRegister()
     {

Tests/PHPWord/IOFactoryTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_IOFactory;
 use PHPWord_Writer_Word2007;

Tests/PHPWord/MediaTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Media;
 use PHPWord_Section;
 

Tests/PHPWord/Reader/Word2007Test.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Reader;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Reader_Word2007;
 use PHPWord_IOFactory;
 

Tests/PHPWord/Section/Footer/PreserveTextTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section\Footer;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Footer_PreserveText;
 
 class PreserveTextTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/FooterTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Footer;
 
 class FooterTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/FootnoteTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Footnote;
 
 class FootnoteTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/HeaderTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Header;
 
 class HeaderTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/ImageTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Image;
 use PHPWord_Style_Image;
 

Tests/PHPWord/Section/LinkTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Link;
 use PHPWord_Style_Font;
 

Tests/PHPWord/Section/ListItemTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_ListItem;
 use PHPWord_Style_ListItem;
 

Tests/PHPWord/Section/MemoryImageTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_MemoryImage;
 
 class MemoryImageTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/ObjectTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Object;
 
 class ObjectTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/PageBreakTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_PageBreak;
 
 class PageBreakTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/SettingsTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Settings;
 
 class SettingsTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/Table/CellTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section\Table;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Table_Cell;
 
 class CellTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/Table/RowTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section\Table;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Table_Row;
 
 class RowTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/TableTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Table;
 
 class TableTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/TextBreakTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_TextBreak;
 
 class TextBreakTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/TextRunTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_TextRun;
 
 class TextRunTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/TextTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Text;
 
 class TextTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/Section/TitleTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Section;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section_Title;
 
 class TitleTest extends \PHPUnit_Framework_TestCase

Tests/PHPWord/SectionTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section;
 
 /**

Tests/PHPWord/Shared/DrawingTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_Drawing;
 
 /**

Tests/PHPWord/Shared/FileTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_File;
 
 /**

Tests/PHPWord/Shared/FontTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Shared_Font;
 

Tests/PHPWord/Shared/StringTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_String;
 
 /**

Tests/PHPWord/Style/CellTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Cell;
 
 /**

Tests/PHPWord/Style/FontTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Style_Font;
 use PHPWord\Tests\TestHelperDOCX;

Tests/PHPWord/Style/ImageTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Image;
 
 /**

Tests/PHPWord/Style/ListItemTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_ListItem;
 
 /**

Tests/PHPWord/Style/ParagraphTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Style_Paragraph;
 use PHPWord_Style_Tab;

Tests/PHPWord/Style/RowTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Row;
 
 /**

Tests/PHPWord/Style/TOCTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_TOC;
 
 /**

Tests/PHPWord/Style/TableFullTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_TableFull;
 
 /**

Tests/PHPWord/Style/TableTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Table;
 
 /**

Tests/PHPWord/Style/TabsTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Style_Tab;
 use PHPWord_Style_Tabs;

Tests/PHPWord/TOCTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_TOC;
 use PHPWord_Style_TOC;
 
@@ -12,7 +11,7 @@ use PHPWord_Style_TOC;
  * @covers  PHPWord_TOC
  * @runTestsInSeparateProcesses
  */
-class TOCTest extends PHPUnit_Framework_TestCase
+class TOCTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @covers PHPWord_TOC::__construct

Tests/PHPWord/TemplateTest.php

@@ -6,21 +6,20 @@ use PHPWord_Template;
 /**
  * @coversDefaultClass PHPWord_Template
  */
-class TemplateTest extends \PHPUnit_Framework_TestCase
+final class TemplateTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers ::applyXslStyleSheet
+     * @covers ::save
      * @test
      */
-    final public function testXslStyleSheetCanBeApplied()
+    final public function testTemplateCanBeSavedInTemporaryLocation()
     {
-        $template = new PHPWord_Template(
+        $templateFqfn = \join(
-            \join(
+            \DIRECTORY_SEPARATOR,
-                \DIRECTORY_SEPARATOR,
+            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'with_table_macros.docx')
-                array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'with_table_macros.docx')
-            )
         );
 
+        $document = new PHPWord_Template($templateFqfn);
         $xslDOMDocument = new \DOMDocument();
         $xslDOMDocument->load(
             \join(
@@ -28,32 +27,61 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
                 array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'xsl', 'remove_tables_by_needle.xsl')
             )
         );
-
         foreach (array('${employee.', '${scoreboard.') as $needle) {
-            $template->applyXslStyleSheet($xslDOMDocument, array('needle' => $needle));
+            $document->applyXslStyleSheet($xslDOMDocument, array('needle' => $needle));
         }
 
-        $actualDocument = $template->save();
+        $documentFqfn = $document->save();
-        $expectedDocument = \join(
+
+        $this->assertNotEmpty($documentFqfn, 'FQFN of the saved document is empty.');
+        $this->assertFileExists($documentFqfn, "The saved document \"{$documentFqfn}\" doesn't exist.");
+
+        $templateZip = new \ZipArchive();
+        $templateZip->open($templateFqfn);
+        $templateXml = $templateZip->getFromName('word/document.xml');
+        if ($templateZip->close() === false) {
+            throw new \Exception("Could not close zip file \"{$templateZip}\".");
+        }
+
+        $documentZip = new \ZipArchive();
+        $documentZip->open($documentFqfn);
+        $documentXml = $documentZip->getFromName('word/document.xml');
+        if ($documentZip->close() === false) {
+            throw new \Exception("Could not close zip file \"{$documentZip}\".");
+        }
+
+        $this->assertNotEquals($documentXml, $templateXml);
+
+        return $documentFqfn;
+    }
+
+    /**
+     * @covers ::applyXslStyleSheet
+     * @depends testTemplateCanBeSavedInTemporaryLocation
+     * @test
+     */
+    final public function testXslStyleSheetCanBeApplied($actualDocumentFqfn)
+    {
+        $expectedDocumentFqfn = \join(
             \DIRECTORY_SEPARATOR,
             array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'documents', 'without_table_macros.docx')
         );
 
-        $actualZip = new \ZipArchive();
+        $actualDocumentZip = new \ZipArchive();
-        $actualZip->open($actualDocument);
+        $actualDocumentZip->open($actualDocumentFqfn);
-        $actualXml = $actualZip->getFromName('word/document.xml');
+        $actualDocumentXml = $actualDocumentZip->getFromName('word/document.xml');
-        if ($actualZip->close() === false) {
+        if ($actualDocumentZip->close() === false) {
-            throw new \Exception('Could not close zip file "' . $actualDocument . '".');
+            throw new \Exception("Could not close zip file \"{$actualDocumentFqfn}\".");
         }
 
-        $expectedZip = new \ZipArchive();
+        $expectedDocumentZip = new \ZipArchive();
-        $expectedZip->open($expectedDocument);
+        $expectedDocumentZip->open($expectedDocumentFqfn);
-        $expectedXml = $expectedZip->getFromName('word/document.xml');
+        $expectedDocumentXml = $expectedDocumentZip->getFromName('word/document.xml');
-        if ($expectedZip->close() === false) {
+        if ($expectedDocumentZip->close() === false) {
-            throw new \Exception('Could not close zip file "' . $expectedDocument . '".');
+            throw new \Exception("Could not close zip file \"{$expectedDocumentFqfn}\".");
         }
 
-        $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
+        $this->assertXmlStringEqualsXmlString($expectedDocumentXml, $actualDocumentXml);
     }
 
     /**

Tests/PHPWord/Writer/ODTextTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Writer_ODText;
 use PHPWord;
 

Tests/PHPWord/Writer/RTFTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Writer_RTF;
 use PHPWord;
 

Tests/PHPWord/Writer/Word2007/BaseTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer\Word2007;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord\Tests\TestHelperDOCX;
 

Tests/PHPWord/Writer/Word2007/DocumentTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer\Word2007;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Writer_Word2007;
 use PHPWord_Writer_Word2007_Document;

Tests/PHPWord/Writer/Word2007/StylesTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer\Word2007;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord\Tests\TestHelperDOCX;
 

Tests/PHPWord/Writer/Word2007Test.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Writer;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Writer_Word2007;
 use PHPWord;
 use PHPWord\Tests\TestHelperDOCX;

Tests/PHPWordTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_DocumentProperties;
 use PHPWord_Section;
@@ -14,7 +13,7 @@ use PHPWord_Style;
  * @covers  PHPWord
  * @runTestsInSeparateProcesses
  */
-class PHPWordTest extends PHPUnit_Framework_TestCase
+class PHPWordTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var PHPWord