summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-16 13:31:39 +0100
committerRemi Collet <remi@remirepo.net>2020-01-16 13:31:39 +0100
commit4085ea91f4cbb5fe1cdea93b26a03f003dbaba7d (patch)
tree8ec3bd3de898000b0484b54e82f81a5aa75e96a5
parente4a55527b5fb06161a6be4269881e79cc265ee3c (diff)
update to 1.2.3 (no change)HEADmaster
raise dependency on PHP 7.1 raise dependency on theseer/fdomdocument 1.6 allow symfony/finder v5
-rw-r--r--composer.json18
-rw-r--r--php-phpunit-FinderFacade.spec42
2 files changed, 41 insertions, 19 deletions
diff --git a/composer.json b/composer.json
index ba282a5..75284a4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,13 +13,27 @@
"support": {
"issues": "https://github.com/sebastianbergmann/finder-facade/issues"
},
+ "prefer-stable": true,
"require": {
- "theseer/fdomdocument": "~1.3",
- "symfony/finder": "~2.3|~3.0|~4.0"
+ "php": "^7.1",
+ "theseer/fdomdocument": "^1.6",
+ "symfony/finder": "^2.3|^3.0|^4.0|^5.0"
+ },
+ "config": {
+ "platform": {
+ "php": "7.1.3"
+ },
+ "optimize-autoloader": true,
+ "sort-packages": true
},
"autoload": {
"classmap": [
"src/"
]
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2"
+ }
}
}
diff --git a/php-phpunit-FinderFacade.spec b/php-phpunit-FinderFacade.spec
index 862b7a5..42297bf 100644
--- a/php-phpunit-FinderFacade.spec
+++ b/php-phpunit-FinderFacade.spec
@@ -1,12 +1,12 @@
# remirepo/fedora spec file for php-phpunit-FinderFacade
#
-# Copyright (c) 2012-2019 Remi Collet
+# Copyright (c) 2012-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f
+%global gh_commit 167c45d131f7fc3d159f56f191a0a22228765e16
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project finder-facade
@@ -16,8 +16,8 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-phpunit-FinderFacade
-Version: 1.2.2
-Release: 5%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
Summary: Wrapper for Symfony Finder component
License: BSD
@@ -25,13 +25,13 @@ URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
BuildArch: noarch
-BuildRequires: php(language) >= 5.3.3
+BuildRequires: php(language) >= 7.1
BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
BuildRequires: %{_bindir}/phpunit
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(theseer/fdomdocument) >= 1.3 with php-composer(theseer/fdomdocument) < 2)
-BuildRequires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 5)
+BuildRequires: (php-composer(theseer/fdomdocument) >= 1.6 with php-composer(theseer/fdomdocument) < 2)
+BuildRequires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 6)
%else
BuildRequires: php-theseer-fDOMDocument
BuildRequires: php-symfony-finder
@@ -39,12 +39,13 @@ BuildRequires: php-symfony-finder
%endif
# From composer.json "require": {
-# "theseer/fdomdocument": "~1.3",
-# "symfony/finder": "~2.3|~3.0|~4.0"
-Requires: php(language) >= 5.3.3
+# "php": "^7.1",
+# "theseer/fdomdocument": "^1.6",
+# "symfony/finder": "^2.3|^3.0|^4.0|^5.0"
+Requires: php(language) >= 7.1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(theseer/fdomdocument) >= 1.3 with php-composer(theseer/fdomdocument) < 2)
-Requires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 5)
+Requires: (php-composer(theseer/fdomdocument) >= 1.6 with php-composer(theseer/fdomdocument) < 2)
+Requires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 6)
%else
Requires: php-theseer-fDOMDocument
Requires: php-symfony-finder
@@ -74,14 +75,15 @@ phpab \
src
cat << 'EOF' | tee -a src/autoload.php
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
'%{php_home}/TheSeer/fDOMDocument/autoload.php',
- array(
+ [
+ '%{php_home}/Symfony5/Component/Finder/autoload.php',
'%{php_home}/Symfony4/Component/Finder/autoload.php',
'%{php_home}/Symfony3/Component/Finder/autoload.php',
'%{php_home}/Symfony/Component/Finder/autoload.php',
- ),
-));
+ ],
+]);
EOF
@@ -95,7 +97,7 @@ cp -pr src %{buildroot}%{php_home}/SebastianBergmann/FinderFacade
php -r 'require "%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php";'
ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php72 php73 php74; do
if which $cmd; then
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php \
%{_bindir}/phpunit --verbose tests || ret=1
@@ -122,6 +124,12 @@ fi
%changelog
+* Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 1.2.3-1
+- update to 1.2.3 (no change)
+- raise dependency on PHP 7.1
+- raise dependency on theseer/fdomdocument 1.6
+- allow symfony/finder v5
+
* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 1.2.2-5
- cleanup for EL-8