From 97e1ed83fada0e95ea5ed6c732196e308f5be4af Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 18 Jan 2022 12:08:18 +0100
Subject: update to 3.3.0

---
 php-doctrine-dbal3-bin.patch | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'php-doctrine-dbal3-bin.patch')

diff --git a/php-doctrine-dbal3-bin.patch b/php-doctrine-dbal3-bin.patch
index 2d92fcd..7deb6a2 100644
--- a/php-doctrine-dbal3-bin.patch
+++ b/php-doctrine-dbal3-bin.patch
@@ -1,11 +1,14 @@
 diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php
---- ./bin/doctrine-dbal.php.rpm	2021-10-04 09:39:41.000000000 +0200
-+++ ./bin/doctrine-dbal.php	2021-10-04 09:40:19.300550825 +0200
-@@ -1,25 +1,14 @@
+--- ./bin/doctrine-dbal.php.rpm	2022-01-18 12:01:41.339284813 +0100
++++ ./bin/doctrine-dbal.php	2022-01-18 12:03:08.516032174 +0100
+@@ -1,3 +1,4 @@
 +#!/usr/bin/env php
  <?php
  
  use Doctrine\DBAL\Tools\Console\ConsoleRunner;
+@@ -11,24 +12,12 @@ fwrite(
+ 
+ echo PHP_EOL . PHP_EOL;
  
 -$files       = [__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php'];
 -$loader      = null;
@@ -31,22 +34,22 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php
      $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
  
 diff -up ./src/Tools/Console/ConsoleRunner.php.rpm ./src/Tools/Console/ConsoleRunner.php
---- ./src/Tools/Console/ConsoleRunner.php.rpm	2021-10-04 09:39:41.000000000 +0200
-+++ ./src/Tools/Console/ConsoleRunner.php	2021-10-04 09:41:02.034408249 +0200
-@@ -5,7 +5,6 @@ namespace Doctrine\DBAL\Tools\Console;
+--- ./src/Tools/Console/ConsoleRunner.php.rpm	2022-01-18 12:01:41.339284813 +0100
++++ ./src/Tools/Console/ConsoleRunner.php	2022-01-18 12:04:47.473745340 +0100
+@@ -2,7 +2,6 @@
+ 
+ namespace Doctrine\DBAL\Tools\Console;
+ 
+-use Composer\InstalledVersions;
  use Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand;
  use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand;
  use Exception;
--use PackageVersions\Versions;
- use Symfony\Component\Console\Application;
- use Symfony\Component\Console\Command\Command;
- 
-@@ -25,7 +24,7 @@ class ConsoleRunner
+@@ -27,7 +26,7 @@ class ConsoleRunner
       */
      public static function run(ConnectionProvider $connectionProvider, $commands = [])
      {
--        $cli = new Application('Doctrine Command Line Interface', Versions::getVersion('doctrine/dbal'));
-+        $cli = new Application('Doctrine Command Line Interface', '@VERSION@');
+-        $version = InstalledVersions::getVersion('doctrine/dbal');
++        $version = '@VERSION@';
+         assert($version !== null);
  
-         $cli->setCatchExceptions(true);
-         self::addCommands($cli, $connectionProvider);
+         $cli = new Application('Doctrine Command Line Interface', $version);
-- 
cgit