Merge branch 'master' of C:\Projects\PHPOffice\PHPSpreadsheet\develop with conflicts.

tests/data/Style/NumberFormat.php

@@ -33,6 +33,16 @@ return [
         12,
         '#.0#',
     ],
+    [
+        '-70',
+        -70,
+        '#,##0;[Red]-#,##0'
+    ],
+    [
+        '70',
+        -70,
+        '#,##0;[Red]#,##0'
+    ],
     [
         '0.1',
         0.10000000000000001,
@@ -114,6 +124,12 @@ return [
         12200000,
         '0.0,,',
     ],
+    // Percentage
+    [
+        '12%',
+        0.12,
+        '0%',
+    ],
     [
         '8%',
         0.080000000000000002,
@@ -221,4 +237,35 @@ return [
         13.0316,
         '_("€"* #,##0.00_);_("€"* \(#,##0.00\);_("€"* "-"??_);_(@_)',
     ],
+    // Named colours
+    // Simple color
+    [
+        '12345',
+        12345,
+        '[Green]General',
+    ],
+    // Multiple colors
+    [
+        '12345',
+        12345,
+        '[Blue]0;[Red]0',
+    ],
+    // Multiple colors
+    [
+        'Positive',
+        12,
+        '[Green]"Positive";[Red]"Negative";[Blue]"Zero"',
+    ],
+    // Multiple colors
+    [
+        'Zero',
+        0,
+        '[Green]"Positive";[Red]"Negative";[Blue]"Zero"',
+    ],
+    // Multiple colors
+    [
+        'Negative',
+        -2,
+        '[Green]"Positive";[Red]"Negative";[Blue]"Zero"',
+    ],
 ];