update to 3.10.0

2 files changed, 47 insertions, 44 deletions

diff --git a/php-bartlett-php-compatinfo-db-3.7-rpm.patch b/php-bartlett-php-compatinfo-db-3.10-rpm.patch
index 23997f3..69497ee 100644
--- a/php-bartlett-php-compatinfo-db-3.7-rpm.patch
+++ b/php-bartlett-php-compatinfo-db-3.10-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db
---- ./bin/compatinfo-db.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./bin/compatinfo-db	2021-06-24 13:55:02.768658550 +0200
+--- ./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
@@ -20,8 +20,8 @@ diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db
  /** @var ApplicationInterface $app */
  $app = $container->get(ApplicationInterface::class);
 diff -up ./cli-config.php.rpm ./cli-config.php
---- ./cli-config.php.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./cli-config.php	2021-06-24 13:55:02.768658550 +0200
+--- ./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;
@@ -35,8 +35,8 @@ diff -up ./cli-config.php.rpm ./cli-config.php
  $entityManager = $container->get(EntityManagerInterface::class);
  
 diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php
---- ./config/bootstrap.php.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./config/bootstrap.php	2021-06-24 13:55:02.768658550 +0200
+--- ./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 {
@@ -47,21 +47,22 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php
          __DIR__ . '/../vendor/autoload.php',
          // dependency
 diff -up ./config/container.php.rpm ./config/container.php
---- ./config/container.php.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./config/container.php	2021-06-24 13:55:02.768658550 +0200
-@@ -16,7 +16,7 @@ use Symfony\Component\Messenger\Dependen
+--- ./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('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-06-24 12:31:36.000000000 +0200
-+++ ./config/set/default.php	2021-06-24 13:55:02.768658550 +0200
-@@ -73,7 +73,10 @@ return static function (ContainerConfigu
+--- ./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
          ;
      }
  
@@ -73,7 +74,7 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php
  
      $services->set(JsonFileHandler::class);
      $services->set(VersionParser::class);
-@@ -91,7 +94,7 @@ return static function (ContainerConfigu
+@@ -90,7 +93,7 @@ return static function (ContainerConfigu
  
      $dbUrl = getenv('DATABASE_URL');
      if (false === $dbUrl) {
@@ -82,9 +83,31 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php
          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-06-24 12:31:36.000000000 +0200
-+++ ./src/Presentation/Console/Application.php	2021-06-24 13:55:02.768658550 +0200
+--- ./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;
@@ -117,8 +140,8 @@ diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Conso
      }
  
 diff -up ./tests/Reference/GenericTest.php.rpm ./tests/Reference/GenericTest.php
---- ./tests/Reference/GenericTest.php.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./tests/Reference/GenericTest.php	2021-06-24 13:55:02.768658550 +0200
+--- ./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
@@ -128,26 +151,3 @@ diff -up ./tests/Reference/GenericTest.php.rpm ./tests/Reference/GenericTest.php
  
          self::$optionalreleases = [];
  
-diff -up ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php
---- ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php.rpm	2021-06-24 12:31:36.000000000 +0200
-+++ ./src/Infrastructure/Persistence/Doctrine/EntityManagerFactory.php	2021-06-24 13:56:40.350353276 +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 --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index b8270be..c51ca81 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    06576c588c8ac4121fa3ddaa751f712f80f0f74d
+%global gh_commit    bd790b6587f527fb12c25751b4cd171fd43d09a0
 %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.9.0
+%global upstream_version  3.10.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.7-rpm.patch
+Patch0:         %{name}-3.10-rpm.patch
 # CURL_SSLVERSION constants have been backported
 Patch1:         %{name}-curltls.patch
 
@@ -286,6 +286,9 @@ exit $ret
 
 
 %changelog
+* Wed Sep  1 2021 Remi Collet <remi@remirepo.net> - 3.10.0-1
+- update to 3.10.0
+
 * Mon Aug  2 2021 Remi Collet <remi@remirepo.net> - 3.9.0-1
 - update to 3.9.0