Rename URI handler files

ext/uri/config.m4

@@ -2,10 +2,10 @@ dnl Configure options
 dnl
 
 PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
-  php_lexbor.h
   php_uri.h
   php_uri_common.h
-  php_uriparser.h
+  uri_parser_rfc3986.h
+  uri_parser_whatwg.h
 ]))
 
 AC_DEFINE([URI_ENABLE_ANSI], [1], [Define to 1 for enabling ANSI support of uriparser.])
@@ -18,6 +18,6 @@ $URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/
 $URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
 $URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriShorten.c"
 
-PHP_NEW_EXTENSION(uri, [php_lexbor.c php_uri.c php_uri_common.c php_uriparser.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 PHP_ADD_EXTENSION_DEP(uri, lexbor)
 PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)

ext/uri/config.w32

@@ -1,9 +1,9 @@
-EXTENSION("uri", "php_lexbor.c php_uri.c php_uri_common.c php_uriparser.c", false /* never shared */, "/I ext/lexbor /I ext/uri/uriparser/include /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+EXTENSION("uri", php_uri.c php_uri_common.c "uri_parser_rfc3986.c uri_parser_whatwg.c ", false /* never shared */, "/I ext/lexbor /I ext/uri/uriparser/include /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 
 AC_DEFINE("URI_ENABLE_ANSI", 1, "Define to 1 for enabling ANSI support of uriparser.")
 AC_DEFINE("URI_NO_UNICODE", 1, "Define to 1 for disabling unicode support of uriparser.")
 ADD_FLAG("CFLAGS_URI", "/D URI_STATIC_BUILD");
 
 ADD_EXTENSION_DEP('uri', 'lexbor');
 ADD_SOURCES("ext/uri/uriparser/src", "UriCommon.c UriCompare.c UriCopy.c UriEscape.c UriFile.c UriIp4.c UriIp4Base.c UriMemory.c UriNormalize.c UriNormalizeBase.c UriParse.c UriParseBase.c UriQuery.c UriRecompose.c UriResolve.c UriShorten.c", "uri");
-PHP_INSTALL_HEADERS("ext/uri", "php_lexbor.h php_uri.h php_uri_common.h php_uriparser.h uriparser/src uriparser/include");
+PHP_INSTALL_HEADERS("ext/uri", "php_uri.h php_uri_common.h uri_parser_whatwg.h uri_parser_rfc3986.h uriparser/src uriparser/include");

ext/uri/php_uri.c

@@ -26,8 +26,8 @@
 #include "ext/standard/info.h"
 
 #include "php_uri.h"
-#include "php_lexbor.h"
-#include "php_uriparser.h"
+#include "uri_parser_whatwg.h"
+#include "uri_parser_rfc3986.h"
 #include "php_uri_arginfo.h"
 #include "uriparser/src/UriConfig.h"
 

ext/uri/php_uriparser.c → ext/uri/uri_parser_rfc3986.c

@@ -15,7 +15,7 @@
 */
 
 #include "php.h"
-#include "php_uriparser.h"
+#include "uri_parser_rfc3986.h"
 #include "php_uri_common.h"
 #include "Zend/zend_smart_str.h"
 #include "Zend/zend_exceptions.h"

ext/uri/php_lexbor.c → ext/uri/uri_parser_whatwg.c

@@ -15,7 +15,7 @@
 */
 
 #include "php.h"
-#include "php_lexbor.h"
+#include "uri_parser_whatwg.h"
 #include "php_uri_common.h"
 #include "Zend/zend_enum.h"
 #include "Zend/zend_smart_str.h"