update to 2.8.1

raise dependency on PHP 7.2
raise dependency on doctrine/annotations 1.11.1
raise dependency on doctrine/common 3.0
raise dependency on doctrine/dbal 2.10
raise dependency on doctrine/inflector 1.4 and allow 2.0
raise dependency on doctrine/persistence 2.0
switch to phpunit9

2 files changed, 53 insertions, 40 deletions

diff --git a/composer.json b/composer.json
index 069d19f..1e5ddef 100644
--- a/composer.json
+++ b/composer.json
@@ -13,33 +13,30 @@
         {"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
     ],
     "config": {
-        "platform": {
-            "php": "7.1.3"
-        },
         "sort-packages": true
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.2|^8.0",
         "ext-pdo": "*",
         "composer/package-versions-deprecated": "^1.8",
-        "doctrine/annotations": "^1.8",
+        "doctrine/annotations": "^1.11.1",
         "doctrine/cache": "^1.9.1",
         "doctrine/collections": "^1.5",
-        "doctrine/common": "^2.11 || ^3.0",
-        "doctrine/dbal": "^2.9.3",
+        "doctrine/common": "^3.0",
+        "doctrine/dbal": "^2.10.0",
         "doctrine/event-manager": "^1.1",
-        "doctrine/inflector": "^1.0",
+        "doctrine/inflector": "^1.4|^2.0",
         "doctrine/instantiator": "^1.3",
         "doctrine/lexer": "^1.0",
-        "doctrine/persistence": "^1.3.3 || ^2.0",
+        "doctrine/persistence": "^2.0",
         "symfony/console": "^3.0|^4.0|^5.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^5.0",
+        "doctrine/coding-standard": "^8.0",
         "phpstan/phpstan": "^0.12.18",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.5|^9.4",
         "symfony/yaml": "^3.4|^4.0|^5.0",
-        "vimeo/psalm": "^3.11"
+        "vimeo/psalm": "4.1.1"
     },
     "suggest": {
         "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index 84e5633..22be8fb 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -13,16 +13,16 @@
 
 %global github_owner     doctrine
 %global github_name      orm
-%global github_version   2.7.4
-%global github_commit    7d84a4998091ece4d645253ac65de9f879eeed2f
+%global github_version   2.8.1
+%global github_commit    242cf1a33df1b8bc5e1b86c3ebd01db07851c833
 
 %global composer_vendor  doctrine
 %global composer_project orm
 
-# "php": "^7.1"
-%global php_min_ver 7.1
-# "doctrine/annotations": "^1.8",
-%global annotations_min_ver 1.8
+# "php": "^7.2|^8.0"
+%global php_min_ver 7.2
+# "doctrine/annotations": "^1.11.1",
+%global annotations_min_ver 1.11.1
 %global annotations_max_ver 2
 # "doctrine/cache": "^1.9.1"
 %global cache_min_ver 1.9.1
@@ -30,23 +30,23 @@
 # "doctrine/collections": "^1.5"
 %global collections_min_ver 1.5
 %global collections_max_ver 2
-# "doctrine/common": "^2.11 || ^3.0"
-%global common_min_ver 2.11
+# "doctrine/common": "^3.0"
+%global common_min_ver 3.0
 %global common_max_ver 4
-# "doctrine/dbal": "^2.9.3"
-%global dbal_min_ver 2.9.3
+# "doctrine/dbal": "^2.10"
+%global dbal_min_ver 2.10
 %global dbal_max_ver 3
-# "doctrine/inflector": "^1.0"
-%global inflector_min_ver 1.0
-%global inflector_max_ver 2
+# "doctrine/inflector": "^1.4|^2.0"
+%global inflector_min_ver 1.4
+%global inflector_max_ver 3
 # "doctrine/instantiator": "^1.3"
 %global instantiator_min_ver 1.3
 %global instantiator_max_ver 2
 # "doctrine/lexer": "^1.0"
 %global lexer_min_ver 1.0
 %global lexer_max_ver 2
-# "doctrine/persistence": "^1.3.3 || ^2.0"
-%global persistence_min_ver 1.3.3
+# "doctrine/persistence": "^2.0"
+%global persistence_min_ver 2.0
 %global persistence_max_ver 3
 # "doctrine/event-manager": "^1.1"
 %global event_min_ver 1.1
@@ -126,7 +126,13 @@ BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/yaml) <  %{symfony_max_ver}
 BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver}
 %endif
-BuildRequires: phpunit7 >= 7.5
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%global phpunit %{_bindir}/phpunit9
+BuildRequires: phpunit9 >= 9.4
+%else
+%global phpunit %{_bindir}/phpunit8
+BuildRequires: phpunit8 >= 8.5
+%endif
 BuildRequires: php-pdo
 # phpcompatinfo (computed from version 2.5.11)
 BuildRequires: php-ctype
@@ -259,19 +265,16 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required([
-    [
-        '%{phpdir}/Doctrine/Common3/autoload.php',
-        '%{phpdir}/Doctrine/Common/autoload.php',
-    ],
+    '%{phpdir}/Doctrine/Common3/autoload.php',
     '%{phpdir}/Doctrine/Common/Cache/autoload.php',
     '%{phpdir}/Doctrine/Common/Collections/autoload.php',
-    '%{phpdir}/Doctrine/Common/Inflector/autoload.php',
-    '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
-    '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
     [
-        '%{phpdir}/Doctrine/Persistence2/autoload.php',
-        '%{phpdir}/Doctrine/Persistence/autoload.php',
+        '%{phpdir}/Doctrine/Inflector2/autoload.php',
+        '%{phpdir}/Doctrine/Common/Inflector/autoload.php',
     ],
+    '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
+    '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
+    '%{phpdir}/Doctrine/Persistence2/autoload.php',
     '%{phpdir}/Doctrine/DBAL/autoload.php',
     '%{phpdir}/Doctrine/Instantiator/autoload.php',
     [
@@ -322,9 +325,12 @@ BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
-for PHP_EXEC in "" php72 php73 php74; do
-    if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC %{_bindir}/phpunit7 --verbose -d memory_limit="512M" --bootstrap bootstrap.php \
+for CMDARG in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+    if which $CMDARG; then
+        set $CMDARG
+        $1 ${2:-%{_bindir}/phpunit9} \
+            --verbose -d memory_limit="512M" \
+            --bootstrap bootstrap.php \
             || RETURN_CODE=1
     fi
 done
@@ -345,6 +351,16 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 2.8.1-1
+- update to 2.8.1
+- raise dependency on PHP 7.2
+- raise dependency on doctrine/annotations 1.11.1
+- raise dependency on doctrine/common 3.0
+- raise dependency on doctrine/dbal 2.10
+- raise dependency on doctrine/inflector 1.4 and allow 2.0
+- raise dependency on doctrine/persistence 2.0
+- switch to phpunit9
+
 * Mon Oct 12 2020 Remi Collet <remi@remirepo.net> - 2.7.4-1
 - update to 2.7.4