From 479abdf0e6c827180a7c42565c9b58888363d5d5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Dec 2021 15:01:22 +0100 Subject: update to 6.0.1 raise dependency on PHP 7.4 drop dependency on bartlett/php-reflect add dependency on nikic/php-parser --- php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch | 93 ----------------------------- 1 file changed, 93 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch (limited to 'php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch') diff --git a/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch deleted file mode 100644 index 80e3196..0000000 --- a/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./bin/phpcompatinfo 2021-12-10 16:26:30.756115071 +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-12-10 15:36:22.000000000 +0100 -+++ ./config/bootstrap.php 2021-12-10 16:26:30.757115067 +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-12-10 16:26:30.757115067 +0100 -+++ ./config/set/default.php 2021-12-10 16:28:22.196710654 +0100 -@@ -32,7 +32,7 @@ use function Symfony\Component\Dependenc - * @return void - */ - 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-12-10 15:36:22.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-12-10 16:26:30.757115067 +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-12-10 15:36:22.000000000 +0100 -+++ ./tests/Reference/ParameterTest.php 2021-12-10 16:26:30.757115067 +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/TestCase.php.rpm ./tests/TestCase.php ---- ./tests/TestCase.php.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./tests/TestCase.php 2021-12-10 16:26:30.757115067 +0100 -@@ -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'; - $references = $container->get(ReferenceCollectionInterface::class); - $sniffs = $container->get(SniffCollection::class); - -- cgit