Changeset 56975 for trunk/src/wp-includes/ID3/getid3.lib.php

Timestamp:

10/20/2023 01:27:56 PM (20 months ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.23.

The latest version includes numerous bug fixes, a few new features, as well as various improvements for PHP 8.1 and PHP 8.2 support.

This commit also includes PHPCS adjustments previously made for a passing PHP Compatibility scan.

References:

• ​getID3 1.9.23 release notes
• ​Full list of changes in getID3 1.9.23

Follow-up to [47601], [48278], [52254], [54376].

Props jrf.
Fixes #59683.

File:

• trunk/src/wp-includes/ID3/getid3.lib.php (modified) (4 diffs)

trunk/src/wp-includes/ID3/getid3.lib.php

@@ -122 +122 @@
         }
         // if integers are 64-bit - no other check required
-        if ($hasINT64 || (($num <= PHP_INT_MAX) && ($num >= PHP_INT_MIN))) { // phpcs:ignore PHPCompatibility.Constants.NewConstants.php_int_minFound
+        if ($hasINT64 || (($num <= PHP_INT_MAX) && ($num >= PHP_INT_MIN))) {
             return true;
         }
         return false;
+    }
+
+    /**
+     * Perform a division, guarding against division by zero
+     *
+     * @param float|int $numerator
+     * @param float|int $denominator
+     * @param float|int $fallback
+     * @return float|int
+     */
+    public static function SafeDiv($numerator, $denominator, $fallback = 0) {
+        return $denominator ? $numerator / $denominator : $fallback;
     }
 
@@ -135 +147 @@
     public static function DecimalizeFraction($fraction) {
         list($numerator, $denominator) = explode('/', $fraction);
-        return $numerator / ($denominator ? $denominator : 1);
+        return (int) $numerator / ($denominator ? $denominator : 1);
     }
 
@@ -872 +884 @@
      */
     public static function iconv_fallback_iso88591_utf8($string, $bom=false) {
-        if (function_exists('utf8_encode')) {
-            return utf8_encode($string);
-        }
-        // utf8_encode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
         $newcharstring = '';
         if ($bom) {
@@ -944 +952 @@
      */
     public static function iconv_fallback_utf8_iso88591($string) {
-        if (function_exists('utf8_decode')) {
-            return utf8_decode($string);
-        }
-        // utf8_decode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
         $newcharstring = '';
         $offset = 0;