From: Johan Cwiklinski Date: Tue, 2 Nov 2021 11:47:34 +0000 (+0100) Subject: Patch laminas for php 8.1 X-Git-Tag: 0.9.5.2~9 X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=bbdc9a8a5077922380da6bbcaaf62a4042210ac7;p=galette.git Patch laminas for php 8.1 --- diff --git a/galette/composer.json b/galette/composer.json index c9f4aa689..47570f086 100644 --- a/galette/composer.json +++ b/galette/composer.json @@ -62,7 +62,8 @@ "post-install-cmd": [ "patch -d vendor/slim/slim/ -p3 < ../patches/slim-php81.patch", "patch -d vendor/smarty/smarty/ -p3 < ../patches/smarty-php81.patch", - "patch -d vendor/mathmarques/smarty-view/ -p3 < ../patches/smarty-view-php81.patch" + "patch -d vendor/mathmarques/smarty-view/ -p3 < ../patches/smarty-view-php81.patch", + "patch -d vendor/laminas/ -p2 < ../patches/laminas-php81.patch" ] } } diff --git a/patches/laminas-php81.patch b/patches/laminas-php81.patch new file mode 100644 index 000000000..8cdd19ce5 --- /dev/null +++ b/patches/laminas-php81.patch @@ -0,0 +1,11 @@ +diff -up vendor/laminas/laminas-cache-storage-adapter-apcu/src/Apcu.php.patch vendor/laminas/laminas-cache-storage-adapter-apcu/src/Apcu.php +--- vendor/laminas/laminas-cache-storage-adapter-apcu/src/Apcu.php.patch 2021-11-02 12:45:13.681224419 +0100 ++++ vendor/laminas/laminas-cache-storage-adapter-apcu/src/Apcu.php 2021-11-02 12:45:41.509820264 +0100 +@@ -125,6 +125,7 @@ class Apcu extends AbstractAdapter imple + * + * @return ApcuIterator + */ ++ #[\ReturnTypeWillChange] + public function getIterator() + { + $options = $this->getOptions();