Trim trailing whitespace in source code files

11 files changed, 161 insertions, 161 deletions

diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS
index a7ef53665e..7b0bbe7286 100644
--- a/ext/intl/ERROR.CONVENTIONS
+++ b/ext/intl/ERROR.CONVENTIONS
@@ -28,7 +28,7 @@ void intl_error_set(intl_error* err, UErrorCode code, char* msg, int copyMsg);
 and by passing NULL as the first parameter. The last function is a combination
 of the first two. If the message is not a static buffer, copyMsg should be 1.
 This makes the message string be copied and freed when no longer needed. There's
-no way to pass ownership of the string without it being copied. 
+no way to pass ownership of the string without it being copied.
 
 
 :: The last is ALSO stored in the object whose method call triggered the error,
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 13ff6a75a7..ab8ab76796 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -57,7 +57,7 @@ static void _php_intlgregcal_constructor_body(
 			zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 			"intlgregcal_create_instance: too many arguments", 0);
-		if (!is_constructor) {		
+		if (!is_constructor) {
 			zval_dtor(return_value);
 			RETVAL_NULL();
 		}
@@ -70,7 +70,7 @@ static void _php_intlgregcal_constructor_body(
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 			"intlgregcal_create_instance: no variant with 4 arguments "
 			"(excluding trailing NULLs)", 0);
-		if (!is_constructor) {		
+		if (!is_constructor) {
 			zval_dtor(return_value);
 			RETVAL_NULL();
 		}
@@ -83,7 +83,7 @@ static void _php_intlgregcal_constructor_body(
 				"|z!s!", &tz_object, &locale, &locale_len) == FAILURE) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 				"intlgregcal_create_instance: bad arguments", 0);
-			if (!is_constructor) {		
+			if (!is_constructor) {
 				zval_dtor(return_value);
 				RETVAL_NULL();
 			}
@@ -95,7 +95,7 @@ static void _php_intlgregcal_constructor_body(
 			&largs[5]) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 			"intlgregcal_create_instance: bad arguments", 0);
-		if (!is_constructor) {		
+		if (!is_constructor) {
 			zval_dtor(return_value);
 			RETVAL_NULL();
 		}
@@ -113,7 +113,7 @@ static void _php_intlgregcal_constructor_body(
 			if (!EG(exception)) {
 				zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
 			}
-			if (!is_constructor) {		
+			if (!is_constructor) {
 				zval_dtor(return_value);
 				RETVAL_NULL();
 			}
@@ -132,7 +132,7 @@ static void _php_intlgregcal_constructor_body(
 				delete gcal;
 			}
 			delete tz;
-			if (!is_constructor) {		
+			if (!is_constructor) {
 				zval_dtor(return_value);
 				RETVAL_NULL();
 			}
@@ -145,7 +145,7 @@ static void _php_intlgregcal_constructor_body(
 				intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 					"intlgregcal_create_instance: at least one of the arguments"
 					" has an absolute value that is too large", 0);
-				if (!is_constructor) {		
+				if (!is_constructor) {
 					zval_dtor(return_value);
 					RETVAL_NULL();
 				}
@@ -170,7 +170,7 @@ static void _php_intlgregcal_constructor_body(
 			if (gcal) {
 				delete gcal;
 			}
-			if (!is_constructor) {		
+			if (!is_constructor) {
 				zval_dtor(return_value);
 				RETVAL_NULL();
 			}
@@ -190,7 +190,7 @@ static void _php_intlgregcal_constructor_body(
 				"from PHP's default timezone name (see date_default_timezone_get())",
 				0);
 			delete gcal;
-			if (!is_constructor) {		
+			if (!is_constructor) {
 				zval_dtor(return_value);
 				RETVAL_NULL();
 			}
diff --git a/ext/intl/config.w32 b/ext/intl/config.w32
index 328288be3d..3065ac2311 100644
--- a/ext/intl/config.w32
+++ b/ext/intl/config.w32
@@ -99,18 +99,18 @@ if (PHP_INTL != "no") {
 				transliterator_class.c \
 				transliterator_methods.c",
 				"intl");
-		
+
 		ADD_SOURCES(configure_module_dirname + "/timezone", "\
 				timezone_class.cpp \
 				timezone_methods.cpp",
 				"intl");
-				
+
 		ADD_SOURCES(configure_module_dirname + "/calendar", "\
 				calendar_methods.cpp \
 				gregoriancalendar_methods.cpp \
 				calendar_class.cpp",
 				"intl");
-				
+
 		ADD_SOURCES(configure_module_dirname + "/breakiterator", "\
 				breakiterator_class.cpp \
 				breakiterator_methods.cpp \
@@ -119,7 +119,7 @@ if (PHP_INTL != "no") {
 				codepointiterator_internal.cpp \
 				codepointiterator_methods.cpp ",
 				"intl");
-		
+
 		ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib");
 
 		/* Compat for ICU before 58.1.*/
diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt
index 3bb31b00ec..316d81357c 100644
--- a/ext/intl/doc/Tutorial.txt
+++ b/ext/intl/doc/Tutorial.txt
@@ -1,13 +1,13 @@
 1. Collator::getAvailableLocales().
 Return the locales available at the time of the call, including registered locales.
 If a sever error occurs (such as out of memory condition) this will return null.
-If there is no locale data, an empty enumeration will be returned. 
+If there is no locale data, an empty enumeration will be returned.
 Returned locales list is a strings in format of RFC4646 standart (see http://www.rfc-editor.org/rfc/rfc4646.txt).
 Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project.org/icu-bin/locexp).
 
 
 2. Collator::getDisplayName( $obj_locale, $disp_locale ).
-Get name of the object for the desired Locale, in the desired language. Both arguments 
+Get name of the object for the desired Locale, in the desired language. Both arguments
 must be from getAvailableLocales method.
 
      @param  string  $obj_locale   Locale to get display name for.
@@ -19,21 +19,21 @@ For locale format see RFC4647 standart in ftp://ftp.rfc-editor.org/in-notes/rfc4
 3. Collator::getLocaleByType( $type ).
 Allow user to select whether she wants information on requested, valid or actual locale.
 Returned locale tag is a string formatted to a RFC4646 standart and normalize to normal form -
-value is a string from 
-For example, a collator for "en_US_CALIFORNIA" was requested. In the current state of ICU (2.0), 
-the requested locale is "en_US_CALIFORNIA", the valid locale is "en_US" (most specific locale 
-supported by ICU) and the actual locale is "root" (the collation data comes unmodified from the UCA) 
-The locale is considered supported by ICU if there is a core ICU bundle for that locale (although 
-it may be empty). 
+value is a string from
+For example, a collator for "en_US_CALIFORNIA" was requested. In the current state of ICU (2.0),
+the requested locale is "en_US_CALIFORNIA", the valid locale is "en_US" (most specific locale
+supported by ICU) and the actual locale is "root" (the collation data comes unmodified from the UCA)
+The locale is considered supported by ICU if there is a core ICU bundle for that locale (although
+it may be empty).
 
 
 4. VariableTop
 The Variable_Top attribute is only meaningful if the Alternate attribute is not set to NonIgnorable.
-In such a case, it controls which characters count as ignorable. The string value specifies 
+In such a case, it controls which characters count as ignorable. The string value specifies
 the "highest" character (in UCA order) weight that is to be considered ignorable.
-Thus, for example, if a user wanted whitespace to be ignorable, but not any visible characters, 
-then s/he would use the value Variable_Top="\u0020" (space). The string should only be a 
-single character. All characters of the same primary weight are equivalent, so 
+Thus, for example, if a user wanted whitespace to be ignorable, but not any visible characters,
+then s/he would use the value Variable_Top="\u0020" (space). The string should only be a
+single character. All characters of the same primary weight are equivalent, so
 Variable_Top="\u3000" (ideographic space) has the same effect as Variable_Top="\u0020".
 This setting (alone) has little impact on string comparison performance; setting it lower or higher
 will make sort keys slightly shorter or longer respectively.
@@ -124,7 +124,7 @@ the languages currently in use. Therefore, ICU provides a data-driven, flexible,
 customizable mechanism called "tailoring". Tailoring overrides the default order of code points
 and the values of the ICU Collation Service attributes.
 Collator have followed attributes:
-   - FRENCH_COLLATION, possible values are: 
+   - FRENCH_COLLATION, possible values are:
 	ON
 	OFF (default)
 	DEFAULT
diff --git a/ext/intl/doc/collator_api.php b/ext/intl/doc/collator_api.php
index ef7250243b..8005aca2ca 100644
--- a/ext/intl/doc/collator_api.php
+++ b/ext/intl/doc/collator_api.php
@@ -324,7 +324,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {}
  * Get the locale name of the collator.
  *
  * @param Collator $coll Collator object.
- * @param int      $type You can choose between valid and 
+ * @param int      $type You can choose between valid and
  *                       actual locale
  *                       (ULOC_VALID_LOCALE, ULOC_ACTUAL_LOCALE
  *                       respectively).
diff --git a/ext/intl/doc/datefmt_api.php b/ext/intl/doc/datefmt_api.php
index 6beb243863..2dba59df63 100644
--- a/ext/intl/doc/datefmt_api.php
+++ b/ext/intl/doc/datefmt_api.php
@@ -4,9 +4,9 @@
  * Date Formatter class - locale-dependent formatting/parsing of dates using pattern strings and/or canned patterns.
  *
  * This class represents the ICU date formatting functionality. It allows users to
- * display dates in a localized format or to parse strings 
+ * display dates in a localized format or to parse strings
  * into PHP date values using pattern strings and/or canned patterns.
- * 
+ *
  * Example:
  * <code>
  * $datefmt = new DateFormatter("de-DE", LONG, SHORT, date_default_timezone_get());
@@ -38,19 +38,19 @@ class DateFormatter {
     const SHORT = 3;
 
     /**
-     * The following int constants are used to specify the calendar. 
-     * These calendars are all based directly on the Gregorian calendar 
-     * Non-Gregorian calendars need to be specified in locale. 
+     * The following int constants are used to specify the calendar.
+     * These calendars are all based directly on the Gregorian calendar
+     * Non-Gregorian calendars need to be specified in locale.
      * Examples might include locale="hi@calendar=BUDDHIST"
      */
     const TRADITIONAL = 0; // non-Gregorian calendar that is locale-defined, required by ICU
     const GREGORIAN = 1 ;// Gregorian calendar
-	
+
 #############################################################################
 # Object-oriented API
 #############################################################################
 	/**
-	 * Create a date formatter 
+	 * Create a date formatter
 	 *
 	 * @param string  $locale     Locale to use when formatting or parsing
 	 * @param integer $datetype   Date type to use (none, short, medium, long, full)
@@ -66,7 +66,7 @@ class DateFormatter {
 	public function __construct($locale, $datetype, $timetype, $timezone = null, $calendar= null , $pattern= null) {}
 
 	/**
-	 * Create a date formatter 
+	 * Create a date formatter
 	 *
 	 * @param string  $locale     Locale to use when formatting or parsing
 	 * @param integer $datetype   Date type to use (none, short, medium, long, full)
@@ -86,7 +86,7 @@ class DateFormatter {
 	 * @param mixed $value - value to format
          *     integer: a unix timestamp value (seconds since epoch, UTC)
          *     array: a localtime array  - uses 24 hour clock in tm_hour field
-         * @return string  a formatted string or, if an error occurred, 'null'. 
+         * @return string  a formatted string or, if an error occurred, 'null'.
 	 */
         public function format($value) {}
 
@@ -96,7 +96,7 @@ class DateFormatter {
 	 * $parse_pos and consuming as much of the input value as possible
 	 * If no error occurs before $value is consumed, $parse_pos will contain -1
 	 * otherwise it will contain the position at which parsing ended (and the error
-	 * occurred). 
+	 * occurred).
 	 * @param string  $value      string to convert to a time
 	 * @param integer $parse_pos  position at which to start the parsing in $value (zero-based)
 	 *                            This variable will contain the end position if the parse fails
@@ -105,13 +105,13 @@ class DateFormatter {
 	 */
 	 public function parse($value, $parse_pos=0) {}
 
-	 
+
         /**
          * converts string $value to a field-based time value, starting at
 	 * $parse_pos and consuming as much of the input value as possible
 	 * If no error occurs before $value is consumed, $parse_pos will contain -1
 	 * otherwise it will contain the position at which parsing ended (and the error
-	 * occurred). 
+	 * occurred).
 	 * @param string  $value      string to convert to a time
 	 * @param integer $parse_pos  position at which to start the parsing in $value (zero-based)
 	 *                            This variable will contain the end position if the parse fails
@@ -122,21 +122,21 @@ class DateFormatter {
 
 
 	 /**
-	  * Gets the datetype in use 
+	  * Gets the datetype in use
 	  * @return integer the current 'datetype' value of the formatter
 	  */
          public function getDateType() {}
 
 
 	 /**
-	  * Gets the timetype in use 
+	  * Gets the timetype in use
 	  * @return integer the current 'timetype' value of the formatter
 	  */
          public function getTimeType() {}
 
 
 	 /**
-	  * Gets the leniency in use 
+	  * Gets the leniency in use
 	  * @return boolean   'true' if parser is lenient, 'false' if parser is strict
 	  *                   default value for parser is 'false'.
 	  */
@@ -144,22 +144,22 @@ class DateFormatter {
 
 
 	 /**
-	  * Sets the leniency to use 
+	  * Sets the leniency to use
 	  * @param boolean $lenient  sets whether the parser is lenient or not, default is 'false'
-          *                          'true' sets the parser to accept otherwise flawed date or 
+          *                          'true' sets the parser to accept otherwise flawed date or
 	  *                          time patterns, parsing as much as possible to obtain a value.
-          *                          'false' sets the parser to strictly parse strings into dates. 
-	  *                          Extra space, unrecognized tokens, or invalid values 
+          *                          'false' sets the parser to strictly parse strings into dates.
+	  *                          Extra space, unrecognized tokens, or invalid values
 	  *                          ("February 30th") are not accepted.
 	  *
-          * @return boolean          'true' if successful; 'false' if an error occurred. 
+          * @return boolean          'true' if successful; 'false' if an error occurred.
 	  */
 	 public function setLenient($lenient) {}
 
 
 	 /**
-	  * Gets the locale in use 
-	  * @param  [integer]  which locale should be returned? 
+	  * Gets the locale in use
+	  * @param  [integer]  which locale should be returned?
 	  *                    values may include ULOC_ACTUAL_LOCALE,
 	  *                    ULOC_VALID_LOCALE. By default the actual
 	  *                    locale is returned.
@@ -187,33 +187,33 @@ class DateFormatter {
 
 
         /**
-         * Sets the calendar used to the appropriate calendar, which must be 
+         * Sets the calendar used to the appropriate calendar, which must be
 	 * one of the constants defined above. Some examples include:
          *   - Gregorian calendar
          *   - Traditional
          * Default value is GREGORIAN
 	 * @param integer $which the calendar (an enumerated constant) to use.
-         * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized 
+         * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized
 	 */
          public function setCalendar($which) {}
 
 
         /**
-	 * Gets the Calendar in use 
+	 * Gets the Calendar in use
 	 * @return integer the calendar being used by the formatter
 	 */
          public function getCalendar() {}
 
 
         /**
-	 * Gets the pattern in use 
-    	 * @return string the pattern string being used to format/parse 
+	 * Gets the pattern in use
+    	 * @return string the pattern string being used to format/parse
 	 */
 	public function getPattern() {}
 
 
         /**
-	 * Sets the pattern to  use 
+	 * Sets the pattern to  use
          * @param  string $pattern new pattern string to use
          * @return boolean 'true' if successful, 'false' if an error occurred. Bad format
          *                 strings are usually the cause of the latter.
@@ -247,7 +247,7 @@ class DateFormatter {
 
 
 	/**
-	 * Create a date formatter 
+	 * Create a date formatter
 	 *
 	 * @param string  $locale     Locale to use when formatting or parsing
 	 * @param integer $datetype   Date type to use (none, short, medium, long, full)
@@ -268,7 +268,7 @@ class DateFormatter {
 	 * @param mixed $value - value to format
          *     integer: a unix timestamp value (seconds since epoch, UTC)
          *     array: a localtime array   - uses 24 hour clock in tm_hour field
-         * @return string  a formatted string or, if an error occurred, 'null'. 
+         * @return string  a formatted string or, if an error occurred, 'null'.
 	 */
         function datefmt_format($fmt , $value) {}
 
@@ -278,7 +278,7 @@ class DateFormatter {
 	 * $parse_pos and consuming as much of the input value as possible
 	 * If no error occurs before $value is consumed, $parse_pos will contain -1
 	 * otherwise it will contain the position at which parsing ended (and the error
-	 * occurred). 
+	 * occurred).
          * @param DateFormatter $fmt The date formatter resource
 	 * @param string  $value      string to convert to a time
 	 * @param integer $parse_pos  position at which to start the parsing in $value (zero-based)
@@ -288,13 +288,13 @@ class DateFormatter {
 	 */
 	 function datefmt_parse($fmt , $value, $parse_pos=0) {}
 
-	 
+
         /**
          * converts string $value to a field-based time value, starting at
 	 * $parse_pos and consuming as much of the input value as possible
 	 * If no error occurs before $value is consumed, $parse_pos will contain -1
 	 * otherwise it will contain the position at which parsing ended (and the error
-	 * occurred). 
+	 * occurred).
          * @param DateFormatter $fmt The date formatter resource
 	 * @param string  $value      string to convert to a time
 	 * @param integer $parse_pos  position at which to start the parsing in $value (zero-based)
@@ -322,7 +322,7 @@ class DateFormatter {
 
 
 	 /**
-	  * Gets the leniency of the formatter 
+	  * Gets the leniency of the formatter
           * @param DateFormatter $fmt The date formatter resource
 	  * @return boolean   'true' if parser is lenient, 'false' if parser is strict
 	  *                   default value for parser is 'false'.
@@ -331,16 +331,16 @@ class DateFormatter {
 
 
 	 /**
-	  * Sets the leniency of the formatter 
+	  * Sets the leniency of the formatter
           * @param DateFormatter $fmt The date formatter resource
 	  * @param boolean $lenient  sets whether the parser is lenient or not, default is 'false'
-          *                          'true' sets the parser to accept otherwise flawed date or 
+          *                          'true' sets the parser to accept otherwise flawed date or
 	  *                          time patterns, parsing as much as possible to obtain a value.
-          *                          'false' sets the parser to strictly parse strings into dates. 
-	  *                          Extra space, unrecognized tokens, or invalid values 
+          *                          'false' sets the parser to strictly parse strings into dates.
+	  *                          Extra space, unrecognized tokens, or invalid values
 	  *                          ("February 30th") are not accepted.
 	  *
-          * @return boolean          'true' if successful; 'false' if an error occurred. 
+          * @return boolean          'true' if successful; 'false' if an error occurred.
 	  */
 	 function datefmt_set_lenient($fmt , $lenient) {}
 
@@ -348,7 +348,7 @@ class DateFormatter {
 	 /**
 	  * Gets the locale in  use
           * @param DateFormatter $fmt The date formatter resource
-	  * @param  [integer]  which locale should be returned? 
+	  * @param  [integer]  which locale should be returned?
 	  *                    values may include ULOC_ACTUAL_LOCALE,
 	  *                    ULOC_VALID_LOCALE. By default the actual
 	  *                    locale is returned.
@@ -366,14 +366,14 @@ class DateFormatter {
 
 
         /**
-         * Sets the calendar used to the appropriate calendar, which must be 
+         * Sets the calendar used to the appropriate calendar, which must be
 	 * one of the constants defined above. Some examples include:
          *   - Gregorian calendar
          *   - Traditional
          * Default value is GREGORIAN
          * @param DateFormatter $fmt The date formatter resource
 	 * @param integer $which the calendar (an enumerated constant) to use.
-         * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized 
+         * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized
 	 */
          function datefmt_set_calendar($fmt , $which) {}
 
diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php
index e22d165cbb..91f4869166 100644
--- a/ext/intl/doc/grapheme_api.php
+++ b/ext/intl/doc/grapheme_api.php
@@ -30,14 +30,14 @@
 	 * Find position (in grapheme units) of first occurrence of a string
 	 * @param string	$haystack	The string to look in
 	 * @param string	$needle		The string to look for
-	 * @param [int]		$offset		The optional offset parameter allows you to specify 
-						which character in haystack  to start searching. The position 
+	 * @param [int]		$offset		The optional offset parameter allows you to specify
+						which character in haystack  to start searching. The position
 						returned is still relative to the beginning of haystack.
 	 * @return int		Returns the position as an integer. If needle is not found, strpos() will return boolean FALSE.
 	*/
 	function grapheme_strpos($haystack, $needle, $offset = 0) {}
 
-	
+
 	/**
          * Find position (in grapheme units) of first occurrence of a case-insensitive string
          * @param string        $haystack       The string to look in
@@ -48,7 +48,7 @@
          * @return int          Returns the position as an integer. If needle is not found, grapheme_stripos() will return boolean FALSE.
         */
         function grapheme_stripos($haystack, $needle, $offset = 0) {}
- 
+
 
 	/**
          * Find position (in grapheme units) of last occurrence of a string
@@ -77,12 +77,12 @@
 	/**
 	 * Return part of a string
 	 * @param string	$string		The input string.
-	 * @param int		$start		If start  is non-negative, the returned string will start at the 
+	 * @param int		$start		If start  is non-negative, the returned string will start at the
 						start'th position in string, counting from zero. If start is negative,
-						the returned string will start at the start'th character from the 
+						the returned string will start at the start'th character from the
 						end of string.
 	 * @param [int]		$length		If length  is given and is positive, the string returned will contain
-						at most length characters beginning from start (depending on the 
+						at most length characters beginning from start (depending on the
 						length of string). If string is less than or equal to start characters
 						long, FALSE  will be returned. If length is given and is negative, then
 						that many characters will be omitted from the end of string (after the
@@ -122,7 +122,7 @@
 	 * @param [int]		$extract_type	one of GRAPHEME_EXTR_COUNT (default), GRAPHEME_EXTR_MAXBYTES, or GRAPHEME_EXTR_MAXCHARS
 	 * @param [int]		$start		starting position in $haystack in bytes
 	 * @param [&int]	$next		set to next starting position in bytes
-	 * @return string	A string starting at offset $start containing no more than $size grapheme clusters 
+	 * @return string	A string starting at offset $start containing no more than $size grapheme clusters
 				and ending on a default grapheme cluster boundary.
 	*/
 	function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0, &$next) {}
diff --git a/ext/intl/doc/locale_api.php b/ext/intl/doc/locale_api.php
index c6c41ede0a..4633ac1227 100644
--- a/ext/intl/doc/locale_api.php
+++ b/ext/intl/doc/locale_api.php
@@ -1,29 +1,29 @@
 <?php
 
 /**
- * A "Locale" is an identifier used to get language, culture, or regionally-specific 
+ * A "Locale" is an identifier used to get language, culture, or regionally-specific
  * behavior from an API. PHP locales are organized and identified the same
- * way that the CLDR locales used by ICU (and many vendors of Unix-like operating 
+ * way that the CLDR locales used by ICU (and many vendors of Unix-like operating
  * systems, the Mac, Java, and so forth) use. Locales are identified using
  * RFC 4646 language tags (which use hyphen, not underscore) in addition to the
  * more traditional underscore-using identifiers. Unless otherwise noted
- * the functions in this class are tolerant of both formats. 
+ * the functions in this class are tolerant of both formats.
  *
  * Examples of identifiers include:
  *
  *  * en-US (English, United States)
  *  * zh-Hant-TW (Chinese, Traditional Script, Taiwan)
- *  * fr-CA, fr-FR (French for Canada and France respectively) 
+ *  * fr-CA, fr-FR (French for Canada and France respectively)
  *
- * The Locale class (and related procedural functions) are used to interact 
- * with locale identifiers--to verify that an ID is well-formed, valid, 
- * etc. The extensions used by CLDR in UAX #35 (and inherited by ICU) are 
+ * The Locale class (and related procedural functions) are used to interact
+ * with locale identifiers--to verify that an ID is well-formed, valid,
+ * etc. The extensions used by CLDR in UAX #35 (and inherited by ICU) are
  * valid and used wherever they would be in ICU normally.
  *
- * Locales cannot be instantiated as objects. All of the functions/methods 
+ * Locales cannot be instantiated as objects. All of the functions/methods
  * provided are static.
  *
- *   * The null or empty string obtains the "root" locale. 
+ *   * The null or empty string obtains the "root" locale.
  *     The "root" locale is equivalent to "en_US_POSIX" in CLDR.
  *   * Language tags (and thus locale identifiers) are case insensitive. There
  *     exists a canonicalization function to make case match the specification.
@@ -56,7 +56,7 @@ class Locale {
 	const ACTUAL_LOCALE 			= 'ULOC_ACTUAL_LOCALE';
    	const VALID_LOCALE 			= 'ULOC_VALID_LOCALE';
 
-	/** 
+	/**
 	 * Valid locale tag and subtag values
 	 */
 	const LANG_TAG 				= "language";
@@ -66,7 +66,7 @@ class Locale {
 	const VARIANT_TAG 			= "variant";
 	const GRANDFATHERED_LANG_TAG 		= "grandfathered";
 	const PRIVATE_TAG 			= "private";
-	
+
 
 #############################################################################
 # Object-oriented API
@@ -74,12 +74,12 @@ class Locale {
 
 	/**
 	 * Gets the default locale value from the INTL global 'default_locale'
-	 * At the PHP initilaization (MINIT) this value is set to 
-	 * 'intl.default_locale' value from php.ini if that value exists 
-	 * or from ICU's function  uloc_getDefault() 
+	 * At the PHP initilaization (MINIT) this value is set to
+	 * 'intl.default_locale' value from php.ini if that value exists
+	 * or from ICU's function  uloc_getDefault()
 	 * Then onwards picks up changes from setDefault() calls also
 	 *
-     	 * @return string the current runtime locale 
+     	 * @return string the current runtime locale
      	 */
 	public static function getDefault() {}
 
@@ -87,7 +87,7 @@ class Locale {
      	 * sets the default runtime locale to $locale
  	 * This changes the value of INTL global 'default_locale'
      	 *
-     	 * @param 	string	 $locale 	is a BCP 47 compliant language tag containing the 
+     	 * @param 	string	 $locale 	is a BCP 47 compliant language tag containing the
      	 *					locale identifier. UAX #35 extensions are accepted.
      	 * @return	boolean 		'true' if okay, 'false' if an error
      	 */
@@ -98,8 +98,8 @@ class Locale {
 	 * Gets the primary language for the input locale
 	 *
      	 * @param	string	$locale 	the locale to extract the primary language code from
-     	 * @return 	string 			the language code associated with the language 
-	 *					or null in case of error. 
+     	 * @return 	string 			the language code associated with the language
+	 *					or null in case of error.
      	 */
     	public static function getPrimaryLanguage($locale) {}
 
@@ -126,7 +126,7 @@ class Locale {
 	 * Gets the variants for the input locale
 	 *
     	 * @param 	string 	$locale 	the locale to extract the variants from
-     	 * @return 	array 			the array containing the list of all variants 
+     	 * @return 	array 			the array containing the list of all variants
 	 *					subtag for the locale or null if not present
      	 */
 	public static function getAllVariants($locale) {}
@@ -136,7 +136,7 @@ class Locale {
 	 * Gets the keywords for the input locale
 	 *
      	 * @param 	string 	$locale 	the locale to extract the keywords from
-     	 * @return 	array 			associative array containing the keyword-value pairs for this locale 
+     	 * @return 	array 			associative array containing the keyword-value pairs for this locale
      	 */
     	public static function getKeywords($locale) {}
 
@@ -146,9 +146,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a displayname for
 	 * @param 	[string] 	$in_locale  	optional format locale
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
     	public static function getDisplayName($locale, $in_locale = null) {}
 
@@ -158,9 +158,9 @@ class Locale {
 	 *
      	 * @param 	string 	 	$locale 	the locale to return a display language for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the language name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the language for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	public static function getDisplayLanguage($lang, $in_locale = null) {}
 
@@ -169,9 +169,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display script for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the script name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the script for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	public static function getDisplayScript($script, $in_locale = null) {}
 
@@ -181,9 +181,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display region for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the region name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the region for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	public static function getDisplayRegion($region, $in_locale = null) {}
 
@@ -193,15 +193,15 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display variant for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the variant name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the variant for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	public static function getDisplayVariant($variant, $in_locale = null) {}
 
 
     	/**
-	 * Checks if a $langtag  filter matches with $locale according to 
+	 * Checks if a $langtag  filter matches with $locale according to
 	 * RFC 4647's basic filtering algorithm
 	 *
      	 * @param 	string 		$langtag	the language tag to check
@@ -213,24 +213,24 @@ class Locale {
 
 	/**
      	 * Searchs the items in $langtag for the best match to the language
-	 * range specified in $locale according to RFC 4647's lookup algorithm. 
+	 * range specified in $locale according to RFC 4647's lookup algorithm.
 	 *
 	 * @param 	array 		$langtag  	an array containing a list of language tags to compare
 	 *            					to $locale
 	 * @param 	string 		$locale   	the locale to use as the language range when matching
 	 * @param 	string 		$default  	the locale to use if no match is found
-	 * @return 	string 				closest matching language tag, $default, 
+	 * @return 	string 				closest matching language tag, $default,
 	 *						or empty string
 	 */
     	public static function lookup(array $langtag, $locale, $default = null) {}
 
 
 	/**
-     	 * Returns a correctly ordered and delimited locale ID 
+     	 * Returns a correctly ordered and delimited locale ID
 	 *
-	 * @param 	array 		$subtags 	an array containing a list of key-value pairs, where 
-	 * 						the keys identify the particular locale ID subtags, 	
-	 *						and the values are the associated subtag values. 
+	 * @param 	array 		$subtags 	an array containing a list of key-value pairs, where
+	 * 						the keys identify the particular locale ID subtags,
+	 *						and the values are the associated subtag values.
 	 *
 	 * @return 	string 				the corresponding locale identifier.
 	 */
@@ -240,11 +240,11 @@ class Locale {
 	/**
 	 * Returns a key-value array of locale ID subtag elements.
 	 *
-	 * @param 	string		$locale		the locale to extract the subtag array from 					
+	 * @param 	string		$locale		the locale to extract the subtag array from
 	 *
-	 * @return 	array 		$subtags 	an array containing a list of key-value pairs, where 
-	 * 						the keys identify the particular locale ID subtags, 	
-	 *						and the values are the associated subtag values. 
+	 * @return 	array 		$subtags 	an array containing a list of key-value pairs, where
+	 * 						the keys identify the particular locale ID subtags,
+	 *						and the values are the associated subtag values.
 	 */
     	public static function parseLocale($locale) {}
 
@@ -257,12 +257,12 @@ class Locale {
 
 	/**
 	 * Gets the default locale value from the INTL global 'default_locale'
-	 * At the PHP initilaization (MINIT) this value is set to 
-	 * 'intl.default_locale' value from php.ini if that value exists 
-	 * or from ICU's function  uloc_getDefault() 
+	 * At the PHP initilaization (MINIT) this value is set to
+	 * 'intl.default_locale' value from php.ini if that value exists
+	 * or from ICU's function  uloc_getDefault()
 	 * Then onwards picks up changes from setDefault() calls also
 	 *
-     	 * @return string the current runtime locale 
+     	 * @return string the current runtime locale
      	 */
 	 function locale_get_default() {}
 
@@ -270,7 +270,7 @@ class Locale {
      	 * sets the default runtime locale to $locale
  	 * This changes the value of INTL global 'default_locale'
      	 *
-     	 * @param 	string	 $locale 	is a BCP 47 compliant language tag containing the 
+     	 * @param 	string	 $locale 	is a BCP 47 compliant language tag containing the
      	 *					locale identifier. UAX #35 extensions are accepted.
      	 * @return	boolean 		'true' if okay, 'false' if an error
      	 */
@@ -281,8 +281,8 @@ class Locale {
 	 * Gets the primary language for the input locale
 	 *
      	 * @param	string	$locale 	the locale to extract the primary language code from
-     	 * @return 	string 			the language code associated with the language 
-	 *					or null in case of error. 
+     	 * @return 	string 			the language code associated with the language
+	 *					or null in case of error.
      	 */
     	 function locale_get_primary_language($locale) {}
 
@@ -309,7 +309,7 @@ class Locale {
 	 * Gets the variants for the input locale
 	 *
     	 * @param 	string 	$locale 	the locale to extract the variants from
-     	 * @return 	array 			the array containing the list of all variants 
+     	 * @return 	array 			the array containing the list of all variants
 	 *					subtag for the locale or null if not present
      	 */
 	 function locale_get_all_variants($locale) {}
@@ -319,7 +319,7 @@ class Locale {
 	 * Gets the keywords for the input locale
 	 *
      	 * @param 	string 	$locale 	the locale to extract the keywords from
-     	 * @return 	array 			associative array containing the keyword-value pairs for this locale 
+     	 * @return 	array 			associative array containing the keyword-value pairs for this locale
      	 */
     	 function locale_get_keywords($locale) {}
 
@@ -329,9 +329,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a displayname for
 	 * @param 	[string] 	$in_locale  	optional format locale
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
     	 function locale_get_display_name($locale, $in_locale = null) {}
 
@@ -341,9 +341,9 @@ class Locale {
 	 *
      	 * @param 	string 	 	$locale 	the locale to return a display language for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the language name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the language for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	 function locale_get_display_language($lang, $in_locale = null) {}
 
@@ -352,9 +352,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display script for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the script name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the script for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	 function locale_get_display_script($script, $in_locale = null) {}
 
@@ -364,9 +364,9 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display region for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the region name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the region for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	 function locale_get_display_region($region, $in_locale = null) {}
 
@@ -376,15 +376,15 @@ class Locale {
 	 *
     	 * @param 	string 	 	$locale 	the locale to return a display variant for
 	 * @param 	[string] 	$in_locale  	optional format locale to use to display the variant name
-	 * 						If is 'null' then the default locale is used. 
+	 * 						If is 'null' then the default locale is used.
 	 * @return 	string  			display name of the variant for the $locale in the format
-	 * 						appropriate for $in_locale. 
+	 * 						appropriate for $in_locale.
      	 */
 	 function locale_get_display_variant($variant, $in_locale = null) {}
 
 
     	/**
-	 * Checks if a $langtag  filter matches with $locale according to 
+	 * Checks if a $langtag  filter matches with $locale according to
 	 * RFC 4647's basic filtering algorithm
 	 *
      	 * @param 	string 		$langtag	the language tag to check
@@ -396,24 +396,24 @@ class Locale {
 
 	/**
      	 * Searchs the items in $langtag for the best match to the language
-	 * range specified in $locale according to RFC 4647's lookup algorithm. 
+	 * range specified in $locale according to RFC 4647's lookup algorithm.
 	 *
 	 * @param 	array 		$langtag  	an array containing a list of language tags to compare
 	 *            					to $locale
 	 * @param 	string 		$locale   	the locale to use as the language range when matching
 	 * @param 	string 		$default  	the locale to use if no match is found
-	 * @return 	string 				closest matching language tag, $default, 
+	 * @return 	string 				closest matching language tag, $default,
 	 *						or empty string
 	 */
     	 function locale_lookup(array $langtag, $locale, $default = null) {}
 
 
 	/**
-     	 * Returns a correctly ordered and delimited locale ID 
+     	 * Returns a correctly ordered and delimited locale ID
 	 *
-	 * @param 	array 		$subtags 	an array containing a list of key-value pairs, where 
-	 * 						the keys identify the particular locale ID subtags, 	
-	 *						and the values are the associated subtag values. 
+	 * @param 	array 		$subtags 	an array containing a list of key-value pairs, where
+	 * 						the keys identify the particular locale ID subtags,
+	 *						and the values are the associated subtag values.
 	 *
 	 * @return 	string 				the corresponding locale identifier.
 	 */
@@ -423,11 +423,11 @@ class Locale {
 	/**
 	 * Returns a key-value array of locale ID subtag elements.
 	 *
-	 * @param 	string		$locale		the locale to extract the subtag array from 					
+	 * @param 	string		$locale		the locale to extract the subtag array from
 	 *
-	 * @return 	array 		$subtags 	an array containing a list of key-value pairs, where 
-	 * 						the keys identify the particular locale ID subtags, 	
-	 *						and the values are the associated subtag values. 
+	 * @return 	array 		$subtags 	an array containing a list of key-value pairs, where
+	 * 						the keys identify the particular locale ID subtags,
+	 *						and the values are the associated subtag values.
 	 */
     	 function locale_parse_locale($locale) {}
 
diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php
index 3df6f0de11..856946c718 100644
--- a/ext/intl/doc/msgfmt_api.php
+++ b/ext/intl/doc/msgfmt_api.php
@@ -14,7 +14,7 @@ class MessageFormatter {
 
 	/**
 	 * Constructs a new Message Formatter
-	 * 
+	 *
 	 * @param  string   $locale  the locale to use when formatting arguments
 	 * @param  string   $pattern the pattern string to stick arguments into
 	 */
@@ -22,7 +22,7 @@ class MessageFormatter {
 
 	/**
 	 * Constructs a new Message Formatter
-	 * 
+	 *
 	 * @param  string   $locale  the locale to use when formatting arguments
 	 * @param  string   $pattern the pattern string to stick arguments into
 	 */
@@ -113,7 +113,7 @@ class MessageFormatter {
 
 	/**
 	 * Constructs a new Message Formatter
-	 * 
+	 *
 	 * @param  string   $locale  the locale to use when formatting arguments
 	 * @param  string   $pattern the pattern string to stick arguments into
 	 * @return MessageFormatter formatter object
@@ -122,7 +122,7 @@ class MessageFormatter {
 
 	/**
 	 * Format the message
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @param   array   $args   arguments to insert into the pattern string
 	 * @return  string  the formatted string, or false if an error occurred
 	 */
@@ -134,7 +134,7 @@ class MessageFormatter {
 	 * $error will contain any error code. If an error occurs, $parse_pos contains
 	 * the position of the error.
 	 *
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @param  string  $value      string to parse for items
 	 * @return array               array containing items extracted
 	 *
@@ -168,7 +168,7 @@ class MessageFormatter {
 	/**
 	 * Get the pattern used by the formatter
 	 *
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @return  string  the pattern string for this message formatter
 	 */
 	function msgfmt_get_pattern($fmt) {}
@@ -176,7 +176,7 @@ class MessageFormatter {
 	/**
 	 * Set the pattern used by the formatter
 	 *
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @param  string  $pattern  the pattern string to use in this message formatter
 	 * @return boolean 'true' if successful, 'false' if an error
 	 */
@@ -187,14 +187,14 @@ class MessageFormatter {
 	 *
 	 * Returns error code from the last number formatting operation.
 	 *
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @return integer the error code, one of UErrorCode values. Initial value is U_ZERO_ERROR.
 	 */
 	function msgfmt_get_error_code($fmt) {}
 	/**
 	 * Get the error text from the last operation.
 	 *
-	 * @param MessageFormatter $fmt The message formatter 
+	 * @param MessageFormatter $fmt The message formatter
 	 * @return string Description of the last error.
 	 */
 	function msgfmt_get_error_message($fmt) {}
diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c
index a88b559572..f80eea106a 100644
--- a/ext/intl/intl_error.c
+++ b/ext/intl/intl_error.c
@@ -233,7 +233,7 @@ void intl_errors_set_code( intl_error* err, UErrorCode err_code )
 void intl_register_IntlException_class( void )
 {
 	zend_class_entry ce;
-	
+
 	/* Create and register 'IntlException' class. */
 	INIT_CLASS_ENTRY_EX( ce, "IntlException", sizeof( "IntlException" ) - 1, NULL );
 	IntlException_ce_ptr = zend_register_internal_class_ex( &ce,
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index dba93f3fbc..4ba5e8fa1f 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -410,7 +410,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
 		loc_name = intl_locale_get_default();
 		loc_name_len = strlen(loc_name);
 	}
-	
+
 	INTL_CHECK_LOCALE_LEN(loc_name_len);
 
 	/* Call ICU get */
@@ -439,7 +439,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
 	}
 
 }
-/* }}} */ 
+/* }}} */
 
 /* {{{ proto static string Locale::getScript($locale)
  * gets the script for the $locale