Merge branch 'pull-request/3304'

* pull-request/3304:
  Bump intl extension version to PHP release version

Author: smalyshev

ext/intl/php_intl.c

@@ -103,7 +103,6 @@
 #include <ext/standard/info.h>
 
 #include "php_ini.h"
-#define INTL_MODULE_VERSION PHP_INTL_VERSION
 
 /*
  * locale_get_default has a conflict since ICU also has
@@ -879,7 +878,7 @@ zend_module_entry intl_module_entry = {
 	PHP_RINIT( intl ),
 	PHP_RSHUTDOWN( intl ),
 	PHP_MINFO( intl ),
-	INTL_MODULE_VERSION,
+	PHP_INTL_VERSION,
 	PHP_MODULE_GLOBALS(intl),   /* globals descriptor */
 	PHP_GINIT(intl),            /* globals ctor */
 	NULL,                       /* globals dtor */
@@ -1061,7 +1060,6 @@ PHP_MINFO_FUNCTION( intl )
 
 	php_info_print_table_start();
 	php_info_print_table_header( 2, "Internationalization support", "enabled" );
-	php_info_print_table_row( 2, "version", INTL_MODULE_VERSION );
 	php_info_print_table_row( 2, "ICU version", U_ICU_VERSION );
 #ifdef U_ICU_DATA_VERSION
 	php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION );

ext/intl/php_intl.h

@@ -71,7 +71,7 @@ PHP_MINFO_FUNCTION(intl);
 
 const char *intl_locale_get_default( void );
 
-#define PHP_INTL_VERSION "1.1.0"
+#define PHP_INTL_VERSION PHP_VERSION
 
 #endif  /* PHP_INTL_H */