From 124b43ef1246201ec2e73d4726ef0a9252a9407c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Sep 2020 12:19:51 +0200
Subject: update to 2.11.0 raise dependency on PHP 7.3 switch to phpunit9

---
 composer.json               |  9 ++++-----
 php-doctrine-dbal-bin.patch |  7 ++++---
 php-doctrine-dbal.spec      | 20 +++++++++++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 0c61fc4..e3c2668 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "ext-pdo": "*",
         "doctrine/cache": "^1.0",
         "doctrine/event-manager": "^1.0"
@@ -42,7 +42,7 @@
         "jetbrains/phpstorm-stubs": "^2019.1",
         "nikic/php-parser": "^4.4",
         "phpstan/phpstan": "^0.12.40",
-        "phpunit/phpunit": "^8.5.5",
+        "phpunit/phpunit": "^9.3",
         "psalm/plugin-phpunit": "^0.10.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
         "vimeo/psalm": "^3.14.2"
@@ -54,7 +54,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "7.2.0"
+            "php": "7.3.0"
         }
     },
     "autoload": {
@@ -65,8 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.10.x-dev",
-            "dev-develop": "3.0.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     }
 }
diff --git a/php-doctrine-dbal-bin.patch b/php-doctrine-dbal-bin.patch
index abb302e..2d1269f 100644
--- a/php-doctrine-dbal-bin.patch
+++ b/php-doctrine-dbal-bin.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php
---- ./bin/doctrine-dbal.php.rpm	2018-12-10 15:16:50.314834508 +0100
-+++ ./bin/doctrine-dbal.php	2018-12-10 15:16:54.519857316 +0100
-@@ -1,26 +1,21 @@
+--- ./bin/doctrine-dbal.php.rpm	2020-09-21 12:14:14.995837618 +0200
++++ ./bin/doctrine-dbal.php	2020-09-21 12:16:37.888455856 +0200
+@@ -1,27 +1,22 @@
 +#!/usr/bin/env php
  <?php
  
@@ -13,6 +13,7 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php
 +$classLoaderSymfony = new \Doctrine\Common\ClassLoader('Symfony');
 +$classLoaderSymfony->register();
 +
+ use Doctrine\DBAL\Tools\Console\ConnectionProvider;
  use Doctrine\DBAL\Tools\Console\ConsoleRunner;
  use Symfony\Component\Console\Helper\HelperSet;
  
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
index 9ccf4db..b5317e0 100644
--- a/php-doctrine-dbal.spec
+++ b/php-doctrine-dbal.spec
@@ -13,14 +13,14 @@
 
 %global github_owner     doctrine
 %global github_name      dbal
-%global github_version   2.10.4
-%global github_commit    47433196b6390d14409a33885ee42b6208160643
+%global github_version   2.11.0
+%global github_commit    0d4e1a8b29dd987704842f0465aded378f441dca
 
 %global composer_vendor  doctrine
 %global composer_project dbal
 
-# "php": "^7.2"
-%global php_min_ver 7.2
+# "php": "^7.3"
+%global php_min_ver 7.3
 # "doctrine/cache": "^1.0"
 %global doctrine_cache_min_ver 1.0
 %global doctrine_cache_max_ver 2
@@ -56,7 +56,7 @@ Patch0:        %{name}-bin.patch
 BuildArch: noarch
 # Tests
 %if %{with tests}
-BuildRequires: phpunit8 >= 8.5.5
+BuildRequires: phpunit9 >= 9.3
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 # remirepo:1
@@ -193,11 +193,12 @@ require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL/autoload.php';
 BOOTSTRAP
 
 : Upstream tests
+# TODO php 8 (Doctrine\DBAL\Driver\PDOConnection::query() must be compatible with PDO::query)
 RETURN_CODE=0
-for PHP_EXEC in php php72 php73 php74; do
+for PHP_EXEC in php php73 php74; do
     rm -f /tmp/test_nesting.sqlite
     if which $PHP_EXEC; then
-        $PHP_EXEC %{_bindir}/phpunit8 \
+        $PHP_EXEC %{_bindir}/phpunit9 \
             --bootstrap bs.php \
             --verbose || RETURN_CODE=1
     fi
@@ -218,6 +219,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Sep 21 2020 Remi Collet <remi@remirepo.net> - 2.11.0-1
+- update to 2.11.0
+- raise dependency on PHP 7.3
+- switch to phpunit9
+
 * Mon Sep 14 2020 Remi Collet <remi@remirepo.net> - 2.10.4-1
 - update to 2.10.4
 
-- 
cgit