diff --git a/README.md b/README.md index ea80d80..d83a5c7 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # [PHPExif](http://github.com/LycheeOrg/php-exif) [![GitHub Release][release-shield]](https://github.com/LycheeOrg/php-exif/releases) -[![PHP 8.0 & 8.1][php-shield]](https://github.com/LycheeOrg/php-exif#installation-composer) +[![PHP 8.1 & 8.2][php-shield]](https://github.com/LycheeOrg/php-exif#installation-composer) [![MIT License][license-shield]](https://github.com/LycheeOrg/php-exif/blob/master/LICENSE)
[![Build Status](https://github.com/LycheeOrg/php-exif/workflows/Tests/badge.svg)](https://github.com/LycheeOrg/php-exif/actions) @@ -45,6 +45,16 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/Ly ## Contributors +* [ildyria](https://github.com/ildyria) +* [d7415](https://github.com/d7415) +* [kamil4](https://github.com/kamil4) +* [nagmat84](https://github.com/nagmat84) +* [qwerty287](https://github.com/qwerty287) + +#### Past Contributors + +Thank you for your help! + * [Tom Van Herreweghe](http://github.com/Miljar) * [Ingewikkeld](https://github.com/Ingewikkeld) * [Christophe Singer](https://github.com/wasinger) @@ -53,9 +63,8 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/Ly * [Marek Szymczuk](https://github.com/bonzai) * [Scott Pringle](https://github.com/Luciam91) * [tmp-hallenser](https://github.com/tmp-hallenser) -* [kamil4](https://github.com/kamil4) -* [ildyria](https://github.com/ildyria) -* [nagmat84](https://github.com/nagmat84) +* [icager](https://github.com/icager) + ## License @@ -63,5 +72,5 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/Ly [release-shield]: https://img.shields.io/github/release-pre/LycheeOrg/php-exif.svg -[php-shield]: https://img.shields.io/badge/PHP-8.0%20|%208.1-blue +[php-shield]: https://img.shields.io/badge/PHP-8.1%20|%208.2-blue [license-shield]: https://img.shields.io/github/license/LycheeOrg/Lychee.svg diff --git a/Resources/doc/usage.md b/Resources/doc/usage.md index c523997..2242ba1 100644 --- a/Resources/doc/usage.md +++ b/Resources/doc/usage.md @@ -5,16 +5,16 @@ ```php read('/path/to/file'); diff --git a/composer.json b/composer.json index 31c927c..3d23b53 100755 --- a/composer.json +++ b/composer.json @@ -30,8 +30,7 @@ "require": { "php": "^8.1", "ext-fileinfo": "*", - "fylax/forceutf8": "dev-master", - "neitanod/forceutf8": "^2.0.4", + "fylax/forceutf8": "^3.0.1", "php-ffmpeg/php-ffmpeg": "^1.0", "thecodingmachine/safe": "^2.2" }, diff --git a/composer.lock b/composer.lock index 7b2bec6..fc00460 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": "6218133d84ce7c4074995dbb65b12769", + "content-hash": "4dcaa4e8901c1231378b9e34a386cf80", "packages": [ { "name": "evenement/evenement", @@ -55,16 +55,16 @@ }, { "name": "fylax/forceutf8", - "version": "dev-master", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/Fylax/forceutf8.git", - "reference": "c84c1759be6f0c1578242485508befde191f9947" + "reference": "9372e4488c5b6d5a671fd4d3244eef2268a4d1e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Fylax/forceutf8/zipball/c84c1759be6f0c1578242485508befde191f9947", - "reference": "c84c1759be6f0c1578242485508befde191f9947", + "url": "https://api.github.com/repos/Fylax/forceutf8/zipball/9372e4488c5b6d5a671fd4d3244eef2268a4d1e4", + "reference": "9372e4488c5b6d5a671fd4d3244eef2268a4d1e4", "shasum": "" }, "require": { @@ -73,7 +73,6 @@ "suggest": { "ext-iconv": "*" }, - "default-branch": true, "type": "library", "extra": { "thanks": { @@ -82,7 +81,7 @@ } }, "autoload": { - "psr-4": { + "psr-0": { "ForceUTF8\\": "src/" } }, @@ -95,59 +94,14 @@ "name": "Nico Caprioli", "email": "nico.caprioli@gmail.com", "role": "Developer" - }, - { - "name": "Sjoerd Wenker", - "email": "sjoerd@relisten.nl" } ], "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.", "homepage": "https://github.com/Fylax/forceutf8", "support": { - "source": "https://github.com/Fylax/forceutf8/tree/master" - }, - "time": "2022-12-27T08:34:55+00:00" - }, - { - "name": "neitanod/forceutf8", - "version": "v2.0.4", - "source": { - "type": "git", - "url": "https://github.com/neitanod/forceutf8.git", - "reference": "c1fbe70bfb5ad41b8ec5785056b0e308b40d4831" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/c1fbe70bfb5ad41b8ec5785056b0e308b40d4831", - "reference": "c1fbe70bfb5ad41b8ec5785056b0e308b40d4831", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "ForceUTF8\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastián Grignoli", - "email": "grignoli@gmail.com" - } - ], - "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.", - "homepage": "https://github.com/neitanod/forceutf8", - "support": { - "issues": "https://github.com/neitanod/forceutf8/issues", - "source": "https://github.com/neitanod/forceutf8/tree/master" + "source": "https://github.com/Fylax/forceutf8/tree/v3.0.1" }, - "time": "2019-12-10T14:09:14+00:00" + "time": "2022-12-29T13:20:55+00:00" }, { "name": "php-ffmpeg/php-ffmpeg", @@ -453,16 +407,16 @@ }, { "name": "symfony/cache", - "version": "v6.2.3", + "version": "v6.2.4", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "640fa048de31988b8924c0715d2e3404266efdac" + "reference": "ddd1a70bfdf4ed19facad0db689c7bca979d322e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/640fa048de31988b8924c0715d2e3404266efdac", - "reference": "640fa048de31988b8924c0715d2e3404266efdac", + "url": "https://api.github.com/repos/symfony/cache/zipball/ddd1a70bfdf4ed19facad0db689c7bca979d322e", + "reference": "ddd1a70bfdf4ed19facad0db689c7bca979d322e", "shasum": "" }, "require": { @@ -529,7 +483,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.2.3" + "source": "https://github.com/symfony/cache/tree/v6.2.4" }, "funding": [ { @@ -545,7 +499,7 @@ "type": "tidelift" } ], - "time": "2022-12-22T17:55:15+00:00" + "time": "2022-12-29T16:29:13+00:00" }, { "name": "symfony/cache-contracts", @@ -6177,7 +6131,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "fylax/forceutf8": 20, "lychee-org/phpstan-lychee": 20 }, "prefer-stable": true, diff --git a/lib/PHPExif/Enum/ReaderType.php b/lib/PHPExif/Enum/ReaderType.php index a562e83..65d376d 100644 --- a/lib/PHPExif/Enum/ReaderType.php +++ b/lib/PHPExif/Enum/ReaderType.php @@ -7,10 +7,10 @@ namespace PHPExif\Enum; -enum ReaderType: string +enum ReaderType { - case NATIVE = 'native'; - case EXIFTOOL = 'exiftool'; - case FFPROBE = 'ffprobe'; - case IMAGICK = 'imagick'; + case NATIVE; + case EXIFTOOL; + case FFPROBE; + case IMAGICK; }