Changeset 56975 for trunk/src/wp-includes/ID3/module.tag.id3v2.php

Timestamp:

10/20/2023 01:27:56 PM (17 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/module.tag.id3v2.php (modified) (3 diffs)

trunk/src/wp-includes/ID3/module.tag.id3v2.php

@@ -1495 +1495 @@
                         }
                     }
-                } while (false);
+                } while (false); // @phpstan-ignore-line
             }
 
@@ -3754 +3754 @@
      */
     public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
-        for ($i = 0; $i < strlen($numberstring); $i++) {
-            if ((chr($numberstring[$i]) < chr('0')) || (chr($numberstring[$i]) > chr('9'))) {
-                if (($numberstring[$i] == '.') && $allowdecimal) {
-                    // allowed
-                } elseif (($numberstring[$i] == '-') && $allownegative && ($i == 0)) {
-                    // allowed
-                } else {
-                    return false;
-                }
-            }
-        }
-        return true;
+        $pattern  = '#^';
+        $pattern .= ($allownegative ? '\\-?' : '');
+        $pattern .= '[0-9]+';
+        $pattern .= ($allowdecimal  ? '(\\.[0-9]+)?' : '');
+        $pattern .= '$#';
+        return preg_match($pattern, $numberstring);
     }
 
@@ -3774 +3768 @@
      */
     public static function IsValidDateStampString($datestamp) {
-        if (strlen($datestamp) != 8) {
-            return false;
-        }
-        if (!self::IsANumber($datestamp, false)) {
+        if (!preg_match('#^[12][0-9]{3}[01][0-9][0123][0-9]$#', $datestamp)) {
             return false;
         }