Ticket #58309: 58309.2.diff

src/wp-admin/includes/class-pclzip.php

@@ -1170 +1170 @@
     // ----- Reset the error handler
     $this->privErrorReset();
 
-    // ----- Look if the $p_archive is a PclZip object
-    if (is_object($p_archive) && $p_archive instanceof pclzip)
+    // ----- Look if the $p_archive is an instantiated PclZip object
+    if ($p_archive instanceof pclzip)
     {
 
       // ----- Duplicate the archive
@@ -1234 +1234 @@
       return(0);
     }
 
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if (is_object($p_archive_to_add) && $p_archive_to_add instanceof pclzip)
+    // ----- Look if the $p_archive_to_add is an instantiated PclZip object
+    if ($p_archive_to_add instanceof pclzip)
     {
 
       // ----- Merge the archive

src/wp-includes/media.php

@@ -3748 +3748 @@
  * Determines whether the value is an acceptable type for GD image functions.
  *
  * In PHP 8.0, the GD extension uses GdImage objects for its data structures.
- * This function checks if the passed value is either a resource of type `gd`
- * or a GdImage object instance. Any other type will return false.
+ * This function checks if the passed value is either a GdImage object instance
+ * or a resource of type `gd`. Any other type will return false.
  *
  * @since 5.6.0
  *
@@ -3758 +3758 @@
  *              false otherwise.
  */
 function is_gd_image( $image ) {
-        if ( is_resource( $image ) && 'gd' === get_resource_type( $image )
-                || is_object( $image ) && $image instanceof GdImage
+        if ( $image instanceof GdImage
+                || is_resource( $image ) && 'gd' === get_resource_type( $image )
         ) {
                 return true;
         }