diff --git a/.patches/mp3info-check-array-key.diff b/.patches/mp3info-check-array-key.diff deleted file mode 100644 index ff1718187..000000000 --- a/.patches/mp3info-check-array-key.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/Mp3Info.php b/src/Mp3Info.php -index 257b147..17e4074 100644 ---- a/src/Mp3Info.php -+++ b/src/Mp3Info.php -@@ -373,7 +373,6 @@ private function readMpegFrame($fp) { - - switch ($header_bytes[1] >> 3 & 0b11) { - case 0b00: $this->codecVersion = self::MPEG_25; break; -- case 0b01: $this->codecVersion = self::CODEC_UNDEFINED; break; - case 0b10: $this->codecVersion = self::MPEG_2; break; - case 0b11: $this->codecVersion = self::MPEG_1; break; - } -@@ -384,6 +383,9 @@ private function readMpegFrame($fp) { - case 0b11: $this->layerVersion = self::LAYER_1; break; - } - -+ if (!isset($this->codecVersion) || !isset($this->layerVersion) || !isset($header_bytes[2])) { -+ throw new \Exception('Unrecognized codecVersion or layerVersion headers!'); -+ } - $this->bitRate = self::$_bitRateTable[$this->codecVersion][$this->layerVersion][$header_bytes[2] >> 4]; - $this->sampleRate = self::$_sampleRateTable[$this->codecVersion][($header_bytes[2] >> 2) & 0b11]; - -@@ -394,6 +396,9 @@ private function readMpegFrame($fp) { - case 0b11: $this->channel = self::MONO; break; - } - -+ if (!isset($this->channel)) { -+ throw new \Exception('Unrecognized channel header!'); -+ } - $vbr_offset = self::$_vbrOffsets[$this->codecVersion][$this->channel == self::MONO ? 0 : 1]; - - // check for VBR diff --git a/composer.json b/composer.json index 1c7964e7a..a3084e723 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "symfony/process": "^6.4.15", "symfony/routing": "^6.4.12", "symfony/translation": "^6.4.4", - "wapmorgan/mp3info": "^0.1.0", + "wapmorgan/mp3info": "^0.1.1", "web-auth/webauthn-lib": "^4.9.1" }, "scripts": { diff --git a/composer.lock b/composer.lock index 0b42d3ce7..a2f8b867f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "699fdae2bb3e54eb8ea7d6aeede832ba", + "content-hash": "f99da27962994423ed67b0f0561c23dc", "packages": [ { "name": "aws/aws-crt-php", @@ -6126,16 +6126,16 @@ }, { "name": "wapmorgan/mp3info", - "version": "0.1.0", + "version": "0.1.1", "source": { "type": "git", "url": "https://github.com/wapmorgan/Mp3Info.git", - "reference": "f4e3b0d606732f667729c116e1baa4f845a65f9d" + "reference": "e532c2e1997874f9c672c7810ce90ef15004ef94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wapmorgan/Mp3Info/zipball/f4e3b0d606732f667729c116e1baa4f845a65f9d", - "reference": "f4e3b0d606732f667729c116e1baa4f845a65f9d", + "url": "https://api.github.com/repos/wapmorgan/Mp3Info/zipball/e532c2e1997874f9c672c7810ce90ef15004ef94", + "reference": "e532c2e1997874f9c672c7810ce90ef15004ef94", "shasum": "" }, "require": { @@ -6166,9 +6166,9 @@ ], "support": { "issues": "https://github.com/wapmorgan/Mp3Info/issues", - "source": "https://github.com/wapmorgan/Mp3Info/tree/0.1.0" + "source": "https://github.com/wapmorgan/Mp3Info/tree/0.1.1" }, - "time": "2023-05-28T18:37:15+00:00" + "time": "2025-04-01T20:51:11+00:00" }, { "name": "web-auth/cose-lib", diff --git a/composer.patches.json b/composer.patches.json index cbe5110f2..1047b6e57 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,7 +1,3 @@ { - "patches": { - "wapmorgan/mp3info": { - "generate exception if codec/layer versions or channel headers are unrecognized": ".patches/mp3info-check-array-key.diff" - } - } + "patches": {} } diff --git a/composer/installed.json b/composer/installed.json index b51ce4afe..e75b2b30c 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -6381,33 +6381,28 @@ }, { "name": "wapmorgan/mp3info", - "version": "0.1.0", - "version_normalized": "0.1.0.0", + "version": "0.1.1", + "version_normalized": "0.1.1.0", "source": { "type": "git", "url": "https://github.com/wapmorgan/Mp3Info.git", - "reference": "f4e3b0d606732f667729c116e1baa4f845a65f9d" + "reference": "e532c2e1997874f9c672c7810ce90ef15004ef94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wapmorgan/Mp3Info/zipball/f4e3b0d606732f667729c116e1baa4f845a65f9d", - "reference": "f4e3b0d606732f667729c116e1baa4f845a65f9d", + "url": "https://api.github.com/repos/wapmorgan/Mp3Info/zipball/e532c2e1997874f9c672c7810ce90ef15004ef94", + "reference": "e532c2e1997874f9c672c7810ce90ef15004ef94", "shasum": "" }, "require": { "ext-mbstring": "*", "php": ">=5.4.0" }, - "time": "2023-05-28T18:37:15+00:00", + "time": "2025-04-01T20:51:11+00:00", "bin": [ "bin/mp3scan" ], "type": "library", - "extra": { - "patches_applied": { - "generate exception if codec/layer versions or channel headers are unrecognized": ".patches/mp3info-check-array-key.diff" - } - }, "installation-source": "dist", "autoload": { "psr-4": { @@ -6429,7 +6424,7 @@ ], "support": { "issues": "https://github.com/wapmorgan/Mp3Info/issues", - "source": "https://github.com/wapmorgan/Mp3Info/tree/0.1.0" + "source": "https://github.com/wapmorgan/Mp3Info/tree/0.1.1" }, "install-path": "../wapmorgan/mp3info" }, diff --git a/composer/installed.php b/composer/installed.php index 75df019b0..5096980e5 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -881,9 +881,9 @@ 'dev_requirement' => false, ), 'wapmorgan/mp3info' => array( - 'pretty_version' => '0.1.0', - 'version' => '0.1.0.0', - 'reference' => 'f4e3b0d606732f667729c116e1baa4f845a65f9d', + 'pretty_version' => '0.1.1', + 'version' => '0.1.1.0', + 'reference' => 'e532c2e1997874f9c672c7810ce90ef15004ef94', 'type' => 'library', 'install_path' => __DIR__ . '/../wapmorgan/mp3info', 'aliases' => array(), diff --git a/wapmorgan/mp3info/PATCHES.txt b/wapmorgan/mp3info/PATCHES.txt deleted file mode 100644 index c6bbacdd6..000000000 --- a/wapmorgan/mp3info/PATCHES.txt +++ /dev/null @@ -1,7 +0,0 @@ -This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) -Patches applied to this directory: - -generate exception if codec/layer versions or channel headers are unrecognized -Source: .patches/mp3info-check-array-key.diff - -