Merge remote-tracking branch 'sandesh/php_85_support' into 2.20.x

Author: glo71317

composer.json

@@ -28,10 +28,10 @@
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "laminas/laminas-recaptcha": "^3.4.0",
-        "laminas/laminas-session": "^2.25",
+        "laminas/laminas-session": "^2.25 || ^3.0",
         "laminas/laminas-stdlib": "^3.10.1",
         "laminas/laminas-text": "^2.12.1",
-        "laminas/laminas-validator": "^2.19.0"
+        "laminas/laminas-validator": "^2.19.0 || ^3.0"
     },
     "require-dev": {
         "ext-gd": "*",

composer.lock

@@ -115,8 +115,6 @@
       <code><![CDATA[$img]]></code>
       <code><![CDATA[$img]]></code>
       <code><![CDATA[$img]]></code>
-      <code><![CDATA[$img]]></code>
-      <code><![CDATA[$img2]]></code>
       <code><![CDATA[$img2]]></code>
       <code><![CDATA[$img2]]></code>
       <code><![CDATA[$img2]]></code>

psalm-baseline.xml

@@ -14,7 +14,6 @@
 use function imagecolorat;
 use function imagecreatefrompng;
 use function imagecreatetruecolor;
-use function imagedestroy;
 use function imagefilledellipse;
 use function imagefilledrectangle;
 use function imageftbbox;
@@ -619,8 +618,6 @@ protected function generateImage($id, $word)
         }
 
         imagepng($img2, $imgFile);
-        imagedestroy($img);
-        imagedestroy($img2);
     }
 
     /**