From a793fd73c77b82c5baeee33eb0c36a91685c4426 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 25 May 2021 11:52:41 +0200
Subject: update to 2.9.1 lower dependency on PHP 7.1 raise dependency on
 doctrine/annotations 1.13 raise dependency on doctrine/cache 1.11 and allow
 v2 raise dependency on doctrine/dbal 2.13 add dependency on
 doctrine/deprecations add dependency on psr/cache add build dependency on
 symfony/cache

---
 php-doctrine-orm-version.patch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'php-doctrine-orm-version.patch')

diff --git a/php-doctrine-orm-version.patch b/php-doctrine-orm-version.patch
index 471edd8..900d653 100644
--- a/php-doctrine-orm-version.patch
+++ b/php-doctrine-orm-version.patch
@@ -1,35 +1,35 @@
-diff -up ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
---- ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm	2021-02-24 11:46:38.401567397 +0100
-+++ ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php	2021-02-24 11:48:56.874107710 +0100
-@@ -24,7 +24,6 @@ use Doctrine\DBAL\Tools\Console as DBALC
- use Doctrine\ORM\EntityManagerInterface;
+diff -up ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm2 ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
+--- ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm2	2021-05-25 11:43:30.755931291 +0200
++++ ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php	2021-05-25 11:43:41.408887703 +0200
+@@ -26,7 +26,6 @@ use Doctrine\ORM\Tools\Console\EntityMan
+ use Doctrine\ORM\Tools\Console\EntityManagerProvider\HelperSetManagerProvider;
  use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
  use OutOfBoundsException;
 -use PackageVersions\Versions;
  use Symfony\Component\Console\Application;
  use Symfony\Component\Console\Command\Command as SymfonyCommand;
  use Symfony\Component\Console\Helper\HelperSet;
-@@ -68,7 +67,7 @@ final class ConsoleRunner
+@@ -72,7 +71,7 @@ final class ConsoleRunner
       */
-     public static function createApplication(HelperSet $helperSet, array $commands = []): Application
+     public static function createApplication($helperSetOrProvider, array $commands = []): Application
      {
 -        $cli = new Application('Doctrine Command Line Interface', Versions::getVersion('doctrine/orm'));
 +        $cli = new Application('Doctrine Command Line Interface', '@VERSION@');
          $cli->setCatchExceptions(true);
-         $cli->setHelperSet($helperSet);
-         self::addCommands($cli);
-diff -up ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php
---- ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm	2021-02-24 11:42:32.000000000 +0100
-+++ ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php	2021-02-24 11:46:38.402567394 +0100
-@@ -6,7 +6,6 @@ namespace Doctrine\Tests\ORM\Tools\Conso
  
+         if ($helperSetOrProvider instanceof HelperSet) {
+diff -up ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm2 ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php
+--- ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm2	2021-05-25 11:22:59.000000000 +0200
++++ ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php	2021-05-25 11:43:50.620850013 +0200
+@@ -8,7 +8,6 @@ use Doctrine\Deprecations\PHPUnit\Verify
  use Doctrine\ORM\Tools\Console\ConsoleRunner;
+ use Doctrine\ORM\Tools\Console\EntityManagerProvider;
  use Doctrine\Tests\DoctrineTestCase;
 -use PackageVersions\Versions;
  use Symfony\Component\Console\Command\Command;
  use Symfony\Component\Console\Helper\HelperSet;
  
-@@ -22,7 +21,7 @@ final class ConsoleRunnerTest extends Do
+@@ -28,7 +27,7 @@ final class ConsoleRunnerTest extends Do
          $app       = ConsoleRunner::createApplication($helperSet);
  
          self::assertSame($helperSet, $app->getHelperSet());
-- 
cgit