diff --git a/Account/Account.php b/Account/Account.php index 50d38f4fe..7cc661071 100644 --- a/Account/Account.php +++ b/Account/Account.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace phpOMS\Account; -use phpOMS\Contract\ArrayableInterface; use phpOMS\Localization\Localization; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; use phpOMS\Validation\Network\Email; @@ -30,7 +29,7 @@ use phpOMS\Validation\Network\Email; * @link https://karaka.app * @since 1.0.0 */ -class Account implements \JsonSerializable, ArrayableInterface +class Account implements \JsonSerializable { /** * Id. diff --git a/Account/Group.php b/Account/Group.php index fec196fd0..eb90a599a 100644 --- a/Account/Group.php +++ b/Account/Group.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace phpOMS\Account; -use phpOMS\Contract\ArrayableInterface; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; /** @@ -25,7 +24,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * @link https://karaka.app * @since 1.0.0 */ -class Group implements \JsonSerializable, ArrayableInterface +class Group implements \JsonSerializable { /** * Group id. diff --git a/Contract/SerializableInterface.php b/Contract/SerializableInterface.php new file mode 100644 index 000000000..c313eb475 --- /dev/null +++ b/Contract/SerializableInterface.php @@ -0,0 +1,32 @@ +__unserialize(\substr($raw, $namespaceEnd + 1)); + $obj->unserialize(\substr($raw, $namespaceEnd + 1)); return $obj; default: diff --git a/DataStorage/Cache/Connection/RedisCache.php b/DataStorage/Cache/Connection/RedisCache.php index 61e3c818b..c3d715403 100644 --- a/DataStorage/Cache/Connection/RedisCache.php +++ b/DataStorage/Cache/Connection/RedisCache.php @@ -418,7 +418,7 @@ final class RedisCache extends ConnectionAbstract } elseif ($type === CacheValueType::_ARRAY) { return (string) \json_encode($value); } elseif ($type === CacheValueType::_SERIALIZABLE) { - return \get_class($value) . self::DELIM . $value->__serialize(); + return \get_class($value) . self::DELIM . $value->serialize(); } elseif ($type === CacheValueType::_JSONSERIALIZABLE) { return \get_class($value) . self::DELIM . ((string) \json_encode($value->jsonSerialize())); } elseif ($type === CacheValueType::_NULL) { @@ -475,7 +475,7 @@ final class RedisCache extends ConnectionAbstract } $obj = new $namespace(); - $obj->__unserialize(\substr($raw, $namespaceEnd + 1)); + $obj->unserialize(\substr($raw, $namespaceEnd + 1)); return $obj; default: diff --git a/DataStorage/Database/Mapper/DataMapperAbstract.php b/DataStorage/Database/Mapper/DataMapperAbstract.php index 6b01efd2f..a884a17f8 100644 --- a/DataStorage/Database/Mapper/DataMapperAbstract.php +++ b/DataStorage/Database/Mapper/DataMapperAbstract.php @@ -355,7 +355,7 @@ abstract class DataMapperAbstract } elseif ($type === 'Json') { return (string) \json_encode($value); } elseif ($type === 'Serializable') { - return $value->__serialize(); + return $value->serialize(); } elseif (\is_object($value) && \method_exists($value, 'getId')) { return $value->getId(); } diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php index fc7c02d6a..b09e5e4df 100644 --- a/DataStorage/Database/Mapper/ReadMapper.php +++ b/DataStorage/Database/Mapper/ReadMapper.php @@ -632,7 +632,7 @@ final class ReadMapper extends DataMapperAbstract if ($member === null || $value === null) { $obj->{$def['internal']} = $value; } else { - $member->__unserialize($value); + $member->unserialize($value); } } @@ -706,7 +706,7 @@ final class ReadMapper extends DataMapperAbstract $refProp->setValue($obj, \json_decode($value, true)); } elseif ($def['mapper']::COLUMNS[$column]['type'] === 'Serializable') { $member = $isPublic ? $obj->{$member} : $refProp->getValue($obj); - $member->__unserialize($value); + $member->unserialize($value); } if (!$isPublic) { diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php index 3f9ebe2bc..eee58653c 100644 --- a/DataStorage/Database/Query/Builder.php +++ b/DataStorage/Database/Query/Builder.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace phpOMS\DataStorage\Database\Query; use phpOMS\Algorithm\Graph\DependencyResolver; +use phpOMS\Contract\SerializableInterface; use phpOMS\DataStorage\Database\BuilderAbstract; use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; @@ -1454,7 +1455,7 @@ class Builder extends BuilderAbstract return $column; } elseif ($column instanceof Column) { return $column->getColumn(); - } elseif ($column instanceof \Serializable) { + } elseif ($column instanceof SerializableInterface) { return $column->serialize(); } elseif ($column instanceof self) { return \md5($column->toSql()); diff --git a/DataStorage/Database/Query/Grammar/Grammar.php b/DataStorage/Database/Query/Grammar/Grammar.php index aa1f18adf..0bedf22d5 100644 --- a/DataStorage/Database/Query/Grammar/Grammar.php +++ b/DataStorage/Database/Query/Grammar/Grammar.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\DataStorage\Database\Query\Grammar; +use phpOMS\Contract\SerializableInterface; use phpOMS\DataStorage\Database\GrammarAbstract; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Column; @@ -359,7 +360,7 @@ class Grammar extends GrammarAbstract $encoded = \json_encode($value); return $encoded ? $encoded : 'NULL'; - } elseif ($value instanceof \Serializable) { + } elseif ($value instanceof SerializableInterface) { return $value->serialize(); } elseif ($value instanceof Parameter) { return $value->__toString(); diff --git a/Localization/Defaults/localization.sqlite b/Localization/Defaults/localization.sqlite index a87dc7249..e3759a2ba 100644 Binary files a/Localization/Defaults/localization.sqlite and b/Localization/Defaults/localization.sqlite differ diff --git a/Localization/ISO3166CharEnum.php b/Localization/ISO3166CharEnum.php index bc47740a4..b5d6af00c 100755 --- a/Localization/ISO3166CharEnum.php +++ b/Localization/ISO3166CharEnum.php @@ -523,4 +523,6 @@ class ISO3166CharEnum extends Enum public const _ZMB = 'ZMB'; public const _ZWE = 'ZWE'; + + public const _XXX = 'XXX'; } diff --git a/Localization/ISO3166NameEnum.php b/Localization/ISO3166NameEnum.php index 654d20030..bef0e80d9 100755 --- a/Localization/ISO3166NameEnum.php +++ b/Localization/ISO3166NameEnum.php @@ -525,4 +525,6 @@ class ISO3166NameEnum extends Enum public const _ZWE = 'Zimbabwe'; public const _XKK = 'Kosovo'; + + public const _XXX = 'XXX'; } diff --git a/Localization/ISO3166NumEnum.php b/Localization/ISO3166NumEnum.php index 077d64716..64a87bd57 100755 --- a/Localization/ISO3166NumEnum.php +++ b/Localization/ISO3166NumEnum.php @@ -523,4 +523,6 @@ class ISO3166NumEnum extends Enum public const _ZMB = '894'; public const _ZWE = '716'; + + public const _XXX = '000'; } diff --git a/Localization/ISO3166TwoEnum.php b/Localization/ISO3166TwoEnum.php index 8bc8dfd11..37989762a 100755 --- a/Localization/ISO3166TwoEnum.php +++ b/Localization/ISO3166TwoEnum.php @@ -525,4 +525,6 @@ class ISO3166TwoEnum extends Enum public const _ZWE = 'ZW'; public const _XKK = 'XK'; + + public const _XXX = 'XX'; } diff --git a/Message/Socket/SocketHeader.php b/Message/Socket/SocketHeader.php index 71cc6282a..1ab44ccdb 100644 --- a/Message/Socket/SocketHeader.php +++ b/Message/Socket/SocketHeader.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\Message\Socket; +use phpOMS\Contract\SerializableInterface; use phpOMS\Message\HeaderAbstract; /** @@ -26,7 +27,7 @@ use phpOMS\Message\HeaderAbstract; * @link https://karaka.app * @since 1.0.0 */ -class SocketHeader extends HeaderAbstract implements \Serializable +class SocketHeader extends HeaderAbstract implements SerializableInterface { private $sendFrom = null; diff --git a/Model/Message/Dom.php b/Model/Message/Dom.php index e4cc95003..9421d2470 100644 --- a/Model/Message/Dom.php +++ b/Model/Message/Dom.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Model\Message; -use phpOMS\Contract\ArrayableInterface; +use phpOMS\Contract\SerializableInterface; /** * Dom class. @@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface; * @link https://karaka.app * @since 1.0.0 */ -final class Dom implements \Serializable, ArrayableInterface +final class Dom implements SerializableInterface { /** * Message type. diff --git a/Model/Message/FormValidation.php b/Model/Message/FormValidation.php index ea9e96732..8a5401c9a 100644 --- a/Model/Message/FormValidation.php +++ b/Model/Message/FormValidation.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Model\Message; -use phpOMS\Contract\ArrayableInterface; +use phpOMS\Contract\SerializableInterface; /** * FormValidation class. @@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface; * @link https://karaka.app * @since 1.0.0 */ -final class FormValidation implements \JsonSerializable, \Serializable, ArrayableInterface +final class FormValidation implements \JsonSerializable, SerializableInterface { /** * Message type. diff --git a/Model/Message/Notify.php b/Model/Message/Notify.php index 74dc6b062..8c9954183 100644 --- a/Model/Message/Notify.php +++ b/Model/Message/Notify.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Model\Message; -use phpOMS\Contract\ArrayableInterface; +use phpOMS\Contract\SerializableInterface; /** * Notify class. @@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface; * @link https://karaka.app * @since 1.0.0 */ -final class Notify implements \JsonSerializable, \Serializable, ArrayableInterface +final class Notify implements \JsonSerializable, SerializableInterface { /** * Message type. diff --git a/Model/Message/Redirect.php b/Model/Message/Redirect.php index 70d4478a4..3ff1c25fa 100644 --- a/Model/Message/Redirect.php +++ b/Model/Message/Redirect.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Model\Message; -use phpOMS\Contract\ArrayableInterface; +use phpOMS\Contract\SerializableInterface; /** * Redirect class. @@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface; * @link https://karaka.app * @since 1.0.0 */ -final class Redirect implements \JsonSerializable, \Serializable, ArrayableInterface +final class Redirect implements \JsonSerializable, SerializableInterface { /** * Message type. diff --git a/Model/Message/Reload.php b/Model/Message/Reload.php index abbcc461c..f07e6dbd8 100644 --- a/Model/Message/Reload.php +++ b/Model/Message/Reload.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Model\Message; -use phpOMS\Contract\ArrayableInterface; +use phpOMS\Contract\SerializableInterface; /** * Reload class. @@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface; * @link https://karaka.app * @since 1.0.0 */ -final class Reload implements \JsonSerializable, \Serializable, ArrayableInterface +final class Reload implements \JsonSerializable, SerializableInterface { /** * Message type. diff --git a/Stdlib/Base/FloatInt.php b/Stdlib/Base/FloatInt.php index 9901bd427..83fed7a32 100644 --- a/Stdlib/Base/FloatInt.php +++ b/Stdlib/Base/FloatInt.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\Stdlib\Base; +use phpOMS\Contract\SerializableInterface; + /** * FloatInt class. * @@ -22,7 +24,7 @@ namespace phpOMS\Stdlib\Base; * @link https://karaka.app * @since 1.0.0 */ -class FloatInt implements \Serializable +class FloatInt implements SerializableInterface { /** * Max amount of decimals. diff --git a/Stdlib/Base/Iban.php b/Stdlib/Base/Iban.php index 1d8fb42b4..e1ef180b6 100644 --- a/Stdlib/Base/Iban.php +++ b/Stdlib/Base/Iban.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\Stdlib\Base; +use phpOMS\Contract\SerializableInterface; use phpOMS\Validation\Finance\IbanEnum; /** @@ -24,7 +25,7 @@ use phpOMS\Validation\Finance\IbanEnum; * @link https://karaka.app * @since 1.0.0 */ -class Iban implements \Serializable +class Iban implements SerializableInterface { /** * Iban. diff --git a/Stdlib/Base/Location.php b/Stdlib/Base/Location.php index 868ce7d58..59ad13edd 100644 --- a/Stdlib/Base/Location.php +++ b/Stdlib/Base/Location.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\Stdlib\Base; +use phpOMS\Contract\SerializableInterface; use phpOMS\Localization\ISO3166TwoEnum; /** @@ -24,7 +25,7 @@ use phpOMS\Localization\ISO3166TwoEnum; * @link https://karaka.app * @since 1.0.0 */ -class Location implements \JsonSerializable, \Serializable +class Location implements \JsonSerializable, SerializableInterface { /** * Location id @@ -56,7 +57,7 @@ class Location implements \JsonSerializable, \Serializable * @var string * @since 1.0.0 */ - protected string $country = ISO3166TwoEnum::_USA; + protected string $country = ISO3166TwoEnum::_XXX; /** * Street & district. diff --git a/Stdlib/Queue/PriorityQueue.php b/Stdlib/Queue/PriorityQueue.php index a40b569c2..d3a9639b8 100644 --- a/Stdlib/Queue/PriorityQueue.php +++ b/Stdlib/Queue/PriorityQueue.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\Stdlib\Queue; +use phpOMS\Contract\SerializableInterface; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; /** @@ -24,7 +25,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * @link https://karaka.app * @since 1.0.0 */ -class PriorityQueue implements \Countable, \Serializable +class PriorityQueue implements \Countable, SerializableInterface { /** * Queue type. diff --git a/System/File/ExtensionType.php b/System/File/ExtensionType.php index 85d7a5b39..5896ec3c6 100755 --- a/System/File/ExtensionType.php +++ b/System/File/ExtensionType.php @@ -53,4 +53,6 @@ abstract class ExtensionType extends Enum public const DIRECTORY = 2048; public const WORD = 4096; + + public const REFERENCE = 8192; } diff --git a/System/File/FileUtils.php b/System/File/FileUtils.php index 37ac49987..f59b99398 100644 --- a/System/File/FileUtils.php +++ b/System/File/FileUtils.php @@ -48,6 +48,8 @@ final class FileUtils public const SYSTEM_EXTENSION = ['bak', 'dll', 'sys', 'tmp', 'msi', 'so', 'exe', 'bin', 'iso']; + public const REFERENCE = ['reference']; + /** * Constructor. * @@ -93,6 +95,8 @@ final class FileUtils return ExtensionType::SPREADSHEET; } elseif (\in_array($extension, self::DIRECTORY)) { return ExtensionType::DIRECTORY; + } elseif (\in_array($extension, self::REFERENCE)) { + return ExtensionType::REFERENCE; } return ExtensionType::UNKNOWN; diff --git a/Utils/Parser/Php/ArrayParser.php b/Utils/Parser/Php/ArrayParser.php index 8d9e8210c..b6f331a2e 100644 --- a/Utils/Parser/Php/ArrayParser.php +++ b/Utils/Parser/Php/ArrayParser.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\Utils\Parser\Php; +use phpOMS\Contract\SerializableInterface; + /** * Array parser class. * @@ -77,7 +79,7 @@ class ArrayParser return \rtrim(\rtrim(\number_format($value, 5, '.', ''), '0'), '.'); } elseif (\is_scalar($value)) { return (string) $value; - } elseif ($value instanceof \Serializable) { + } elseif ($value instanceof SerializableInterface) { return self::parseVariable($value->serialize()); } elseif ($value instanceof \JsonSerializable) { return self::parseVariable($value->jsonSerialize()); diff --git a/Utils/StringUtils.php b/Utils/StringUtils.php index 1b0d13b60..5a71137e4 100644 --- a/Utils/StringUtils.php +++ b/Utils/StringUtils.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace phpOMS\Utils; use phpOMS\Contract\RenderableInterface; +use phpOMS\Contract\SerializableInterface; /** * String utils class. @@ -200,7 +201,7 @@ final class StringUtils $encoded = \json_encode($element, $option !== null ? $option : 0); return $encoded ? $encoded : null; - } elseif ($element instanceof \Serializable) { + } elseif ($element instanceof SerializableInterface) { return $element->serialize(); } elseif (\is_string($element)) { return $element; diff --git a/Utils/TaskSchedule/Interval.php b/Utils/TaskSchedule/Interval.php index da67921ac..5088e8ccc 100644 --- a/Utils/TaskSchedule/Interval.php +++ b/Utils/TaskSchedule/Interval.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\Utils\TaskSchedule; +use phpOMS\Contract\SerializableInterface; + /** * Interval class for tasks. * @@ -22,7 +24,7 @@ namespace phpOMS\Utils\TaskSchedule; * @link https://karaka.app * @since 1.0.0 */ -class Interval implements \Serializable +class Interval implements SerializableInterface { /** * Start of the task. diff --git a/tests/DataStorage/Cache/Connection/FileCacheSerializable.php b/tests/DataStorage/Cache/Connection/FileCacheSerializable.php index 8534b0691..7cf5ced70 100755 --- a/tests/DataStorage/Cache/Connection/FileCacheSerializable.php +++ b/tests/DataStorage/Cache/Connection/FileCacheSerializable.php @@ -14,11 +14,13 @@ declare(strict_types=1); namespace phpOMS\tests\DataStorage\Cache\Connection; -class FileCacheSerializable implements \Serializable +use phpOMS\Contract\SerializableInterface; + +class FileCacheSerializable implements SerializableInterface { public $val = 'asdf'; - public function serialize() + public function serialize() : string { return 'abc'; } diff --git a/tests/DataStorage/Database/TestModel/BaseModel.php b/tests/DataStorage/Database/TestModel/BaseModel.php index 5bdaaab66..8a33563eb 100755 --- a/tests/DataStorage/Database/TestModel/BaseModel.php +++ b/tests/DataStorage/Database/TestModel/BaseModel.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\tests\DataStorage\Database\TestModel; +use phpOMS\Contract\SerializableInterface; + class BaseModel { protected int $id = 0; @@ -65,10 +67,10 @@ class BaseModel $this->ownsOneSelf = new OwnsOneModel(); $this->belongsToOne = new BelongsToModel(); - $this->serializable = new class() implements \Serializable { + $this->serializable = new class() implements SerializableInterface { public $value = ''; - public function serialize() + public function serialize() : string { return '123'; } diff --git a/tests/Localization/MoneyTest.php b/tests/Localization/MoneyTest.php index 420048ed7..04656ae6d 100644 --- a/tests/Localization/MoneyTest.php +++ b/tests/Localization/MoneyTest.php @@ -102,7 +102,7 @@ final class MoneyTest extends \PHPUnit\Framework\TestCase public function testMoneySerialization() : void { $money = new Money('999.23'); - self::assertEquals(9992300, $money->__serialize()); + self::assertEquals(9992300, $money->serialize()); } /** @@ -112,7 +112,7 @@ final class MoneyTest extends \PHPUnit\Framework\TestCase public function testMoneyUnserialization() : void { $money = new Money('999.23'); - $money->__unserialize(3331234); + $money->unserialize(3331234); self::assertEquals('333.12', $money->getAmount()); } diff --git a/tests/Model/Message/DomTest.php b/tests/Model/Message/DomTest.php index 6b2748809..a1deb7cb8 100644 --- a/tests/Model/Message/DomTest.php +++ b/tests/Model/Message/DomTest.php @@ -79,7 +79,7 @@ final class DomTest extends \PHPUnit\Framework\TestCase 'selector' => '#sel', 'action' => DomAction::SHOW, 'content' => 'msg', - ]), $obj->__serialize()); + ]), $obj->serialize()); self::assertEquals([ 'type' => 'dom', @@ -90,7 +90,7 @@ final class DomTest extends \PHPUnit\Framework\TestCase ], $obj->jsonSerialize()); $obj2 = new Dom(); - $obj2->__unserialize($obj->__serialize()); + $obj2->unserialize($obj->serialize()); self::assertEquals($obj, $obj2); } } diff --git a/tests/Model/Message/FormValidationTest.php b/tests/Model/Message/FormValidationTest.php index b95d2b381..8de44bead 100644 --- a/tests/Model/Message/FormValidationTest.php +++ b/tests/Model/Message/FormValidationTest.php @@ -56,11 +56,11 @@ final class FormValidationTest extends \PHPUnit\Framework\TestCase $obj = new FormValidation($arr); self::assertEquals(['type' => 'validation', 'validation' => $arr], $obj->toArray()); - self::assertEquals(\json_encode(['type' => 'validation', 'validation' => $arr]), $obj->__serialize()); + self::assertEquals(\json_encode(['type' => 'validation', 'validation' => $arr]), $obj->serialize()); self::assertEquals(['type' => 'validation', 'validation' => $arr], $obj->jsonSerialize()); $obj2 = new FormValidation(); - $obj2->__unserialize($obj->__serialize()); + $obj2->unserialize($obj->serialize()); self::assertEquals($obj, $obj2); } } diff --git a/tests/Model/Message/NotifyTest.php b/tests/Model/Message/NotifyTest.php index 35ecbded6..3f18c9d5c 100644 --- a/tests/Model/Message/NotifyTest.php +++ b/tests/Model/Message/NotifyTest.php @@ -84,7 +84,7 @@ final class NotifyTest extends \PHPUnit\Framework\TestCase 'msg' => 'msg', 'title' => 'title', 'level' => NotifyType::ERROR, - ]), $obj->__serialize()); + ]), $obj->serialize()); self::assertEquals([ 'type' => 'notify', @@ -96,7 +96,7 @@ final class NotifyTest extends \PHPUnit\Framework\TestCase ], $obj->jsonSerialize()); $obj2 = new Notify(); - $obj2->__unserialize($obj->__serialize()); + $obj2->unserialize($obj->serialize()); self::assertEquals($obj, $obj2); } } diff --git a/tests/Model/Message/RedirectTest.php b/tests/Model/Message/RedirectTest.php index 076be4c13..343b71281 100644 --- a/tests/Model/Message/RedirectTest.php +++ b/tests/Model/Message/RedirectTest.php @@ -59,7 +59,7 @@ final class RedirectTest extends \PHPUnit\Framework\TestCase $obj = new Redirect('url', true); self::assertEquals(['type' => 'redirect', 'time' => 0, 'uri' => 'url', 'new' => true], $obj->toArray()); - self::assertEquals(\json_encode(['type' => 'redirect', 'time' => 0, 'uri' => 'url', 'new' => true]), $obj->__serialize()); + self::assertEquals(\json_encode(['type' => 'redirect', 'time' => 0, 'uri' => 'url', 'new' => true]), $obj->serialize()); self::assertEquals(['type' => 'redirect', 'time' => 0, 'uri' => 'url', 'new' => true], $obj->jsonSerialize()); $obj->setDelay(6); @@ -67,7 +67,7 @@ final class RedirectTest extends \PHPUnit\Framework\TestCase self::assertEquals(['type' => 'redirect', 'time' => 6, 'uri' => 'test', 'new' => true], $obj->toArray()); $obj2 = new Redirect(); - $obj2->__unserialize($obj->__serialize()); + $obj2->unserialize($obj->serialize()); self::assertEquals($obj, $obj2); } } diff --git a/tests/Model/Message/ReloadTest.php b/tests/Model/Message/ReloadTest.php index 5691e234d..6ceef1886 100644 --- a/tests/Model/Message/ReloadTest.php +++ b/tests/Model/Message/ReloadTest.php @@ -55,14 +55,14 @@ final class ReloadTest extends \PHPUnit\Framework\TestCase $obj = new Reload(5); self::assertEquals(['type' => 'reload', 'time' => 5], $obj->toArray()); - self::assertEquals(\json_encode(['type' => 'reload', 'time' => 5]), $obj->__serialize()); + self::assertEquals(\json_encode(['type' => 'reload', 'time' => 5]), $obj->serialize()); self::assertEquals(['type' => 'reload', 'time' => 5], $obj->jsonSerialize()); $obj->setDelay(6); self::assertEquals(['type' => 'reload', 'time' => 6], $obj->toArray()); $obj2 = new Reload(); - $obj2->__unserialize($obj->__serialize()); + $obj2->unserialize($obj->serialize()); self::assertEquals($obj, $obj2); } } diff --git a/tests/Stdlib/Base/IbanTest.php b/tests/Stdlib/Base/IbanTest.php index e732f6bf8..bfae19a1d 100644 --- a/tests/Stdlib/Base/IbanTest.php +++ b/tests/Stdlib/Base/IbanTest.php @@ -60,10 +60,10 @@ final class IbanTest extends \PHPUnit\Framework\TestCase $iban = new Iban($strRepresentation); self::assertEquals($strRepresentation, $iban->prettyPrint()); - self::assertEquals($strRepresentation, $iban->__serialize()); + self::assertEquals($strRepresentation, $iban->serialize()); - $iban->__unserialize('dE226008000009600280 00'); - self::assertEquals('DE22 6008 0000 0960 0280 00', $iban->__serialize()); + $iban->unserialize('dE226008000009600280 00'); + self::assertEquals('DE22 6008 0000 0960 0280 00', $iban->serialize()); } /** diff --git a/tests/Stdlib/Base/LocationTest.php b/tests/Stdlib/Base/LocationTest.php index 3ba82819d..8a95ea7d8 100644 --- a/tests/Stdlib/Base/LocationTest.php +++ b/tests/Stdlib/Base/LocationTest.php @@ -215,7 +215,7 @@ final class LocationTest extends \PHPUnit\Framework\TestCase $this->location->setGeo(['lat' => 12.1, 'long' => 11.2,]); self::assertEquals($expected, $this->location->jsonSerialize()); - self::assertEquals(\json_encode($this->location->jsonSerialize()), $this->location->__serialize()); + self::assertEquals(\json_encode($this->location->jsonSerialize()), $this->location->serialize()); } /** @@ -237,7 +237,7 @@ final class LocationTest extends \PHPUnit\Framework\TestCase ], ]; - $this->location->__unserialize(\json_encode($expected)); - self::assertEquals(\json_encode($expected), $this->location->__serialize()); + $this->location->unserialize(\json_encode($expected)); + self::assertEquals(\json_encode($expected), $this->location->serialize()); } } diff --git a/tests/Stdlib/Queue/PriorityQueueTest.php b/tests/Stdlib/Queue/PriorityQueueTest.php index 615a2c3df..1c9c6dce5 100644 --- a/tests/Stdlib/Queue/PriorityQueueTest.php +++ b/tests/Stdlib/Queue/PriorityQueueTest.php @@ -187,9 +187,9 @@ final class PriorityQueueTest extends \PHPUnit\Framework\TestCase $queue->insert('c', -1); $queue2 = new PriorityQueue(); - $queue2->__unserialize($queue->__serialize()); + $queue2->unserialize($queue->serialize()); - self::assertEquals($queue->__serialize(), $queue2->__serialize()); + self::assertEquals($queue->serialize(), $queue2->serialize()); } /** diff --git a/tests/Utils/Parser/Php/ArrayParserTest.php b/tests/Utils/Parser/Php/ArrayParserTest.php index 1bda69619..4d92b44f2 100644 --- a/tests/Utils/Parser/Php/ArrayParserTest.php +++ b/tests/Utils/Parser/Php/ArrayParserTest.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\tests\Utils\Parser\Php; +use phpOMS\Contract\SerializableInterface; use phpOMS\Utils\Parser\Php\ArrayParser; /** @@ -30,8 +31,8 @@ final class ArrayParserTest extends \PHPUnit\Framework\TestCase */ public function testParser() : void { - $serializable = new class() implements \Serializable { - public function serialize() { return 2; } + $serializable = new class() implements SerializableInterface { + public function serialize() : string { return '2'; } public function unserialize($raw) : void {} }; diff --git a/tests/Utils/StringUtilsTest.php b/tests/Utils/StringUtilsTest.php index 630cfe016..617f9b9e4 100644 --- a/tests/Utils/StringUtilsTest.php +++ b/tests/Utils/StringUtilsTest.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace phpOMS\tests\Utils; use phpOMS\Contract\RenderableInterface; +use phpOMS\Contract\SerializableInterface; use phpOMS\Utils\StringUtils; require_once __DIR__ . '/../Autoloader.php'; @@ -130,8 +131,8 @@ final class StringUtilsTest extends \PHPUnit\Framework\TestCase self::assertEquals('["abc"]', StringUtils::stringify(['abc'])); - self::assertEquals('abc', StringUtils::stringify(new class() implements \Serializable { - public function serialize() + self::assertEquals('abc', StringUtils::stringify(new class() implements SerializableInterface { + public function serialize() : string { return 'abc'; } diff --git a/tests/Utils/TaskSchedule/IntervalTest.php b/tests/Utils/TaskSchedule/IntervalTest.php index 3528d7ea3..6740b2dba 100644 --- a/tests/Utils/TaskSchedule/IntervalTest.php +++ b/tests/Utils/TaskSchedule/IntervalTest.php @@ -51,7 +51,7 @@ final class IntervalTest extends \PHPUnit\Framework\TestCase 'dayOfMonth' => [], 'dayOfWeek' => [], 'year' => [], - ]), $interval->__serialize() + ]), $interval->serialize() ); } @@ -307,7 +307,7 @@ final class IntervalTest extends \PHPUnit\Framework\TestCase 'dayOfMonth' => [['start' => 1, 'end' => 3, 'step' => 2]], 'dayOfWeek' => [['start' => 1, 'end' => 3, 'step' => 2]], 'year' => [['start' => 1, 'end' => 3, 'step' => 2]], - ]), $interval->__serialize()); + ]), $interval->serialize()); } /** @@ -327,7 +327,7 @@ final class IntervalTest extends \PHPUnit\Framework\TestCase $interval->addDayOfMonth(1, 3, 2); $interval->addDayOfWeek(1, 3, 2); - $interval2 = new Interval(null, $interval->__serialize()); + $interval2 = new Interval(null, $interval->serialize()); self::assertEquals('2015-08-14', $interval2->getStart()->format('Y-m-d')); self::assertEquals('2018-10-30', $interval2->getEnd()->format('Y-m-d')); diff --git a/tests/Views/ViewTest.php b/tests/Views/ViewTest.php index 306fd2155..5f46d2994 100644 --- a/tests/Views/ViewTest.php +++ b/tests/Views/ViewTest.php @@ -410,10 +410,10 @@ final class ViewTest extends \PHPUnit\Framework\TestCase public function testSerialize() : void { $view = new View(); - self::assertEquals('[]', $view->__serialize()); + self::assertEquals('[]', $view->serialize()); $view->setTemplate('/phpOMS/tests/Views/testTemplate'); - self::assertEquals('Test', $view->__serialize()); + self::assertEquals('Test', $view->serialize()); } /** @@ -476,7 +476,7 @@ final class ViewTest extends \PHPUnit\Framework\TestCase $view = new View($this->app->l11nManager); $view->setTemplate('something.txt'); - self::assertEquals('', $view->__serialize()); + self::assertEquals('', $view->serialize()); } /**