From 010cd948c9cb1feb54d3251f6d3ffaa5d5146a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 10 Oct 2023 12:53:00 +0200 Subject: [PATCH] Drop support for unserializing old serialization formats --- lib/Doctrine/ORM/Query/ParserResult.php | 22 ------------------ .../ParserResults/single_select_2_14_3.txt | Bin 2373 -> 0 bytes .../ParserResults/single_select_2_15_0.txt | Bin 2370 -> 0 bytes 3 files changed, 22 deletions(-) delete mode 100644 tests/Doctrine/Tests/ORM/Functional/ParserResults/single_select_2_14_3.txt delete mode 100644 tests/Doctrine/Tests/ORM/Functional/ParserResults/single_select_2_15_0.txt diff --git a/lib/Doctrine/ORM/Query/ParserResult.php b/lib/Doctrine/ORM/Query/ParserResult.php index 7eb25b473b0..8b5ee1f7ee5 100644 --- a/lib/Doctrine/ORM/Query/ParserResult.php +++ b/lib/Doctrine/ORM/Query/ParserResult.php @@ -17,12 +17,6 @@ */ class ParserResult { - private const LEGACY_PROPERTY_MAPPING = [ - 'sqlExecutor' => '_sqlExecutor', - 'resultSetMapping' => '_resultSetMapping', - 'parameterMappings' => '_parameterMappings', - ]; - /** * The SQL executor used for executing the SQL. */ @@ -121,20 +115,4 @@ public function getSqlParameterPositions(string|int $dqlPosition): array { return $this->parameterMappings[$dqlPosition]; } - - public function __wakeup(): void - { - $this->__unserialize((array) $this); - } - - /** @param array $data */ - public function __unserialize(array $data): void - { - foreach (self::LEGACY_PROPERTY_MAPPING as $property => $legacyProperty) { - $this->$property = $data[sprintf("\0%s\0%s", self::class, $legacyProperty)] - ?? $data[sprintf("\0%s\0%s", self::class, $property)] - ?? $this->$property - ?? null; - } - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ParserResults/single_select_2_14_3.txt b/tests/Doctrine/Tests/ORM/Functional/ParserResults/single_select_2_14_3.txt deleted file mode 100644 index db83fe2de48b85df26d722963cb94cc6a96554be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2373 zcmbW3TTk0C6vuhqr-<@6O{nRGiz_s-QZy#ovKDDCl`NASn5SGy>ohH2=P&ay7qErJ-_4W|`Vhbi|7h-JS>!-dK7d z&0{)zrg&+KGVD)8x4ZXvUNWEQ{2`?or4-xs9?@o7(J^d&bf?X%vXoJ7P1rZ0a}0lH z!|UPTHi%pDP$$9pEYOK;eRA_$WyBKxml0%t|&_b1#k7nIwCOg$W z3-tx8yRG#^cA;&{L#u7-G;Sb!kiwrto49nx@jxDVsaX_DL()6Dp2%Z=Qmo2Ks+ED6u&+eq zs1o6l17VWa_HM~oGanTRrDi_xDX;&BRpvvEF9LZbrON6euTE`=7gm6AkOYp-8x|{F zM}+s9(xeI(5G!%y+6g`bTbEcK^595>9$e?8pYRaz)#z5s{FEnATZBz^oeZVe$eaYu zn+?J&I&DaJjePGmI)i*r$A%?bq1Vf|?q4lfaVe6M4jz5VYaz z2PpU?HyWh!OXrrrE6QLpe%SUBlryPC<3c+`UJ4t6cS9lBtE_jE3qa2R9wM8x<_USyK=Pz7A&QV1f zQj$;%0s+b(RmRZXR(eNk@3!6lUk-mX=)1hwSIGArgevS*{axp5BeM09|Lf8m`Nzd$ z4?eWHO1LL+4OSF1$_g7fJx%U@;TxdYj=t(`^aeL-qO8If3Ep(;ddEK;H5+Z*v0JRI nmpVlFD3H}dR^EP|aF1_U*#HYy_-Dak)e_hhhu7%{`tRh^&@)3>*W z8#0xvuh_(a9PU71*!t<+bUEGU^D21Bx$pN}QGPHV6BU1>o3i+#QwqoP@dNO<{0BTr z2h@t}Ol>x(KQl5o>m<;#*IFu~OJ)OTXfxAyl!W8Yq6fz=SmHTiQRGD`)ylw3I94KZ zP>FEMaSYq`Zpm1)o)rnDWM_MbAd4?3ZnGYQinwYz&9Yz%)>{GtYx;1vUp|-}|Be3M!M2^@Jf;N2l z00p1qR)17}>D&@<qAf8!VDuWsuO z&k&Y(w8>yxq}wcC{LG2d$RIeJk=q&s6v+X4z(Fm11VJtCtbcV5Biqzi4qYIX>ag1N zVTYBerS6zIRC(S$=21EP4iti~3YR>c>0IG0n7H5_{;hI2>KYcffY_(=gzjE*1vy6* zWk^XvF$e@GlT;Z)ovn04Yd>zg|GylbH0V)YbQSWrgPvCXsB;bx;m5yu$p3U{&ivcr zu?HX8TqoR@H4nkcLAJ%T6Qy58{*N6khbckBUc r%~FR59|f|``0;82=>E<*!8LwhWX~%+;j5Wl2frH64*wn=9-jRItfCbX