WIP

Author: 0b10011

.travis.yml

@@ -3,10 +3,6 @@ language: php
 dist: precise
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
     - 7.0
     - 7.1
     - 7.2
@@ -16,12 +12,9 @@ matrix:
     include:
         - php: 7.0
           env: COVERAGE=1
-        - php: 5.3
-          env: COMPOSER_MEMORY_LIMIT=2G
         - php: 7.3
           env: DEPENDENCIES="--ignore-platform-reqs"
     exclude:
-        - php: 5.3
         - php: 7.0
         - php: 7.3
 

docs/elements.rst

@@ -218,11 +218,11 @@ Table style can be defined with ``addTableStyle``:
 .. code-block:: php
 
     $tableStyle = array(
-        'borderColor' => '006699',
+        'borderColor' => new Hex('006699'),
         'borderSize'  => 6,
         'cellMargin'  => 50
     );
-    $firstRowStyle = array('bgColor' => '66BBFF');
+    $firstRowStyle = array('bgColor' => new Hex('66BBFF'));
     $phpWord->addTableStyle('myTable', $tableStyle, $firstRowStyle);
     $table = $section->addTable('myTable');
 

docs/general.rst

@@ -48,7 +48,7 @@ folder <https://github.com/PHPOffice/PHPWord/tree/master/samples/>`__.
     $fontStyleName = 'oneUserDefinedStyle';
     $phpWord->addFontStyle(
         $fontStyleName,
-        array('name' => 'Tahoma', 'size' => 10, 'color' => '1B2232', 'bold' => true)
+        array('name' => 'Tahoma', 'size' => 10, 'color' => new Hex('1B2232'), 'bold' => true)
     );
     $section->addText(
         '"The greatest accomplishment is not in never falling, '

docs/recipes.rst

@@ -75,7 +75,7 @@ Apply 'HeadingN' paragraph style to TextRun or Link. Sample code:
     $phpWord = new \PhpOffice\PhpWord\PhpWord();
     $phpWord->addTitleStyle(1, array('size' => 16, 'bold' => true));
     $phpWord->addTitleStyle(2, array('size' => 14, 'bold' => true));
-    $phpWord->addFontStyle('Link', array('color' => '0000FF', 'underline' => 'single'));
+    $phpWord->addFontStyle('Link', array('color' => new Hex('0000FF'), 'underline' => 'single'));
 
     $section = $phpWord->addSection();
 

docs/styles.rst

@@ -48,7 +48,7 @@ Available Font style options:
 - ``color``. Font color, e.g. *FF0000*.
 - ``doubleStrikethrough``. Double strikethrough, *true* or *false*.
 - ``fgColor``. Font highlight color, e.g. *yellow*, *green*, *blue*.
-   See ``\PhpOffice\PhpWord\Style\Font::FGCOLOR_...`` class constants for possible values
+   See ``\PhpOffice\PhpWord\Style\Colors\ForegroundColor::$allowed_colors`` variable for possible values
 - ``hint``. Font content type, *default*, *eastAsia*, or *cs*.
 - ``italic``. Italic, *true* or *false*.
 - ``name``. Font name, e.g. *Arial*.
@@ -105,15 +105,14 @@ Available Table style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
    See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` class constants for possible values.
-- ``bgColor``. Background color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
-- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in *twip*.
-- ``indent``. Table indent from leading margin. Must be an instance of ``\PhpOffice\PhpWord\ComplexType\TblWidth``.
-- ``width``. Table width in Fiftieths of a Percent or Twentieths of a Point.
-- ``unit``. The unit to use for the width. One of ``\PhpOffice\PhpWord\SimpleType\TblWidth``. Defaults to *auto*.
+- ``bgColor``. Background color. Must be an instance of ``\PhpOffice\PhpWord\Style\Colors\ColorInterface``.
+- ``border(Top|Right|Bottom|Left)Color``. Border color. Must be an instance of ``\PhpOffice\PhpWord\Style\Colors\ColorInterface``.
+- ``border(Top|Right|Bottom|Left)Size``. Border size. Must be an instance of ``\PhpOffice\PhpWord\Style\Lengths\Absolute``.
+- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin. Must be an instance of ``\PhpOffice\PhpWord\Style\Lengths\Absolute``.
+- ``indent``. Table indent from leading margin. Must be an instance of ``\PhpOffice\PhpWord\Lengths\Length``.
+- ``width``. Table width. Must be an instance of ``\PhpOffice\PhpWord\Lengths\Length``.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
-- ``cellSpacing`` Cell spacing in *twip*
+- ``cellSpacing`` Cell spacing. Must be an instance of ``\PhpOffice\PhpWord\Lengths\Absolute``
 - ``position`` Floating Table Positioning, see below for options
 - ``bidiVisual`` Present table as Right-To-Left
 

docs/templates-processing.rst

@@ -89,10 +89,10 @@ The result will be
 
     Customer: ${customer_name#1}
     Address: ${customer_address#1}
-    
+
     Customer: ${customer_name#2}
     Address: ${customer_address#2}
-    
+
     Customer: ${customer_name#3}
     Address: ${customer_address#3}
 
@@ -113,7 +113,7 @@ The result will then be
 
     Customer: Batman
     Address: Gotham City
-    
+
     Customer: Superman
     Address: Metropolis
 
@@ -234,7 +234,7 @@ See ``Sample_40_TemplateSetComplexValue.php`` for examples.
 
 .. code-block:: php
 
-    $table = new Table(array('borderSize' => 12, 'borderColor' => 'green', 'width' => 6000, 'unit' => TblWidth::TWIP));
+    $table = new Table(array('borderSize' => 12, 'borderColor' => 'green', 'width' => Absolute::from("twip", 6000)));
     $table->addRow();
     $table->addCell(150)->addText('Cell A1');
     $table->addCell(150)->addText('Cell A2');

samples/Sample_01_SimpleText.php

@@ -47,7 +47,7 @@
 $textrun = $section->addTextRun();
 $textrun->addText('I am inline styled ', $fontStyle);
 $textrun->addText('with ');
-$textrun->addText('color', array('color' => '996699'));
+$textrun->addText('color', array('color' => new Hex('996699')));
 $textrun->addText(', ');
 $textrun->addText('bold', array('bold' => true));
 $textrun->addText(', ');

samples/Sample_03_Sections.php

@@ -8,7 +8,7 @@
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 // New portrait section
-$section = $phpWord->addSection(array('borderColor' => '00FF00', 'borderSize' => 12));
+$section = $phpWord->addSection(array('borderColor' => new Hex('00FF00'), 'borderSize' => 12));
 $section->addText('I am placed on a default section.');
 
 // New landscape section

samples/Sample_04_Textrun.php

@@ -13,10 +13,10 @@
 $phpWord->addFontStyle($boldFontStyleName, array('bold' => true));
 
 $coloredFontStyleName = 'ColoredText';
-$phpWord->addFontStyle($coloredFontStyleName, array('color' => 'FF8080', 'bgColor' => 'FFFFCC'));
+$phpWord->addFontStyle($coloredFontStyleName, array('color' => new Hex('FF8080'), 'bgColor' => new Hex('FFFFCC')));
 
 $linkFontStyleName = 'NLink';
-$phpWord->addLinkStyle($linkFontStyleName, array('color' => '0000FF', 'underline' => \PhpOffice\PhpWord\Style\Font::UNDERLINE_SINGLE));
+$phpWord->addLinkStyle($linkFontStyleName, array('color' => new Hex('0000FF'), 'underline' => \PhpOffice\PhpWord\Style\Font::UNDERLINE_SINGLE));
 
 // New portrait section
 $section = $phpWord->addSection();

samples/Sample_06_Footnote.php

@@ -17,10 +17,10 @@
 $phpWord->addFontStyle($boldFontStyleName, array('bold' => true));
 
 $coloredFontStyleName = 'ColoredText';
-$phpWord->addFontStyle($coloredFontStyleName, array('color' => 'FF8080', 'bgColor' => 'FFFFCC'));
+$phpWord->addFontStyle($coloredFontStyleName, array('color' => new Hex('FF8080'), 'bgColor' => new Hex('FFFFCC')));
 
 $linkFontStyleName = 'NLink';
-$phpWord->addLinkStyle($linkFontStyleName, array('color' => '0000FF', 'underline' => \PhpOffice\PhpWord\Style\Font::UNDERLINE_SINGLE));
+$phpWord->addLinkStyle($linkFontStyleName, array('color' => new Hex('0000FF'), 'underline' => \PhpOffice\PhpWord\Style\Font::UNDERLINE_SINGLE));
 
 // New portrait section
 $section = $phpWord->addSection();