summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json15
-rw-r--r--php-webimpress-safe-writer.spec13
2 files changed, 17 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index 79cfbf1..a88254e 100644
--- a/composer.json
+++ b/composer.json
@@ -10,11 +10,12 @@
"race condition"
],
"require": {
- "php": "^7.2"
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.4.3",
- "webimpress/coding-standard": "dev-develop"
+ "phpunit/phpunit": "^8.5.8 || ^9.3.7",
+ "vimeo/psalm": "^3.14.2",
+ "webimpress/coding-standard": "^1.1.5"
},
"autoload": {
"psr-4": {
@@ -31,18 +32,20 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev",
- "dev-develop": "2.1.x-dev",
+ "dev-master": "2.1.x-dev",
+ "dev-develop": "2.2.x-dev",
"dev-release-1.0": "1.0.x-dev"
}
},
"scripts": {
"check": [
"@cs-check",
- "@test"
+ "@test",
+ "@static-analysis"
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
+ "static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
diff --git a/php-webimpress-safe-writer.spec b/php-webimpress-safe-writer.spec
index 3b524a9..a3cad0e 100644
--- a/php-webimpress-safe-writer.spec
+++ b/php-webimpress-safe-writer.spec
@@ -12,13 +12,13 @@
%global github_owner webimpress
%global github_name safe-writer
-%global github_version 2.0.0
-%global github_commit d03bea3b98abe1d4c8b24cbebf524361ffaafee4
+%global github_version 2.1.0
+%global github_commit 5cfafdec5873c389036f14bf832a5efc9390dcdd
%global composer_vendor webimpress
%global composer_project safe-writer
-# "php": "^7.2"
+# "php": "^7.2 || ^8.0"
%global php_min_ver 7.2
# Build using "--without tests" to disable tests
@@ -44,7 +44,7 @@ BuildArch: noarch
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: phpunit8
+BuildRequires: phpunit8 >= 8.5.8
## phpcompatinfo for version 2.0.0
BuildRequires: php-json
BuildRequires: php-spl
@@ -103,7 +103,7 @@ sed 's/function testMultipleWriters/function SKIP_testMultipleWriters/' \
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit8)
-for PHP_EXEC in php php72 php73 php74; do
+for PHP_EXEC in php php72 php73 php74 php80; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose \
--bootstrap %{buildroot}%{phpdir}/Webimpress/SafeWriter/autoload.php \
@@ -126,5 +126,8 @@ exit $RETURN_CODE
%changelog
+* Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+
* Sun Feb 23 2020 Shawn Iwinski <shawn@iwin.ski> - 2.0.0-1
- Initial package