added warnings on read/write errors, fixed missing php_stream_close(), updated README, updated changelog

Author: johmue

.gitignore

@@ -64,3 +64,4 @@ tests/*/*/*.diff
 tests/*/*/*.php
 tests/*/*/*.exp
 tmp-php.ini
+libxl/*

ChangeLog

@@ -18,13 +18,17 @@
 	* Added data type argument for ExcelSheet::writeCol() (see issue #29)
 	* Fixed bug in ExcelSheet::read() (see issue #86)
 	* Fixed bug in ExcelBook::setDefaultFont() (see issue #66)
-	* Added autofit handling for ExcelBook::setColWidth()
+	* Added autofit support for ExcelBook::setColWidth()
 	* Added implicit formula recognition on ExcelSheet::write() operations (prefix formula with '=')
 	* Added multibyte support for license name and license key (see issue #60 and README)
 	* Added default date format when writing dates
 	* Added ExcelSheet::__construct(ExcelBook $book, $name) for customized ExcelSheets
-	* Updated documentation
-	* Fixed typo -> changed excel.ini_skip_empty to excel.skip_emtpy
+	* Added warnings on read/write errors
+	* Removed final keyword for ExcelFormat::__construct(ExcelBook $book)
+	* Removed invalid PAPER_* constants in ExcelSheet
+	* Removed invalid COLOR_* constants in ExcelFormat
+	* Updated documentation and README
+	* Changed php.ini variable name: excel.ini_skip_empty --> excel.skip_emtpy
 
 [2014-06-03] - Version 1.0
 	* Fixed issue #63 writing for NULL values using writeRow()

README.markdown

@@ -20,79 +20,85 @@ Please see the ```docs/``` and the ```tests/``` directory.
 
 ### Linux
 
-    // change into php source files directory
-    cd php-5.x.x
-    
-    // clone repository into php extension dir
-    git clone https://github.com/iliaal/php_excel.git ext/excel
-    
-    // rebuild configure
-    ./buildconf --force
-    
-    // replace <PATH> with the file path to the extracted libxl files
-    // on a 32-bit platform use
-    ./configure --with-excel --with-libxl-incdir=<PATH>/libxl-3.6.0.1/include_c --with-libxl-libdir=<PATH>/libxl-3.6.0.1/lib
-    
-    // on a 64-bit platform use
-    ./configure --with-excel --with-libxl-incdir=<PATH>/libxl-3.6.0.1/include_c --with-libxl-libdir=<PATH>/libxl-3.6.0.1/lib64
+``` shell
+# change into php source files directory
+cd php-5.x.x
 
+# clone repository into php extension dir
+git clone https://github.com/iliaal/php_excel.git ext/excel
+
+# rebuild configure
+./buildconf --force
+
+# replace <PATH> with the file path to the extracted libxl files
+# on a 32-bit platform use
+./configure --with-excel --with-libxl-incdir=<PATH>/libxl-3.6.0.1/include_c --with-libxl-libdir=<PATH>/libxl-3.6.0.1/lib
+
+# on a 64-bit platform use
+./configure --with-excel --with-libxl-incdir=<PATH>/libxl-3.6.0.1/include_c --with-libxl-libdir=<PATH>/libxl-3.6.0.1/lib64
+```
+ 
 ### Windows
 
 Pre-build packages for Windows can be downloaded [here](http://windows.php.net/downloads/pecl/snaps/excel).
 
 ## Getting started
 
-    <?php
-        
-    // init excel work book as xlsx
-    $useXlsxFormat = true;
-    $xlBook = new \ExcelBook('<YOUR_LICENSE_NAME>', '<YOUR_LICENSE_KEY>', $useXlsxFormat);
-    $xlBook->setLocale('UTF-8');
-
-    // add sheet to work book
-    $xlSheet1 = $xlBook->addSheet('Sheet1');
-
-    // create a small sample data set
-    $dataset = [
-        [1, 1500, 'John', 'Doe'],
-        [2,  750, 'Jane', 'Doe']
-    ];
-
-    // write data set to sheet
-    $row = 1;
-    foreach($dataset as $item){
-        $xlSheet1->writeRow($row, $item);
-        $row++;
-    }
-
-    // write sum formula under data set
-    $col = 1;
-    $xlSheet1->write($row, $col, '=SUM(B1:B3)');
-
-    // add second sheet to work book
-    $xlSheet2 = $xlBook->addSheet('Sheet2');
-
-    // add a date with specific date format to second sheet
-    $row = 1; $col = 0;
-    $date = new \DateTime('2014-08-02');
-    $dateFormat = new \ExcelFormat($xlBook);
-    $dateFormat->numberFormat(\ExcelFormat::NUMFORMAT_DATE);
-    $xlSheet2->write($row, $col, $date->getTimestamp(), $dateFormat, \ExcelFormat::AS_DATE);
-
-    // save workbook
-    $xlBook->save('test.xlsx');
+``` php
+<?php
+    
+// init excel work book as xlsx
+$useXlsxFormat = true;
+$xlBook = new \ExcelBook('<YOUR_LICENSE_NAME>', '<YOUR_LICENSE_KEY>', $useXlsxFormat);
+$xlBook->setLocale('UTF-8');
+
+// add sheet to work book
+$xlSheet1 = $xlBook->addSheet('Sheet1');
+
+// create a small sample data set
+$dataset = [
+    [1, 1500, 'John', 'Doe'],
+    [2,  750, 'Jane', 'Doe']
+];
+
+// write data set to sheet
+$row = 1;
+foreach($dataset as $item){
+    $xlSheet1->writeRow($row, $item);
+    $row++;
+}
+
+// write sum formula under data set
+$col = 1;
+$xlSheet1->write($row, $col, '=SUM(B1:B3)');
+
+// add second sheet to work book
+$xlSheet2 = $xlBook->addSheet('Sheet2');
+
+// add a date with specific date format to second sheet
+$row = 1; $col = 0;
+$date = new \DateTime('2014-08-02');
+$dateFormat = new \ExcelFormat($xlBook);
+$dateFormat->numberFormat(\ExcelFormat::NUMFORMAT_DATE);
+$xlSheet2->write($row, $col, $date->getTimestamp(), $dateFormat, \ExcelFormat::AS_DATE);
+
+// save workbook
+$xlBook->save('test.xlsx');
+```
 
 ## optional php.ini settings
 
 To prevent unvealing your credentials in your code you can save them in your php.ini file.
 They will be automatically fetched by the extension and you can pass ```null``` instead of
 your credentials ```new \ExcelBook(null, null, $useXlsxFormat)```.
 
-    ; optional settings for excel extension
-    [excel]
-    excel.license_name="<YOUR_LICENSE_NAME>"
-    excel.license_key="<YOUR_LICENSE_KEY>"
-    excel.skip_empty=0
+``` ini
+; optional settings for excel extension
+[excel]
+excel.license_name="<YOUR_LICENSE_NAME>"
+excel.license_key="<YOUR_LICENSE_KEY>"
+excel.skip_empty=0
+```
 
 ## Known Issues
 

excel.c

@@ -479,6 +479,7 @@ EXCEL_METHOD(Book, save)
 		}
 
 		if ((numbytes = php_stream_write(stream, contents, len)) != len) {
+			php_stream_close(stream);
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space", numbytes, len);
 			RETURN_FALSE;
 		}
@@ -2251,6 +2252,7 @@ EXCEL_METHOD(Sheet, readRow)
 		if (!php_excel_read_cell(row, lc, value, sheet, book, &format, read_formula)) {
 			zval_ptr_dtor(&value);
 			zval_dtor(return_value);
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read cell in row %ld, column %d with error '%s'", row, lc, xlBookErrorMessage(book));
 			RETURN_FALSE;
 		} else {
 			add_next_index_zval(return_value, value);
@@ -2311,6 +2313,7 @@ EXCEL_METHOD(Sheet, readCol)
 		if (!php_excel_read_cell(lc, col, value, sheet, book, &format, read_formula)) {
 			zval_ptr_dtor(&value);
 			zval_dtor(return_value);
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read cell in row %d, column %ld with error '%s'", lc, col, xlBookErrorMessage(book));
 			RETURN_FALSE;
 		} else {
 			add_next_index_zval(return_value, value);
@@ -2345,6 +2348,7 @@ EXCEL_METHOD(Sheet, read)
 	}
 
 	if (!php_excel_read_cell(row, col, return_value, sheet, book, &format, read_formula)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read cell in row %ld, column %ld with error '%s'", row, col, xlBookErrorMessage(book));
 		RETURN_FALSE;
 	}
 
@@ -2447,7 +2451,12 @@ EXCEL_METHOD(Sheet, write)
 		FORMAT_FROM_OBJECT(format, oformat);
 	}
 
-	RETURN_BOOL(php_excel_write_cell(sheet, book, row, col, data, oformat ? format : 0, dtype TSRMLS_CC));
+	if (!php_excel_write_cell(sheet, book, row, col, data, oformat ? format : 0, dtype TSRMLS_CC)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write cell in row %ld, column %ld with error '%s'", row, col, xlBookErrorMessage(book));
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
 }
 /* }}} */
 
@@ -2492,6 +2501,7 @@ EXCEL_METHOD(Sheet, writeRow)
 		zend_hash_move_forward_ex(Z_ARRVAL_P(data), &pos)) {
 
 		if (!php_excel_write_cell(sheet, book, row, i++, *element, oformat ? format : 0, -1 TSRMLS_CC)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write cell in row %ld, column %ld with error '%s'", row, i-1, xlBookErrorMessage(book));
 			RETURN_FALSE;
 		}
 	}
@@ -2542,6 +2552,7 @@ EXCEL_METHOD(Sheet, writeCol)
 		zend_hash_move_forward_ex(Z_ARRVAL_P(data), &pos)) {
 
 		if (!php_excel_write_cell(sheet, book, i++, col, *element, oformat ? format : 0, dtype TSRMLS_CC)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write cell in row %ld, column %ld with error '%s'", i-1, col, xlBookErrorMessage(book));
 			RETURN_FALSE;
 		}
 	}