Merge branch 'stretch-table' of https://github.com/aoloe/php-PHPWord

troosan · troosan · commit 615c1d55761e · 2018-02-13T23:29:53.000+01:00
into tableLayout

Conflicts:
	src/PhpWord/Writer/Word2007/Style/Table.php
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -110,7 +110,7 @@ private function writeWidth(XMLWriter $xmlWriter, $width, $unit)
     /**
      * Enable/Disable automatic resizing of the table
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $layout autofit / fixed
      * @return void
      */

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private function writeWidth(XMLWriter $xmlWriter, $width, $unit)`
`110`	`110`	`/**`
`111`	`111`	`* Enable/Disable automatic resizing of the table`
`112`	`112`	`*`
`113`		`- * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter`
	`113`	`+ * @param \PhpOffice\Common\XMLWriter $xmlWriter`
`114`	`114`	`* @param string $layout autofit / fixed`
`115`	`115`	`* @return void`
`116`	`116`	`*/`