summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-02-03 13:52:17 +0100
committerRemi Collet <remi@php.net>2023-02-03 13:52:17 +0100
commit5b4b7cf825ac8d7fbbe3389ccb62c1bf892f7a4c (patch)
tree9a6daec111b98852e57b54e1929ad1a6d8b89378
parent052b0aa57dc1de165773de57063775cfd8aee7e9 (diff)
update to 5.0.0
raise dependency on PHP 8.1 raise dependency on sebastian/diff 5 raise dependency on sebastian/exporter 5 rename to php-sebastian-comparator5 move to /usr/share/php/SebastianBergmann/Comparator5 add dependency on mbstring extension
-rw-r--r--composer.json14
-rw-r--r--php-sebastian-comparator5.spec80
2 files changed, 55 insertions, 39 deletions
diff --git a/composer.json b/composer.json
index b758e03..03c8aed 100644
--- a/composer.json
+++ b/composer.json
@@ -24,16 +24,18 @@
],
"prefer-stable": true,
"require": {
- "php": ">=7.3",
- "sebastian/diff": "^4.0",
- "sebastian/exporter": "^4.0"
+ "php": ">=8.1",
+ "sebastian/diff": "^5.0",
+ "sebastian/exporter": "^5.0",
+ "ext-dom": "*",
+ "ext-mbstring": "*"
},
"require-dev": {
- "phpunit/phpunit": "^9.3"
+ "phpunit/phpunit": "^10.0"
},
"config": {
"platform": {
- "php": "7.3.0"
+ "php": "8.1.0"
},
"optimize-autoloader": true,
"sort-packages": true
@@ -50,7 +52,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-main": "5.0-dev"
}
}
}
diff --git a/php-sebastian-comparator5.spec b/php-sebastian-comparator5.spec
index b9aaf36..3c59dec 100644
--- a/php-sebastian-comparator5.spec
+++ b/php-sebastian-comparator5.spec
@@ -1,13 +1,16 @@
-# remirepo/fedora spec file for php-sebastian-comparator4
+# remirepo/fedora spec file for php-sebastian-comparator5
#
-# Copyright (c) 2014-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2014-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global bootstrap 0
-%global gh_commit fa0f136dd2334583309d32b62544682ee972b51a
+
+# disabled until phpunit10 available
+%bcond_with tests
+
+%global gh_commit 72f01e6586e0caf6af81297897bd112eb7e9627c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project comparator
@@ -15,18 +18,13 @@
%global pk_vendor sebastian
%global pk_project %{gh_project}
# Namespace
-%global major 4
+%global major 5
%global php_home %{_datadir}/php
%global ns_vendor SebastianBergmann
%global ns_project Comparator
-%if %{bootstrap}
-%bcond_with tests
-%else
-%bcond_without tests
-%endif
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 4.0.8
+Version: 5.0.0
Release: 1%{?dist}
Summary: Compare PHP values for equality, version %{major}
@@ -37,40 +35,47 @@ Source1: makesrc.sh
BuildArch: noarch
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 8.1
+BuildRequires: php-date
+BuildRequires: php-dom
+BuildRequires: php-mbstring
+BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5)
-BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5)
+BuildRequires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6)
+BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6)
# remirepo:4
%else
-BuildRequires: php-sebastian-diff4
-BuildRequires: php-sebastian-exporter4
+BuildRequires: php-sebastian-diff5
+BuildRequires: php-sebastian-exporter5
%endif
BuildRequires: php-fedora-autoloader-devel
%if %{with tests}
# from composer.json, "require-dev": {
-# "phpunit/phpunit": "^9.3"
-BuildRequires: phpunit9 >= 9.3
+# "phpunit/phpunit": "^10.0"
+BuildRequires: phpunit10
%endif
# from composer.json
-# "php": ">=7.3",
-# "sebastian/diff": "^4.0",
-# "sebastian/exporter": "^4.0"
-Requires: php(language) >= 7.3
+# "php": ">=8.1",
+# "sebastian/diff": "^5.0",
+# "sebastian/exporter": "^5.0"
+# "ext-dom": "*",
+# "ext-mbstring": "*"
+Requires: php(language) >= 8.1
+Requires: php-dom
+Requires: php-mbstring
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5)
-Requires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5)
+Requires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6)
+Requires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6)
# remirepo:4
%else
-Requires: php-sebastian-diff4
-Requires: php-sebastian-exporter4
+Requires: php-sebastian-diff5
+Requires: php-sebastian-exporter5
%endif
-# from phpcompatinfo report for version 4.0.0
+# from phpcompatinfo report for version 5.0.0
Requires: php-date
-Requires: php-dom
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -96,8 +101,8 @@ phpab --template fedora --output src/autoload.php src
cat <<EOF | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/%{ns_vendor}/Diff4/autoload.php',
- '%{php_home}/%{ns_vendor}/Exporter4/autoload.php',
+ '%{php_home}/%{ns_vendor}/Diff5/autoload.php',
+ '%{php_home}/%{ns_vendor}/Exporter5/autoload.php',
]);
EOF
@@ -114,10 +119,10 @@ mkdir vendor
: Run upstream test suite
ret=0
-for cmd in php php74 php80 php81 php82; do
+for cmd in php php81 php82; do
if which $cmd; then
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
- %{_bindir}/phpunit9 --no-coverage --verbose || ret=1
+ %{_bindir}/phpunit10 --no-coverage --verbose || ret=1
fi
done
exit $ret
@@ -135,6 +140,15 @@ exit $ret
%changelog
+* Fri Feb 3 2023 Remi Collet <remi@remirepo.net> - 5.0.0-1
+- update to 5.0.0
+- raise dependency on PHP 8.1
+- raise dependency on sebastian/diff 5
+- raise dependency on sebastian/exporter 5
+- rename to php-sebastian-comparator5
+- move to /usr/share/php/SebastianBergmann/Comparator5
+- add dependency on mbstring extension
+
* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 4.0.8-1
- update to 4.0.8