diff --git a/composer.json b/composer.json index 54c7c976b..8236c894c 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,6 @@ "php": "^8.0", "aws/aws-sdk-php": "^3.240", "bantu/ini-get-wrapper": "v1.0.1", - "christophwurst/id3parser": "^0.1.4", "cweagans/composer-patches": "^1.7", "deepdiver/zipstreamer": "2.0.0", "deepdiver1975/tarstreamer": "v2.0.0", @@ -34,6 +33,7 @@ "mexitek/phpcolors": "^1.0", "microsoft/azure-storage-blob": "^1.5.4", "mlocati/ip-lib": "^1.18", + "nextcloud/id3parser": "^0.1.4", "nextcloud/lognormalizer": "^1.0", "opis/closure": "^3.6", "pear/archive_tar": "^1.4.9", diff --git a/composer.lock b/composer.lock index e4bb41c8d..2843da2cf 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": "c11636a163e61609621cf26a4ec2b012", + "content-hash": "aced2dee7280ae6bf51dc56e20a852f3", "packages": [ { "name": "aws/aws-crt-php", @@ -303,46 +303,6 @@ ], "time": "2021-01-20T22:51:39+00:00" }, - { - "name": "christophwurst/id3parser", - "version": "v0.1.4", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/ID3Parser.git", - "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/ID3Parser/zipball/050c9d81ea89b0cf53e23a27efc4e1840f9ab260", - "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "ID3Parser\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0-or-later" - ], - "description": "An ID3 parser", - "homepage": "https://github.com/ChristophWurst/ID3Parser/", - "keywords": [ - "codecs", - "php", - "tags" - ], - "support": { - "issues": "https://github.com/ChristophWurst/ID3Parser/issues", - "source": "https://github.com/ChristophWurst/ID3Parser/tree/v0.1.4" - }, - "time": "2021-11-29T15:02:22+00:00" - }, { "name": "cweagans/composer-patches", "version": "1.7.1", @@ -2353,6 +2313,45 @@ }, "time": "2021-06-14T00:11:39+00:00" }, + { + "name": "nextcloud/id3parser", + "version": "v0.1.4", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ID3Parser.git", + "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ID3Parser/zipball/050c9d81ea89b0cf53e23a27efc4e1840f9ab260", + "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "ID3Parser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-or-later" + ], + "description": "An ID3 parser", + "homepage": "https://github.com/ChristophWurst/ID3Parser/", + "keywords": [ + "codecs", + "php", + "tags" + ], + "support": { + "source": "https://github.com/nextcloud-deps/ID3Parser/tree/v0.1.4" + }, + "time": "2021-11-29T15:02:22+00:00" + }, { "name": "nextcloud/lognormalizer", "version": "v1.0.0", diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index 2dba724bc..0f1187cef 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -1608,13 +1608,13 @@ 'Http\\Promise\\FulfilledPromise' => $vendorDir . '/php-http/promise/src/FulfilledPromise.php', 'Http\\Promise\\Promise' => $vendorDir . '/php-http/promise/src/Promise.php', 'Http\\Promise\\RejectedPromise' => $vendorDir . '/php-http/promise/src/RejectedPromise.php', - 'ID3Parser\\ID3Parser' => $vendorDir . '/christophwurst/id3parser/src/ID3Parser.php', - 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => $vendorDir . '/christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php', - 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => $vendorDir . '/christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php', - 'ID3Parser\\getID3\\getid3' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3.php', - 'ID3Parser\\getID3\\getid3_exception' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_exception.php', - 'ID3Parser\\getID3\\getid3_handler' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_handler.php', - 'ID3Parser\\getID3\\getid3_lib' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_lib.php', + 'ID3Parser\\ID3Parser' => $vendorDir . '/nextcloud/id3parser/src/ID3Parser.php', + 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => $vendorDir . '/nextcloud/id3parser/src/getID3/Tags/getid3_id3v1.php', + 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => $vendorDir . '/nextcloud/id3parser/src/getID3/Tags/getid3_id3v2.php', + 'ID3Parser\\getID3\\getid3' => $vendorDir . '/nextcloud/id3parser/src/getID3/getid3.php', + 'ID3Parser\\getID3\\getid3_exception' => $vendorDir . '/nextcloud/id3parser/src/getID3/getid3_exception.php', + 'ID3Parser\\getID3\\getid3_handler' => $vendorDir . '/nextcloud/id3parser/src/getID3/getid3_handler.php', + 'ID3Parser\\getID3\\getid3_lib' => $vendorDir . '/nextcloud/id3parser/src/getID3/getid3_lib.php', 'IPLib\\Address\\AddressInterface' => $vendorDir . '/mlocati/ip-lib/src/Address/AddressInterface.php', 'IPLib\\Address\\AssignedRange' => $vendorDir . '/mlocati/ip-lib/src/Address/AssignedRange.php', 'IPLib\\Address\\IPv4' => $vendorDir . '/mlocati/ip-lib/src/Address/IPv4.php', diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php index 0c53d1674..91f8e2bd7 100644 --- a/composer/autoload_psr4.php +++ b/composer/autoload_psr4.php @@ -70,7 +70,7 @@ 'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'), 'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'), 'IPLib\\' => array($vendorDir . '/mlocati/ip-lib/src'), - 'ID3Parser\\' => array($vendorDir . '/christophwurst/id3parser/src'), + 'ID3Parser\\' => array($vendorDir . '/nextcloud/id3parser/src'), 'Http\\Promise\\' => array($vendorDir . '/php-http/promise/src'), 'Http\\Client\\' => array($vendorDir . '/php-http/httplug/src'), 'Http\\Adapter\\Guzzle7\\' => array($vendorDir . '/php-http/guzzle7-adapter/src'), diff --git a/composer/autoload_static.php b/composer/autoload_static.php index 2ce021e68..e60cfa2c9 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -550,7 +550,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 ), 'ID3Parser\\' => array ( - 0 => __DIR__ . '/..' . '/christophwurst/id3parser/src', + 0 => __DIR__ . '/..' . '/nextcloud/id3parser/src', ), 'Http\\Promise\\' => array ( @@ -2280,13 +2280,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Http\\Promise\\FulfilledPromise' => __DIR__ . '/..' . '/php-http/promise/src/FulfilledPromise.php', 'Http\\Promise\\Promise' => __DIR__ . '/..' . '/php-http/promise/src/Promise.php', 'Http\\Promise\\RejectedPromise' => __DIR__ . '/..' . '/php-http/promise/src/RejectedPromise.php', - 'ID3Parser\\ID3Parser' => __DIR__ . '/..' . '/christophwurst/id3parser/src/ID3Parser.php', - 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php', - 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php', - 'ID3Parser\\getID3\\getid3' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3.php', - 'ID3Parser\\getID3\\getid3_exception' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_exception.php', - 'ID3Parser\\getID3\\getid3_handler' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_handler.php', - 'ID3Parser\\getID3\\getid3_lib' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_lib.php', + 'ID3Parser\\ID3Parser' => __DIR__ . '/..' . '/nextcloud/id3parser/src/ID3Parser.php', + 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/Tags/getid3_id3v1.php', + 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/Tags/getid3_id3v2.php', + 'ID3Parser\\getID3\\getid3' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/getid3.php', + 'ID3Parser\\getID3\\getid3_exception' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/getid3_exception.php', + 'ID3Parser\\getID3\\getid3_handler' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/getid3_handler.php', + 'ID3Parser\\getID3\\getid3_lib' => __DIR__ . '/..' . '/nextcloud/id3parser/src/getID3/getid3_lib.php', 'IPLib\\Address\\AddressInterface' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/AddressInterface.php', 'IPLib\\Address\\AssignedRange' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/AssignedRange.php', 'IPLib\\Address\\IPv4' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/IPv4.php', diff --git a/composer/installed.json b/composer/installed.json index f02a64d16..797ce2621 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -312,49 +312,6 @@ ], "install-path": "../brick/math" }, - { - "name": "christophwurst/id3parser", - "version": "v0.1.4", - "version_normalized": "0.1.4.0", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/ID3Parser.git", - "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/ID3Parser/zipball/050c9d81ea89b0cf53e23a27efc4e1840f9ab260", - "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "time": "2021-11-29T15:02:22+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "ID3Parser\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0-or-later" - ], - "description": "An ID3 parser", - "homepage": "https://github.com/ChristophWurst/ID3Parser/", - "keywords": [ - "codecs", - "php", - "tags" - ], - "support": { - "issues": "https://github.com/ChristophWurst/ID3Parser/issues", - "source": "https://github.com/ChristophWurst/ID3Parser/tree/v0.1.4" - }, - "install-path": "../christophwurst/id3parser" - }, { "name": "cweagans/composer-patches", "version": "1.7.1", @@ -2452,6 +2409,48 @@ }, "install-path": "../mtdowling/jmespath.php" }, + { + "name": "nextcloud/id3parser", + "version": "v0.1.4", + "version_normalized": "0.1.4.0", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ID3Parser.git", + "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ID3Parser/zipball/050c9d81ea89b0cf53e23a27efc4e1840f9ab260", + "reference": "050c9d81ea89b0cf53e23a27efc4e1840f9ab260", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "time": "2021-11-29T15:02:22+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "ID3Parser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-or-later" + ], + "description": "An ID3 parser", + "homepage": "https://github.com/ChristophWurst/ID3Parser/", + "keywords": [ + "codecs", + "php", + "tags" + ], + "support": { + "source": "https://github.com/nextcloud-deps/ID3Parser/tree/v0.1.4" + }, + "install-path": "../nextcloud/id3parser" + }, { "name": "nextcloud/lognormalizer", "version": "v1.0.0", diff --git a/composer/installed.php b/composer/installed.php index 0398e5da0..e27bfe0d6 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'nextcloud/3rdparty', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '61a25781426c010588c4758da451fbded2e08465', + 'reference' => '17e4333c0642e3ab75a0a385274c84668aed74e1', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -55,15 +55,6 @@ 'aliases' => array(), 'dev_requirement' => false, ), - 'christophwurst/id3parser' => array( - 'pretty_version' => 'v0.1.4', - 'version' => '0.1.4.0', - 'reference' => '050c9d81ea89b0cf53e23a27efc4e1840f9ab260', - 'type' => 'library', - 'install_path' => __DIR__ . '/../christophwurst/id3parser', - 'aliases' => array(), - 'dev_requirement' => false, - ), 'cweagans/composer-patches' => array( 'pretty_version' => '1.7.1', 'version' => '1.7.1.0', @@ -328,12 +319,21 @@ 'nextcloud/3rdparty' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '61a25781426c010588c4758da451fbded2e08465', + 'reference' => '17e4333c0642e3ab75a0a385274c84668aed74e1', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), 'dev_requirement' => false, ), + 'nextcloud/id3parser' => array( + 'pretty_version' => 'v0.1.4', + 'version' => '0.1.4.0', + 'reference' => '050c9d81ea89b0cf53e23a27efc4e1840f9ab260', + 'type' => 'library', + 'install_path' => __DIR__ . '/../nextcloud/id3parser', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'nextcloud/lognormalizer' => array( 'pretty_version' => 'v1.0.0', 'version' => '1.0.0.0', diff --git a/christophwurst/id3parser/LICENSE b/nextcloud/id3parser/LICENSE similarity index 100% rename from christophwurst/id3parser/LICENSE rename to nextcloud/id3parser/LICENSE diff --git a/christophwurst/id3parser/src/ID3Parser.php b/nextcloud/id3parser/src/ID3Parser.php similarity index 100% rename from christophwurst/id3parser/src/ID3Parser.php rename to nextcloud/id3parser/src/ID3Parser.php diff --git a/christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php b/nextcloud/id3parser/src/getID3/Tags/getid3_id3v1.php similarity index 100% rename from christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php rename to nextcloud/id3parser/src/getID3/Tags/getid3_id3v1.php diff --git a/christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php b/nextcloud/id3parser/src/getID3/Tags/getid3_id3v2.php similarity index 100% rename from christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php rename to nextcloud/id3parser/src/getID3/Tags/getid3_id3v2.php diff --git a/christophwurst/id3parser/src/getID3/getid3.php b/nextcloud/id3parser/src/getID3/getid3.php similarity index 100% rename from christophwurst/id3parser/src/getID3/getid3.php rename to nextcloud/id3parser/src/getID3/getid3.php diff --git a/christophwurst/id3parser/src/getID3/getid3_exception.php b/nextcloud/id3parser/src/getID3/getid3_exception.php similarity index 100% rename from christophwurst/id3parser/src/getID3/getid3_exception.php rename to nextcloud/id3parser/src/getID3/getid3_exception.php diff --git a/christophwurst/id3parser/src/getID3/getid3_handler.php b/nextcloud/id3parser/src/getID3/getid3_handler.php similarity index 100% rename from christophwurst/id3parser/src/getID3/getid3_handler.php rename to nextcloud/id3parser/src/getID3/getid3_handler.php diff --git a/christophwurst/id3parser/src/getID3/getid3_lib.php b/nextcloud/id3parser/src/getID3/getid3_lib.php similarity index 100% rename from christophwurst/id3parser/src/getID3/getid3_lib.php rename to nextcloud/id3parser/src/getID3/getid3_lib.php