From 3e48f7848045a708ec61a5914019d028f57ca18c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Jan 2021 16:26:45 +0100 Subject: update to 3.1.0 drop dependency on league/tactician drop dependency on laminas/laminas-diagnostics add dependency on doctrine/orm add dependency on symfony/config add dependency on symfony/dependency-injection add dependency on symfony/event-dispatcher add dependency on symfony/messenger add dependency on symfony/requirements-checker switch to phpunit9 --- php-bartlett-php-compatinfo-db-2.19-rpm.patch | 95 --------------------------- 1 file changed, 95 deletions(-) delete mode 100644 php-bartlett-php-compatinfo-db-2.19-rpm.patch (limited to 'php-bartlett-php-compatinfo-db-2.19-rpm.patch') diff --git a/php-bartlett-php-compatinfo-db-2.19-rpm.patch b/php-bartlett-php-compatinfo-db-2.19-rpm.patch deleted file mode 100644 index 1d1d2f5..0000000 --- a/php-bartlett-php-compatinfo-db-2.19-rpm.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db ---- ./bin/compatinfo-db.rpm 2020-07-11 10:24:45.000000000 +0200 -+++ ./bin/compatinfo-db 2020-07-13 11:22:01.041329662 +0200 -@@ -7,10 +7,7 @@ declare(strict_types=1); - gc_disable(); // performance boost - - $possibleAutoloadPaths = [ -- // local dev repository -- __DIR__ . '/../vendor/autoload.php', -- // dependency -- __DIR__ . '/../../../../vendor/autoload.php', -+ '/usr/share/php/Bartlett/CompatInfoDb/autoload.php', - ]; - - $isAutoloadFound = false; -diff -up ./src/DatabaseFactory.php.rpm ./src/DatabaseFactory.php ---- ./src/DatabaseFactory.php.rpm 2020-07-11 10:24:45.000000000 +0200 -+++ ./src/DatabaseFactory.php 2020-07-13 11:22:01.041329662 +0200 -@@ -35,14 +35,13 @@ class DatabaseFactory - - private static function getSqliteDsn() : array - { -- if (PATH_SEPARATOR == ';') { -- // windows -- $userHome = getenv('USERPROFILE'); -+ if (($db = getenv('BARTLETT_COMPATINFO_DB')) && file_exists($db)) { -+ static::$tempDir = dirname($db); -+ } else if (file_exists($db = '/usr/share/php-bartlett-php-compatinfo-db/' . static::$database)) { -+ static::$tempDir = dirname($db); - } else { -- // unix -- $userHome = getenv('HOME'); -- } -- static::$tempDir = $userHome . '/.bartlett'; -+ static::$tempDir = dirname(dirname(dirname(__DIR__))) . '/data'; -+ } - - return [ - 'driver' => 'pdo_sqlite', -@@ -58,19 +57,6 @@ class DatabaseFactory - { - $dbParams = self::getSqliteDsn(); - -- if (!file_exists(static::$tempDir)) { -- mkdir(static::$tempDir); -- } -- $source = dirname(__DIR__) . '/data/' . static::$database; -- $dest = static::$tempDir . '/' . static::$database; -- -- if (!file_exists($dest) -- || sha1_file($source) !== sha1_file($dest) -- ) { -- // install DB only if necessary (missing or modified) -- copy($source, $dest); -- } -- - return new PDO($dbParams['url']); - } --} -\ Pas de fin de ligne à la fin du fichier -+} -diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php ---- ./src/Presentation/Console/Application.php.rpm 2020-07-13 11:22:01.041329662 +0200 -+++ ./src/Presentation/Console/Application.php 2020-07-13 11:32:58.975441852 +0200 -@@ -13,8 +13,6 @@ use Bartlett\CompatInfoDb\Presentation\C - use Bartlett\CompatInfoDb\Presentation\Console\Command\ReleaseCommand; - use Bartlett\CompatInfoDb\Presentation\Console\Command\ShowCommand; - --use PackageVersions\Versions; -- - use Psr\Container\ContainerInterface; - - use Symfony\Component\Console\CommandLoader\CommandLoaderInterface; -@@ -40,20 +38,7 @@ class Application extends \Symfony\Compo - - public function __construct(ContainerInterface $container, string $version = 'UNKNOWN') - { -- if ('UNKNOWN' === $version) { -- // composer or git outside world strategy -- $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-db'); -- list($ver, ) = explode('@', $version); -- -- if (strpos($ver, 'dev') === false) { -- $version = $ver; -- } -- } -+ $version = self::VERSION; - parent::__construct(self::NAME, $version); - - $this->container = $container; -- cgit