diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4dadc94..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: php - -php: - - 5.3 - - 5.4 - - -notifications: - email: - - arielferrandini@gmail.com diff --git a/Urlizer.php b/Urlizer.php index af7bf67..af5e0cb 100644 --- a/Urlizer.php +++ b/Urlizer.php @@ -221,13 +221,13 @@ public static function utf8ToAscii($str, $unknown = '?') foreach ($chars as $i => $c) { $ud = 0; - if (ord($c{0})>=0 && ord($c{0})<=127) { continue; } // ASCII - next please - if (ord($c{0})>=192 && ord($c{0})<=223) { $ord = (ord($c{0})-192)*64 + (ord($c{1})-128); } - if (ord($c{0})>=224 && ord($c{0})<=239) { $ord = (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128); } - if (ord($c{0})>=240 && ord($c{0})<=247) { $ord = (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128); } - if (ord($c{0})>=248 && ord($c{0})<=251) { $ord = (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128); } - if (ord($c{0})>=252 && ord($c{0})<=253) { $ord = (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128); } - if (ord($c{0})>=254 && ord($c{0})<=255) { $chars{$i} = $unknown; continue; } //error + if (ord($c[0])>=0 && ord($c[0])<=127) { continue; } // ASCII - next please + if (ord($c[0])>=192 && ord($c[0])<=223) { $ord = (ord($c[0])-192)*64 + (ord($c[1])-128); } + if (ord($c[0])>=224 && ord($c[0])<=239) { $ord = (ord($c[0])-224)*4096 + (ord($c[1])-128)*64 + (ord($c[2])-128); } + if (ord($c[0])>=240 && ord($c[0])<=247) { $ord = (ord($c[0])-240)*262144 + (ord($c[1])-128)*4096 + (ord($c[2])-128)*64 + (ord($c[3])-128); } + if (ord($c[0])>=248 && ord($c[0])<=251) { $ord = (ord($c[0])-248)*16777216 + (ord($c[1])-128)*262144 + (ord($c[2])-128)*4096 + (ord($c[3])-128)*64 + (ord($c[4])-128); } + if (ord($c[0])>=252 && ord($c[0])<=253) { $ord = (ord($c[0])-252)*1073741824 + (ord($c[1])-128)*16777216 + (ord($c[2])-128)*262144 + (ord($c[3])-128)*4096 + (ord($c[4])-128)*64 + (ord($c[5])-128); } + if (ord($c[0])>=254 && ord($c[0])<=255) { $chars[$i] = $unknown; continue; } //error $bank = $ord >> 8; @@ -242,9 +242,9 @@ public static function utf8ToAscii($str, $unknown = '?') $newchar = $ord & 255; if (array_key_exists($newchar, $UTF8_TO_ASCII[$bank])) { - $chars{$i} = $UTF8_TO_ASCII[$bank][$newchar]; + $chars[$i] = $UTF8_TO_ASCII[$bank][$newchar]; } else { - $chars{$i} = $unknown; + $chars[$i] = $unknown; } } @@ -297,7 +297,7 @@ public static function validUtf8($str) $len = strlen($str); for ($i = 0; $i < $len; $i++) { - $in = ord($str{$i}); + $in = ord($str[$i]); if ($mState == 0) { // When mState is zero we expect either a US-ASCII character or a // multi-octet sequence.