#58 - More fixes.

Author: Roman Syroeshko

README.md

@@ -103,15 +103,15 @@ $section->addText('Hello world! I am formatted by a user defined style',
     'myOwnStyle');
 
 // You can also put the appended element to local object like this:
-$fontStyle = new PhpOffice\PhpWord\Style\Font();
+$fontStyle = new \PhpOffice\PhpWord\Style\Font();
 $fontStyle->setBold(true);
 $fontStyle->setName('Verdana');
 $fontStyle->setSize(22);
 $myTextElement = $section->addText('Hello World!');
 $myTextElement->setFontStyle($fontStyle);
 
 // Finally, write the document:
-$xmlWriter = PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'Word2007');
+$xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'Word2007');
 $xmlWriter->save('helloWorld.docx');
 ```
 
@@ -125,15 +125,15 @@ You can use PhpWord helper functions to convert inches, centimeters, or points t
 ```php
 // Paragraph with 6 points space after
 $phpWord->addParagraphStyle('My Style', array(
-    'spaceAfter' => PhpOffice\PhpWord\Shared\Font::pointSizeToTwips(6))
+    'spaceAfter' => \PhpOffice\PhpWord\Shared\Font::pointSizeToTwips(6))
 );
 
 $section = $phpWord->createSection();
 $sectionStyle = $section->getSettings();
 // half inch left margin
-$sectionStyle->setMarginLeft(PhpOffice\PhpWord\Shared\Font::inchSizeToTwips(.5));
+$sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Font::inchSizeToTwips(.5));
 // 2 cm right margin
-$sectionStyle->setMarginRight(PhpOffice\PhpWord\Shared\Font::centimeterSizeToTwips(2));
+$sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Font::centimeterSizeToTwips(2));
 ```
 
 <a name="sections"></a>

Tests/PhpWord/DocumentPropertiesTest.php

@@ -4,8 +4,7 @@
 use PhpOffice\PhpWord\DocumentProperties;
 
 /**
- * @package                     PhpWord\Tests
- * @coversDefaultClass          PhpOffice\PhpWord\DocumentProperties
+ * @coversDefaultClass          \PhpOffice\PhpWord\DocumentProperties
  * @runTestsInSeparateProcesses
  */
 class DocumentPropertiesTest extends \PHPUnit_Framework_TestCase

Tests/PhpWord/Exceptions/ExceptionTest.php

@@ -6,8 +6,8 @@
 class ExceptionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\Exception
-     * @covers            PhpOffice\PhpWord\Exceptions\Exception
+     * @expectedException \PhpOffice\PhpWord\Exceptions\Exception
+     * @covers            \PhpOffice\PhpWord\Exceptions\Exception
      */
     public function testThrowException()
     {

Tests/PhpWord/Exceptions/InvalidImageExceptionTest.php

@@ -6,8 +6,8 @@
 class InvalidImageExceptionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\InvalidImageException
-     * @covers            PhpOffice\PhpWord\Exceptions\InvalidImageException
+     * @expectedException \PhpOffice\PhpWord\Exceptions\InvalidImageException
+     * @covers            \PhpOffice\PhpWord\Exceptions\InvalidImageException
      */
     public function testThrowException()
     {

Tests/PhpWord/Exceptions/InvalidStyleExceptionTest.php

@@ -6,8 +6,8 @@
 class InvalidStyleExceptionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\InvalidStyleException
-     * @covers            PhpOffice\PhpWord\Exceptions\InvalidStyleException
+     * @expectedException \PhpOffice\PhpWord\Exceptions\InvalidStyleException
+     * @covers            \PhpOffice\PhpWord\Exceptions\InvalidStyleException
      */
     public function testThrowException()
     {

Tests/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php

@@ -6,8 +6,8 @@
 class UnsupportedImageTypeExceptionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
-     * @covers            PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
+     * @expectedException \PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
+     * @covers            \PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
      */
     public function testThrowException()
     {

Tests/PhpWord/IOFactoryTest.php

@@ -5,8 +5,7 @@
 use PhpOffice\PhpWord\IOFactory;
 
 /**
- * @@coversDefaultClass         PhpOffice\PhpWord\IOFactory
- * @package                     PhpWord\Tests
+ * @coversDefaultClass         \PhpOffice\PhpWord\IOFactory
  * @runTestsInSeparateProcesses
  */
 final class IOFactoryTest extends \PHPUnit_Framework_TestCase
@@ -24,7 +23,7 @@ final public function testExistingWriterCanBeCreated()
 
     /**
      * @covers                   ::createWriter
-     * @expectedException        PhpOffice\PhpWord\Exceptions\Exception
+     * @expectedException        \PhpOffice\PhpWord\Exceptions\Exception
      * @expectedExceptionMessage Could not instantiate "Word2006" class.
      */
     final public function testNonexistentWriterCanNotBeCreated()
@@ -45,7 +44,7 @@ final public function testExistingReaderCanBeCreated()
 
     /**
      * @covers                   ::createReader
-     * @expectedException        PhpOffice\PhpWord\Exceptions\Exception
+     * @expectedException        \PhpOffice\PhpWord\Exceptions\Exception
      * @expectedExceptionMessage Could not instantiate "Word2006" class.
      */
     final public function testNonexistentReaderCanNotBeCreated()

Tests/PhpWord/MediaTest.php

@@ -37,7 +37,7 @@ public function testGetFooterMediaElements()
     /**
      * Todo: add memory image to this test
      *
-     * @covers PhpOffice\PhpWord\Media::addSectionMediaElement
+     * @covers \PhpOffice\PhpWord\Media::addSectionMediaElement
      */
     public function testAddSectionMediaElement()
     {

Tests/PhpWord/Reader/Word2007Test.php

@@ -4,14 +4,8 @@
 use PhpOffice\PhpWord\Reader\Word2007;
 use PhpOffice\PhpWord\IOFactory;
 
-/**
- * @package PhpWord\Tests
- */
 class Word2007Test extends \PHPUnit_Framework_TestCase
 {
-    /** @var Test file directory */
-    private $dir;
-
     /**
      * Init
      */
@@ -25,27 +19,25 @@ public function tearDown()
     public function testCanRead()
     {
         $dir = join(
-            DIRECTORY_SEPARATOR,
+            \DIRECTORY_SEPARATOR,
             array(\PHPWORD_TESTS_BASE_DIR, '_files', 'documents')
         );
         $object = new Word2007;
-        $file = $dir . DIRECTORY_SEPARATOR . 'reader.docx';
+        $file = $dir . \DIRECTORY_SEPARATOR . 'reader.docx';
         $this->assertTrue($object->canRead($file));
     }
 
     /**
-     * Test canRead() failure
-     *
-     * @expectedException Exception
+     * @expectedException \PhpOffice\PhpWord\Exceptions\Exception
      */
     public function testCanReadFailed()
     {
         $dir = join(
-            DIRECTORY_SEPARATOR,
+            \DIRECTORY_SEPARATOR,
             array(\PHPWORD_TESTS_BASE_DIR, '_files', 'documents')
         );
         $object = new Word2007;
-        $file = $dir . DIRECTORY_SEPARATOR . 'foo.docx';
+        $file = $dir . \DIRECTORY_SEPARATOR . 'foo.docx';
         $this->assertFalse($object->canRead($file));
         $object = IOFactory::load($file);
     }
@@ -56,10 +48,10 @@ public function testCanReadFailed()
     public function testLoad()
     {
         $dir = join(
-            DIRECTORY_SEPARATOR,
+            \DIRECTORY_SEPARATOR,
             array(\PHPWORD_TESTS_BASE_DIR, '_files', 'documents')
         );
-        $file = $dir . DIRECTORY_SEPARATOR . 'reader.docx';
+        $file = $dir . \DIRECTORY_SEPARATOR . 'reader.docx';
         $object = IOFactory::load($file);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $object);
     }

Tests/PhpWord/Section/ImageTest.php

@@ -4,7 +4,7 @@
 use PhpOffice\PhpWord\Section\Image;
 
 /**
- * @coversDefaultClass PhpOffice\PhpWord\Section\Image
+ * @coversDefaultClass \PhpOffice\PhpWord\Section\Image
  */
 class ImageTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,7 +32,7 @@ public function testConstructWithStyle()
         $oImage = new Image(
             $src,
             array('width' => 210, 'height' => 210, 'align' => 'center',
-                'wrappingStyle' => PhpOffice\PhpWord\Style\Image::WRAPPING_STYLE_BEHIND)
+                'wrappingStyle' => \PhpOffice\PhpWord\Style\Image::WRAPPING_STYLE_BEHIND)
         );
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oImage->getStyle());
@@ -52,7 +52,7 @@ public function testValidImageTypes()
     }
 
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\InvalidImageException
+     * @expectedException \PhpOffice\PhpWord\Exceptions\InvalidImageException
      * @covers            ::__construct
      */
     public function testImageNotFound()
@@ -61,7 +61,7 @@ public function testImageNotFound()
     }
 
     /**
-     * @expectedException PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
+     * @expectedException \PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
      * @covers            ::__construct
      */
     public function testInvalidImageTypes()