Revert "update composer libs"

This reverts commit e779335d06
This commit is contained in:
Mario
2019-04-25 11:24:09 +02:00
parent 701167bc12
commit f1c0797780
102 changed files with 3992 additions and 3132 deletions

View File

@@ -9,8 +9,8 @@ namespace Sabre\VObject;
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
class StringUtil
{
class StringUtil {
/**
* Returns true or false depending on if a string is valid UTF-8.
*
@@ -18,14 +18,15 @@ class StringUtil
*
* @return bool
*/
public static function isUTF8($str)
{
static function isUTF8($str) {
// Control characters
if (preg_match('%[\x00-\x08\x0B-\x0C\x0E\x0F]%', $str)) {
return false;
}
return (bool) preg_match('%%u', $str);
return (bool)preg_match('%%u', $str);
}
/**
@@ -38,12 +39,12 @@ class StringUtil
*
* @return string
*/
public static function convertToUTF8($str)
{
static function convertToUTF8($str) {
$encoding = mb_detect_encoding($str, ['UTF-8', 'ISO-8859-1', 'WINDOWS-1252'], true);
switch ($encoding) {
case 'ISO-8859-1':
case 'ISO-8859-1' :
$newStr = utf8_encode($str);
break;
/* Unreachable code. Not sure yet how we can improve this
@@ -52,11 +53,14 @@ class StringUtil
$newStr = iconv('cp1252', 'UTF-8', $str);
break;
*/
default:
default :
$newStr = $str;
}
// Removing any control characters
return preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $newStr);
return (preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $newStr));
}
}