summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-08-25 07:32:31 +0200
committerRemi Collet <remi@php.net>2023-08-25 07:32:31 +0200
commit2c5c5a26ce42f3c2c8fc888cbf559895201a43f2 (patch)
tree8e5f4896e6594b477c31de40bb6d5375bcc6a541
parenta9fae59034316e1b64614dda78184b32a0134daf (diff)
update to 1.13.0
raise dependency on PHP 7.4 use phpunit10
-rw-r--r--composer.json6
-rw-r--r--php-league-mime-type-detection.spec34
2 files changed, 26 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 80ca1af..cd75bee 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,11 @@
"phpstan": "vendor/bin/phpstan analyse -l 6 src"
},
"require": {
- "php": "^7.2 || ^8.0",
+ "php": "^7.4 || ^8.0",
"ext-fileinfo": "*"
},
"require-dev": {
- "phpunit/phpunit": "^8.5.8 || ^9.3",
+ "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0",
"phpstan/phpstan": "^0.12.68",
"friendsofphp/php-cs-fixer": "^3.2"
},
@@ -28,7 +28,7 @@
},
"config": {
"platform": {
- "php": "7.2.0"
+ "php": "7.4.0"
}
}
}
diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec
index d829866..009cdad 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-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2020-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
# Github
-%global gh_commit ff6248ea87a9f116e78edd6002e39e5128a0d4dd
+%global gh_commit a6dfb1194a2946fcdc1f38219445234f65b35c96
%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.11.0
+Version: 1.13.0
Release: 1%{?dist}
Summary: Mime-type detection for Flysystem
@@ -31,22 +31,29 @@ Source1: makesrc.sh
BuildArch: noarch
-BuildRequires: php(language) >= 7.2
+BuildRequires: php(language) >= 7.4
BuildRequires: php-fileinfo
BuildRequires: php-json
# From composer.json, "require-dev": {
-# "phpunit/phpunit": "^8.5.8 || ^9.3",
+# "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0",
# "phpstan/phpstan": "^0.12.68",
# "friendsofphp/php-cs-fixer": "^3.2"
+# remirepo:1
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
+BuildRequires: phpunit10
+%global phpunit %{_bindir}/phpunit10
+# remirepo:4
+%else
BuildRequires: phpunit9 >= 9.3
%global phpunit %{_bindir}/phpunit9
+%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require": {
-# "php": "^7.2 || ^8.0",
+# "php": "^7.4 || ^8.0",
# "ext-fileinfo": "*"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-fileinfo
# From phpcompatifo report for 1.4.0
Requires: php-json
@@ -96,13 +103,13 @@ sed -e 's/PHPStan\\Testing\\TestCase/PHPUnit\\Framework\\TestCase/' -i src/Overr
: Run upstream test suite
# the_generated_map_should_be_up_to_date is online
ret=0
-for cmdarg in "php %{phpunit}" php74 php80 php81; do
+for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do
if which $cmdarg; then
set $cmdarg
- $1 ${2:-%{_bindir}/phpunit9} \
+ $1 ${2:-%{_bindir}/phpunit10} \
--filter '^((?!(the_generated_map_should_be_up_to_date)).)*$' \
--no-coverage \
- --verbose || ret=1
+ || ret=1
fi
done
exit $ret
@@ -119,6 +126,11 @@ exit $ret
%changelog
+* Fri Aug 25 2023 Remi Collet <remi@remirepo.net> - 1.13.0-1
+- update to 1.13.0
+- raise dependency on PHP 7.4
+- use phpunit10
+
* Tue Apr 19 2022 Remi Collet <remi@remirepo.net> - 1.11.0-1
- update to 1.11.0