From c1fb9a31dca5bd3edc4ebb414424d7de85dbda27 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 26 Mar 2022 14:59:56 +0100 Subject: [PATCH] undo serialize deprecation --- Account/Account.php | 3 +- Account/Group.php | 3 +- Contract/SerializableInterface.php | 32 ++++++++++++++++++ .../Cache/Connection/CacheValueType.php | 2 +- .../Cache/Connection/ConnectionAbstract.php | 3 +- DataStorage/Cache/Connection/MemCached.php | 7 ++-- DataStorage/Cache/Connection/RedisCache.php | 4 +-- .../Database/Mapper/DataMapperAbstract.php | 2 +- DataStorage/Database/Mapper/ReadMapper.php | 4 +-- DataStorage/Database/Query/Builder.php | 3 +- .../Database/Query/Grammar/Grammar.php | 3 +- Localization/Defaults/localization.sqlite | Bin 24178688 -> 24178688 bytes Localization/ISO3166CharEnum.php | 2 ++ Localization/ISO3166NameEnum.php | 2 ++ Localization/ISO3166NumEnum.php | 2 ++ Localization/ISO3166TwoEnum.php | 2 ++ Message/Socket/SocketHeader.php | 3 +- Model/Message/Dom.php | 4 +-- Model/Message/FormValidation.php | 4 +-- Model/Message/Notify.php | 4 +-- Model/Message/Redirect.php | 4 +-- Model/Message/Reload.php | 4 +-- Stdlib/Base/FloatInt.php | 4 ++- Stdlib/Base/Iban.php | 3 +- Stdlib/Base/Location.php | 5 +-- Stdlib/Queue/PriorityQueue.php | 3 +- System/File/ExtensionType.php | 2 ++ System/File/FileUtils.php | 4 +++ Utils/Parser/Php/ArrayParser.php | 4 ++- Utils/StringUtils.php | 3 +- Utils/TaskSchedule/Interval.php | 4 ++- .../Connection/FileCacheSerializable.php | 6 ++-- .../Database/TestModel/BaseModel.php | 6 ++-- tests/Localization/MoneyTest.php | 4 +-- tests/Model/Message/DomTest.php | 4 +-- tests/Model/Message/FormValidationTest.php | 4 +-- tests/Model/Message/NotifyTest.php | 4 +-- tests/Model/Message/RedirectTest.php | 4 +-- tests/Model/Message/ReloadTest.php | 4 +-- tests/Stdlib/Base/IbanTest.php | 6 ++-- tests/Stdlib/Base/LocationTest.php | 6 ++-- tests/Stdlib/Queue/PriorityQueueTest.php | 4 +-- tests/Utils/Parser/Php/ArrayParserTest.php | 5 +-- tests/Utils/StringUtilsTest.php | 5 +-- tests/Utils/TaskSchedule/IntervalTest.php | 6 ++-- tests/Views/ViewTest.php | 6 ++-- 46 files changed, 134 insertions(+), 69 deletions(-) create mode 100644 Contract/SerializableInterface.php 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 a87dc72491649c20502c58ab5fbd844511199ff4..e3759a2ba42efa8f89e9f8f09d181b2fd179bf83 100644 GIT binary patch delta 1532 zcmYk&<#*5p9EI`y$PET#cDR7#-1p~P%Laz?7(3+ zik;v4#^XKb`TPO5@ZjF6h0(U0Wast>RYX;hE~<&@ zB16;=nWCnsC2EU0qOPbXvP6B6EpkKy(NG*E8i~fDiD)XCiRPk(XenBW)}oDQE823v0a=mE)W-ri^Rp^5^<@xOk6Im5Lb$;#MNSlxJFzn zt`pab8^n#`CULX4McgWG6Ss>y#7=RixJ%qE?h*Hj`^5bvloS;we{3l$E{Pt9c0~_H z4@JA9hoeWLN2AB0(r8cgc=SZHH+nL9DtbD4CVDp77d;m}AH5L07`+s|9K90lk6w*l zi(ZcoL~lfIMsG!LNAE=MM(;)MM;}BVMhByhqO#~v^l|h_^l9{2^m+6}^kwu_^mX)2 z^lkKA^nG+V`XTx;IuiX9{T%%g{Tlri{T}(7Kcl~*zoUP)mK7((ktt`&n+m3)sbngf zRFh_^n5rh-R5R60hN)pPO-)nF)HZcYT~p6wnffN%0-K?Zl=5GVS1Wgrnl*1`kH>GzZqZ#nn7l;8DfT- zVP?1)VMdx!X0#b&#+q?vyqRDonn`A|nPR4zX=b{aVP=|HX11AQ=9+nCzFA-v8q6ZI z*eo$i%`&sxtS~FhDziE%Ei2AT8W&dDn9{a#M)@77HS&`w<@Gqa6)usRd delta 1676 zcmdVWbz{~A7)Ig!XxL!D27`_6(cQJt-Cc){jW98BsJE!7FId>K0}~Znhr{l|4xHVE zozML-{Nr37;FKKPpI#E}$V+zbY%(I*y%mv&N}{r;BC3jNqPnOdYKmGSU1W&bqK?QE zbwxc-hAzF%7qP1uv+KP6fz33qFMMu#|bQWDi zSJ6#$7d=Ez(M$9eeMDc;PxKc9#6U4f3>HJgP%%sl7X_kFj1VKmC^1@$5o5(TFc>CI7}Qaju1zRqr}l-vp7Z^D~=P#ixb3&Vv9IQl!&e3WO0f(RY;sB zwu#fl8RAT_U7RJ(7UzhR*dca`bH#b$d~t!eQ0x*HiHpT0;!<&$xLjNzO2w7pDsi>A zMqDed6W5Cy#Es%6v0L0MZV|VN+r;hS4zWkvDee+??`7}SRPx8Riqzidp6K4_zUcnw zf#|{Lq3Gf0k*F-%7d;x4NBg74qQ|2rq9>!LqNk&0qGzM$qUWO*q8Fo=qL-srqF1BW zq65+E(Hqg5(Oc2m(L2$*(R4| z`Y!rD`XTx;`YAdT{T%%g{Tlri{T}(tpV42@-_bwOzuPNPNh&gxOl4EWR5jI1byLIC zG__2+$uPA|9g}J5ntG2C&@fo6~yY=)SjW|$dn3QVCHVMdx! zX0#b&#+q?vyqRDonn`A|nPR4zX=b{aVP=|HX11AQ=9+nCzFA-vnnh-@Sz<6t%`&sx ztS~FhDznB4bq^u%Ul(Z#lv2XO(5< t6emSVmF%>%w6ZOYijy@-lD}&Yserialize()); } 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()); } /**