diff options
| -rw-r--r-- | 3.patch | 22 | ||||
| -rw-r--r-- | 485f75211335bfd69882bee7d3fccc730485aa82.patch | 41 | ||||
| -rw-r--r-- | php-league-mime-type-detection.spec | 35 |
3 files changed, 90 insertions, 8 deletions
@@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..7c5ae5d --- /dev/null +++ b/485f75211335bfd69882bee7d3fccc730485aa82.patch @@ -0,0 +1,41 @@ +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/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index 3ceb78e..6783bf6 100644 --- a/php-league-mime-type-detection.spec +++ b/php-league-mime-type-detection.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit fda190b62b962d96a069fcc414d781db66d65b69 +%global gh_commit ea2fbfc988bade315acd5967e6d02274086d0f28 %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.4.0 +Version: 1.5.0 Release: 1%{?dist} Summary: Mime-type detection for Flysystem @@ -29,6 +29,9 @@ 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 @@ -37,7 +40,13 @@ BuildRequires: php-json # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5.8", # "phpstan/phpstan": "^0.12.36" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 >= 9.3 +%global phpunit %{_bindir}/phpunit9 +%else BuildRequires: phpunit8 >= 8.5.8 +%global phpunit %{_bindir}/phpunit8 +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -63,6 +72,8 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 +%patch1 -p1 %build @@ -91,12 +102,13 @@ EOF : Run upstream test suite # the_generated_map_should_be_up_to_date is online ret=0 -for cmd in php php72 php73 php74 php80; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 \ - --filter '^((?!(the_generated_map_should_be_up_to_date)).)*$' \ - --no-coverage \ - --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(the_generated_map_should_be_up_to_date)).)*$' \ + --no-coverage \ + --verbose || ret=1 fi done exit $ret @@ -113,5 +125,12 @@ exit $ret %changelog +* 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 + https://github.com/thephpleague/mime-type-detection/pull/3 +- open https://github.com/thephpleague/mime-type-detection/pull/4 phpunit 9 +- switch to phpunit9 + * Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 1.4.0-1 - initial package |