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

ivanlanin · ivanlanin · commit bde866642930 · 2014-03-13T20:15:21.000+07:00
diff --git a/Tests/PHPWord/AutoloaderTest.php b/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()
     {
diff --git a/Tests/PHPWord/IOFactoryTest.php b/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;
diff --git a/Tests/PHPWord/MediaTest.php b/Tests/PHPWord/MediaTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Media;
 use PHPWord_Section;
 
diff --git a/Tests/PHPWord/Reader/Word2007Test.php b/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;
 
diff --git a/Tests/PHPWord/Section/Footer/PreserveTextTest.php b/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
diff --git a/Tests/PHPWord/Section/FooterTest.php b/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
diff --git a/Tests/PHPWord/Section/FootnoteTest.php b/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
diff --git a/Tests/PHPWord/Section/HeaderTest.php b/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
diff --git a/Tests/PHPWord/Section/ImageTest.php b/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;
 
diff --git a/Tests/PHPWord/Section/LinkTest.php b/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;
 
diff --git a/Tests/PHPWord/Section/ListItemTest.php b/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;
 
diff --git a/Tests/PHPWord/Section/MemoryImageTest.php b/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
diff --git a/Tests/PHPWord/Section/ObjectTest.php b/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
diff --git a/Tests/PHPWord/Section/PageBreakTest.php b/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
diff --git a/Tests/PHPWord/Section/SettingsTest.php b/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
diff --git a/Tests/PHPWord/Section/Table/CellTest.php b/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
diff --git a/Tests/PHPWord/Section/Table/RowTest.php b/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
diff --git a/Tests/PHPWord/Section/TableTest.php b/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
diff --git a/Tests/PHPWord/Section/TextBreakTest.php b/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
diff --git a/Tests/PHPWord/Section/TextRunTest.php b/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
diff --git a/Tests/PHPWord/Section/TextTest.php b/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
diff --git a/Tests/PHPWord/Section/TitleTest.php b/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
diff --git a/Tests/PHPWord/SectionTest.php b/Tests/PHPWord/SectionTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Section;
 
 /**
diff --git a/Tests/PHPWord/Shared/DrawingTest.php b/Tests/PHPWord/Shared/DrawingTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_Drawing;
 
 /**
diff --git a/Tests/PHPWord/Shared/FileTest.php b/Tests/PHPWord/Shared/FileTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_File;
 
 /**
diff --git a/Tests/PHPWord/Shared/FontTest.php b/Tests/PHPWord/Shared/FontTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord;
 use PHPWord_Shared_Font;
 
diff --git a/Tests/PHPWord/Shared/StringTest.php b/Tests/PHPWord/Shared/StringTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Shared;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Shared_String;
 
 /**
diff --git a/Tests/PHPWord/Style/CellTest.php b/Tests/PHPWord/Style/CellTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Cell;
 
 /**
diff --git a/Tests/PHPWord/Style/FontTest.php b/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;
diff --git a/Tests/PHPWord/Style/ImageTest.php b/Tests/PHPWord/Style/ImageTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Image;
 
 /**
diff --git a/Tests/PHPWord/Style/ListItemTest.php b/Tests/PHPWord/Style/ListItemTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_ListItem;
 
 /**
diff --git a/Tests/PHPWord/Style/ParagraphTest.php b/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;
diff --git a/Tests/PHPWord/Style/RowTest.php b/Tests/PHPWord/Style/RowTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Row;
 
 /**
diff --git a/Tests/PHPWord/Style/TOCTest.php b/Tests/PHPWord/Style/TOCTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_TOC;
 
 /**
diff --git a/Tests/PHPWord/Style/TableFullTest.php b/Tests/PHPWord/Style/TableFullTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_TableFull;
 
 /**
diff --git a/Tests/PHPWord/Style/TableTest.php b/Tests/PHPWord/Style/TableTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPWord\Tests\Style;
 
-use PHPUnit_Framework_TestCase;
 use PHPWord_Style_Table;
 
 /**
diff --git a/Tests/PHPWord/Style/TabsTest.php b/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;
diff --git a/Tests/PHPWord/TOCTest.php b/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 @@
  * @covers  PHPWord_TOC
  * @runTestsInSeparateProcesses
  */
-class TOCTest extends PHPUnit_Framework_TestCase
+class TOCTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @covers PHPWord_TOC::__construct
diff --git a/Tests/PHPWord/TemplateTest.php b/Tests/PHPWord/TemplateTest.php
diff --git a/Tests/PHPWord/Writer/ODTextTest.php b/Tests/PHPWord/Writer/ODTextTest.php
diff --git a/Tests/PHPWord/Writer/RTFTest.php b/Tests/PHPWord/Writer/RTFTest.php
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/PHPWord/Writer/Word2007Test.php b/Tests/PHPWord/Writer/Word2007Test.php
diff --git a/Tests/PHPWordTest.php b/Tests/PHPWordTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPWord\Tests;`
`3`	`3`
`4`		`-use PHPUnit_Framework_TestCase;`
`5`	`4`	`use PHPWord_Autoloader;`
`6`	`5`	`use PHPWord_Autoloader as Autoloader;`
`7`	`6`
`8`		`-class AutoloaderTest extends PHPUnit_Framework_TestCase`
	`7`	`+class AutoloaderTest extends \PHPUnit_Framework_TestCase`
`9`	`8`	`{`
`10`	`9`	`public function testRegister()`
`11`	`10`	`{`