From 36cd07ff091d737c21d1a9163fc41d31daf3bc43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Apr 2022 14:25:37 +0200 Subject: update bundled bartlett/php-compatinfo-db to 4.2.0 --- installed.json | 98 +++++++++++++++++++++++----------------- php-bartlett-PHP-CompatInfo.spec | 32 ++++++++----- 2 files changed, 76 insertions(+), 54 deletions(-) diff --git a/installed.json b/installed.json index 56f01ab..87c1c03 100644 --- a/installed.json +++ b/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "bartlett/php-compatinfo-db", - "version": "4.2.0", - "version_normalized": "4.2.0.0", + "version": "4.3.0", + "version_normalized": "4.3.0.0", "source": { "type": "git", "url": "https://github.com/llaville/php-compatinfo-db.git", - "reference": "00f02e17f4e4155f188bd879f6e6df4fac70935b" + "reference": "812826fc9be71b2aa2c887d3a6eac875ea3fcfbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/llaville/php-compatinfo-db/zipball/00f02e17f4e4155f188bd879f6e6df4fac70935b", - "reference": "00f02e17f4e4155f188bd879f6e6df4fac70935b", + "url": "https://api.github.com/repos/llaville/php-compatinfo-db/zipball/812826fc9be71b2aa2c887d3a6eac875ea3fcfbe", + "reference": "812826fc9be71b2aa2c887d3a6eac875ea3fcfbe", "shasum": "" }, "require": { @@ -43,7 +43,7 @@ "bartlett/graph-uml": "^1.2", "psr/log": "^1.0" }, - "time": "2022-03-21T07:41:04+00:00", + "time": "2022-04-20T06:07:39+00:00", "bin": [ "bin/compatinfo-db" ], @@ -541,21 +541,21 @@ }, { "name": "doctrine/common", - "version": "3.2.2", - "version_normalized": "3.2.2.0", + "version": "3.3.0", + "version_normalized": "3.3.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "295082d3750987065912816a9d536c2df735f637" + "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/295082d3750987065912816a9d536c2df735f637", - "reference": "295082d3750987065912816a9d536c2df735f637", + "url": "https://api.github.com/repos/doctrine/common/zipball/c824e95d4c83b7102d8bc60595445a6f7d540f96", + "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96", "shasum": "" }, "require": { - "doctrine/persistence": "^2.0", + "doctrine/persistence": "^2.0 || ^3.0", "php": "^7.1 || ^8.0" }, "require-dev": { @@ -567,7 +567,7 @@ "symfony/phpunit-bridge": "^4.0.5", "vimeo/psalm": "^4.4" }, - "time": "2022-02-02T09:15:57+00:00", + "time": "2022-02-05T18:28:51+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -614,7 +614,7 @@ ], "support": { "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/3.2.2" + "source": "https://github.com/doctrine/common/tree/3.3.0" }, "funding": [ { @@ -1137,17 +1137,17 @@ }, { "name": "doctrine/orm", - "version": "2.11.2", - "version_normalized": "2.11.2.0", + "version": "2.12.0", + "version_normalized": "2.12.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "9c351e044478135aec1755e2c0c0493a4b6309db" + "reference": "d5503644314ed825fe4b276a588458a033fa3e7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/9c351e044478135aec1755e2c0c0493a4b6309db", - "reference": "9c351e044478135aec1755e2c0c0493a4b6309db", + "url": "https://api.github.com/repos/doctrine/orm/zipball/d5503644314ed825fe4b276a588458a033fa3e7c", + "reference": "d5503644314ed825fe4b276a588458a033fa3e7c", "shasum": "" }, "require": { @@ -1160,14 +1160,14 @@ "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^2.2", + "doctrine/lexer": "^1.2.3", + "doctrine/persistence": "^2.4 || ^3", "ext-ctype": "*", "php": "^7.1 || ^8.0", "psr/cache": "^1 || ^2 || ^3", "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0", "symfony/polyfill-php72": "^1.23", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "doctrine/annotations": "<1.13 || >= 2.0" @@ -1176,8 +1176,9 @@ "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "1.4.6", + "phpstan/phpstan": "~1.4.10 || 1.5.0", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", @@ -1187,7 +1188,7 @@ "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "2022-03-09T15:23:58+00:00", + "time": "2022-04-19T18:34:28+00:00", "bin": [ "bin/doctrine" ], @@ -1232,53 +1233,52 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.11.2" + "source": "https://github.com/doctrine/orm/tree/2.12.0" }, "install-path": "../doctrine/orm" }, { "name": "doctrine/persistence", - "version": "2.4.1", - "version_normalized": "2.4.1.0", + "version": "3.0.0", + "version_normalized": "3.0.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "092a52b71410ac1795287bb5135704ef07d18dd0" + "reference": "e6103cb9e0982a4312e05ad94bb7be3f8e2d5869" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/092a52b71410ac1795287bb5135704ef07d18dd0", - "reference": "092a52b71410ac1795287bb5135704ef07d18dd0", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/e6103cb9e0982a4312e05ad94bb7be3f8e2d5869", + "reference": "e6103cb9e0982a4312e05ad94bb7be3f8e2d5869", "shasum": "" }, "require": { - "doctrine/cache": "^1.11 || ^2.0", "doctrine/collections": "^1.0", - "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "psr/cache": "^1.0 || ^2.0 || ^3.0" }, "conflict": { - "doctrine/annotations": "<1.0 || >=2.0", + "doctrine/annotations": "<1.7 || >=2.0", "doctrine/common": "<2.10" }, "require-dev": { "composer/package-versions-deprecated": "^1.11", - "doctrine/annotations": "^1.0", + "doctrine/annotations": "^1.7", "doctrine/coding-standard": "^9.0", "doctrine/common": "^3.0", - "phpstan/phpstan": "1.4.6", - "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5", + "phpstan/phpstan": "1.5.0", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", "symfony/cache": "^4.4 || ^5.4 || ^6.0", - "vimeo/psalm": "4.21.0" + "vimeo/psalm": "4.22.0" }, - "time": "2022-03-22T06:44:40+00:00", + "time": "2022-04-15T10:39:55+00:00", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { - "Doctrine\\Common\\": "src/Common", "Doctrine\\Persistence\\": "src/Persistence" } }, @@ -1313,7 +1313,7 @@ } ], "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", - "homepage": "https://doctrine-project.org/projects/persistence.html", + "homepage": "https://www.doctrine-project.org/projects/persistence.html", "keywords": [ "mapper", "object", @@ -1323,8 +1323,22 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/2.4.1" + "source": "https://github.com/doctrine/persistence/tree/3.0.0" }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", + "type": "tidelift" + } + ], "install-path": "../doctrine/persistence" }, { diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 9d6608f..9242ac3 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -55,23 +55,25 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.2.0 +# License BSD-3-Clause +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.3.0 +Provides: bundled(php-nikic-php-parser) = v4.13.2 +# License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 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.2 +Provides: bundled(php-doctrine-common) = 3.3.0 Provides: bundled(php-doctrine-dbal) = 3.3.5 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 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.11.2 -Provides: bundled(php-doctrine-persistence) = 2.4.1 -Provides: bundled(php-nikic-php-parser) = v4.13.2 +Provides: bundled(php-doctrine-orm) = 2.12.0 +Provides: bundled(php-doctrine-persistence) = 3.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 @@ -148,14 +150,17 @@ php -r ' echo "cant decode json file\n"; exit(3); } - $lic = []; + $res = []; foreach($pkgs["packages"] as $pkg) { - printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - $lic = array_merge($lic, $pkg["license"]); + $lic = implode(" and ", $pkg["license"]); + if (!isset($res[$lic])) $res[$lic] = []; + $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); } - sort($lic); - printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));' - + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); + } +' %build # Nothing @@ -193,6 +198,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Wed Apr 20 2022 Remi Collet - 6.4.1-2 +- update bundled bartlett/php-compatinfo-db to 4.2.0 + * Thu Apr 7 2022 Remi Collet - 6.4.1-1 - update to 6.4.1 -- cgit