summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-12-02 10:02:10 +0100
committerRemi Collet <remi@php.net>2021-12-02 10:02:10 +0100
commit66f4f97a3062f1bcb547bf43682cbfe15b3c03d2 (patch)
tree646836411766491b5647f0ee4c4f23b597b5ca9f
parente6884c2d3ebc9c4016522d4268521a3c8b909db3 (diff)
update to 3.15.0
raise dependency on PHP 7.3 add dependency on doctrine/dbal 3 add dependency on symfony/finder
-rw-r--r--composer.json10
-rw-r--r--php-bartlett-php-compatinfo-db.spec43
2 files changed, 40 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index 380796e..26c130c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,16 @@
{
"name": "bartlett/php-compatinfo-db",
- "description": "Reference Database to be used with php-compatinfo library",
+ "description": "Reference Database of all functions, constants, classes, interfaces on PHP standard distribution and about 110 extensions",
"keywords": ["compatibility", "database", "reference"],
"type": "library",
"license": "BSD-3-Clause",
- "homepage": "http://bartlett.laurent-laville.org/php-compatinfo/",
+ "homepage": "https://github.com/llaville/php-compatinfo-db",
"support": {
"source": "https://github.com/llaville/php-compatinfo-db",
"issues": "https://github.com/llaville/php-compatinfo-db/issues"
},
"require": {
- "php": "^7.2|^8.0",
+ "php": "^7.3|^8.0",
"ext-json": "*",
"ext-pcre": "*",
"ext-pdo": "*",
@@ -19,11 +19,13 @@
"composer/package-versions-deprecated": "^1.8",
"composer/semver": "^1.0|^2.0|^3.0",
"doctrine/orm": "^2.7",
+ "doctrine/dbal": "^2.13.1||^3.1.1",
"symfony/cache": "^4.4|^5.0",
"symfony/config": "^4.4|^5.0",
"symfony/console": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/event-dispatcher": "^4.4|^5.0",
+ "symfony/finder": "^4.4|^5.0",
"symfony/messenger": "^4.4|^5.0",
"symfony/process": "^4.4|^5.0",
"symfony/requirements-checker": "^2.0",
@@ -77,7 +79,7 @@
"scripts-descriptions": {
"setup-database": "Initializes SQLite database from JSON files in data directory."
},
- "minimum-stability": "dev",
+ "minimum-stability": "stable",
"prefer-stable": true,
"config": {
"sort-packages": true,
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index f264f4b..dd944c9 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
# See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit 442dcb63237853f6d0f296591b929434019b597d
+%global gh_commit 65080937bf2d2d7606230db0d847eae5be8999b8
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151031
%global gh_owner llaville
@@ -28,7 +28,7 @@
%bcond_with im6
%bcond_with im7
-%global upstream_version 3.14.0
+%global upstream_version 3.15.0
#global upstream_prever RC1
Name: php-%{c_vendor}-%{c_project}
@@ -50,9 +50,8 @@ Patch0: %{name}-3.14-rpm.patch
# - Phar::OPENSSL_SHA* constants
Patch1: %{name}-backports.patch
-
BuildArch: noarch
-BuildRequires: php(language) >= 7.2
+BuildRequires: php(language) >= 7.3
BuildRequires: php-json
BuildRequires: php-pcre
BuildRequires: php-pdo
@@ -66,11 +65,13 @@ BuildRequires: php-spl
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
BuildRequires: (php-composer(doctrine/orm) >= 2.7 with php-composer(doctrine/orm) < 4)
+BuildRequires: (php-composer(doctrine/dbal) >= 3.1.1 with php-composer(doctrine/dbal) < 4)
BuildRequires: (php-composer(symfony/requirements-checker) >= 2.0 with php-composer(symfony/requirements-checker) < 3)
-# remirepo:5
+# remirepo:6
%else
BuildRequires: php-composer-semver3
BuildRequires: php-doctrine-orm >= 2.7
+BuildRequires: php-doctrine-dbal3 >= 3.1.1
BuildRequires: php-symfony-requirements-checker >= 2.0
%endif
BuildRequires: php-symfony4-cache >= 4.4
@@ -78,6 +79,7 @@ BuildRequires: php-symfony4-config >= 4.4
BuildRequires: php-symfony4-console >= 4.4
BuildRequires: php-symfony4-dependency-injection >= 4.4
BuildRequires: php-symfony4-event-dispatcher >= 4.4
+BuildRequires: php-symfony4-finder >= 4.4
BuildRequires: php-symfony4-process >= 4.4
BuildRequires: php-symfony4-messenger >= 4.4
BuildRequires: php-symfony4-stopwatch >= 4.4
@@ -97,7 +99,7 @@ BuildRequires: php-pecl-imagick-im7
%endif
# From composer.json, "require"
-# "php": "^7.2|^8.0",
+# "php": "^7.3|^8.0",
# "ext-json": "*",
# "ext-pcre": "*",
# "ext-pdo": "*",
@@ -106,16 +108,18 @@ BuildRequires: php-pecl-imagick-im7
# "composer/package-versions-deprecated": "^1.8",
# "composer/semver": "^1.0|^2.0|^3.0",
# "doctrine/orm": "^2.7",
+# "doctrine/dbal": "^2.13.1||^3.1.1",
# "symfony/cache": "^4.4|^5.0",
# "symfony/config": "^4.4|^5.0",
# "symfony/console": "^4.4|^5.0",
# "symfony/dependency-injection": "^4.4|^5.0",
# "symfony/event-dispatcher": "^4.4|^5.0",
+# "symfony/finder": "^4.4|^5.0",
# "symfony/messenger": "^4.4|^5.0",
# "symfony/process": "^4.4|^5.0",
# "symfony/requirements-checker": "^2.0",
# "symfony/stopwatch": "^4.4|^5.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.3
Requires: php-json
Requires: php-pcre
Requires: php-pdo
@@ -125,11 +129,13 @@ Requires: php-spl
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
Requires: (php-composer(doctrine/orm) >= 2.7 with php-composer(doctrine/orm) < 4)
+Requires: (php-composer(doctrine/dbal) >= 3.1.1 with php-composer(doctrine/dbal) < 4)
Requires: (php-composer(symfony/requirements-checker) >= 2.0 with php-composer(symfony/requirements-checker) < 3)
-# remirepo:5
+# remirepo:6
%else
Requires: php-composer-semver3 >= 3.0
Requires: php-doctrine-orm >= 2.7
+Requires: php-doctrine-dbal3 >= 3.1.1
Requires: php-symfony-requirements-checker >= 2.0
%endif
Requires: php-symfony4-cache >= 4.4
@@ -137,6 +143,7 @@ Requires: php-symfony4-config >= 4.4
Requires: php-symfony4-console >= 4.4
Requires: php-symfony4-dependency-injection >= 4.4
Requires: php-symfony4-event-dispatcher >= 4.4
+Requires: php-symfony4-finder >= 4.4
Requires: php-symfony4-messenger >= 4.4
Requires: php-symfony4-process >= 4.4
Requires: php-symfony4-stopwatch >= 4.4
@@ -149,7 +156,8 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5
%description
-%{summary}.
+Reference Database of all functions, constants, classes, interfaces on PHP
+standard distribution and about 110 extensions.
%prep
@@ -178,9 +186,11 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
'%{_datadir}/php/Symfony4/Component/Console/autoload.php',
'%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php',
'%{_datadir}/php/Symfony4/Component/EventDispatcher/autoload.php',
+ '%{_datadir}/php/Symfony4/Component/Finder/autoload.php',
'%{_datadir}/php/Symfony4/Component/Messenger/autoload.php',
'%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php',
'%{_datadir}/php/Symfony/Requirements/autoload.php',
+ '%{_datadir}/php/Doctrine/DBAL3/autoload.php',
'%{_datadir}/php/Doctrine/ORM/autoload.php',
__DIR__ . '/Infrastructure/Framework/Symfony/Polyfill.php',
));
@@ -260,6 +270,11 @@ install -D -p -m 755 bin/compatinfo-db %{buildroot}%{_bindir}/%{name}
%check
export DATABASE_URL=sqlite:///%{buildroot}%{_datadir}/%{name}/compatinfo.sqlite
+# https://github.com/llaville/php-compatinfo-db/issues/79
+rm -rf tests/Reference/Extension/PhpPecl/Imagick
+# https://github.com/llaville/php-compatinfo-db/issues/99
+rm -rf tests/Reference/Extension/PhpPecl/Rdkafka
+
mkdir config
cat << 'EOF' | tee config/bootstrap.php
<?php
@@ -289,6 +304,16 @@ exit $ret
%changelog
+* Thu Dec 2 2021 Remi Collet <remi@remirepo.net> - 3.15.0-1
+- update to 3.15.0
+- raise dependency on PHP 7.3
+- add dependency on doctrine/dbal 3
+- add dependency on symfony/finder
+
+* Tue Nov 23 2021 Remi Collet <remi@remirepo.net> - 3.14.0-2
+- test build for upstream patches for
+ https://github.com/llaville/php-compatinfo-db/issues/97
+
* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 3.14.0-1
- update to 3.14.0