deon/redir
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to KH 3.3 and improved

Browse Source
This commit is contained in:
Deon George
2013-04-13 16:17:56 +10:00
parent 6f50463ec7
commit 6f7913d363
1551 changed files with 96188 additions and 29813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
includes/kohana/system/utf8/ord.php
View File

@@ -1,10 +1,10 @@
<?php defined('SYSPATH') or die('No direct script access.');
<?php defined('SYSPATH') OR die('No direct script access.');
/**
* UTF8::ord
*
* @package Kohana
* @author Kohana Team
* @copyright (c) 2007-2011 Kohana Team
* @copyright (c) 2007-2012 Kohana Team
* @copyright (c) 2005 Harry Fuecks
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
*/
@@ -17,8 +17,7 @@ function _ord($chr)
if ( ! isset($chr[1]))
{
trigger_error('Short sequence - at least 2 bytes expected, only 1 seen', E_USER_WARNING);
return FALSE;
throw new UTF8_Exception('Short sequence - at least 2 bytes expected, only 1 seen');
}
$ord1 = ord($chr[1]);
@@ -28,8 +27,7 @@ function _ord($chr)
if ( ! isset($chr[2]))
{
trigger_error('Short sequence - at least 3 bytes expected, only 2 seen', E_USER_WARNING);
return FALSE;
throw new UTF8_Exception('Short sequence - at least 3 bytes expected, only 2 seen');
}
$ord2 = ord($chr[2]);
@@ -39,8 +37,7 @@ function _ord($chr)
if ( ! isset($chr[3]))
{
trigger_error('Short sequence - at least 4 bytes expected, only 3 seen', E_USER_WARNING);
return FALSE;
throw new UTF8_Exception('Short sequence - at least 4 bytes expected, only 3 seen');
}
$ord3 = ord($chr[3]);
@@ -50,8 +47,7 @@ function _ord($chr)
if ( ! isset($chr[4]))
{
trigger_error('Short sequence - at least 5 bytes expected, only 4 seen', E_USER_WARNING);
return FALSE;
throw new UTF8_Exception('Short sequence - at least 5 bytes expected, only 4 seen');
}
$ord4 = ord($chr[4]);
@@ -61,8 +57,7 @@ function _ord($chr)
if ( ! isset($chr[5]))
{
trigger_error('Short sequence - at least 6 bytes expected, only 5 seen', E_USER_WARNING);
return FALSE;
throw new UTF8_Exception('Short sequence - at least 6 bytes expected, only 5 seen');
}
if ($ord0 >= 252 AND $ord0 <= 253)
@@ -70,7 +65,8 @@ function _ord($chr)
if ($ord0 >= 254 AND $ord0 <= 255)
{
trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0, E_USER_WARNING);
return FALSE;
throw new UTF8_Exception("Invalid UTF-8 with surrogate ordinal ':ordinal'", array(
':ordinal' => $ord0,
));
}
}