Merge branch 'pull-request/3296'

smalyshev · smalyshev · commit d7ed929e1c11 · 2018-06-17T14:05:01.000-07:00
* pull-request/3296:
  Bump fileinfo extension version to PHP release version
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
@@ -278,7 +278,6 @@ PHP_MINFO_FUNCTION(fileinfo)
 
 	php_info_print_table_start();
 	php_info_print_table_row(2, "fileinfo support", "enabled");
-	php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION);
 	php_info_print_table_row(2, "libmagic", magic_ver);
 	php_info_print_table_end();
 }
diff --git a/ext/fileinfo/php_fileinfo.h b/ext/fileinfo/php_fileinfo.h
@@ -24,7 +24,7 @@
 extern zend_module_entry fileinfo_module_entry;
 #define phpext_fileinfo_ptr &fileinfo_module_entry
 
-#define PHP_FILEINFO_VERSION "1.0.5"
+#define PHP_FILEINFO_VERSION PHP_VERSION
 
 #ifdef PHP_WIN32
 #define PHP_FILEINFO_API __declspec(dllexport)

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,6 @@ PHP_MINFO_FUNCTION(fileinfo)`
`278`	`278`
`279`	`279`	`php_info_print_table_start();`
`280`	`280`	`php_info_print_table_row(2, "fileinfo support", "enabled");`
`281`		`- php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION);`
`282`	`281`	`php_info_print_table_row(2, "libmagic", magic_ver);`
`283`	`282`	`php_info_print_table_end();`
`284`	`283`	`}`