diff options
| -rw-r--r-- | php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch (renamed from php-bartlett-PHP-CompatInfo-5.5-rpm.patch) | 48 | ||||
| -rw-r--r-- | php-bartlett-PHP-CompatInfo.spec | 10 |
2 files changed, 25 insertions, 33 deletions
diff --git a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch b/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 b743d56..8b362cf 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 @@ -203,6 +203,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 @@ -263,6 +264,9 @@ fi %changelog +* Tue Apr 13 2021 Remi Collet <remi@remirepo.net> - 5.5.2-1 +- update to 5.5.2 + * Mon Mar 15 2021 Remi Collet <remi@remirepo.net> - 5.5.1-1 - update to 5.5.1 - raise dependency on bartlett/php-compatinfo-db 3.4 |