1.2.10

Added Font Color and Background Color Capabilities

.gitignore

@@ -1,4 +1,5 @@
-vendor*
+/vendor*
 /books.fw.png
 /datatypes.fw.png
 /styles.fw.png
+/.gitignore

CHANGELOG.md

@@ -1,35 +1,46 @@
 # Changelog
 
-## 1.0.21 (2021-09-03)
+# 1.2.10 (2022-04-24)
+* Added colors `<style color="#FFFF00" bgcolor="#00FF00">Yellow text on blue background</style>`, thx [mrjemson](https://github.com/mrjemson)
 
+# 1.1.12 (2022-03-15)
+* Added `$xlsx->mergeCells('A1:C1')`
+
+## 1.1.11 (2022-02-05)
+* sheet name maximum length is 31 chars, mb_substr used now
+* license fixed
+
+## 1.1.10 (2022-02-05)
+* namespace added, use Shuchkin\SimpleXLSXGen
+
+## 1.0.23 (2022-02-01)
+* fixed dates if year < 1900 and time only cells, thx [fapth](https://github.com/shuchkin/simplexlsxgen/issues/51)   
+
+## 1.0.22 (2021-10-29)
+* Escape \x00 and \x0B (vertical tab)
+
+## 1.0.21 (2021-09-03)
 *  Fixed saveAs / downloadAs / etc methods more than once
 
 ## 1.0.20 (2021-07-29)
-
 * Fixed sheet names duplicates (Page, Page (1), Page (2)...) 
 
 ## 1.0.19 (2021-07-28)
-
 * Fixed sheet names duplicates 
 
 ## 1.0.18 (2021-07-28)
-
 * Fixed email regex
 
 ## 1.0.17 (2021-07-28)
-
 * Fixed &quot; and &amp; in sheets names
 
 ## 1.0.16 (2021-07-01)
-
 * Fixed &quot;&amp;&quot; in hyperlinks
 
 ## 1.0.15 (2021-06-22)
-
 * Fixed *mailto* hyperlinks detection
 
 ## 1.0.14 (2021-06-08)
-
 * Added *mailto* hyperlinks support (thx Howard Martin)
 ```php
 SimpleXLSXGen::fromArray([
@@ -37,86 +48,65 @@ SimpleXLSXGen::fromArray([
 ])->saveAs('test.xlsx');
 ```
 ## 1.0.13 (2021-05-29)
-
 * Fixed hyperlinks in several sheets
 * Added [Opencollective donation link](https://opencollective.com/simplexlsx)
 
 ## 1.0.12 (2021-05-19)
-
 * Fixed hyperlink regex
 
 ## 1.0.11 (2021-05-14)
-
 * Fixed 0.00% format, thx [marcrobledo](https://github.com/shuchkin/simplexlsxgen/pull/34), more examples in README.md
 
 ## 1.0.10 (2021-05-03)
-
 Stable release
 
 * Added hyperlinks and minimal formatting
 
 ## 0.9.25 (2021-02-26)
-
 * Added PHP Datetime object values in a cells
 
 ## 0.9.24 (2021-02-26)
-
 * Percent support
 
 
 ## 0.9.23 (2021-01-25)
-
 * Fix local floats in XML
 
-
 ## 0.9.22 (2020-11-04)
-
 * Added multiple sheets support, thx [Savino59](https://github.com/Savino59), class ready for extend now
  
 ## 0.9.21 (2020-10-17)
-
 * Updated images
 
 ## 0.9.20 (2020-10-04)
-
 * Disable type detection if string started with chr(0)
 
 ## 0.9.19 (2020-08-23)
-
 * Numbers like SKU right aligned now
 
 ## 0.9.18 (2020-08-22)
-
 * Fixed fast shared strings index
  
 ## 0.9.17 (2020-08-21)
-
 * Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)
  
 ## 0.9.16 (2020-07-29)
-
 * Fixed time detection in HH:MM:SS format
 
 ## 0.9.15 (2020-07-14)
-
 * Escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) 
 
 ## 0.9.14 (2020-05-31)
-
 * Fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu
 
 ## 0.9.13 (2020-05-21)
-
 * If string more 160 chars, save as inlineStr
 
 ## 0.9.12 (2020-05-21)
-
 * Readme fixed
 
 ## 0.9.11 (2020-05-21)
-
 * Removed XML unimportant attributes
 
 ## 0.9.10 (2020-05-20)
-
 * Initial release

README.md

@@ -1,8 +1,10 @@
 # SimpleXLSXGen
 [<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues)
 
-Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.<br/>
-(!) XLSX reader [here](https://github.com/shuchkin/simplexlsx).  
+Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.  
+- XLSX reader [here](https://github.com/shuchkin/simplexlsx)
+- XLS reader [here](https://github.com/shuchkin/simplexls)
+- CSV reader/writer [here](https://github.com/shuchkin/simplecsv)
 
 **Sergey Shuchkin** <sergey.shuchkin@gmail.com> 2020-2021<br/>
 
@@ -15,7 +17,7 @@ $books = [
     [618260307, 'The Hobbit', 'J. R. R. Tolkien', 'Houghton Mifflin', 'USA'],
     [908606664, 'Slinky Malinki', 'Lynley Dodd', 'Mallinson Rendel', 'NZ']
 ];
-$xlsx = SimpleXLSXGen::fromArray( $books );
+$xlsx = Shuchkin\SimpleXLSXGen::fromArray( $books );
 $xlsx->saveAs('books.xlsx'); // or downloadAs('books.xlsx') or $xlsx_content = (string) $xlsx 
 ```
 ![XLSX screenshot](books.png)
@@ -46,7 +48,7 @@ $data = [
     ['Hyperlink + Anchor', '<a href="https://github.com/shuchkin/simplexlsxgen">SimpleXLSXGen</a>'],
     ['RAW string', "\0".'2020-10-04 16:02:00']
 ];
-SimpleXLSXGen::fromArray( $data )->saveAs('datatypes.xlsx');
+Shuchkin\SimpleXLSXGen::fromArray( $data )->saveAs('datatypes.xlsx');
 ```
 ![XLSX screenshot](datatypes.png)
 
@@ -61,14 +63,19 @@ $data = [
     ['Bold + Italic', '<b><i>12345.67</i></b>'],
     ['Hyperlink', 'https://github.com/shuchkin/simplexlsxgen'],
     ['Italic + Hyperlink + Anchor', '<i><a href="https://github.com/shuchkin/simplexlsxgen">SimpleXLSXGen</a></i>'],
+    ['Green', '<style color="#00FF00">12345.67</style>'],
+    ['Bold Red Text', '<b><style color="#FF0000">12345.67</style></b>'],
+    ['Blue Text and Yellow Fill', '<style bgcolor="#FFFF00" color="#0000FF">12345.67</style>'],
     ['Left', '<left>12345.67</left>'],
     ['Center', '<center>12345.67</center>'],
     ['Right', '<right>Right Text</right>'],
-    ['Center + Bold', '<center><b>Name</b></center>']
+    ['Center + Bold', '<center><b>Name</b></center>'],
+    ['<center>MERGE CELLS</center>', null]
 ];
 SimpleXLSXGen::fromArray( $data )
     ->setDefaultFont( 'Courier New' )
     ->setDefaultFontSize( 14 )
+    ->mergeCells('A16:B16')
     ->saveAs('styles_and_tags.xlsx');
 ```
 ![XLSX screenshot](styles.png)
@@ -76,15 +83,16 @@ SimpleXLSXGen::fromArray( $data )
 ### More examples
 ```php
 // Fluid interface, output to browser for download
-SimpleXLSXGen::fromArray( $books )->downloadAs('table.xlsx');
+Shuchkin\SimpleXLSXGen::fromArray( $books )->downloadAs('table.xlsx');
 
 // Fluid interface, multiple sheets
-SimpleXLSXGen::fromArray( $books )->addSheet( $books2 )->download();
+Shuchkin\SimpleXLSXGen::fromArray( $books )->addSheet( $books2 )->download();
 
 // Alternative interface, sheet name, get xlsx content
-$xlsx_cache = (string) (new SimpleXLSXGen)->addSheet( $books, 'Modern style');
+$xlsx_cache = (string) (new Shuchkin\SimpleXLSXGen)->addSheet( $books, 'Modern style');
 
 // Classic interface
+use Shuchkin\SimpleXLSXGen
 $xlsx = new SimpleXLSXGen();
 $xlsx->addSheet( $books, 'Catalog 2021' );
 $xlsx->addSheet( $books2, 'Stephen King catalog');
@@ -99,6 +107,7 @@ ini_set('display_errors', 1 );
 
 $data = [
     ['Debug', 123]
-]
-SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
+];
+
+Shuchkin\SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
 ```

composer.json

@@ -17,6 +17,7 @@
     ]
   },
   "require": {
+    "php": ">=5.4",
     "ext-mbstring": "*",
     "ext-zlib": "*"
   }

license.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Lukas Martinelli
+Copyright (c) 2020-2022 Sergey Shuchkin sergey.shuchkin@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/SimpleXLSXGen.php

@@ -1,4 +1,11 @@
-<?php
+<?php /** @noinspection ReturnTypeCanBeDeclaredInspection */
+/** @noinspection PhpMissingReturnTypeInspection */
+/** @noinspection NullCoalescingOperatorCanBeUsedInspection */
+
+/** @noinspection PhpIssetCanBeReplacedWithCoalesceInspection */
+
+namespace Shuchkin;
+
 /**
  * Class SimpleXLSXGen
  * Export data to MS Excel. PHP XLSX generator
@@ -12,7 +19,6 @@ class SimpleXLSXGen {
     protected $defaultFontSize;
     protected $sheets;
     protected $template;
-	protected $F, $F_KEYS; // fonts
     protected $XF, $XF_KEYS; // cellXfs
     protected $SI, $SI_KEYS; // shared strings
     const N_NORMAL = 0; // General
@@ -29,22 +35,31 @@ class SimpleXLSXGen {
     const F_ITALIC = 4;
     const F_UNDERLINE = 8;
     const F_STRIKE = 16;
+    const F_COLOR = 32;
+    const FL_NONE = 0; // none
+    const FL_SOLID = 1; // solid
+    const FL_MEDIUM_GRAY = 2; // mediumGray
+    const FL_DARK_GRAY = 4; // darkGray
+	const FL_LIGHT_GRAY = 8; // lightGray
+    const FL_GRAY_125 = 16; // gray125
+    const FL_COLOR = 32;
     const A_DEFAULT = 0;
     const A_LEFT = 1;
     const A_RIGHT = 2;
     const A_CENTER = 3;
 
-
     public function __construct() {
         $this->curSheet = -1;
         $this->defaultFont = 'Calibri';
-		$this->sheets = [ ['name' => 'Sheet1', 'rows' => [], 'hyperlinks' => [] ] ];
+        $this->sheets = [ ['name' => 'Sheet1', 'rows' => [], 'hyperlinks' => [], 'mergecells' => [] ] ];
         $this->SI = [];		// sharedStrings index
         $this->SI_KEYS = []; //  & keys
-		$this->F = [ self::F_NORMAL ]; // fonts
-		$this->F_KEYS = [0]; // & keys
-		$this->XF  = [ [self::N_NORMAL, self::F_NORMAL, self::A_DEFAULT] ]; // styles
-		$this->XF_KEYS = ['N0F0A0' => 0 ]; // & keys
+        $this->XF  = [  // styles
+            [self::N_NORMAL, self::A_DEFAULT, self::F_NORMAL, self::FL_NONE, 0, 0],
+            [self::N_NORMAL, self::A_DEFAULT, self::F_NORMAL, self::FL_GRAY_125, 0, 0], // hack
+        ];
+        $this->XF_KEYS['0-0-0-0-0-0'] = 0; // & keys
+        $this->XF_KEYS['0-0-0-16-0-0'] = 1;
 
         $this->template = [
             '_rels/.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -71,7 +86,7 @@ class SimpleXLSXGen {
             'xl/worksheets/sheet1.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
     xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-><dimension ref="{REF}"/>{COLS}<sheetData>{ROWS}</sheetData>{HYPERLINKS}</worksheet>',
+><dimension ref="{REF}"/>{COLS}<sheetData>{ROWS}</sheetData>{MERGECELLS}{HYPERLINKS}</worksheet>',
             'xl/worksheets/_rels/sheet1.xml.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">{HYPERLINKS}</Relationships>',
             'xl/sharedStrings.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -79,7 +94,7 @@ class SimpleXLSXGen {
             'xl/styles.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
 {FONTS}
-<fills count="1"><fill><patternFill patternType="none"/></fill></fills>
+{FILLS}
 <borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders>
 <cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" /></cellStyleXfs>
 {XF}
@@ -110,8 +125,7 @@ class SimpleXLSXGen {
         // <si><t>Простой шаблон</t></si><si><t>Будем делать генератор</t></si>
     }
     public static function fromArray( array $rows, $sheetName = null ) {
-		$xlsx = new static();
-		return $xlsx->addSheet( $rows, $sheetName );
+        return (new static())->addSheet( $rows, $sheetName );
     }
 
     public function addSheet( array $rows, $name = null ) {
@@ -120,13 +134,18 @@ class SimpleXLSXGen {
         if ( $name === null ) { // autogenerated sheet names
             $name = 'Sheet'.($this->curSheet+1);
         } else {
+            $name = mb_substr($name, 0, 31);
             $names = [];
             foreach( $this->sheets as $sh ) {
-				$names[ strtoupper( $sh['name']) ] = 1;
+                $names[ mb_strtoupper( $sh['name']) ] = 1;
             }
             for( $i = 0; $i < 100; $i++ ) {
-				$new_name = ($i === 0) ? $name : $name .' ('.$i.')';
-				$NEW_NAME = strtoupper( $new_name );
+                $postfix = ' ('.$i.')';
+                $new_name = ($i === 0) ? $name : $name . $postfix;
+                if (mb_strlen($new_name) > 31) {
+                    $new_name = mb_substr($name,0, 31-mb_strlen($postfix)) . $postfix;
+                }
+                $NEW_NAME = mb_strtoupper( $new_name );
                 if ( !isset( $names[ $NEW_NAME ]) ) {
                     $name = $new_name;
                     break;
@@ -134,9 +153,9 @@ class SimpleXLSXGen {
             }
         }
 
-		$this->sheets[$this->curSheet] = ['name' => $name, 'hyperlinks' => []];
+        $this->sheets[$this->curSheet] = ['name' => $name, 'hyperlinks' => [], 'mergecells' => []];
 
-		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
+        if ( isset( $rows[0] ) && is_array($rows[0]) ) {
             $this->sheets[$this->curSheet]['rows'] = $rows;
         } else {
             $this->sheets[$this->curSheet]['rows'] = [];
@@ -289,30 +308,64 @@ class SimpleXLSXGen {
                 $this->_writeEntry($fh, $cdrec, $cfilename, $template);
                 $entries++;
             } elseif ( $cfilename === 'xl/styles.xml' ) {
-				$FONTS = ['<fonts count="'.count($this->F).'">'];
-				foreach ( $this->F as $f ) {
+                $XF = $FONTS = $F_KEYS = $FILLS = $FL_KEYS = [];
+//                print_r( $this->XF );
+                foreach( $this->XF as $xf ) {
+                    // 0 - num fmt, 1 - align, 2 - font, 3 - fill, 4 - font color, 5 - bgcolor
+                    // fonts
+                    $F_KEY = $xf[2].'-'.$xf[4];
+                    if ( isset($F_KEYS[ $F_KEY ]) ) {
+                        $F_ID = $F_KEYS[ $F_KEY ];
+                    } else {
+                        $F_ID = $F_KEYS[ $F_KEY ] = count( $FONTS );
+
                         $FONTS[] = '<font><name val="'.$this->defaultFont.'"/><family val="2"/>'
                             . ( $this->defaultFontSize ? '<sz val="'.$this->defaultFontSize.'"/>' : '' )
-						.( $f & self::F_BOLD ? '<b/>' : '')
-						.( $f & self::F_ITALIC ? '<i/>' : '')
-						.( $f & self::F_UNDERLINE ? '<u/>' : '')
-						.( $f & self::F_STRIKE ? '<strike/>' : '')
-						.( $f & self::F_HYPERLINK ? '<color rgb="FF0563C1"/><u/>' : '')
+                            .( $xf[2] & self::F_BOLD ? '<b/>' : '')
+                            .( $xf[2] & self::F_ITALIC ? '<i/>' : '')
+                            .( $xf[2] & self::F_UNDERLINE ? '<u/>' : '')
+                            .( $xf[2] & self::F_STRIKE ? '<strike/>' : '')
+                            .( $xf[2] & self::F_HYPERLINK ? '<u/>' : '')
+                            .( $xf[2] & self::F_COLOR ? '<color rgb="'.$xf[4].'"/>' : '')
                             .'</font>';
                     }
-				$FONTS[] = '</fonts>';
-				$XF = ['<cellXfs count="'.count($this->XF).'">'];
-				foreach( $this->XF as $xf ) {
-					$align = ($xf[2] === self::A_LEFT ? ' applyAlignment="1"><alignment horizontal="left"/>' : '')
-						.($xf[2] === self::A_RIGHT ? ' applyAlignment="1"><alignment horizontal="right"/>' : '')
-						.($xf[2] === self::A_CENTER ? ' applyAlignment="1"><alignment horizontal="center"/>' : '');
-					$XF[] = '<xf numFmtId="'.$xf[0].'" fontId="'.$xf[1].'" fillId="0" borderId="0" xfId="0"'
+                    // fills
+                    $FL_KEY = $xf[3].'-'.$xf[5];
+                    if (isset($FL_KEYS[$FL_KEY])) {
+                        $FL_ID = $FL_KEYS[ $FL_KEY ];
+                    } else {
+                        $FL_ID = $FL_KEYS[ $FL_KEY ] = count($FILLS);
+                        $FILLS[] = '<fill><patternFill patternType="'
+                            .( $xf[3] === 0 ? 'none' : '')
+                            .( $xf[3] & self::FL_SOLID ? 'solid' : '')
+                            .( $xf[3] & self::FL_MEDIUM_GRAY ? 'mediumGray' : '')
+                            .( $xf[3] & self::FL_DARK_GRAY ? 'darkGray' : '')
+                            .( $xf[3] & self::FL_LIGHT_GRAY ? 'lightGray' : '')
+                            .( $xf[3] & self::FL_GRAY_125 ? 'gray125' : '')
+                            .'"'
+                            .( $xf[3] & self::FL_COLOR ? '><fgColor rgb="'.$xf[5].'"/><bgColor indexed="64"/></patternFill>' : ' />')
+                            .'</fill>';
+                    }
+                    $align = ($xf[1] === self::A_LEFT ? ' applyAlignment="1"><alignment horizontal="left"/>' : '')
+                        .($xf[1] === self::A_RIGHT ? ' applyAlignment="1"><alignment horizontal="right"/>' : '')
+                        .($xf[1] === self::A_CENTER ? ' applyAlignment="1"><alignment horizontal="center"/>' : '');
+
+                    $XF[] = '<xf numFmtId="'.$xf[0].'" fontId="'.$F_ID.'" fillId="'.$FL_ID.'" borderId="0" xfId="0"'
                         .($xf[0] > 0 ? ' applyNumberFormat="1"' : '')
+                        .($F_ID > 0 ? ' applyFont="1"' : '')
+                        .($FL_ID > 0 ? ' applyFill="1"' : '')
                         .($align ? $align . '</xf>' : '/>');
 
                 }
+                // wrap collections
+                array_unshift( $XF, '<cellXfs count="'.count($XF).'">');
                 $XF[] = '</cellXfs>';
-				$template = str_replace(['{FONTS}','{XF}'], [implode("\r\n", $FONTS), implode("\r\n", $XF)], $template);
+                array_unshift($FONTS, '<fonts count="'.count($FONTS).'">');
+                $FONTS[] = '</fonts>';
+                array_unshift($FILLS, '<fills count="'.count($FILLS).'">');
+                $FILLS[] = '</fills>';
+
+                $template = str_replace(['{FONTS}','{XF}','{FILLS}'], [implode("\r\n", $FONTS), implode("\r\n", $XF), implode("\r\n", $FILLS)], $template);
                 $this->_writeEntry($fh, $cdrec, $cfilename, $template);
                 $entries++;
             } else {
@@ -435,14 +488,15 @@ class SimpleXLSXGen {
                     if ( !isset($COL[ $CUR_COL ])) {
                         $COL[ $CUR_COL ] = 0;
                     }
+                    $cname = $this->num2name($CUR_COL) . $CUR_ROW;
+
                     if ( $v === null || $v === '' ) {
+                        $row .= '<c r="'.$cname.'"/>';
                         continue;
                     }
 
-					$cname = $this->num2name($CUR_COL) . $CUR_ROW;
-
                     $ct = $cv = null;
-					$N = $F = $A = 0;
+                    $N = $A = $F = $FL = $C = $B = 0;
 
                     if ( is_string($v) ) {
 
@@ -463,6 +517,18 @@ class SimpleXLSXGen {
                                 if ( strpos( $v, '<s>' ) !== false ) {
                                     $F += self::F_STRIKE;
                                 }
+                                if ( preg_match('/<style([^>]+)>/', $v, $m ) ) {
+
+                                    if ( preg_match('/ color="([^"]+)"/', $m[1], $m2) ) {
+
+                                        $F += self::F_COLOR;
+                                        $C = strlen($m2[1]) === 8 ? $m2[1] : ('FF' . ltrim($m2[1],'#'));
+                                    }
+                                    if ( preg_match('/ bgcolor="([^"]+)"/', $m[1], $m2) ) {
+                                        $FL += self::FL_COLOR;
+                                        $B = strlen($m2[1]) === 8 ? $m2[1] : ('FF' . ltrim($m2[1],'#'));
+                                    }
+                                }
                                 if ( strpos( $v, '<left>' ) !== false ) {
                                     $A += self::A_LEFT;
                                 }
@@ -475,11 +541,11 @@ class SimpleXLSXGen {
                                 if ( preg_match( '/<a href="(https?:\/\/[^"]+)">(.*?)<\/a>/i', $v, $m ) ) {
                                     $h = explode( '#', $m[1] );
                                     $this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $h[0], 'L' => isset( $h[1] ) ? $h[1] : ''];
-									$F = self::F_HYPERLINK; // Hyperlink
+                                    $F += self::F_HYPERLINK; // Hyperlink
                                 }
                                 if ( preg_match( '/<a href="(mailto?:[^"]+)">(.*?)<\/a>/i', $v, $m ) ) {
                                     $this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $m[1], 'L' => ''];
-									$F = self::F_HYPERLINK; // mailto hyperlink
+                                    $F += self::F_HYPERLINK; // mailto hyperlink
                                 }
                                 $v = strip_tags( $v );
                             } // tags
@@ -511,19 +577,23 @@ class SimpleXLSXGen {
                                 $N = self::N_TIME; // time
                             } elseif ( preg_match( '/^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
                                 $cv = $this->date2excel( $m[1], $m[2], $m[3], $m[4], $m[5], $m[6] );
-								$N = self::N_DATETIME; // [22] m/d/yy h:mm
+                                $N = ((int) $m[1] === 0) ? self::N_TIME : self::N_DATETIME; // [22] m/d/yy h:mm
                             } elseif ( preg_match( '/^(\d\d)\/(\d\d)\/(\d\d\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
                                 $cv = $this->date2excel( $m[3], $m[2], $m[1], $m[4], $m[5], $m[6] );
                                 $N = self::N_DATETIME; // [22] m/d/yy h:mm
                             } elseif ( preg_match( '/^[0-9+-.]+$/', $v ) ) { // Long ?
-								$A = self::A_RIGHT;
+                                $A += self::A_RIGHT;
                             } elseif ( preg_match( '/^https?:\/\/\S+$/i', $v ) ) {
                                 $h = explode( '#', $v );
                                 $this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $h[0], 'L' => isset( $h[1] ) ? $h[1] : ''];
-								$F = self::F_HYPERLINK; // Hyperlink
+                                $F += self::F_HYPERLINK; // Hyperlink
                             } elseif ( preg_match( "/^[a-zA-Z0-9_\.\-]+@([a-zA-Z0-9][a-zA-Z0-9\-]*\.)+[a-zA-Z]{2,}$/", $v ) ) {
                                 $this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => 'mailto:' . $v, 'L' => ''];
-								$F = self::F_HYPERLINK; // Hyperlink
+                                $F += self::F_HYPERLINK; // Hyperlink
+                            }
+                            if ( ($N === self::N_DATE || $N === self::N_DATETIME) && $cv < 0 ) {
+                                $cv = null;
+                                $N = 0;
                             }
                         }
                         if ( !$cv) {
@@ -553,9 +623,9 @@ class SimpleXLSXGen {
                     } elseif ( is_float( $v ) ) {
                         $vl = mb_strlen( (string) $v );
                         $cv = $v;
-					} elseif ( $v instanceof DateTime ) {
+                    } elseif ( $v instanceof \DateTime ) {
                         $vl = 16;
-						$cv = $this->date2excel( $v->format('Y'), $v->format('m'), $v->format('d'), $v->format('H'), $v->format('i'), $v->format('s') );
+                        $cv = $this->date2excel($v->format('Y'), $v->format('m'), $v->format('d'), $v->format('H'), $v->format('i'), $v->format('s'));
                         $N = self::N_DATETIME; // [22] m/d/yy h:mm
                     } else {
                         continue;
@@ -564,28 +634,31 @@ class SimpleXLSXGen {
                     $COL[ $CUR_COL ] = max( $vl, $COL[ $CUR_COL ] );
 
                     $cs = 0;
-					if ( $N + $F + $A > 0 ) {
 
-						if ( isset($this->F_KEYS[ $F ] ) ) {
-							$cf = $this->F_KEYS[ $F ];
-						} else {
-							$cf = count($this->F);
-							$this->F_KEYS[$F] = $cf;
-							$this->F[] = $F;
+                    if ( $N + $A + $F + $FL > 0 ) {
+
+                        if ( $FL === self::FL_COLOR ) {
+                            $FL += self::FL_SOLID;
                         }
-						$NFA = 'N' . $N . 'F' . $cf . 'A' . $A;
-						if ( isset( $this->XF_KEYS[ $NFA ] ) ) {
-							$cs = $this->XF_KEYS[ $NFA ];
+                        if ( ($F & self::F_HYPERLINK) && !($F & self::F_COLOR)) {
+                            $F += self::F_COLOR;
+                            $C = 'FF0563C1';
+                        }
+
+                        $XF_KEY = $N . '-' . $A  . '-' . $F. '-'. $FL . '-' . $C . '-' . $B;
+//                        echo $cname .'='.$XF_KEY.PHP_EOL;
+                        if ( isset( $this->XF_KEYS[ $XF_KEY ] ) ) {
+                            $cs = $this->XF_KEYS[ $XF_KEY ];
                         }
                         if ( $cs === 0 ) {
                             $cs = count( $this->XF );
-							$this->XF_KEYS[ $NFA ] = $cs;
-							$this->XF[] = [$N, $cf, $A];
+                            $this->XF_KEYS[ $XF_KEY ] = $cs;
+                            $this->XF[] = [$N, $A, $F, $FL, $C, $B];
                         }
                     }
 
-					$row .= '<c r="' . $cname . '"'.($ct ? ' t="'.$ct.'"' : '').($cs ? ' s="'.$cs.'"' : '').'>'
-					        .($ct === 'inlineStr' ? '<is><t>'.$cv.'</t></is>' : '<v>' . $cv . '</v>')."</c>\r\n";
+                    $row .= '<c r="' . $cname . '"' . ($ct ? ' t="' . $ct . '"' : '') . ($cs ? ' s="' . $cs . '"' : '') . '>'
+                            . ($ct === 'inlineStr' ? '<is><t>' . $cv . '</t></is>' : '<v>' . $cv . '</v>') . "</c>\r\n";
                 }
                 $ROWS[] = $row . "</row>\r\n";
             }
@@ -593,11 +666,22 @@ class SimpleXLSXGen {
                 $COLS[] = '<col min="'.$k.'" max="'.$k.'" width="'.min( $max+1, 60).'" />';
             }
             $COLS[] = '</cols>';
-			$REF = 'A1:'.$this->num2name(count($COLS)) . $CUR_ROW;
+            $REF = 'A1:'.$this->num2name(count($COL)) . $CUR_ROW;
         } else {
             $ROWS[] = '<row r="1"><c r="A1" t="s"><v>0</v></c></row>';
             $REF = 'A1:A1';
         }
+
+        $MERGECELLS = [];
+        if ( count($this->sheets[$idx]['mergecells']) ) {
+            $MERGECELLS[] = '';
+            $MERGECELLS[] = '<mergeCells count="'.count($this->sheets[$idx]['mergecells']).'">';
+            foreach( $this->sheets[$idx]['mergecells'] as $m ) {
+                $MERGECELLS[] = '<mergeCell ref="'.$m.'"/>';
+            }
+            $MERGECELLS[] = '</mergeCells>';
+        }
+
         $HYPERLINKS = [];
         if ( count( $this->sheets[$idx]['hyperlinks']) ) {
             $HYPERLINKS[] = '<hyperlinks>';
@@ -609,8 +693,8 @@ class SimpleXLSXGen {
         //restore locale
         setlocale(LC_NUMERIC, $_loc);
 
-		return str_replace(['{REF}','{COLS}','{ROWS}','{HYPERLINKS}'],
-			[ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS), implode("\r\n", $HYPERLINKS) ],
+        return str_replace(['{REF}','{COLS}','{ROWS}','{MERGECELLS}','{HYPERLINKS}'],
+            [ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS), implode("\r\n", $MERGECELLS), implode("\r\n", $HYPERLINKS) ],
             $template );
     }
 
@@ -625,15 +709,16 @@ class SimpleXLSXGen {
     }
 
     public function date2excel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
+
         $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
 
-	    if ( $year === 0 ) {
+        if ( (int) $year === 0 ) {
             return $excelTime;
         }
 
         // self::CALENDAR_WINDOWS_1900
         $excel1900isLeapYear = True;
-		if (((int)$year === 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
+        if (($year === 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
         $myExcelBaseDate = 2415020;
 
         // Julian base date Adjustment
@@ -643,9 +728,9 @@ class SimpleXLSXGen {
             $month += 9;
             --$year;
         }
-		//    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
         $century = substr($year,0,2);
         $decade = substr($year,2,2);
+        //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
         $excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myExcelBaseDate + $excel1900isLeapYear;
 
         return (float) $excelDate + $excelTime;
@@ -658,7 +743,13 @@ class SimpleXLSXGen {
         $this->defaultFontSize = $size;
         return $this;
     }
+    public function mergeCells( $range ) {
+        $this->sheets[$this->curSheet]['mergecells'][] = $range;
+        return $this;
+    }
     public function esc( $str ) {
-		return str_replace( ['&', '<', '>', "\x03"], ['&amp;', '&lt;', '&gt;', ''], $str );
+        // XML UTF-8: #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+        // but we use fast version
+        return str_replace( ['&', '<', '>', "\x00","\x03","\x0B"], ['&amp;', '&lt;', '&gt;', '', '', ''], $str );
     }
 }