Skip to content

merge + fix conflicts from phpdocblocks pr #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidGoodwin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

merge + fix conflicts from phpdocblocks pr #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
331a0f5
merge + fix conflicts from phpdocblocks pr ( https://github.com/neita…
DavidGoodwin Oct 19, 2021
3e95319
fix failure to lint
DavidGoodwin Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 60 additions & 1 deletion src/ForceUTF8/Encoding.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,14 @@
class Encoding {

const ICONV_TRANSLIT = "TRANSLIT";

const ICONV_IGNORE = "IGNORE";

const WITHOUT_ICONV = "";

/**
* @var array
*/
protected static $win1252ToUtf8 = array(
128 => "\xe2\x82\xac",

Expand Down Expand Up @@ -80,7 +85,10 @@ class Encoding {
159 => "\xc5\xb8"
);

protected static $brokenUtf8ToUtf8 = array(
/**
* @var array
*/
protected static $brokenUtf8ToUtf8 = array(
"\xc2\x80" => "\xe2\x82\xac",

"\xc2\x82" => "\xe2\x80\x9a",
Expand Down Expand Up @@ -115,6 +123,9 @@ class Encoding {
"\xc2\x9f" => "\xc5\xb8"
);

/**
* @var array
*/
protected static $utf8ToWin1252 = array(
"\xe2\x82\xac" => "\x80",

Expand Down Expand Up @@ -150,6 +161,10 @@ class Encoding {
"\xc5\xb8" => "\x9f"
);

/**
* @param array|string $text
* @return array|string
*/
static function toUTF8($text){
/**
* Function \ForceUTF8\Encoding::toUTF8
Expand Down Expand Up @@ -245,6 +260,11 @@ static function toUTF8($text){
return $buf;
}

/**
* @param array|string $text
* @param string $option
* @return array|string
*/
static function toWin1252($text, $option = self::WITHOUT_ICONV) {
if(is_array($text)) {
foreach($text as $k => $v) {
Expand All @@ -258,14 +278,27 @@ static function toWin1252($text, $option = self::WITHOUT_ICONV) {
}
}

/**
* @param array|string $text
* @return array|string
*/
static function toISO8859($text, $option = self::WITHOUT_ICONV) {
return self::toWin1252($text, $option);
}

/**
* @param array|string $text
* @return array|string
*/
static function toLatin1($text, $option = self::WITHOUT_ICONV) {
return self::toWin1252($text, $option);
}

/**
* @param array|string $text
* @param string $option
* @return array|string
*/
static function fixUTF8($text, $option = self::WITHOUT_ICONV){
if(is_array($text)) {
foreach($text as $k => $v) {
Expand All @@ -287,6 +320,10 @@ static function fixUTF8($text, $option = self::WITHOUT_ICONV){
return $text;
}

/**
* @param string $text
* @return mixed
*/
static function UTF8FixWin1252Chars($text){
// If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1
// (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.
Expand All @@ -295,18 +332,30 @@ static function UTF8FixWin1252Chars($text){
return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);
}

/**
* @param string $str
* @return string
*/
static function removeBOM($str=""){
if(substr($str, 0,3) === pack("CCC",0xef,0xbb,0xbf)) {
$str=substr($str, 3);
}
return $str;
}

/**
* @param string $text
* @return int
*/
protected static function strlen($text){
return (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload')) & 2) ?
mb_strlen($text,'8bit') : strlen($text);
}

/**
* @param string $encodingLabel
* @return string
*/
public static function normalizeEncoding($encodingLabel)
{
$encoding = strtoupper($encodingLabel);
Expand All @@ -330,13 +379,23 @@ public static function normalizeEncoding($encodingLabel)
return $equivalences[$encoding];
}

/**
* @param string $encodingLabel
* @param string $text
* @return array|string
*/
public static function encode($encodingLabel, $text)
{
$encodingLabel = self::normalizeEncoding($encodingLabel);
if($encodingLabel === 'ISO-8859-1') return self::toLatin1($text);
return self::toUTF8($text);
}

/**
* @param string $text
* @param string $option
* @return string
*/
protected static function utf8_decode($text, $option = self::WITHOUT_ICONV)
{
if ($option == self::WITHOUT_ICONV || !function_exists('iconv')) {
Expand Down