From: Anatol Belski <ab@php.net>
Date: Sat, 31 Mar 2018 23:03:40 +0000 (+0200)
Subject: Simplify namespace access
X-Git-Tag: php-7.3.0alpha1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8200e48857aeaf09f7127751efc5632ef7660a7;p=php

Simplify namespace access

The icu namespace is an alias which resolves to the real namespace.
---

diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp
index 5d42e671b5..51433bf43f 100644
--- a/ext/intl/breakiterator/breakiterator_class.cpp
+++ b/ext/intl/breakiterator/breakiterator_class.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
+using icu::RuleBasedBreakIterator;
 
 /* {{{ Global variables */
 zend_class_entry *BreakIterator_ce_ptr;
diff --git a/ext/intl/breakiterator/breakiterator_class.h b/ext/intl/breakiterator/breakiterator_class.h
index 9032f6f90f..a856b7c7e0 100644
--- a/ext/intl/breakiterator/breakiterator_class.h
+++ b/ext/intl/breakiterator/breakiterator_class.h
@@ -27,7 +27,7 @@
 #ifndef USE_BREAKITERATOR_POINTER
 typedef void BreakIterator;
 #else
-using U_ICU_NAMESPACE::BreakIterator;
+using icu::BreakIterator;
 #endif
 
 typedef struct {
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp
index 1a91954469..f5ddc9c62f 100644
--- a/ext/intl/breakiterator/breakiterator_methods.cpp
+++ b/ext/intl/breakiterator/breakiterator_methods.cpp
@@ -32,8 +32,8 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
-using U_ICU_NAMESPACE::BreakIterator;
-using U_ICU_NAMESPACE::Locale;
+using icu::BreakIterator;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(BreakIterator, __construct)
 {
diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp
index 1b6339cd6e..8994646bd1 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
@@ -33,7 +33,7 @@ typedef union {
 
 using namespace PHP;
 
-using U_ICU_NAMESPACE::UCharCharacterIterator;
+using icu::UCharCharacterIterator;
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
 
diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h
index d8633516d8..7ecf12deb5 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.h
+++ b/ext/intl/breakiterator/codepointiterator_internal.h
@@ -20,9 +20,9 @@
 #include <unicode/brkiter.h>
 #include <unicode/unistr.h>
 
-using U_ICU_NAMESPACE::BreakIterator;
-using U_ICU_NAMESPACE::CharacterIterator;
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::BreakIterator;
+using icu::CharacterIterator;
+using icu::UnicodeString;
 
 namespace PHP {
 
diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
index b0fe87eda5..90c7ad7f02 100644
--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
@@ -26,8 +26,8 @@ extern "C" {
 #include "../intl_convertcpp.h"
 #include "../intl_common.h"
 
-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
-using U_ICU_NAMESPACE::Locale;
+using icu::RuleBasedBreakIterator;
+using icu::Locale;
 
 static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
 	return (RuleBasedBreakIterator*)bio->biter;
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index 4a641d967c..a3844d3266 100644
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@ -34,8 +34,8 @@ extern "C" {
 #include <assert.h>
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::Locale;
+using icu::GregorianCalendar;
+using icu::Locale;
 
 /* {{{ Global variables */
 zend_class_entry *Calendar_ce_ptr;
diff --git a/ext/intl/calendar/calendar_class.h b/ext/intl/calendar/calendar_class.h
index 3202f672a5..33cd7bc8e3 100644
--- a/ext/intl/calendar/calendar_class.h
+++ b/ext/intl/calendar/calendar_class.h
@@ -27,7 +27,7 @@
 #ifndef USE_CALENDAR_POINTER
 typedef void Calendar;
 #else
-using U_ICU_NAMESPACE::Calendar;
+using icu::Calendar;
 #endif
 
 typedef struct {
diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index 0f450c737d..8c6aaed103 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -43,7 +43,7 @@ extern "C" {
 }
 #include "../common/common_enum.h"
 
-using U_ICU_NAMESPACE::Locale;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 {
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 33f0cb0c8e..48745818b5 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -36,10 +36,10 @@ extern "C" {
 #include "zend_exceptions.h"
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::UnicodeString;
-using U_ICU_NAMESPACE::StringPiece;
+using icu::GregorianCalendar;
+using icu::Locale;
+using icu::UnicodeString;
+using icu::StringPiece;
 
 static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
 	return (GregorianCalendar*)co->ucal;
diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp
index 2e8e296472..ea881d9dfa 100644
--- a/ext/intl/common/common_date.cpp
+++ b/ext/intl/common/common_date.cpp
@@ -25,8 +25,8 @@ extern "C" {
 #include <ext/date/php_date.h>
 }
 
-using U_ICU_NAMESPACE::TimeZone;
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::TimeZone;
+using icu::UnicodeString;
 
 #include "zend_portability.h"
 
diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h
index 5ed0200232..a1c08e434e 100644
--- a/ext/intl/common/common_date.h
+++ b/ext/intl/common/common_date.h
@@ -28,7 +28,7 @@ U_CDECL_END
 
 #include <unicode/timezone.h>
 
-using U_ICU_NAMESPACE::TimeZone;
+using icu::TimeZone;
 
 U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
 U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
diff --git a/ext/intl/common/common_enum.h b/ext/intl/common/common_enum.h
index 41c102a5b1..9e47115304 100644
--- a/ext/intl/common/common_enum.h
+++ b/ext/intl/common/common_enum.h
@@ -75,7 +75,7 @@ U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter);
 U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
 
 #ifdef __cplusplus
-using U_ICU_NAMESPACE::StringEnumeration;
+using icu::StringEnumeration;
 U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
 #endif
 
diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp
index d0010fc856..7a3979a043 100644
--- a/ext/intl/dateformat/dateformat_format_object.cpp
+++ b/ext/intl/dateformat/dateformat_format_object.cpp
@@ -33,11 +33,11 @@ extern "C" {
 #include "../common/common_date.h"
 }
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::DateFormat;
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::StringPiece;
-using U_ICU_NAMESPACE::SimpleDateFormat;
+using icu::Locale;
+using icu::DateFormat;
+using icu::GregorianCalendar;
+using icu::StringPiece;
+using icu::SimpleDateFormat;
 
 static const DateFormat::EStyle valid_styles[] = {
 		DateFormat::kNone,
diff --git a/ext/intl/dateformat/dateformat_helpers.cpp b/ext/intl/dateformat/dateformat_helpers.cpp
index 3caf59a309..7e070ea464 100644
--- a/ext/intl/dateformat/dateformat_helpers.cpp
+++ b/ext/intl/dateformat/dateformat_helpers.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include "../calendar/calendar_class.h"
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
+using icu::GregorianCalendar;
 
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h
index 162c35abfb..fd73e81d89 100644
--- a/ext/intl/dateformat/dateformat_helpers.h
+++ b/ext/intl/dateformat/dateformat_helpers.h
@@ -28,9 +28,9 @@ extern "C" {
 #include "../php_intl.h"
 }
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::Calendar;
-using U_ICU_NAMESPACE::DateFormat;
+using icu::Locale;
+using icu::Calendar;
+using icu::DateFormat;
 
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
diff --git a/ext/intl/intl_convertcpp.h b/ext/intl/intl_convertcpp.h
index e3c53d7a56..0bb486f7b6 100644
--- a/ext/intl/intl_convertcpp.h
+++ b/ext/intl/intl_convertcpp.h
@@ -26,7 +26,7 @@
 #include <unicode/unistr.h>
 #include <zend_types.h>
 
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::UnicodeString;
 
 int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
 
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp
index 5a45398dce..287139bb93 100644
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -76,15 +76,15 @@ MessageFormatAdapter::getMessagePattern(MessageFormat* m) {
 #endif
 U_NAMESPACE_END
 
-using U_ICU_NAMESPACE::Formattable;
-using U_ICU_NAMESPACE::Format;
-using U_ICU_NAMESPACE::DateFormat;
-using U_ICU_NAMESPACE::MessageFormat;
+using icu::Formattable;
+using icu::Format;
+using icu::DateFormat;
+using icu::MessageFormat;
 #ifdef HAS_MESSAGE_PATTERN
-using U_ICU_NAMESPACE::MessagePattern;
+using icu::MessagePattern;
 #endif
-using U_ICU_NAMESPACE::MessageFormatAdapter;
-using U_ICU_NAMESPACE::FieldPosition;
+using icu::MessageFormatAdapter;
+using icu::FieldPosition;
 
 U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
 {
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index d3038504f6..70d2067a1c 100644
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #include <ext/date/php_date.h>
 }
 
-using U_ICU_NAMESPACE::Calendar;
+using icu::Calendar;
 
 /* {{{ Global variables */
 U_CDECL_BEGIN
diff --git a/ext/intl/timezone/timezone_class.h b/ext/intl/timezone/timezone_class.h
index d6c45a46f1..99e9b56dae 100644
--- a/ext/intl/timezone/timezone_class.h
+++ b/ext/intl/timezone/timezone_class.h
@@ -30,7 +30,7 @@
 #ifndef USE_TIMEZONE_POINTER
 typedef void TimeZone;
 #else
-using U_ICU_NAMESPACE::TimeZone;
+using icu::TimeZone;
 #endif
 
 typedef struct {
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index abf4548d27..5cf5afc934 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -38,8 +38,8 @@ extern "C" {
 }
 #include "common/common_enum.h"
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::Calendar;
+using icu::Locale;
+using icu::Calendar;
 
 U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 {