summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-22 07:35:41 +0100
committerRemi Collet <remi@php.net>2021-11-22 07:35:41 +0100
commit6e780cba23ff1ac5f8505ac4020385287d3bc576 (patch)
tree5eceb3d11d19d8c90cd32abe7ba373efdb2ec42c
parent2c471f9189edf2ae1c4b55dd3fd458bb0b2239c3 (diff)
update to 1.9.0HEADmaster
-rw-r--r--Makefile2
-rw-r--r--composer.json3
-rw-r--r--php-league-mime-type-detection.spec11
3 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 91b0fd5..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../../common/Makefile
+include ../../../common/Makefile
diff --git a/composer.json b/composer.json
index 765b05c..80ca1af 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
}
],
"scripts": {
+ "test": "vendor/bin/phpunit",
"phpstan": "vendor/bin/phpstan analyse -l 6 src"
},
"require": {
@@ -18,7 +19,7 @@
"require-dev": {
"phpunit/phpunit": "^8.5.8 || ^9.3",
"phpstan/phpstan": "^0.12.68",
- "friendsofphp/php-cs-fixer": "^2.18"
+ "friendsofphp/php-cs-fixer": "^3.2"
},
"autoload": {
"psr-4": {
diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec
index d514837..b2fecb9 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 b38b25d7b372e9fddb00335400467b223349fd7e
+%global gh_commit aa70e813a6ad3d1558fc927863d47309b4c23e69
%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.8.0
+Version: 1.9.0
Release: 1%{?dist}
Summary: Mime-type detection for Flysystem
@@ -37,7 +37,7 @@ BuildRequires: php-json
# From composer.json, "require-dev": {
# "phpunit/phpunit": "^8.5.8 || ^9.3",
# "phpstan/phpstan": "^0.12.68",
-# "friendsofphp/php-cs-fixer": "^2.18"
+# "friendsofphp/php-cs-fixer": "^3.2"
BuildRequires: phpunit9 >= 9.3
%global phpunit %{_bindir}/phpunit9
# Autoloader
@@ -96,7 +96,7 @@ 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}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} \
@@ -119,6 +119,9 @@ exit $ret
%changelog
+* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 1.9.0-1
+- update to 1.9.0
+
* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 1.8.0-1
- update to 1.8.0