From ecb8cfa912a73e4bb75ffd9fec5945c2d1f45d8c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Feb 2021 11:57:25 +0100 Subject: [PATCH 1/4] v5.4.3 (cherry picked from commit 4ea39816fe14be29778231ca0b417acfd3b3e4be) --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 890f63b..69ddb24 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz /php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz /php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 5862466..de99e32 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 456308cc09f2c78903195bbbf09886314950a083 +%global gh_commit e4f9846a409a53b4b095c39386c9c9dbbc903519 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,7 +26,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.4.2 +Version: 5.4.3 %global specrel 1 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -231,6 +231,9 @@ fi %changelog +* Mon Feb 15 2021 Remi Collet - 5.4.3-1 +- update to 5.4.3 + * Mon Nov 23 2020 Remi Collet - 5.4.2-1 - update to 5.4.2 diff --git a/sources b/sources index 5ad4082..166e7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz) = d44aa858c4a7d5ac8581056ea772f745e7a3c395c575f2d77a4130412935645cb06dd7135e196ceec1ca249bcd0c546e55f3126a75d83160ee2cb2cf094303a1 +SHA512 (php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz) = 8092c6dd1e18e73dfae52438275943c71e798b7793fb78ac7c0231d1744f24d7c609c6c1c4ae97067dc47a540f36b44ca88016657601489d012d70560cadbeb1 From 97041793f855b17968e25cf239dcb154e775d8b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Mar 2021 07:46:52 +0100 Subject: [PATCH 2/4] update to 5.5.1 raise dependency on PHP 7.2 raise dependency on bartlett/php-compatinfo-db 3.4 (cherry picked from commit a950b4e8ad6a2fd7601df42180ae5ef4fc076acd) --- .gitignore | 2 + php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch | 73 -------------- php-bartlett-PHP-CompatInfo-5.5-rpm.patch | 105 ++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 57 +++++------ sources | 2 +- 5 files changed, 137 insertions(+), 102 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-5.5-rpm.patch diff --git a/.gitignore b/.gitignore index 69ddb24..fe85675 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ clog /php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz /php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz /php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch b/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch deleted file mode 100644 index d77f69b..0000000 --- a/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2020-11-23 09:20:15.949928560 +0100 -+++ ./bin/phpcompatinfo 2020-11-23 09:23:44.418075703 +0100 -@@ -8,39 +8,13 @@ if (PHP_SAPI !== 'cli') { - - gc_disable(); // performance boost - --if (\Phar::running()) { -- $possibleAutoloadPaths = [ -- 'phar://phpcompatinfo.phar/vendor/autoload.php' -- ]; --} else { -- $possibleAutoloadPaths = [ -- // local dev repository -- __DIR__ . '/../vendor/autoload.php', -- // dependency -- __DIR__ . '/../../../../vendor/autoload.php', -- ]; --} -- --$isAutoloadFound = false; --foreach ($possibleAutoloadPaths as $possibleAutoloadPath) { -- if (file_exists($possibleAutoloadPath)) { -- require_once $possibleAutoloadPath; -- $isAutoloadFound = true; -- break; -- } --} -- --if ($isAutoloadFound === false) { -- throw new RuntimeException(sprintf( -- 'Unable to find "vendor/autoload.php" in "%s" paths.', -- implode('", "', $possibleAutoloadPaths) -- )); --} -+$vendorDir = '/usr/share/php/Bartlett/CompatInfo'; -+require_once $vendorDir . '/autoload.php'; - - use Bartlett\CompatInfo\Console\ApplicationInterface; - - /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ --$container = require dirname(__DIR__) . '/config/container.php'; -+$container = require $vendorDir . '/config/container.php'; - - $app = $container->get(ApplicationInterface::class); - $app->setContainer($container); -diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-11-20 13:00:53.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-11-23 09:21:14.242121292 +0100 -@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio - use Symfony\Component\EventDispatcher\EventDispatcher; - use Symfony\Component\EventDispatcher\EventDispatcherInterface ; - --use PackageVersions\Versions; -- - use Phar; - use function substr_count; - -@@ -78,14 +76,6 @@ class Application extends BaseApplicatio - $version = self::VERSION; - } elseif (substr_count($version, '.') === 2) { - // release is in X.Y.Z format -- } else { -- // composer or git strategy -- $version = Versions::getVersion('bartlett/php-compatinfo'); -- list($ver, ) = explode('@', $version); -- -- if (strpos($ver, 'dev') === false) { -- $version = $ver; -- } - } - parent::__construct(self::NAME, $version); - diff --git a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5-rpm.patch new file mode 100644 index 0000000..f84d1bb --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.5-rpm.patch @@ -0,0 +1,105 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2021-03-15 08:24:33.926051485 +0100 ++++ ./bin/phpcompatinfo 2021-03-15 08:27:12.457422097 +0100 +@@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { + + gc_disable(); // performance boost + +-require_once dirname(__DIR__) . '/config/bootstrap.php'; ++require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php'; + + use Bartlett\CompatInfo\Console\ApplicationInterface; + + /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ +-$container = require dirname(__DIR__) . '/config/container.php'; ++$container = require '/usr/share/php/Bartlett/CompatInfo/config/container.php'; + + $app = $container->get(ApplicationInterface::class); + $app->setContainer($container); +diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php +--- ./config/bootstrap.php.rpm 2021-03-15 08:25:20.386867027 +0100 ++++ ./config/bootstrap.php 2021-03-15 08:26:06.587683611 +0100 +@@ -6,6 +6,8 @@ if (\Phar::running()) { + ]; + } else { + $possibleAutoloadPaths = [ ++ // RPM ++ __DIR__ . '/../autoload.php', + // local dev repository + __DIR__ . '/../vendor/autoload.php', + // dependency +diff -up ./config/set/default.php.rpm ./config/set/default.php +--- ./config/set/default.php.rpm 2021-03-13 11:18:56.000000000 +0100 ++++ ./config/set/default.php 2021-03-15 08:24:33.926051485 +0100 +@@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc + */ + return static function (ContainerConfigurator $containerConfigurator): void + { +- $containerConfigurator->import(dirname(__DIR__,2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); ++ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); + $containerConfigurator->import(__DIR__ . '/common.php'); + + $parameters = $containerConfigurator->parameters(); +diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-03-13 11:18:56.000000000 +0100 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-03-15 08:24:33.926051485 +0100 +@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio + use Symfony\Component\EventDispatcher\EventDispatcher; + use Symfony\Component\EventDispatcher\EventDispatcherInterface ; + +-use PackageVersions\Versions; +- + use Phar; + use function substr_count; + +@@ -78,14 +76,6 @@ class Application extends BaseApplicatio + $version = self::VERSION; + } elseif (substr_count($version, '.') === 2) { + // release is in X.Y.Z format +- } else { +- // composer or git strategy +- $version = Versions::getVersion('bartlett/php-compatinfo'); +- list($ver, ) = explode('@', $version); +- +- if (strpos($ver, 'dev') === false) { +- $version = $ver; +- } + } + parent::__construct(self::NAME, $version); + +diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php +--- ./tests/Reference/ParameterTest.php.rpm 2021-03-15 08:33:56.677816772 +0100 ++++ ./tests/Reference/ParameterTest.php 2021-03-15 08:35:06.718538322 +0100 +@@ -42,7 +42,7 @@ final class ParameterTest extends SniffT + */ + public function functionProvider() + { +- $container = require __DIR__ . '/../../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + $repository = $container->get(FunctionRepository::class); + $functions = []; + foreach ($repository->getAll() as $function) { +diff -up ./tests/Sniffs/SniffTestCase.php.rpm ./tests/Sniffs/SniffTestCase.php +--- ./tests/Sniffs/SniffTestCase.php.rpm 2021-03-15 08:33:50.789840180 +0100 ++++ ./tests/Sniffs/SniffTestCase.php 2021-03-15 08:34:48.304611521 +0100 +@@ -21,7 +21,7 @@ abstract class SniffTestCase extends Tes + + self::$fixtures .= 'sniffs' . DIRECTORY_SEPARATOR; + +- $container = require __DIR__ . '/../../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + self::$sniffs = $container->get(SniffCollection::class); + } + } +diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php +--- ./tests/TestCase.php.rpm 2021-03-15 08:33:45.726860307 +0100 ++++ ./tests/TestCase.php 2021-03-15 08:34:30.666681640 +0100 +@@ -38,7 +38,7 @@ abstract class TestCase extends \PHPUnit + // request for a Bartlett\CompatInfo\Api\Analyser + self::$api = $client->api('analyser'); + +- $container = require __DIR__ . '/../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + self::$references = $container->get(ReferenceCollectionInterface::class); + } + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index de99e32..2df8408 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2020 Remi Collet +# Copyright (c) 2011-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e4f9846a409a53b4b095c39386c9c9dbbc903519 +%global gh_commit 38294902ae898ae4d29b300a516474330670f33f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,16 +19,12 @@ #global prever RC2 %bcond_without tests -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -%global sym_prefix php-symfony3 -%else -%global sym_prefix php-symfony -%endif +%global upstream_version 5.5.1 +#global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo -Version: 5.4.3 -%global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -38,17 +34,17 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Script for fedora-review Source1: fedora-review-check -# Autoload and sqlite database path +# Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.4.2-rpm.patch +Patch0: %{name}-5.5-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.1.3 +BuildRequires: php(language) >= 7.2 %if %{with tests} # to run test suite BuildRequires: php-pdo_sqlite BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) BuildRequires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -59,14 +55,14 @@ BuildRequires: (php-composer(symfony/finder) >= 4.4 with php-comp BuildRequires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) BuildRequires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) BuildRequires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) -%global phpunit %{_bindir}/phpunit8 +%global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} # For our patch / autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require" -# "php": "^7.1.3|^8.0", +# "php": "^7.2|^8.0", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -74,7 +70,7 @@ BuildRequires: php-fedora-autoloader-devel # "ext-pdo": "*", # "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.4", -# "bartlett/php-compatinfo-db": "^2.0", +# "bartlett/php-compatinfo-db": "^3.4", # "doctrine/collections": "^1.4", # "composer/package-versions-deprecated": "^1.8", # "psr/log": "^1.0", @@ -86,7 +82,7 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/dependency-injection": "^4.4|^5.0", # "symfony/serializer": "^4.4|^5.0", # "symfony/stopwatch": "^4.4|^5.0" -Requires: php(language) >= 7.1.3 +Requires: php(language) >= 7.2 Requires: php-cli Requires: php-json Requires: php-libxml @@ -95,7 +91,7 @@ Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) Requires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -105,7 +101,7 @@ Requires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-comp Requires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) Requires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) Requires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) -Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) +Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -170,8 +166,6 @@ find src -name \*rpm -delete -print # fix path in configuration sed -e 's:src/Bartlett/CompatInfo/::' -i config/set/*php mv config src/Bartlett/CompatInfo/config -# for tests -ln -s src/Bartlett/CompatInfo/config config # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php @@ -195,19 +189,21 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with tests} %check -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php +mkdir config +cat << 'EOF' | tee config/bootstrap.php - 5.5.1-1 +- update to 5.5.1 +- raise dependency on PHP 7.2 +- raise dependency on bartlett/php-compatinfo-db 3.4 + * Mon Feb 15 2021 Remi Collet - 5.4.3-1 - update to 5.4.3 diff --git a/sources b/sources index 166e7f3..cce85f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz) = 8092c6dd1e18e73dfae52438275943c71e798b7793fb78ac7c0231d1744f24d7c609c6c1c4ae97067dc47a540f36b44ca88016657601489d012d70560cadbeb1 +SHA512 (php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz) = e9e06c73068388acaf8f2f2f5c2e62fae5b07b01c051e31dcc11be77cded72953577e8f4d6d2c540db99454a14911943dc4a23aae1d9720b9996b38774618785 From 1321cdfe6de0afd81bda788510591789b5d31e51 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Apr 2021 10:49:56 +0200 Subject: [PATCH 3/4] v5.5.2 (cherry picked from commit 6b4ad234dcdaa688ed212bfa5bb049806a7aad49) --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-5.5.2-rpm.patch | 48 +++++++------------ php-bartlett-PHP-CompatInfo.spec | 10 ++-- sources | 2 +- 4 files changed, 27 insertions(+), 34 deletions(-) rename php-bartlett-PHP-CompatInfo-5.5-rpm.patch => php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch (66%) diff --git a/.gitignore b/.gitignore index fe85675..481e978 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz /php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz /php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch similarity index 66% rename from php-bartlett-PHP-CompatInfo-5.5-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch index f84d1bb..0ada6f5 100644 --- a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-03-15 08:24:33.926051485 +0100 -+++ ./bin/phpcompatinfo 2021-03-15 08:27:12.457422097 +0100 +--- ./bin/phpcompatinfo.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./bin/phpcompatinfo 2021-04-13 10:41:27.780928446 +0200 @@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { gc_disable(); // performance boost @@ -17,8 +17,8 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo $app = $container->get(ApplicationInterface::class); $app->setContainer($container); diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-03-15 08:25:20.386867027 +0100 -+++ ./config/bootstrap.php 2021-03-15 08:26:06.587683611 +0100 +--- ./config/bootstrap.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./config/bootstrap.php 2021-04-13 10:41:27.780928446 +0200 @@ -6,6 +6,8 @@ if (\Phar::running()) { ]; } else { @@ -29,8 +29,8 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php __DIR__ . '/../vendor/autoload.php', // dependency diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-03-13 11:18:56.000000000 +0100 -+++ ./config/set/default.php 2021-03-15 08:24:33.926051485 +0100 +--- ./config/set/default.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./config/set/default.php 2021-04-13 10:41:27.780928446 +0200 @@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc */ return static function (ContainerConfigurator $containerConfigurator): void @@ -41,8 +41,8 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php $parameters = $containerConfigurator->parameters(); diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-03-13 11:18:56.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-03-15 08:24:33.926051485 +0100 +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-04-13 10:41:27.780928446 +0200 @@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface ; @@ -68,8 +68,8 @@ diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/Co parent::__construct(self::NAME, $version); diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php ---- ./tests/Reference/ParameterTest.php.rpm 2021-03-15 08:33:56.677816772 +0100 -+++ ./tests/Reference/ParameterTest.php 2021-03-15 08:35:06.718538322 +0100 +--- ./tests/Reference/ParameterTest.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./tests/Reference/ParameterTest.php 2021-04-13 10:41:27.780928446 +0200 @@ -42,7 +42,7 @@ final class ParameterTest extends SniffT */ public function functionProvider() @@ -79,27 +79,15 @@ diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest $repository = $container->get(FunctionRepository::class); $functions = []; foreach ($repository->getAll() as $function) { -diff -up ./tests/Sniffs/SniffTestCase.php.rpm ./tests/Sniffs/SniffTestCase.php ---- ./tests/Sniffs/SniffTestCase.php.rpm 2021-03-15 08:33:50.789840180 +0100 -+++ ./tests/Sniffs/SniffTestCase.php 2021-03-15 08:34:48.304611521 +0100 -@@ -21,7 +21,7 @@ abstract class SniffTestCase extends Tes - - self::$fixtures .= 'sniffs' . DIRECTORY_SEPARATOR; - -- $container = require __DIR__ . '/../../config/container.php'; -+ $container = require '@BUILDPATH@/config/container.php'; - self::$sniffs = $container->get(SniffCollection::class); - } - } diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php ---- ./tests/TestCase.php.rpm 2021-03-15 08:33:45.726860307 +0100 -+++ ./tests/TestCase.php 2021-03-15 08:34:30.666681640 +0100 -@@ -38,7 +38,7 @@ abstract class TestCase extends \PHPUnit - // request for a Bartlett\CompatInfo\Api\Analyser - self::$api = $client->api('analyser'); - +--- ./tests/TestCase.php.rpm 2021-04-13 10:41:27.780928446 +0200 ++++ ./tests/TestCase.php 2021-04-13 10:43:04.778512016 +0200 +@@ -46,7 +46,7 @@ abstract class TestCase extends \PHPUnit + */ + protected function executeAnalysis(string $dataSource): array + { - $container = require __DIR__ . '/../config/container.php'; + $container = require '@BUILDPATH@/config/container.php'; - self::$references = $container->get(ReferenceCollectionInterface::class); - } + $references = $container->get(ReferenceCollectionInterface::class); + $sniffs = $container->get(SniffCollection::class); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2df8408..2b0b204 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 38294902ae898ae4d29b300a516474330670f33f +%global gh_commit 547803ee1bd9e160bbb99f58273177b497790636 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 5.5.1 +%global upstream_version 5.5.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -36,7 +36,7 @@ Source1: fedora-review-check # Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.5-rpm.patch +Patch0: %{name}-5.5.2-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -169,6 +169,7 @@ mv config src/Bartlett/CompatInfo/config # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php +sed -e 's/5.5.1/%{version}/' -i $FILE grep " VERSION" $FILE grep %{version} $FILE @@ -227,6 +228,9 @@ fi %changelog +* Tue Apr 13 2021 Remi Collet - 5.5.2-1 +- update to 5.5.2 + * Mon Mar 15 2021 Remi Collet - 5.5.1-1 - update to 5.5.1 - raise dependency on PHP 7.2 diff --git a/sources b/sources index cce85f2..22ac5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz) = e9e06c73068388acaf8f2f2f5c2e62fae5b07b01c051e31dcc11be77cded72953577e8f4d6d2c540db99454a14911943dc4a23aae1d9720b9996b38774618785 +SHA512 (php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz) = 9962e17cbeb8334f985ad586aef000b15d98bed72fdcd5a1598cc7ebada3aea935477ba13fca7b0bc5974b5a3cd43231f25fbc4b3ffb213dbe5101a22cf9926b From 5cb43cf74b03e1f158d14ace845f9f5ad6d69fa2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 May 2021 09:20:07 +0200 Subject: [PATCH 4/4] v5.5.3 (cherry picked from commit f424718294632dab5d7f8cf83d6a0bf8b39d888c) --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 481e978..4d8593e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz /php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz /php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2b0b204..2a76dfa 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 547803ee1bd9e160bbb99f58273177b497790636 +%global gh_commit 7353738b51e38b0763e2bf154d05c55ad2fdc105 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 5.5.2 +%global upstream_version 5.5.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -228,6 +228,9 @@ fi %changelog +* Mon May 3 2021 Remi Collet - 5.5.3-1 +- update to 5.5.3 + * Tue Apr 13 2021 Remi Collet - 5.5.2-1 - update to 5.5.2 diff --git a/sources b/sources index 22ac5bb..054f865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz) = 9962e17cbeb8334f985ad586aef000b15d98bed72fdcd5a1598cc7ebada3aea935477ba13fca7b0bc5974b5a3cd43231f25fbc4b3ffb213dbe5101a22cf9926b +SHA512 (php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz) = ae0d12353505763a55594d98a9856a277f4badd5f654a031c156f3da45f81de7b05920d076f7d3ebcd396050514d57a8ed3655ebe79a54558af81e6c28a91973