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

Author: ivanlanin

README.md

@@ -59,7 +59,7 @@ In this case, you will have to register the autoloader.
 
 ```php
 require_once 'path/to/PhpWord/src/PhpWord/Autoloader.php';
-PhpOffice\PhpWord\Autoloader::register();
+\PhpOffice\PhpWord\Autoloader::register();
 ```
 
 ## Basic usage

docs/general.rst

@@ -13,7 +13,7 @@ folder <https://github.com/PHPOffice/PHPWord/tree/master/samples/>`__.
 .. code-block:: php
 
     require_once 'src/PhpWord/Autoloader.php';
-    PhpOffice\PhpWord\Autoloader::register();
+    \PhpOffice\PhpWord\Autoloader::register();
 
     $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
@@ -73,7 +73,7 @@ during development to make the resulting XML file easier to read.
 
 .. code-block:: php
 
-    PhpOffice\PhpWord\Settings::setCompatibility(false);
+    \PhpOffice\PhpWord\Settings::setCompatibility(false);
 
 Zip class
 ~~~~~~~~~
@@ -87,7 +87,7 @@ included with PHPWord.
 
 .. code-block:: php
 
-    PhpOffice\PhpWord\Settings::setZipClass(PhpOffice\PhpWord\Settings::PCLZIP);
+    \PhpOffice\PhpWord\Settings::setZipClass(\PhpOffice\PhpWord\Settings::PCLZIP);
 
 Default font
 ------------

docs/setup.rst

@@ -53,7 +53,7 @@ invoke ``Autoloader::register``.
 .. code-block:: php
 
     require_once '/path/to/src/PhpWord/Autoloader.php';
-    PhpOffice\PhpWord\Autoloader::register();
+    \PhpOffice\PhpWord\Autoloader::register();
 
 Using samples
 -------------

samples/Sample_01_SimpleText.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , " Create new PhpWord object" , \EOL;
+echo date('H:i:s') , " Create new PhpWord object" , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $phpWord->addFontStyle('rStyle', array('bold' => true, 'italic' => true, 'size' => 16));
 $phpWord->addParagraphStyle('pStyle', array('align' => 'center', 'spaceAfter' => 100));
@@ -48,7 +48,7 @@
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_02_TabStops.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , ' Create new PhpWord object' , \EOL;
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 // Ads styles
@@ -28,15 +28,15 @@
 $section = $phpWord->addSection();
 
 // Add listitem elements
-$section->addText("Multiple Tabs:\tOne\tTwo\tThree", NULL, 'multipleTab');
-$section->addText("Left Aligned\tRight Aligned", NULL, 'rightTab');
-$section->addText("\tCenter Aligned",            NULL, 'centerTab');
+$section->addText("Multiple Tabs:\tOne\tTwo\tThree", null, 'multipleTab');
+$section->addText("Left Aligned\tRight Aligned", null, 'rightTab');
+$section->addText("\tCenter Aligned",            null, 'centerTab');
 
 // Save file
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_03_Sections.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , ' Create new PhpWord object' , \EOL;
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 // New portrait section
@@ -29,7 +29,7 @@
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_04_Textrun.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , ' Create new PhpWord object' , \EOL;
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 // Ads styles
@@ -37,7 +37,7 @@
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_05_Multicolumn.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , " Create new PhpWord object" , \EOL;
+echo date('H:i:s') , " Create new PhpWord object" , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $filler = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' .
     'Nulla fermentum, tortor id adipiscing adipiscing, tortor turpis commodo. ' .
@@ -39,7 +39,7 @@
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_06_Footnote.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word Document
-echo date('H:i:s') , " Create new PhpWord object" , \EOL;
+echo date('H:i:s') , " Create new PhpWord object" , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 \PhpOffice\PhpWord\Settings::setCompatibility(false);
 
@@ -41,7 +41,7 @@
 $name = basename(__FILE__, '.php');
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
 foreach ($writers as $writer => $extension) {
-    echo date('H:i:s'), " Write to {$writer} format", \EOL;
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
     $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
     $xmlWriter->save("{$name}.{$extension}");
     rename("{$name}.{$extension}", "results/{$name}.{$extension}");

samples/Sample_07_TemplateCloneRow.php

@@ -2,7 +2,7 @@
 include_once 'Sample_Header.php';
 
 // New Word document
-echo date('H:i:s') , " Create new PhpWord object" , \EOL;
+echo date('H:i:s') , " Create new PhpWord object" , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 $document = $phpWord->loadTemplate('resources/Sample_07_TemplateCloneRow.docx');
@@ -56,7 +56,7 @@
 $document->setValue('userPhone#3', '+1 428 889 775');
 
 $name = 'Sample_07_TemplateCloneRow.docx';
-echo date('H:i:s'), " Write to Word2007 format", \EOL;
+echo date('H:i:s'), " Write to Word2007 format", EOL;
 $document->saveAs($name);
 rename($name, "results/{$name}");