Merge branch '10.0/bugfixes' into 11.0/bugfixes

Author: cedric-anne

composer.lock

@@ -694,7 +694,7 @@ public static function showListForItem(CommonDBTM $item, $withtemplate = 0, $opt
         if (method_exists(static::$itemtype_1, 'getCriteriaFromProfile')) {
             $profile_criteria = static::$itemtype_1::getCriteriaFromProfile();
             $criteria['WHERE'] = array_merge($criteria['WHERE'], $profile_criteria['WHERE'] ?? []);
-            $criteria['LEFT JOIN'] = array_merge($criteria['LEFT JOIN'], $profile_criteria['LEFT JOIN'] ?? []); // @phpstan-ignore offsetAccess.notFound
+            $criteria['LEFT JOIN'] = array_merge($criteria['LEFT JOIN'], $profile_criteria['LEFT JOIN'] ?? []);
         }
         $criteria['WHERE'][static::$itemtype_1::getTable() . ".is_deleted"] = 0;
         $criteria['LIMIT'] = (int) $_SESSION['glpilist_limit'];

src/CommonItilObject_Item.php

@@ -56,7 +56,6 @@
 use function Safe\imagealphablending;
 use function Safe\imagecopyresampled;
 use function Safe\imagecreatetruecolor;
-use function Safe\imagedestroy;
 use function Safe\imageflip;
 use function Safe\imagerotate;
 use function Safe\imagesavealpha;
@@ -757,12 +756,7 @@ protected function gd_destroy_image_object($file_path)
     {
         $image = $this->image_objects[$file_path] ?? null ;
         if ($image) {
-            try {
-                imagedestroy($image);
-                return true;
-            } catch (ImageException $e) {
-                return false;
-            }
+            return true;
         }
         return false;
     }
@@ -850,7 +844,6 @@ protected function gd_orient_image($file_path, $src_img)
                     defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1
                 );
                 $new_img = imagerotate($tmp_img, 270, 0);
-                imagedestroy($tmp_img);
                 break;
             case 6:
                 $new_img = imagerotate($src_img, 270, 0);
@@ -861,7 +854,6 @@ protected function gd_orient_image($file_path, $src_img)
                     defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2
                 );
                 $new_img = imagerotate($tmp_img, 270, 0);
-                imagedestroy($tmp_img);
                 break;
             case 8:
                 $new_img = imagerotate($src_img, 90, 0);