Flatten Element folder

ivanlanin · ivanlanin · commit 6c5dd05570a9 · 2014-03-27T21:23:38.000+07:00
diff --git a/src/PhpWord/Container/Container.php b/src/PhpWord/Container/Container.php
@@ -33,7 +33,7 @@
 use PhpOffice\PhpWord\Element\TextBreak;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\Link;
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 use PhpOffice\PhpWord\Element\ListItem;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Image;
@@ -156,7 +156,7 @@ public function addLink($linkSrc, $linkName = null, $styleFont = null, $stylePar
      * @param string $text
      * @param mixed $styleFont
      * @param mixed $styleParagraph
-     * @return \PhpOffice\PhpWord\Element\Footer\PreserveText
+     * @return \PhpOffice\PhpWord\Element\PreserveText
      */
     public function addPreserveText($text, $styleFont = null, $styleParagraph = null)
     {
diff --git a/src/PhpWord/Element/Cell.php b/src/PhpWord/Element/Cell.php
@@ -23,13 +23,13 @@
  * @version    0.9.0
  */
 
-namespace PhpOffice\PhpWord\Element\Table;
+namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Exception\InvalidObjectException;
 use PhpOffice\PhpWord\Exception\InvalidImageException;
 use PhpOffice\PhpWord\Media;
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 use PhpOffice\PhpWord\Element\Image;
 use PhpOffice\PhpWord\Element\Link;
 use PhpOffice\PhpWord\Element\ListItem;
@@ -277,7 +277,7 @@ public function addObject($src, $style = null)
      * @param string $text
      * @param mixed $styleFont
      * @param mixed $styleParagraph
-     * @return \PhpOffice\PhpWord\Element\Footer\PreserveText
+     * @return \PhpOffice\PhpWord\Element\PreserveText
      */
     public function addPreserveText($text, $styleFont = null, $styleParagraph = null)
     {
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
@@ -23,7 +23,7 @@
  * @version    0.9.0
  */
 
-namespace PhpOffice\PhpWord\Element\Footer;
+namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
diff --git a/src/PhpWord/Element/Row.php b/src/PhpWord/Element/Row.php
@@ -23,7 +23,7 @@
  * @version    0.9.0
  */
 
-namespace PhpOffice\PhpWord\Element\Table;
+namespace PhpOffice\PhpWord\Element;
 
 /**
  * Table row element
@@ -99,7 +99,7 @@ public function __construct($insideOf, $pCount, $height = null, $style = null)
      *
      * @param int $width
      * @param mixed $style
-     * @return \PhpOffice\PhpWord\Element\Table\Cell
+     * @return \PhpOffice\PhpWord\Element\Cell
      */
     public function addCell($width = null, $style = null)
     {
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Element\Table\Row;
+use PhpOffice\PhpWord\Element\Row;
 
 /**
  * Table element
@@ -114,7 +114,7 @@ public function addRow($height = null, $style = null)
      *
      * @param int $width
      * @param mixed $style
-     * @return \PhpOffice\PhpWord\Element\Table\Cell
+     * @return \PhpOffice\PhpWord\Element\Cell
      */
     public function addCell($width = null, $style = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Base.php b/src/PhpWord/Writer/Word2007/Base.php
@@ -26,7 +26,7 @@
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 use PhpOffice\PhpWord\Element\Footnote;
 use PhpOffice\PhpWord\Element\Image;
 use PhpOffice\PhpWord\Element\Link;
diff --git a/src/PhpWord/Writer/Word2007/Footer.php b/src/PhpWord/Writer/Word2007/Footer.php
@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 use PhpOffice\PhpWord\Element\Image;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Text;
diff --git a/src/PhpWord/Writer/Word2007/Header.php b/src/PhpWord/Writer/Word2007/Header.php
@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 use PhpOffice\PhpWord\Element\Image;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Text;
diff --git a/tests/PhpWord/Tests/Container/FooterTest.php b/tests/PhpWord/Tests/Container/FooterTest.php
@@ -96,7 +96,7 @@ public function testAddPreserveText()
         $element = $oFooter->addPreserveText('text');
 
         $this->assertCount(1, $oFooter->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
     }
 
     public function testAddPreserveTextNotUTF8()
@@ -105,7 +105,7 @@ public function testAddPreserveTextNotUTF8()
         $element = $oFooter->addPreserveText(utf8_decode('ééé'));
 
         $this->assertCount(1, $oFooter->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
         $this->assertEquals($element->getText(), array('ééé'));
     }
 
diff --git a/tests/PhpWord/Tests/Container/HeaderTest.php b/tests/PhpWord/Tests/Container/HeaderTest.php
@@ -93,7 +93,7 @@ public function testAddPreserveText()
         $element = $oHeader->addPreserveText('text');
 
         $this->assertCount(1, $oHeader->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
     }
 
     public function testAddPreserveTextNotUTF8()
@@ -102,7 +102,7 @@ public function testAddPreserveTextNotUTF8()
         $element = $oHeader->addPreserveText(utf8_decode('ééé'));
 
         $this->assertCount(1, $oHeader->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
         $this->assertEquals($element->getText(), array('ééé'));
     }
 
diff --git a/tests/PhpWord/Tests/Element/CellTest.php b/tests/PhpWord/Tests/Element/CellTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace PhpOffice\PhpWord\Tests\Element\Table;
+namespace PhpOffice\PhpWord\Tests\Element;
 
-use PhpOffice\PhpWord\Element\Table\Cell;
+use PhpOffice\PhpWord\Element\Cell;
 
 class CellTest extends \PHPUnit_Framework_TestCase
 {
@@ -10,7 +10,7 @@ public function testConstruct()
         $iVal = rand(1, 1000);
         $oCell = new Cell('section', $iVal);
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table\\Cell', $oCell);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Cell', $oCell);
         $this->assertEquals($oCell->getWidth(), null);
     }
 
@@ -166,7 +166,7 @@ public function testAddPreserveText()
         $element = $oCell->addPreserveText('text');
 
         $this->assertCount(1, $oCell->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
     }
 
     public function testAddPreserveTextNotUTF8()
@@ -175,7 +175,7 @@ public function testAddPreserveTextNotUTF8()
         $element = $oCell->addPreserveText(utf8_decode('ééé'));
 
         $this->assertCount(1, $oCell->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);
         $this->assertEquals($element->getText(), array('ééé'));
     }
 
diff --git a/tests/PhpWord/Tests/Element/PreserveTextTest.php b/tests/PhpWord/Tests/Element/PreserveTextTest.php
@@ -1,15 +1,15 @@
 <?php
-namespace PhpOffice\PhpWord\Tests\Container\Footer;
+namespace PhpOffice\PhpWord\Tests\Element;
 
-use PhpOffice\PhpWord\Element\Footer\PreserveText;
+use PhpOffice\PhpWord\Element\PreserveText;
 
 class PreserveTextTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstruct()
     {
         $oPreserveText = new PreserveText();
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $oPreserveText);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $oPreserveText);
         $this->assertEquals($oPreserveText->getText(), null);
         $this->assertEquals($oPreserveText->getFontStyle(), null);
         $this->assertEquals($oPreserveText->getParagraphStyle(), null);
diff --git a/tests/PhpWord/Tests/Element/RowTest.php b/tests/PhpWord/Tests/Element/RowTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace PhpOffice\PhpWord\Tests\Element\Table;
+namespace PhpOffice\PhpWord\Tests\Element;
 
-use PhpOffice\PhpWord\Element\Table\Row;
+use PhpOffice\PhpWord\Element\Row;
 
 class RowTest extends \PHPUnit_Framework_TestCase
 {
@@ -10,7 +10,7 @@ public function testConstruct()
         $iVal = rand(1, 1000);
         $oRow = new Row('section', $iVal);
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table\\Row', $oRow);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Row', $oRow);
         $this->assertEquals($oRow->getHeight(), null);
         $this->assertInternalType('array', $oRow->getCells());
         $this->assertCount(0, $oRow->getCells());
@@ -37,7 +37,7 @@ public function testAddCell()
         $oRow = new Row('section', 1);
         $element = $oRow->addCell();
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table\\Cell', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Cell', $element);
         $this->assertCount(1, $oRow->getCells());
     }
 }
diff --git a/tests/PhpWord/Tests/Element/TableTest.php b/tests/PhpWord/Tests/Element/TableTest.php
@@ -46,7 +46,7 @@ public function testRow()
     {
         $oTable = new Table('section', 1);
         $element = $oTable->addRow();
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table\\Row', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Row', $element);
         $this->assertCount(1, $oTable->getRows());
     }
 
@@ -55,6 +55,6 @@ public function testCell()
         $oTable = new Table('section', 1);
         $oTable->addRow();
         $element = $oTable->addCell();
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table\\Cell', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Cell', $element);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`namespace PhpOffice\PhpWord\Element;`
`27`	`27`
`28`		`-use PhpOffice\PhpWord\Element\Table\Row;`
	`28`	`+use PhpOffice\PhpWord\Element\Row;`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* Table element`
`@@ -114,7 +114,7 @@ public function addRow($height = null, $style = null)`
`114`	`114`	`*`
`115`	`115`	`* @param int $width`
`116`	`116`	`* @param mixed $style`
`117`		`- * @return \PhpOffice\PhpWord\Element\Table\Cell`
	`117`	`+ * @return \PhpOffice\PhpWord\Element\Cell`
`118`	`118`	`*/`
`119`	`119`	`public function addCell($width = null, $style = null)`
`120`	`120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testAddPreserveText()`
`96`	`96`	`$element = $oFooter->addPreserveText('text');`
`97`	`97`
`98`	`98`	`$this->assertCount(1, $oFooter->getElements());`
`99`		`- $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);`
	`99`	`+ $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public function testAddPreserveTextNotUTF8()`
`@@ -105,7 +105,7 @@ public function testAddPreserveTextNotUTF8()`
`105`	`105`	`$element = $oFooter->addPreserveText(utf8_decode('ééé'));`
`106`	`106`
`107`	`107`	`$this->assertCount(1, $oFooter->getElements());`
`108`		`- $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);`
	`108`	`+ $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);`
`109`	`109`	`$this->assertEquals($element->getText(), array('ééé'));`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function testAddPreserveText()`
`93`	`93`	`$element = $oHeader->addPreserveText('text');`
`94`	`94`
`95`	`95`	`$this->assertCount(1, $oHeader->getElements());`
`96`		`- $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);`
	`96`	`+ $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public function testAddPreserveTextNotUTF8()`
`@@ -102,7 +102,7 @@ public function testAddPreserveTextNotUTF8()`
`102`	`102`	`$element = $oHeader->addPreserveText(utf8_decode('ééé'));`
`103`	`103`
`104`	`104`	`$this->assertCount(1, $oHeader->getElements());`
`105`		`- $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footer\\PreserveText', $element);`
	`105`	`+ $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\PreserveText', $element);`
`106`	`106`	`$this->assertEquals($element->getText(), array('ééé'));`
`107`	`107`	`}`
`108`	`108`