summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-06 12:02:09 +0100
committerRemi Collet <remi@php.net>2022-01-06 12:02:09 +0100
commita41f6d64a524fd237b211e678cbabad21a8fdb39 (patch)
tree9e95dd579586dd73f0c75d0b80e89e1d8b823275
parentd9f5b88d0f0615dcfbd149af6b2944d61c470ecb (diff)
update to 6.1.0
-rw-r--r--composer.json18
-rwxr-xr-xmakesrc.sh2
-rw-r--r--php-bartlett-PHP-CompatInfo.spec30
3 files changed, 28 insertions, 22 deletions
diff --git a/composer.json b/composer.json
index 2ba23ca..3cd30e5 100644
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,8 @@
"ext-libxml": "*",
"ext-pcre": "*",
"ext-spl": "*",
- "bartlett/php-compatinfo-db": ">=3.6 <3.17",
- "composer/package-versions-deprecated": "^1.8",
+ "bartlett/php-compatinfo-db": "^3.17",
+ "bartlett/sarif-php-sdk": "^1.0",
"doctrine/collections": "^1.4",
"nikic/php-parser": "^4.10",
"psr/log": "^1.0",
@@ -30,8 +30,8 @@
"symfony/stopwatch": "^4.4|^5.0"
},
"require-dev": {
- "composer/composer": "^2.0",
- "symfony/phpunit-bridge": "^5.1"
+ "bartlett/graph-uml": "^1.2",
+ "composer/composer": "^2.0"
},
"authors": [
{
@@ -65,13 +65,11 @@
"export DATABASE_URL=sqlite:///${HOME}/.cache/bartlett/compatinfo-db.sqlite"
],
"post-install-cmd": [
- "Bartlett\\CompatInfo\\ComposerScripts::preparePharMetadata",
"@setup-database",
"vendor/bin/doctrine orm:schema-tool:create",
"vendor/bartlett/php-compatinfo-db/bin/compatinfo-db db:init"
],
"post-update-cmd": [
- "Bartlett\\CompatInfo\\ComposerScripts::preparePharMetadata",
"@setup-database"
]
},
@@ -81,10 +79,16 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
+ "platform": {
+ "php": "7.4.0"
+ },
"sort-packages": true,
"optimize-autoloader": true,
"allow-plugins": {
- "composer/package-versions-deprecated": true
+ "cweagans/composer-patches": true
}
+ },
+ "extra": {
+ "enable-patching": true
}
}
diff --git a/makesrc.sh b/makesrc.sh
index c0e118c..f912313 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -17,8 +17,6 @@ echo "Getting commit..."
git checkout $COMMIT || exit 1
cp composer.json vendor/composer/installed.json ../
- sed -e 's/"config": {/"config": {"platform": {"php": "7.4.0"},/' -i composer.json
-
composer install --no-dev --optimize-autoloader
mkdir data
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 879a544..11b1349 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -11,13 +11,13 @@
%undefine __brp_mangle_shebangs
%{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-%global gh_commit 7f878c7b534f3c4bb4d2200267678d53324b5d08
+%global gh_commit e40303a34d7657a92c82cc7cc61c50b5a1f095bd
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151005
%global gh_owner llaville
%global gh_project php-compatinfo
-%global upstream_version 6.0.3
+%global upstream_version 6.1.0
#global upstream_prever RC1
Name: php-bartlett-PHP-CompatInfo
@@ -64,7 +64,8 @@ Requires: php-spl
Requires: php-xmlreader
# Bundled libraries
-Provides: bundled(php-bartlett-php-compatinfo-db) = 3.16.1
+Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.0
+Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1
Provides: bundled(php-brick-math) = 0.9.3
Provides: bundled(php-composer-package-versions-deprecated) = 1.11.99.4
Provides: bundled(php-composer-semver) = 3.2.7
@@ -72,7 +73,7 @@ Provides: bundled(php-doctrine-annotations) = 1.13.2
Provides: bundled(php-doctrine-cache) = 2.1.1
Provides: bundled(php-doctrine-collections) = 1.6.8
Provides: bundled(php-doctrine-common) = 3.2.1
-Provides: bundled(php-doctrine-dbal) = 3.2.0
+Provides: bundled(php-doctrine-dbal) = 3.2.1
Provides: bundled(php-doctrine-deprecations) = v0.5.3
Provides: bundled(php-doctrine-event-manager) = 1.1.1
Provides: bundled(php-doctrine-inflector) = 2.0.4
@@ -81,7 +82,7 @@ Provides: bundled(php-doctrine-lexer) = 1.2.1
Provides: bundled(php-doctrine-orm) = 2.10.4
Provides: bundled(php-doctrine-persistence) = 2.2.3
Provides: bundled(php-nikic-php-parser) = v4.13.2
-Provides: bundled(php-psr-cache) = 2.0.0
+Provides: bundled(php-psr-cache) = 1.0.1
Provides: bundled(php-psr-container) = 1.1.2
Provides: bundled(php-psr-event-dispatcher) = 1.0.0
Provides: bundled(php-psr-log) = 1.1.4
@@ -93,11 +94,11 @@ Provides: bundled(php-symfony-cache-contracts) = v2.5.0
Provides: bundled(php-symfony-config) = v5.4.2
Provides: bundled(php-symfony-console) = v5.4.2
Provides: bundled(php-symfony-dependency-injection) = v5.4.2
-Provides: bundled(php-symfony-deprecation-contracts) = v3.0.0
-Provides: bundled(php-symfony-doctrine-messenger) = v6.0.2
+Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0
+Provides: bundled(php-symfony-doctrine-messenger) = v5.4.0
Provides: bundled(php-symfony-event-dispatcher) = v5.4.0
-Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.0.0
-Provides: bundled(php-symfony-filesystem) = v6.0.0
+Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0
+Provides: bundled(php-symfony-filesystem) = v5.4.0
Provides: bundled(php-symfony-finder) = v5.4.2
Provides: bundled(php-symfony-messenger) = v5.4.2
Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0
@@ -109,13 +110,13 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.24.0
Provides: bundled(php-symfony-polyfill-php80) = v1.24.0
Provides: bundled(php-symfony-polyfill-php81) = v1.24.0
Provides: bundled(php-symfony-process) = v5.4.2
-Provides: bundled(php-symfony-redis-messenger) = v6.0.2
+Provides: bundled(php-symfony-redis-messenger) = v5.4.2
Provides: bundled(php-symfony-requirements-checker) = v2.0.1
Provides: bundled(php-symfony-serializer) = v5.4.2
-Provides: bundled(php-symfony-service-contracts) = v2.4.1
+Provides: bundled(php-symfony-service-contracts) = v2.5.0
Provides: bundled(php-symfony-stopwatch) = v5.4.0
-Provides: bundled(php-symfony-string) = v6.0.2
-Provides: bundled(php-symfony-var-exporter) = v6.0.0
+Provides: bundled(php-symfony-string) = v5.4.2
+Provides: bundled(php-symfony-var-exporter) = v5.4.2
Provides: phpcompatinfo = %{version}
Provides: php-composer(bartlett/php-compatinfo) = %{version}
@@ -178,6 +179,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-
%changelog
+* Thu Jan 6 2022 Remi Collet <remi@remirepo.net> - 6.1.0-1
+- update to 6.1.0
+
* Wed Jan 5 2022 Remi Collet <remi@remirepo.net> - 6.0.3-1
- update to 6.0.3