diff options
author | Remi Collet <remi@remirepo.net> | 2022-01-03 08:08:08 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2022-01-03 08:08:08 +0100 |
commit | 3766f476a7a80dea5d8b414e7a594820cc81fb20 (patch) | |
tree | bbcf322d43f0315bba6a3fc852f4ba2cae6e68c8 /php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch | |
parent | 97aa42b5b9fe84bf90112d64b8e2d34139e4e656 (diff) |
update to 6.0.2unbundled
open https://github.com/llaville/php-compatinfo/issues/316
regression, compatibility with Symfony 4
Diffstat (limited to 'php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch')
-rw-r--r-- | php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch deleted file mode 100644 index e511f63..0000000 --- a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-13 14:10:12.445234956 +0100 -+++ ./bin/phpcompatinfo 2021-12-13 14:11:01.438091460 +0100 -@@ -8,7 +8,7 @@ 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\Infrastructure\Framework\Symfony\DependencyInjection\ContainerFactory; - use Bartlett\CompatInfo\Presentation\Console\ApplicationInterface; -diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-12-13 13:15:10.000000000 +0100 -+++ ./config/bootstrap.php 2021-12-13 14:10:12.445234956 +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-13 14:10:12.445234956 +0100 -+++ ./config/set/default.php 2021-12-13 14:14:41.830445824 +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'); - $containerConfigurator->import(__DIR__ . '/../packages/messenger.php'); - -@@ -88,7 +88,9 @@ return static function (ContainerConfigu - ->tag('phpcompatinfo.sniff') - ; - -- $services->load('Bartlett\CompatInfo\\', __DIR__ . '/../../src'); -+ $services->load('Bartlett\CompatInfo\\Application\\', __DIR__ . '/../../Application'); -+ $services->load('Bartlett\CompatInfo\\Infrastructure\\', __DIR__ . '/../../Infrastructure'); -+ $services->load('Bartlett\CompatInfo\\Presentation\\', __DIR__ . '/../../Presentation'); - - // @link https://symfony.com/doc/current/service_container/tags.html#reference-tagged-services - $services->set(SniffCollectionInterface::class, SniffCollection::class) -diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php ---- ./src/Presentation/Console/Application.php.rpm 2021-12-13 14:16:35.187113793 +0100 -+++ ./src/Presentation/Console/Application.php 2021-12-13 14:16:46.822079705 +0100 -@@ -13,8 +13,6 @@ - - namespace Bartlett\CompatInfo\Presentation\Console; - --use PackageVersions\Versions; -- - use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException; - use Symfony\Component\Config\FileLocator; - use Symfony\Component\Console\Application as SymfonyApplication; -@@ -71,14 +69,6 @@ class Application extends SymfonyApplica - $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 ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php ---- ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm 2021-12-13 14:26:26.391380450 +0100 -+++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php 2021-12-13 14:26:32.148363508 +0100 -@@ -23,7 +23,7 @@ class ContainerFactory - $containerBuilder = new ContainerBuilder(); - $containerBuilder->addCompilerPass(new MessengerPass()); - -- $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 5) . '/config/set')); -+ $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 4) . '/config/set')); - $loader->load($set . '.php'); - $containerBuilder->compile(); // mandatory or the sniffCollection won't be populated - return $containerBuilder; |