From 9651e41907c0705eb87107a4e7f92098c9e53f09 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Mar 2021 14:19:08 +0100 Subject: test build of upcoming 5.5.0 raise dependency on PHP 7.2 raise dependency on bartlett/php-compatinfo-db 3.3 --- php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch | 85 +++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch (limited to 'php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch') diff --git a/php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch new file mode 100644 index 0000000..db16a0c --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.5.0-rpm.patch @@ -0,0 +1,85 @@ +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 -up ./config/set/default.php.rpm ./config/set/default.php +--- ./config/set/default.php.rpm 2021-03-11 11:31:29.234038995 +0100 ++++ ./config/set/default.php 2021-03-11 11:32:21.553810893 +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(); -- cgit