From 6519a1f8a5c2bc2ea90164828f52a1ef0d50e737 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 14:30:46 +0200 Subject: update to 3.10.0 --- php-bartlett-php-compatinfo-db-3.10-rpm.patch | 153 ++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 php-bartlett-php-compatinfo-db-3.10-rpm.patch (limited to 'php-bartlett-php-compatinfo-db-3.10-rpm.patch') diff --git a/php-bartlett-php-compatinfo-db-3.10-rpm.patch b/php-bartlett-php-compatinfo-db-3.10-rpm.patch new file mode 100644 index 0000000..69497ee --- /dev/null +++ b/php-bartlett-php-compatinfo-db-3.10-rpm.patch @@ -0,0 +1,153 @@ +diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db +--- ./bin/compatinfo-db.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./bin/compatinfo-db 2021-09-01 14:26:55.977981605 +0200 +@@ -4,7 +4,7 @@ + + gc_disable(); // performance boost + +-require_once dirname(__DIR__) . '/config/bootstrap.php'; ++require_once '/usr/share/php/Bartlett/CompatInfoDb/config/bootstrap.php'; + + use Bartlett\CompatInfoDb\Presentation\Console\ApplicationInterface; + +@@ -12,7 +12,7 @@ use Symfony\Component\Console\CommandLoa + use Symfony\Component\DependencyInjection\ContainerBuilder; + + /** @var ContainerBuilder $container */ +-$container = require dirname(__DIR__) . '/config/container.php'; ++$container = require '/usr/share/php/Bartlett/CompatInfoDb/config/container.php'; + + /** @var ApplicationInterface $app */ + $app = $container->get(ApplicationInterface::class); +diff -up ./cli-config.php.rpm ./cli-config.php +--- ./cli-config.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./cli-config.php 2021-09-01 14:26:55.977981605 +0200 +@@ -3,9 +3,9 @@ + use Doctrine\ORM\EntityManagerInterface; + use Doctrine\ORM\Tools\Console\ConsoleRunner; + +-require_once __DIR__ . '/config/bootstrap.php'; ++require_once __DIR__ . '/src/config/bootstrap.php'; + +-$container = require __DIR__ . '/config/container.php'; ++$container = require __DIR__ . '/src/config/container.php'; + + $entityManager = $container->get(EntityManagerInterface::class); + +diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php +--- ./config/bootstrap.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./config/bootstrap.php 2021-09-01 14:26:55.977981605 +0200 +@@ -6,6 +6,8 @@ if (\Phar::running()) { + ]; + } else { + $possibleAutoloadPaths = [ ++ // RPM ++ __DIR__ . '/../autoload.php', + // local dev repository + __DIR__ . '/../vendor/autoload.php', + // dependency +diff -up ./config/container.php.rpm ./config/container.php +--- ./config/container.php.rpm 2021-09-01 14:26:55.977981605 +0200 ++++ ./config/container.php 2021-09-01 14:28:03.693829040 +0200 +@@ -16,7 +16,8 @@ use Symfony\Component\Messenger\Dependen + $containerBuilder = new ContainerBuilder(); + $containerBuilder->addCompilerPass(new MessengerPass()); + +-$loader = new PhpFileLoader($containerBuilder, new FileLocator('./config/set')); ++$loader = new PhpFileLoader($containerBuilder, new FileLocator('config/set')); ++$loader = new PhpFileLoader($containerBuilder, new FileLocator(__DIR__ . '/set')); + $loader->load('default.php'); + + $containerBuilder->compile(); +diff -up ./config/set/default.php.rpm ./config/set/default.php +--- ./config/set/default.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./config/set/default.php 2021-09-01 14:26:55.977981605 +0200 +@@ -72,7 +72,10 @@ return static function (ContainerConfigu + ; + } + +- $services->load('Bartlett\CompatInfoDb\\', __DIR__ . '/../../src'); ++ $services->load('Bartlett\CompatInfoDb\\Application\\', __DIR__ . '/../../Application'); ++ $services->load('Bartlett\CompatInfoDb\\Domain\\', __DIR__ . '/../../Domain'); ++ $services->load('Bartlett\CompatInfoDb\\Infrastructure\\', __DIR__ . '/../../Infrastructure'); ++ $services->load('Bartlett\CompatInfoDb\\Presentation\\', __DIR__ . '/../../Presentation'); + + $services->set(JsonFileHandler::class); + $services->set(VersionParser::class); +@@ -90,7 +93,7 @@ return static function (ContainerConfigu + + $dbUrl = getenv('DATABASE_URL'); + if (false === $dbUrl) { +- $dbUrl = 'sqlite:///${HOME}/.cache/bartlett/compatinfo-db.sqlite'; ++ $dbUrl = 'sqlite:////usr/share/php-bartlett-php-compatinfo-db/compatinfo.sqlite'; + putenv('DATABASE_URL=' . $dbUrl); + } + $connectionParams = ['url' => $dbUrl]; +diff -up ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php +--- ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php 2021-09-01 14:26:55.977981605 +0200 +@@ -31,6 +31,9 @@ final class EntityManagerFactory + public static function create(array $connection, bool $isDevMode, string $proxyDir, ?Cache $cache = null): EntityManagerInterface + { + $paths = [implode(DIRECTORY_SEPARATOR, [__DIR__, 'Entity'])]; ++ // Static files in RPM mode ++ $isDevMode = false; ++ $proxyDir = dirname(__DIR__, 3) . '/proxies'; + $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode, $proxyDir, $cache); + if ($isDevMode) { + // suggested for DEV mode: see Doctrine ORM documentation +@@ -38,7 +41,7 @@ final class EntityManagerFactory + $config->setAutogenerateProxyClasses(AbstractProxyFactory::AUTOGENERATE_ALWAYS); + } else { + // lazy generation on PROD or TEST modes (i.e: CI) +- $config->setAutogenerateProxyClasses(AbstractProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS); ++ $config->setAutogenerateProxyClasses(AbstractProxyFactory::AUTOGENERATE_NEVER); + } + + return EntityManager::create(self::connection($connection), $config); +diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php +--- ./src/Presentation/Console/Application.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./src/Presentation/Console/Application.php 2021-09-01 14:26:55.977981605 +0200 +@@ -14,8 +14,6 @@ + + namespace Bartlett\CompatInfoDb\Presentation\Console; + +-use PackageVersions\Versions; +- + use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException; + use Symfony\Component\Config\FileLocator; + use Symfony\Component\Console\Application as SymfonyApplication; +@@ -53,20 +51,7 @@ class Application extends SymfonyApplica + */ + public function __construct(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); + } + +diff -up ./tests/Reference/GenericTest.php.rpm ./tests/Reference/GenericTest.php +--- ./tests/Reference/GenericTest.php.rpm 2021-08-28 08:31:31.000000000 +0200 ++++ ./tests/Reference/GenericTest.php 2021-09-01 14:26:55.977981605 +0200 +@@ -104,7 +104,7 @@ abstract class GenericTest extends TestC + */ + public static function setUpBeforeClass(): void + { +- $container = require implode(DIRECTORY_SEPARATOR, [dirname(__DIR__, 2), 'config', 'container.php']); ++ $container = require implode(DIRECTORY_SEPARATOR, [dirname(__DIR__, 2), 'src', 'config', 'container.php']); + + self::$optionalreleases = []; + -- cgit