1.1.11

added a ; in the Debug section.

.gitignore

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

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 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)
 

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)
 
@@ -66,7 +68,7 @@ $data = [
     ['Right', '<right>Right Text</right>'],
     ['Center + Bold', '<center><b>Name</b></center>']
 ];
-SimpleXLSXGen::fromArray( $data )
+Shuchkin\SimpleXLSXGen::fromArray( $data )
     ->setDefaultFont( 'Courier New' )
     ->setDefaultFontSize( 14 )
     ->saveAs('styles_and_tags.xlsx');
@@ -76,15 +78,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 +102,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,6 @@
 <?php
+namespace Shuchkin;
+
 /**
  * Class SimpleXLSXGen
  * Export data to MS Excel. PHP XLSX generator
@@ -34,7 +36,6 @@ class SimpleXLSXGen {
     const A_RIGHT = 2;
     const A_CENTER = 3;
 
-
     public function __construct() {
         $this->curSheet = -1;
         $this->defaultFont = 'Calibri';
@@ -110,8 +111,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,12 +120,17 @@ 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[ mb_strtoupper( $sh['name']) ] = 1;
             }
             for( $i = 0; $i < 100; $i++ ) {
-				$new_name = ($i === 0) ? $name : $name .' ('.$i.')';
+                $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;
@@ -136,7 +141,7 @@ class SimpleXLSXGen {
 
         $this->sheets[$this->curSheet] = ['name' => $name, 'hyperlinks' => []];
 
-		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'] = [];
@@ -511,7 +516,7 @@ 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
@@ -525,6 +530,10 @@ class SimpleXLSXGen {
                                 $this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => 'mailto:' . $v, 'L' => ''];
                                 $F = self::F_HYPERLINK; // Hyperlink
                             }
+                            if ( ($N === self::N_DATE || $N === self::N_DATETIME) && $cv < 0 ) {
+                                $cv = null;
+                                $N = 0;
+                            }
                         }
                         if ( !$cv) {
 
@@ -553,7 +562,7 @@ 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') );
                         $N = self::N_DATETIME; // [22] m/d/yy h:mm
@@ -625,15 +634,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 +653,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;