update to 3.14.0

2 files changed, 42 insertions, 60 deletions

diff --git a/php-bartlett-php-compatinfo-db-3.10-rpm.patch b/php-bartlett-php-compatinfo-db-3.14-rpm.patch
index 69497ee..c8b30d2 100644
--- a/php-bartlett-php-compatinfo-db-3.10-rpm.patch
+++ b/php-bartlett-php-compatinfo-db-3.14-rpm.patch
@@ -1,6 +1,6 @@
 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
+--- ./bin/compatinfo-db.rpm	2021-11-22 15:36:00.058660775 +0100
++++ ./bin/compatinfo-db	2021-11-22 15:37:05.390347473 +0100
 @@ -4,7 +4,7 @@
  
  gc_disable(); // performance boost
@@ -8,35 +8,12 @@ diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db
 -require_once dirname(__DIR__) . '/config/bootstrap.php';
 +require_once '/usr/share/php/Bartlett/CompatInfoDb/config/bootstrap.php';
  
+ use Bartlett\CompatInfoDb\Infrastructure\Framework\Symfony\DependencyInjection\ContainerFactory;
  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
+--- ./config/bootstrap.php.rpm	2021-11-22 10:58:42.000000000 +0100
++++ ./config/bootstrap.php	2021-11-22 15:36:00.058660775 +0100
 @@ -6,6 +6,8 @@ if (\Phar::running()) {
      ];
  } else {
@@ -46,22 +23,9 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.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
+--- ./config/set/default.php.rpm	2021-11-22 10:58:42.000000000 +0100
++++ ./config/set/default.php	2021-11-22 15:36:00.058660775 +0100
 @@ -72,7 +72,10 @@ return static function (ContainerConfigu
          ;
      }
@@ -83,9 +47,21 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php
          putenv('DATABASE_URL=' . $dbUrl);
      }
      $connectionParams = ['url' => $dbUrl];
+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-11-22 15:39:04.750774992 +0100
++++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php	2021-11-22 15:44:27.715248779 +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();
+         return $containerBuilder;
 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
+--- ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm	2021-11-22 10:58:42.000000000 +0100
++++ ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php	2021-11-22 15:36:00.058660775 +0100
 @@ -31,6 +31,9 @@ final class EntityManagerFactory
      public static function create(array $connection, bool $isDevMode, string $proxyDir, ?Cache $cache = null): EntityManagerInterface
      {
@@ -106,8 +82,8 @@ diff -up ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm
  
          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
+--- ./src/Presentation/Console/Application.php.rpm	2021-11-22 10:58:42.000000000 +0100
++++ ./src/Presentation/Console/Application.php	2021-11-22 15:36:00.058660775 +0100
 @@ -14,8 +14,6 @@
  
  namespace Bartlett\CompatInfoDb\Presentation\Console;
@@ -139,15 +115,15 @@ diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Conso
          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']);
+diff -up ./cli-config.php.rpm ./cli-config.php
+--- ./cli-config.php.rpm	2021-11-22 15:48:52.261030390 +0100
++++ ./cli-config.php	2021-11-22 15:48:54.913018175 +0100
+@@ -5,7 +5,7 @@ use Bartlett\CompatInfoDb\Infrastructure
+ use Doctrine\ORM\EntityManagerInterface;
+ use Doctrine\ORM\Tools\Console\ConsoleRunner;
+ 
+-require_once __DIR__ . '/config/bootstrap.php';
++require_once __DIR__ . '/src/config/bootstrap.php';
  
-         self::$optionalreleases = [];
+ $container = (new ContainerFactory())->create();
  
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index cdcbf17..f264f4b 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 # See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit    01ec6b5c93f7bddb2fcf415d2fbcab9b8f5a7a28
+%global gh_commit    442dcb63237853f6d0f296591b929434019b597d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151031
 %global gh_owner     llaville
@@ -28,7 +28,7 @@
 %bcond_with          im6
 %bcond_with          im7
 
-%global upstream_version  3.12.0
+%global upstream_version  3.14.0
 #global upstream_prever   RC1
 
 Name:           php-%{c_vendor}-%{c_project}
@@ -44,7 +44,7 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 # Fix sqlite database path
 # Fix version and avoir composer/package-versions-deprecated (relying on composer.lock)
 # Set proxy files as static
-Patch0:         %{name}-3.10-rpm.patch
+Patch0:         %{name}-3.14-rpm.patch
 # Backported features affecting test suite
 # - CURL_SSLVERSION constants
 # - Phar::OPENSSL_SHA* constants
@@ -289,6 +289,12 @@ exit $ret
 
 
 %changelog
+* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 3.14.0-1
+- update to 3.14.0
+
+* Tue Nov  2 2021 Remi Collet <remi@remirepo.net> - 3.13.0-1
+- update to 3.13.0
+
 * Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 3.12.0-1
 - update to 3.12.0