From: Kevin Israel <pleasestand@live.com>
Date: Sat, 31 Jan 2015 08:15:36 +0000 (-0500)
Subject: codepointToUtf8(): Throw exception rather than calling die()
X-Git-Tag: 1.31.0-rc.0~12533^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e11c1ff52fff3d5c094501fc26d8d0a636ff74e1;p=lhc%2Fweb%2Fwiklou.git

codepointToUtf8(): Throw exception rather than calling die()

Change-Id: I0f2c05be95d34e069a3e9965f581d2adfc0a1b9d
---

diff --git a/includes/libs/normal/UtfNormalUtil.php b/includes/libs/normal/UtfNormalUtil.php
index 6c925dfafe..ae88e73e90 100644
--- a/includes/libs/normal/UtfNormalUtil.php
+++ b/includes/libs/normal/UtfNormalUtil.php
@@ -27,10 +27,10 @@
 
 /**
  * Return UTF-8 sequence for a given Unicode code point.
- * May die if fed out of range data.
  *
  * @param $codepoint Integer:
  * @return String
+ * @throws InvalidArgumentException if fed out of range data.
  * @public
  */
 function codepointToUtf8( $codepoint ) {
@@ -56,8 +56,7 @@ function codepointToUtf8( $codepoint ) {
 			chr( $codepoint & 0x3f | 0x80 );
 	}
 
-	echo "Asked for code outside of range ($codepoint)\n";
-	die( -1 );
+	throw new InvalidArgumentException( "Asked for code outside of range ($codepoint)" );
 }
 
 /**
@@ -67,6 +66,7 @@ function codepointToUtf8( $codepoint ) {
  *
  * @param $sequence String
  * @return String
+ * @throws InvalidArgumentException if fed out of range data.
  * @private
  */
 function hexSequenceToUtf8( $sequence ) {