diff options
| -rw-r--r-- | 3.patch | 22 | ||||
| -rw-r--r-- | 485f75211335bfd69882bee7d3fccc730485aa82.patch | 41 | ||||
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | php-league-mime-type-detection.spec | 22 |
4 files changed, 23 insertions, 75 deletions
diff --git a/3.patch b/3.patch deleted file mode 100644 index 473584e..0000000 --- a/3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4ce57906fee375c3cd1bb86942d8df991982eb53 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@famillecollet.com> -Date: Tue, 22 Sep 2020 07:53:33 +0200 -Subject: [PATCH] Fix test failure with 8.0.0beta4 - ---- - src/FinfoMimeTypeDetectorTest.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/FinfoMimeTypeDetectorTest.php b/src/FinfoMimeTypeDetectorTest.php -index 9f6c91b..606ecaa 100644 ---- a/src/FinfoMimeTypeDetectorTest.php -+++ b/src/FinfoMimeTypeDetectorTest.php -@@ -71,7 +71,7 @@ public function detecting_from_a_file_location(): void - { - $mimeType = $this->detector->detectMimeTypeFromFile(__DIR__.'/../test_files/flysystem.svg'); - -- $this->assertEquals('image/svg', $mimeType); -+ $this->assertStringStartsWith('image/svg', $mimeType); - } - - /** diff --git a/485f75211335bfd69882bee7d3fccc730485aa82.patch b/485f75211335bfd69882bee7d3fccc730485aa82.patch deleted file mode 100644 index 7c5ae5d..0000000 --- a/485f75211335bfd69882bee7d3fccc730485aa82.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 485f75211335bfd69882bee7d3fccc730485aa82 Mon Sep 17 00:00:00 2001 -From: Frank de Jonge <info@frenky.net> -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] Assert start of string for SVG type, it varies based on PHP - version - ---- - src/FinfoMimeTypeDetectorTest.php | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/FinfoMimeTypeDetectorTest.php b/src/FinfoMimeTypeDetectorTest.php -index fadbe88..9f6c91b 100644 ---- a/src/FinfoMimeTypeDetectorTest.php -+++ b/src/FinfoMimeTypeDetectorTest.php -@@ -38,7 +38,7 @@ public function detecting_mime_type_from_contents(): void - - $mimeType = $this->detector->detectMimeType('flysystem.svg', $contents); - -- $this->assertEquals('image/svg', $mimeType); -+ $this->assertStringStartsWith('image/svg', $mimeType); - } - - /** -@@ -51,7 +51,7 @@ public function detecting_mime_type_from_buffer(): void - - $mimeType = $this->detector->detectMimeTypeFromBuffer($contents); - -- $this->assertEquals('image/svg', $mimeType); -+ $this->assertStringStartsWith('image/svg', $mimeType); - } - - /** -@@ -61,7 +61,7 @@ public function detecting_from_contents_falls_back_to_extension_detection(): voi - { - $mimeType = $this->detector->detectMimeType('flysystem.svg', ''); - -- $this->assertEquals('image/svg+xml', $mimeType); -+ $this->assertStringStartsWith('image/svg+xml', $mimeType); - } - - /** diff --git a/composer.json b/composer.json index 19a62a7..765b05c 100644 --- a/composer.json +++ b/composer.json @@ -8,17 +8,26 @@ "email": "info@frankdejonge.nl" } ], + "scripts": { + "phpstan": "vendor/bin/phpstan analyse -l 6 src" + }, "require": { "php": "^7.2 || ^8.0", "ext-fileinfo": "*" }, "require-dev": { - "phpunit/phpunit": "^8.5.8", - "phpstan/phpstan": "^0.12.36" + "phpunit/phpunit": "^8.5.8 || ^9.3", + "phpstan/phpstan": "^0.12.68", + "friendsofphp/php-cs-fixer": "^2.18" }, "autoload": { "psr-4": { "League\\MimeTypeDetection\\": "src" } + }, + "config": { + "platform": { + "php": "7.2.0" + } } } diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index 6783bf6..5473473 100644 --- a/php-league-mime-type-detection.spec +++ b/php-league-mime-type-detection.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-league-mime-type-detection # -# Copyright (c) 2020 Remi Collet +# Copyright (c) 2020-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit ea2fbfc988bade315acd5967e6d02274086d0f28 +%global gh_commit 3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project mime-type-detection @@ -19,7 +19,7 @@ %global ns_project MimeTypeDetection Name: php-%{pk_vendor}-%{pk_name} -Version: 1.5.0 +Version: 1.7.0 Release: 1%{?dist} Summary: Mime-type detection for Flysystem @@ -29,17 +29,15 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh -Patch0: https://github.com/thephpleague/mime-type-detection/commit/485f75211335bfd69882bee7d3fccc730485aa82.patch -Patch1: https://patch-diff.githubusercontent.com/raw/thephpleague/mime-type-detection/pull/3.patch - BuildArch: noarch BuildRequires: php(language) >= 7.2 BuildRequires: php-fileinfo BuildRequires: php-json # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5.8", -# "phpstan/phpstan": "^0.12.36" +# "phpunit/phpunit": "^8.5.8 || ^9.3", +# "phpstan/phpstan": "^0.12.68", +# "friendsofphp/php-cs-fixer": "^2.18" %if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 >= 9.3 %global phpunit %{_bindir}/phpunit9 @@ -72,8 +70,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -%patch1 -p1 %build @@ -125,6 +121,12 @@ exit $ret %changelog +* Tue Jan 19 2021 Remi Collet <remi@remirepo.net> - 1.7.0-1 +- update to 1.7.0 + +* Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 1.5.1-1 +- update to 1.5.1 + * Tue Sep 22 2020 Remi Collet <remi@remirepo.net> - 1.5.0-1 - update to 1.5.0 - add patch for test suite from upstream and from |