Merge pull request #2086 from Berbe/chg/gdimage-free

Change: PHP 8.5: GdImage freed automatically

bin/migrate

@@ -20,7 +20,7 @@ use PrivateBin\Configuration;
 use PrivateBin\Model;
 
 // third argument in getopt requires PHP >= 7.1
-if (version_compare(PHP_VERSION, '7.1.0') < 0) {
+if (version_compare(PHP_VERSION, '7.1.0', '<')) {
     dieerr('migrate requires php 7.1 or above to work. Sorry.');
 }
 

lib/Controller.php

@@ -124,7 +124,7 @@ class Controller
      */
     public function __construct(?Configuration $config = null)
     {
-        if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION) < 0) {
+        if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<')) {
             error_log(I18n::_('%s requires php %s or above to work. Sorry.', I18n::_('PrivateBin'), self::MIN_PHP_VERSION));
             return;
         }

lib/Data/Database.php

@@ -86,7 +86,7 @@ class Database extends AbstractData
             // tell it to expect ANSI SQL double quotes
             if ($this->_type === 'mysql') {
                 // deprecated as of PHP 8.5
-                if (version_compare(PHP_VERSION, '8.5') < 0 && defined('PDO::MYSQL_ATTR_INIT_COMMAND')) {
+                if (version_compare(PHP_VERSION, '8.5', '<') && defined('PDO::MYSQL_ATTR_INIT_COMMAND')) {
                     $options['opt'][PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'";
                 } elseif (defined('Pdo\Mysql::ATTR_INIT_COMMAND')) {
                     $options['opt'][Pdo\Mysql::ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'";

lib/Vizhash16x16.php

@@ -123,7 +123,9 @@ class Vizhash16x16
         imagepng($image);
         $imagedata = ob_get_contents();
         ob_end_clean();
-        imagedestroy($image);
+        if (version_compare(PHP_VERSION, '8.5', '<') && defined('imagedestroy')) {
+            imagedestroy($image);
+        }
 
         return $imagedata;
     }

tst/ControllerTest.php

@@ -173,7 +173,7 @@ class ControllerTest extends TestCase
     {
         $newConfig   = new class extends Configuration {};
         $configValue = (new ReflectionClass(Controller::class))->getProperty('_conf');
-        if (version_compare(PHP_VERSION, '8.1') < 0) {
+        if (version_compare(PHP_VERSION, '8.1', '<')) {
             // > This function has been DEPRECATED as of PHP 8.5.0. [...]
             // > As of PHP 8.1.0, calling this method has no effect; all properties are accessible by default.
             // @see: https://www.php.net/manual/en/reflectionproperty.setaccessible.php