Ext Rename Xlswriter

config.m4

@@ -1,8 +1,8 @@
-PHP_ARG_WITH(excel_writer, excel_writer support,
-[  --with-excel_writer           Include excel_writer support])
+PHP_ARG_WITH(xlsxwriter, xlswriter support,
+[  --with-xlswriter           Include xlswriter support])
 
-if test "$PHP_EXCEL_WRITER" != "no"; then
-    excel_writer_sources="excel_writer.c \
+if test "$PHP_XLSWRITER" != "no"; then
+    xls_writer_sources="xls_writer.c \
     kernel/exception.c \
     kernel/resource.c \
     kernel/common.c \
@@ -17,8 +17,8 @@ if test "$PHP_EXCEL_WRITER" != "no"; then
             PHP_ADD_INCLUDE($i/include)
             PHP_CHECK_LIBRARY(xlsxwriter, worksheet_write_string,
             [
-                PHP_ADD_LIBRARY_WITH_PATH(xlsxwriter, $i/$PHP_LIBDIR, EXCEL_WRITER_SHARED_LIBADD)
-                excel_writer_sources="$excel_writer_sources \
+                PHP_ADD_LIBRARY_WITH_PATH(xlsxwriter, $i/$PHP_LIBDIR, XLSWRITER_SHARED_LIBADD)
+                xls_writer_sources="$xls_writer_sources \
                 kernel/excel.c \
                 kernel/write.c \
                 kernel/format.c"
@@ -42,9 +42,9 @@ if test "$PHP_EXCEL_WRITER" != "no"; then
         AC_ARG_ENABLE(debug, [--enable-debug compile with debugging system], [PHP_DEBUG=$enableval],[PHP_DEBUG=no])
     fi
 
-    PHP_SUBST(EXCEL_WRITER_SHARED_LIBADD)
+    PHP_SUBST(XLSWRITER_SHARED_LIBADD)
 
-    PHP_NEW_EXTENSION(excel_writer, $excel_writer_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+    PHP_NEW_EXTENSION(xlswriter, $xls_writer_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
     PHP_ADD_BUILD_DIR([$ext_builddir/kernel])
 fi

config.w32

@@ -1,18 +1,18 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("excel_writer", "excel_writer support", "no");
+ARG_WITH("xlswriter", "xlswriter support", "no");
 
-if (PHP_EXCEL_WRITER != "no") {
+if (PHP_XLSWRITER != "no") {
 
-    if (CHECK_LIB("LibXlsxWriter.lib", "excel_writer", PHP_EXCEL_WRITER) &&
-        CHECK_HEADER_ADD_INCLUDE("xlsxwriter.h", "CFLAGS_EXCEL_WRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include;" + PHP_EXCEL_WRITER) &&
-        CHECK_HEADER_ADD_INCLUDE("packager.h", "CFLAGS_EXCEL_WRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include\\xlsxwriter;" + PHP_EXCEL_WRITER) &&
-        CHECK_HEADER_ADD_INCLUDE("format.h", "CFLAGS_EXCEL_WRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include\\xlsxwriter;" + PHP_EXCEL_WRITER)) {
-        EXTENSION("excel_writer", "excel_writer.c")
-        ADD_SOURCES(configure_module_dirname + "\\kernel", "common.c resource.c exception.c excel.c write.c format.c", "excel_writer");
+    if (CHECK_LIB("LibXlsxWriter.lib", "xlswriter", PHP_XLSWRITER) &&
+        CHECK_HEADER_ADD_INCLUDE("xlsxwriter.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include;" + PHP_XLSWRITER) &&
+        CHECK_HEADER_ADD_INCLUDE("packager.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include\\xlsxwriter;" + PHP_XLSWRITER) &&
+        CHECK_HEADER_ADD_INCLUDE("format.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\MSVCLibXlsxWriter\\libxlsxwriter\\include\\xlsxwriter;" + PHP_XLSWRITER)) {
+        EXTENSION("xlswriter", "xls_writer.c")
+        ADD_SOURCES(configure_module_dirname + "\\kernel", "common.c resource.c exception.c excel.c write.c format.c", "xlswriter");
     } else {
-        WARNING("excel_writer not enabled, LibXlsxWriter.lib or headers not found");
+        WARNING("xlswriter not enabled, LibXlsxWriter.lib or headers not found");
     }
 
 }

kernel/include.h

@@ -12,7 +12,7 @@
 #include "xlsxwriter/packager.h"
 #include "xlsxwriter/format.h"
 
-#include "../php_excel_writer.h"
+#include "../php_xls_writer.h"
 #include "excel.h"
 #include "exception.h"
 #include "format.h"

php_excel_writer.h → php_xls_writer.h

@@ -15,10 +15,10 @@
 
 #include "kernel/include.h"
 
-extern zend_module_entry excel_writer_module_entry;
-#define phpext_excel_writer_ptr &excel_writer_module_entry
+extern zend_module_entry xlswriter_module_entry;
+#define phpext_xlswriter_ptr &xlswriter_module_entry
 
-#define PHP_EXCEL_WRITER_VERSION "1.0.0"
+#define PHP_XLS_WRITER_VERSION "1.0.0"
 
 #ifdef PHP_WIN32
 #	define PHP_VTIFUL_API __declspec(dllexport)
@@ -32,13 +32,12 @@ extern zend_module_entry excel_writer_module_entry;
 #include "TSRM.h"
 #endif
 
-#define VTIFUL_RESOURCE_NAME "excel"
+#define VTIFUL_RESOURCE_NAME "xlsx"
 
 extern int le_excel_writer;
 
-#define VTIFUL_STARTUP_MODULE(module) ZEND_MODULE_STARTUP_N(excel_writer_##module)(INIT_FUNC_ARGS_PASSTHRU)
-#define VTIFUL_STARTUP_FUNCTION(module) ZEND_MINIT_FUNCTION(excel_writer_##module)
-#define VTIFUL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(vtiful, v)
+#define VTIFUL_STARTUP_MODULE(module) ZEND_MODULE_STARTUP_N(xlsxwriter_##module)(INIT_FUNC_ARGS_PASSTHRU)
+#define VTIFUL_STARTUP_FUNCTION(module) ZEND_MINIT_FUNCTION(xlsxwriter_##module)
 
 void _php_vtiful_excel_close(zend_resource *rsrc TSRMLS_DC);
 
@@ -46,11 +45,11 @@ void _php_vtiful_excel_close(zend_resource *rsrc TSRMLS_DC);
 ZEND_TSRMLS_CACHE_EXTERN();
 #endif
 
-PHP_MINIT_FUNCTION(excel_writer);
-PHP_MSHUTDOWN_FUNCTION(excel_writer);
-PHP_RINIT_FUNCTION(excel_writer);
-PHP_RSHUTDOWN_FUNCTION(excel_writer);
-PHP_MINFO_FUNCTION(excel_writer);
+PHP_MINIT_FUNCTION(xlswriter);
+PHP_MSHUTDOWN_FUNCTION(xlswriter);
+PHP_RINIT_FUNCTION(xlswriter);
+PHP_RSHUTDOWN_FUNCTION(xlswriter);
+PHP_MINFO_FUNCTION(xlswriter);
 
 #endif
 

tests/001.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
-echo "vtiful extension is available";
+echo "xlswriter extension is available";
 ?>
 --EXPECT--
-vtiful extension is available
+xlswriter extension is available

tests/002.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];

tests/003.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];

tests/004.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];

tests/005.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];

tests/006.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];
@@ -11,4 +11,4 @@ $handle = $excel->fileName('tutorial01.xlsx')
 var_dump($handle);
 ?>
 --EXPECT--
-resource(4) of type (excel)
+resource(4) of type (xlsx)

tests/007.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];
@@ -12,4 +12,4 @@ $boldStyle = \Vtiful\Kernel\Format::bold($handle);
 var_dump($boldStyle);
 ?>
 --EXPECT--
-resource(5) of type (excel)
+resource(5) of type (xlsx)

tests/008.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];
@@ -12,4 +12,4 @@ $italicStyle = \Vtiful\Kernel\Format::italic($handle);
 var_dump($italicStyle);
 ?>
 --EXPECT--
-resource(5) of type (excel)
+resource(5) of type (xlsx)

tests/009.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];
@@ -12,4 +12,4 @@ $underlineStyle = \Vtiful\Kernel\Format::underline($handle, \Vtiful\Kernel\Forma
 var_dump($underlineStyle);
 ?>
 --EXPECT--
-resource(5) of type (excel)
+resource(5) of type (xlsx)

tests/010.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for vtiful presence
 --SKIPIF--
-<?php if (!extension_loaded("excel_writer")) print "skip"; ?>
+<?php if (!extension_loaded("xlswriter")) print "skip"; ?>
 --FILE--
 <?php 
 $config = ['path' => './tests'];

excel_writer.c → xls_writer.c

@@ -22,7 +22,7 @@ int le_excel_writer;
 
 /* {{{ PHP_MINIT_FUNCTION
  */
-PHP_MINIT_FUNCTION(excel_writer)
+PHP_MINIT_FUNCTION(xlswriter)
 {
     VTIFUL_STARTUP_MODULE(exception);
 	VTIFUL_STARTUP_MODULE(excel);
@@ -37,7 +37,7 @@ PHP_MINIT_FUNCTION(excel_writer)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
-PHP_MSHUTDOWN_FUNCTION(excel_writer)
+PHP_MSHUTDOWN_FUNCTION(xlswriter)
 {
 	return SUCCESS;
 }
@@ -45,7 +45,7 @@ PHP_MSHUTDOWN_FUNCTION(excel_writer)
 
 /* {{{ PHP_RINIT_FUNCTION
  */
-PHP_RINIT_FUNCTION(excel_writer)
+PHP_RINIT_FUNCTION(xlswriter)
 {
 #if defined(COMPILE_DL_VTIFUL) && defined(ZTS)
 	ZEND_TSRMLS_CACHE_UPDATE();
@@ -56,7 +56,7 @@ PHP_RINIT_FUNCTION(excel_writer)
 
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
-PHP_RSHUTDOWN_FUNCTION(excel_writer)
+PHP_RSHUTDOWN_FUNCTION(xlswriter)
 {
 	return SUCCESS;
 }
@@ -65,47 +65,47 @@ PHP_RSHUTDOWN_FUNCTION(excel_writer)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(excel_writer)
+PHP_MINFO_FUNCTION(xlswriter)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "excel_writer support", "enabled");
-#if defined(PHP_VTIFUL_VERSION)
-    php_info_print_table_row(2, "Version", PHP_VTIFUL_VERSION);
+	php_info_print_table_header(2, "xlswriter support", "enabled");
+#if defined(PHP_XLS_WRITER_VERSION)
+    php_info_print_table_row(2, "Version", PHP_XLS_WRITER_VERSION);
 #endif
 	php_info_print_table_end();
 }
 /* }}} */
 
-/* {{{ vtiful_functions[]
+/* {{{ xlswriter_functions[]
  *
- * Every user visible function must have an entry in vtiful_functions[].
+ * Every user visible function must have an entry in xlswriter_functions[].
  */
-const zend_function_entry excel_writer_functions[] = {
+const zend_function_entry xlswriter_functions[] = {
 	PHP_FE_END
 };
 /* }}} */
 
 /* {{{ vtiful_module_entry
  */
-zend_module_entry excel_writer_module_entry = {
+zend_module_entry xlswriter_module_entry = {
 	STANDARD_MODULE_HEADER,
-	"excel_writer",
-    excel_writer_functions,
-	PHP_MINIT(excel_writer),
-	PHP_MSHUTDOWN(excel_writer),
-	PHP_RINIT(excel_writer),		/* Replace with NULL if there's nothing to do at request start */
-	PHP_RSHUTDOWN(excel_writer),	/* Replace with NULL if there's nothing to do at request end */
-	PHP_MINFO(excel_writer),
-    PHP_EXCEL_WRITER_VERSION,
+	"xlswriter",
+    xlswriter_functions,
+	PHP_MINIT(xlswriter),
+	PHP_MSHUTDOWN(xlswriter),
+	PHP_RINIT(xlswriter),		/* Replace with NULL if there's nothing to do at request start */
+	PHP_RSHUTDOWN(xlswriter),	/* Replace with NULL if there's nothing to do at request end */
+	PHP_MINFO(xlswriter),
+	PHP_XLS_WRITER_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
-#ifdef COMPILE_DL_EXCEL_WRITER
+#ifdef COMPILE_DL_XLSWRITER
 #ifdef ZTS
 ZEND_TSRMLS_CACHE_DEFINE();
 #endif
-ZEND_GET_MODULE(excel_writer)
+ZEND_GET_MODULE(xlswriter)
 #endif
 
 /*