Cleanup unused data

This commit is contained in:
djmaze 2021-11-26 16:37:41 +01:00
parent 664f2d466a
commit 9a239679db
9 changed files with 13 additions and 44 deletions

View file

@ -19,19 +19,6 @@ namespace MailSo\Base\Enumerations;
abstract class Charset abstract class Charset
{ {
const UTF_8 = 'utf-8'; const UTF_8 = 'utf-8';
const UTF_7 = 'utf-7';
const UTF_7_IMAP = 'utf7-imap';
const WIN_1250 = 'windows-1250';
const WIN_1251 = 'windows-1251';
const WIN_1252 = 'windows-1252';
const WIN_1253 = 'windows-1253';
const WIN_1254 = 'windows-1254';
const WIN_1255 = 'windows-1255';
const WIN_1256 = 'windows-1256';
const WIN_1257 = 'windows-1257';
const WIN_1258 = 'windows-1258';
const ISO_8859_1 = 'iso-8859-1'; const ISO_8859_1 = 'iso-8859-1';
const ISO_8859_8 = 'iso-8859-8';
const ISO_8859_8_I = 'iso-8859-8-i';
const ISO_2022_JP = 'iso-2022-jp'; const ISO_2022_JP = 'iso-2022-jp';
} }

View file

@ -18,16 +18,10 @@ namespace MailSo\Base\Enumerations;
*/ */
abstract class Encoding abstract class Encoding
{ {
const QUOTED_PRINTABLE = 'Quoted-Printable';
const QUOTED_PRINTABLE_LOWER = 'quoted-printable'; const QUOTED_PRINTABLE_LOWER = 'quoted-printable';
const QUOTED_PRINTABLE_SHORT = 'Q'; const QUOTED_PRINTABLE_SHORT = 'Q';
const BASE64 = 'Base64'; const BASE64 = 'Base64';
const BASE64_LOWER = 'base64'; const BASE64_LOWER = 'base64';
const BASE64_SHORT = 'B'; const BASE64_SHORT = 'B';
const SEVEN_BIT = '7bit';
const _7_BIT = '7bit';
const EIGHT_BIT = '8bit';
const _8_BIT = '8bit';
} }

View file

@ -151,7 +151,7 @@ class Binary
{ {
if (!\in_array(self::STREAM_NAME, \stream_get_wrappers())) if (!\in_array(self::STREAM_NAME, \stream_get_wrappers()))
{ {
\stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\Binary'); \stream_wrapper_register(self::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Binary');
} }
if (null === $sUtilsDecodeOrEncodeFunctionName || !\strlen($sUtilsDecodeOrEncodeFunctionName)) if (null === $sUtilsDecodeOrEncodeFunctionName || !\strlen($sUtilsDecodeOrEncodeFunctionName))

View file

@ -52,7 +52,7 @@ class Literal
{ {
if (!\in_array(self::STREAM_NAME, stream_get_wrappers())) if (!\in_array(self::STREAM_NAME, stream_get_wrappers()))
{ {
\stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\Literal'); \stream_wrapper_register(self::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Literal');
} }
$sHashName = \md5(\microtime(true).\rand(1000, 9999)); $sHashName = \md5(\microtime(true).\rand(1000, 9999));

View file

@ -60,7 +60,7 @@ class SubStreams
{ {
if (!\in_array(self::STREAM_NAME, \stream_get_wrappers())) if (!\in_array(self::STREAM_NAME, \stream_get_wrappers()))
{ {
\stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\SubStreams'); \stream_wrapper_register(self::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\SubStreams');
} }
$sHashName = \MailSo\Base\Utils::Sha1Rand(); $sHashName = \MailSo\Base\Utils::Sha1Rand();

View file

@ -37,7 +37,7 @@ class TempFile
{ {
if (!in_array(self::STREAM_NAME, stream_get_wrappers())) if (!in_array(self::STREAM_NAME, stream_get_wrappers()))
{ {
stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\TempFile'); stream_wrapper_register(self::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\TempFile');
} }
} }

View file

@ -41,7 +41,7 @@ class Test
{ {
if (!\in_array(self::STREAM_NAME, \stream_get_wrappers())) if (!\in_array(self::STREAM_NAME, \stream_get_wrappers()))
{ {
\stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\Test'); \stream_wrapper_register(self::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Test');
} }
$sHashName = \md5(\microtime(true).\rand(1000, 9999)); $sHashName = \md5(\microtime(true).\rand(1000, 9999));

View file

@ -38,7 +38,7 @@ abstract class Utils
case 'unicode-1-1-utf-7': case 'unicode-1-1-utf-7':
case 'unicode-1-utf-7': case 'unicode-1-utf-7':
case 'unicode-utf-7': case 'unicode-utf-7':
$sEncoding = Enumerations\Charset::UTF_7; $sEncoding = 'utf-7';
break; break;
case 'utf8': case 'utf8':
case 'utf-8': case 'utf-8':
@ -48,7 +48,7 @@ abstract class Utils
case 'utf-7imap': case 'utf-7imap':
case 'utf7-imap': case 'utf7-imap':
case 'utf-7-imap': case 'utf-7-imap':
$sEncoding = Enumerations\Charset::UTF_7_IMAP; $sEncoding = 'utf7-imap';
break; break;
case 'ks-c-5601-1987': case 'ks-c-5601-1987':
case 'ks_c_5601-1987': case 'ks_c_5601-1987':
@ -60,7 +60,7 @@ abstract class Utils
break; break;
case 'iso-8859-i': case 'iso-8859-i':
case 'iso-8859-8-i': case 'iso-8859-8-i':
$sEncoding = Enumerations\Charset::ISO_8859_8; $sEncoding = 'iso-8859-8';
break; break;
} }
@ -73,7 +73,7 @@ abstract class Utils
if (Enumerations\Charset::UTF_8 !== $sCharset && if (Enumerations\Charset::UTF_8 !== $sCharset &&
static::IsUtf8($sValue) && static::IsUtf8($sValue) &&
false === \strpos($sCharset, Enumerations\Charset::ISO_2022_JP) !\str_contains($sCharset, Enumerations\Charset::ISO_2022_JP)
) )
{ {
$sCharset = Enumerations\Charset::UTF_8; $sCharset = Enumerations\Charset::UTF_8;
@ -187,7 +187,7 @@ abstract class Utils
if ($sFromEncoding === Enumerations\Charset::ISO_8859_1) { if ($sFromEncoding === Enumerations\Charset::ISO_8859_1) {
return \utf8_encode($sInputString); return \utf8_encode($sInputString);
} }
if ($sFromEncoding === Enumerations\Charset::UTF_7_IMAP) { if ($sFromEncoding === 'utf7-imap') {
return static::Utf7ModifiedToUtf8($sInputString); return static::Utf7ModifiedToUtf8($sInputString);
} }
} }
@ -196,7 +196,7 @@ abstract class Utils
if ($sToEncoding === Enumerations\Charset::ISO_8859_1) { if ($sToEncoding === Enumerations\Charset::ISO_8859_1) {
return \utf8_decode($sInputString); return \utf8_decode($sInputString);
} }
if ($sToEncoding === Enumerations\Charset::UTF_7_IMAP) { if ($sToEncoding === 'utf7-imap') {
return static::Utf8ToUtf7Modified($sInputString); return static::Utf8ToUtf7Modified($sInputString);
} }
} }

View file

@ -9,21 +9,14 @@ class Settings
*/ */
protected $aData; protected $aData;
/** public function __construct()
* @var bool
*/
protected $bLocal;
public function __construct(bool $bLocal = false)
{ {
$this->aData = array(); $this->aData = array();
$this->bLocal = $bLocal;
} }
public function InitData(array $aData) : self public function InitData(array $aData) : void
{ {
$this->aData = $aData; $this->aData = $aData;
return $this;
} }
public function DataAsArray() : array public function DataAsArray() : array
@ -31,11 +24,6 @@ class Settings
return $this->aData; return $this->aData;
} }
public function IsLocal() : bool
{
return $this->bLocal;
}
/** /**
* @param mixed $mDefValue = null * @param mixed $mDefValue = null
* *