devilkun · pull · Dec 22, 2021 · Dec 22, 2021 · Dec 22, 2021 · Dec 23, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -32,3 +32,4 @@ Doxyfile export-ignore
 phpstan.neon export-ignore
 phpunit.xml.dist export-ignore
 tests/ export-ignore
+demos/ export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+# Dependabot configuration.
+#
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    commit-message:
+      prefix: "GH Actions:"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -6,6 +6,7 @@ jobs:
   lint:
     name: "Lint"
     runs-on: "ubuntu-latest"
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
@@ -21,27 +22,38 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
+        experimental:
+          - false
+        include:
+          - php-version: "8.5"
+            experimental: true
+            composer-options: "--ignore-platform-reqs"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v6"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           ini-values: error_reporting=-1, display_errors=On
           coverage: "none"
-      - uses: "ramsey/composer-install@v1"
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "${{ matrix.composer-options }}"
       - name: "Run the linter"
         run: "composer lint -- --colors"
 
   static-analysis:
     name: "Static Analysis"
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v6"
       - uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
-          tools: "phpstan:0.12.99"
+          php-version: "8.4"
+          tools: "phpstan:2.1.22"
           coverage: "none"
-      - uses: "ramsey/composer-install@v1"
+      - uses: "ramsey/composer-install@v3"
       - name: "Run PHPStan"
-        run: "phpstan analyse -c phpstan.neon -l 4 getid3"
+        run: "phpstan"
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ getID3() is released under multiple licenses. You may choose from the following
 
 **getID3 Commercial License:**
 
-* [gCL](https://www.getid3.org/#gCL) (payment required)
+* [gCL](https://www.getid3.org/#gCL) (no longer available, existing licenses remain valid)
 
 * * *
 Copies of each of the above licenses are included in the `licenses/`
@@ -125,7 +125,7 @@ Reads & parses (to varying degrees):
   * SWF (Flash)
   * PhotoCD
 
-+ data: 
++ data:
   * ISO-9660 CD-ROM image (directory structure)
   * SZIP (limited support)
   * ZIP (directory structure)
@@ -146,13 +146,22 @@ Reads & parses (to varying degrees):
 Requirements
 ===
 
-* PHP 4.2.0 up to 5.2.x for getID3() 1.7.x (and earlier)
-* PHP 5.0.5 (or higher) for getID3() 1.8.x (and up)
-* PHP 5.0.5 (or higher) for getID3() 2.0.x (and up)
+* PHP 4.2.0 up to 5.2.x for getID3() 1.7.x  (and earlier)
+* PHP 5.0.5 (or higher) for getID3() 1.8.x  (and up)
+* PHP 5.3.0 (or higher) for getID3() 1.9.17 (and up)
+* PHP 5.3.0 (or higher) for getID3() 2.0.x  (and up)
 * at least 4MB memory for PHP. 8MB or more is highly recommended.
   12MB is required with all modules loaded.
 
+Installation
+===
+The preferred method is via [composer](https://getcomposer.org/). Follow the installation [instructions](https://getcomposer.org/doc/00-intro.md) if you do not already have composer installed.
 
+Once composer is installed, execute the following command in your project root to install this library:
+
+```
+composer require james-heinrich/getid3
+```
 
 Usage
 ===
@@ -289,7 +298,7 @@ could essentially write it today with a one-line function:
 
 ``` php
 function getID3($filename) { return unpack('a3TAG/a30title/a30artist/a30album/a4year/a28comment/c1track/c1genreid', substr(file_get_contents($filename), -128)); }
-    
+
 ```
 
 

diff --git a/changelog.txt b/changelog.txt
@@ -18,6 +18,87 @@
 Version History
 ===============
 
+1.9.25: [2026-03-10] James Heinrich :: 1.9.25-202603060942
+	* #452 better handle some Quicktime metadata
+	* #452 handle ISO639-2/T Quicktime language code
+	* #452 Quicktime incorrect "keys" mapping
+	* #474 WriteMetaFLAC fails on new files on Windows
+	* #476 ID3v2 errors with ord()
+	* #477 int conversion warning in PHP8.5
+	* #477 QT skip comment copy on empty data
+	* #480 allow metadata extraction from streamable FLAC files
+	* #481 ID3v1 should not parse files shorter than 128 bytes
+	* #482 MIDI: Fix duration for files without tempo events
+	* #483 MIDI: Check for minimum filessize of a valid MIDI header
+	* #484 stop calling imagedestroy in PHP8+
+	* #485 Matroska: scan for duration when not provided by metadata
+	* #486 null coalescing operator not available in PHP5
+	* #486 WAV.PCM detected as WAV.MP3
+	* #487 Matroska: Handle missing TrackUID
+	* #488 GPS computed timestamp ignoring date
+	* XML XXE
+	* add PHP_INT_MIN for PHP older than 5.6
+	* IVF fix warnings, improve framerate
+	* xml_parser_free deprecated in PHP8.5
+
+1.9.24: [2025-10-09] James Heinrich :: 1.9.24-202509040923
+	» #462 add HEIF image support
+	» #438 add detection support .gpx files
+	* #470 PHP8.5 compatibility
+	* #468 WAV files with RIFF and data chunk sizes of zero
+	* #463 warning on null description
+	* #460 DSS division by zero
+	* #458 errors with MP3 free-format
+	* #452 incorrect parsing of Quicktime files
+	* #450 ogg file formats wrong duration
+	* #449 Lyrics3 did not respect option_tag_apetag
+	* #444 ID3v2 ininitialized string offset 0
+	* #442 PrintHexBytes warning when $string is not a string
+	* #440 MPEG duration error due to error in GOP parsing
+	* #435 compatibility fix for PHP 5.3
+	* #434 do not crash on empty seconds in DSS module
+	* #430 garbage extracted from a RIFF tag in an AIFF file
+	* #429 libxml_disable_entity_loader is deprecated
+	* quicktime parse com.android.capture.fps
+	* tar allow duplicate filenames
+
+1.9.23: [2023-10-19] James Heinrich :: 1.9.23-202310190849
+	» add detection support for 7-zip archives
+	* #424 RIFF Undefined index "data"
+	* #421 tag.xmp remove GLOBALS
+	* #419 Quicktime Undefined index "time_scale"
+	* #418 tag.xmp zero-length fread
+	* #414 Quicktime bitrate for mp4 audio
+	* #413 Quicktime audio metadata
+	* #410 MPEG-1 pixel aspect ratio
+	* #407 PHP 8.1 compatibility
+	* #404 guard against division by zero
+	* #402 remove utf8_encode/utf8_decode
+
+1.9.22: [2022-09-29] James Heinrich :: 1.9.22-202207161647
+	* bugfix #387 fails to detect h265 video codec (QuickTime)
+	* bugfix #385 Quicktime extended atom size
+	* bugfix #378 AAC bitrate cache warning
+	* bugfix #376 simplexml_load_string improvments
+	* bugfix #374 MOD improved SoundTracker support
+	* bugfix #371 fragmented MP4 unsupported warning
+	* bugfix #369 fix remote URLs pattern
+	* bugfix #366 change @error-suppress to isset (quicktime)
+	* bugfix #365 ZIP array offset on value of type int
+	* bugfix #364 add support for ANIMEXTS1.0 in GIF files
+	* bugfix #363 ASF improve support of Header Extension Object data
+	* bugfix #362 version update for ramsey/composer-install
+	* bugfix #359 MPEG-2 aspect ratio divide-by-zero
+	* bugfix #358 free format mp3 bitrate
+	* bugfix #355 undefined array key in ID3v2 chapters
+	* bugfix #352 avoid false detection of Musepack format
+	* bugfix #351 Incorrect length passed to fread on a flac file
+	* bugfix #348 more targeted usage of clearstatcache calls
+	* bugfix #347 fixed reported by PHPStan v0.12.99
+	* bugfix QuickTime support 'ID32' frame (ID3v2 inside QT)
+	* bugfix fix various PHP 8.1 issues
+	* bugfix PDF prevent undefined index
+
 1.9.21: [2021-09-22] James Heinrich :: 1.9.21-202109171300
 	» add support for RIFF.guan
 	¤ add ID3v1 genres 148-191

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "ext-zlib": "Zlib extension is required for archive modules and compressed metadata."
     },
     "scripts": {
-        "lint": "parallel-lint --exclude vendor --exclude .git .",
+        "lint": "parallel-lint --show-deprecated --exclude vendor --exclude .git .",
         "test": [
             "composer lint"
         ]

diff --git a/demos/demo.browse.php b/demos/demo.browse.php
@@ -88,7 +88,7 @@
 if (isset($_REQUEST['filename'])) {
 
 	if (!file_exists($_REQUEST['filename']) || !is_file($_REQUEST['filename'])) {
-		die(getid3_lib::iconv_fallback($FileSystemEncoding, $PageEncoding, $_REQUEST['filename'].' does not exist'));
+		die(htmlentities(getid3_lib::iconv_fallback($FileSystemEncoding, $PageEncoding, $_REQUEST['filename'].' does not exist')));
 	}
 	$starttime = microtime(true);
 
@@ -116,7 +116,7 @@
 		$listdirectory = str_replace(DIRECTORY_SEPARATOR, '/', $listdirectory.'/');
 	}
 
-	if (preg_match('#^(ht|f)tp://#', $_REQUEST['filename'])) {
+	if (preg_match('#^(ht|f)tps?://#', $_REQUEST['filename'])) {
 		echo '<i>Cannot browse remote filesystems</i><br>';
 	} else {
 		echo 'Browse: <a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.urlencode($listdirectory), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'">'.getid3_lib::iconv_fallback($FileSystemEncoding, $PageEncoding, $listdirectory).'</a><br>';
@@ -469,7 +469,7 @@ function table_var_dump($variable, $wrap_in_td=false, $encoding='') {
 	global $FileSystemEncoding;
 	$encoding = ($encoding ? $encoding : $FileSystemEncoding);
 	$returnstring = '';
-	switch (gettype($variable)) {
+	switch (strtolower(gettype($variable))) {
 		case 'array':
 			$returnstring .= ($wrap_in_td ? '<td>' : '');
 			$returnstring .= '<table class="dump" cellspacing="0" cellpadding="2">';

diff --git a/demos/demo.cache.dbm.php b/demos/demo.cache.dbm.php
@@ -16,6 +16,7 @@
 
 
 require_once('../getid3/getid3.php');
+require_once('../getid3/getid3.lib.php');
 getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'extension.cache.dbm.php', __FILE__, true);
 
 $getID3 = new getID3_cached_dbm('db3', '/zimweb/test/test.dbm', '/zimweb/test/test.lock');

diff --git a/demos/demo.dirscan.php b/demos/demo.dirscan.php
@@ -139,7 +139,7 @@ private function getDirs($root) {
 				break;
 			default: // scan 4 directories deep
 				if (!is_dir($root)) {
-    				return null;
+					return null;
 				}
 				$dirs = array_merge(glob($root.'/*', GLOB_ONLYDIR), glob($root.'/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*/*/*', GLOB_ONLYDIR));
 				break;
@@ -216,7 +216,7 @@ function scan_files($dir, $match, $cache='sqlite3', $opt=array('table'=>'getid3_
 				echo ' Scanning: '.$d."\n";
 				$search = self::type_brace($d, $match);
 				if ($search !== null) {
-    				$files = self::file_check($search);
+					$files = self::file_check($search);
 					if ($files !== null) {
 						foreach ($files as $f) {
 							echo ' * Analyzing '.$f.' '."\n";

diff --git a/demos/demo.mp3header.php b/demos/demo.mp3header.php
@@ -705,7 +705,7 @@ function RoughTranslateUnicodeToASCII($rawdata, $frame_textencoding) {
 				break;
 
 			case 3: // UTF-8 encoded Unicode. Terminated with $00.
-				$asciidata = utf8_decode($rawdata);
+				$asciidata = utf8_to_iso8859_1($rawdata);
 				break;
 
 			case 255: // Unicode, Big-Endian. Terminated with $00 00.
@@ -929,43 +929,40 @@ function image_type_to_mime_type($imagetypeid) {
 	}
 }
 
-if (!function_exists('utf8_decode')) {
-	// PHP has this function built-in if it's configured with the --with-xml option
-	// This version of the function is only provided in case XML isn't installed
-	function utf8_decode($utf8text) {
-		// http://www.php.net/manual/en/function.utf8-encode.php
-		// bytes  bits  representation
-		//   1     7    0bbbbbbb
-		//   2     11   110bbbbb 10bbbbbb
-		//   3     16   1110bbbb 10bbbbbb 10bbbbbb
-		//   4     21   11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-
-		$utf8length = strlen($utf8text);
-		$decodedtext = '';
-		for ($i = 0; $i < $utf8length; $i++) {
-			if ((ord($utf8text[$i]) & 0x80) == 0) {
-				$decodedtext .= $utf8text[$i];
-			} elseif ((ord($utf8text[$i]) & 0xF0) == 0xF0) {
-				$decodedtext .= '?';
-				$i += 3;
-			} elseif ((ord($utf8text[$i]) & 0xE0) == 0xE0) {
+function utf8_to_iso8859_1($utf8text) {
+	// http://www.php.net/manual/en/function.utf8-encode.php
+	// bytes  bits  representation
+	//   1     7    0bbbbbbb
+	//   2     11   110bbbbb 10bbbbbb
+	//   3     16   1110bbbb 10bbbbbb 10bbbbbb
+	//   4     21   11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+
+	$utf8length = strlen($utf8text);
+	$decodedtext = '';
+	for ($i = 0; $i < $utf8length; $i++) {
+		if ((ord($utf8text[$i]) & 0x80) == 0) {
+			$decodedtext .= $utf8text[$i];
+		} elseif ((ord($utf8text[$i]) & 0xF0) == 0xF0) {
+			$decodedtext .= '?';
+			$i += 3;
+		} elseif ((ord($utf8text[$i]) & 0xE0) == 0xE0) {
+			$decodedtext .= '?';
+			$i += 2;
+		} elseif ((ord($utf8text[$i]) & 0xC0) == 0xC0) {
+			//   2     11   110bbbbb 10bbbbbb
+			$decodedchar = Bin2Dec(substr(Dec2Bin(ord($utf8text[$i])), 3, 5).substr(Dec2Bin(ord($utf8text[($i + 1)])), 2, 6));
+			if ($decodedchar <= 255) {
+				$decodedtext .= chr($decodedchar);
+			} else {
 				$decodedtext .= '?';
-				$i += 2;
-			} elseif ((ord($utf8text[$i]) & 0xC0) == 0xC0) {
-				//   2     11   110bbbbb 10bbbbbb
-				$decodedchar = Bin2Dec(substr(Dec2Bin(ord($utf8text[$i])), 3, 5).substr(Dec2Bin(ord($utf8text[($i + 1)])), 2, 6));
-				if ($decodedchar <= 255) {
-					$decodedtext .= chr($decodedchar);
-				} else {
-					$decodedtext .= '?';
-				}
-				$i += 1;
 			}
+			$i += 1;
 		}
-		return $decodedtext;
 	}
+	return $decodedtext;
 }
 
+
 if (!function_exists('DateMac2Unix')) {
 	function DateMac2Unix($macdate) {
 		// Macintosh timestamp: seconds since 00:00h January 1, 1904

diff --git a/demos/getid3.css b/demos/getid3.css
@@ -126,22 +126,22 @@ td.dump_boolean {
 */
 
 .tooltip {
-    font: 9pt sans-serif;
-    background: #ffffe1;
-    color: 	black;
-    border: 	black 1px solid;
-    margin: 	2px;
-    padding: 	7px;
-    position: 	absolute;
-    top: 	10px;
-    left: 	10px;
-    z-index: 	10000;
-    visibility: hidden;
+	font: 9pt sans-serif;
+	background: #ffffe1;
+	color: 	black;
+	border: 	black 1px solid;
+	margin: 	2px;
+	padding: 	7px;
+	position: 	absolute;
+	top: 	10px;
+	left: 	10px;
+	z-index: 	10000;
+	visibility: hidden;
 }
 
 .tooltip p {
-     margin-top:   -2px;
-     margin-bottom: 4px;
+	 margin-top:   -2px;
+	 margin-bottom: 4px;
 }