update to 2.9.0

switch to phpunit6
add dependency on doctrine/event-manager
add dependency on doctrine/reflection
add dependency on doctrine/persistence

2 files changed, 63 insertions, 22 deletions

diff --git a/composer.json b/composer.json
index 2b285d5..c3cd736 100644
--- a/composer.json
+++ b/composer.json
@@ -3,25 +3,32 @@
     "type": "library",
     "description": "Common Library for Doctrine projects",
     "keywords": ["collections", "spl", "eventmanager", "annotations", "persistence"],
-    "homepage": "http://www.doctrine-project.org",
+    "homepage": "https://www.doctrine-project.org",
     "license": "MIT",
     "authors": [
         {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
         {"name": "Roman Borschel", "email": "roman@code-factory.org"},
         {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
         {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
+        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"},
+        {"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
     ],
     "require": {
-        "php": "~7.1",
-        "doctrine/inflector": "1.*",
-        "doctrine/cache": "1.*",
-        "doctrine/collections": "1.*",
-        "doctrine/lexer": "1.*",
-        "doctrine/annotations": "1.*"
+        "php": "^7.1",
+        "doctrine/inflector": "^1.0",
+        "doctrine/cache": "^1.0",
+        "doctrine/collections": "^1.0",
+        "doctrine/lexer": "^1.0",
+        "doctrine/annotations": "^1.0",
+        "doctrine/event-manager": "^1.0",
+        "doctrine/reflection": "^1.0",
+        "doctrine/persistence": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^6.3",
+        "doctrine/coding-standard": "^1.0",
+        "squizlabs/php_codesniffer": "^3.0",
+        "symfony/phpunit-bridge": "^4.0.5"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8.x-dev"
+            "dev-master": "2.9.x-dev"
         }
     }
 }
diff --git a/php-doctrine-common.spec b/php-doctrine-common.spec
index baa21fd..201fb05 100644
--- a/php-doctrine-common.spec
+++ b/php-doctrine-common.spec
@@ -12,34 +12,43 @@
 
 %global github_owner     doctrine
 %global github_name      common
-%global github_version   2.8.1
-%global github_commit    f68c297ce6455e8fd794aa8ffaf9fa458f6ade66
+%global github_version   2.9.0
+%global github_commit    a210246d286c77d2b89040f8691ba7b3a713d2c1
 
 %global composer_vendor  doctrine
 %global composer_project common
 
 # "php": "~7.1"
 %global php_min_ver 7.1
-# "doctrine/annotations": "1.*"
+# "doctrine/annotations": "^1.0"
 #     NOTE: Min version not 1.0 because autoloader required
 %global doctrine_annotations_min_ver 1.2.6
 %global doctrine_annotations_max_ver 2.0
-# "doctrine/cache": "1.*"
+# "doctrine/cache": "^1.0"
 #     NOTE: Min version not 1.0 because autoloader required
 %global doctrine_cache_min_ver 1.4.1
 %global doctrine_cache_max_ver 2.0
-# "doctrine/collections": "1.*"
+# "doctrine/collections": "^1.0"
 #     NOTE: Min version not 1.0 because autoloader required
 %global doctrine_collections_min_ver 1.3.0
 %global doctrine_collections_max_ver 2.0
-# "doctrine/inflector": "1.*"
+# "doctrine/inflector": "^1.0"
 #     NOTE: Min version not 1.0 because autoloader required
 %global doctrine_inflector_min_ver 1.0.1
 %global doctrine_inflector_max_ver 2.0
-# "doctrine/lexer": "1.*"
+# "doctrine/lexer": "^1.0"
 #     NOTE: Min version not 1.0 because autoloader required
 %global doctrine_lexer_min_ver 1.0.1
 %global doctrine_lexer_max_ver 2.0
+# "doctrine/event-manager": "^1.0"
+%global doctrine_event_min_ver 1.0
+%global doctrine_event_max_ver 2
+# "doctrine/reflection": "^1.0"
+%global doctrine_refl_min_ver 1.0
+%global doctrine_refl_max_ver 2
+# "doctrine/persistence": "^1.0"
+%global doctrine_pers_min_ver 1.0
+%global doctrine_pers_max_ver 2
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -74,6 +83,9 @@ BuildRequires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with p
 BuildRequires: (php-composer(doctrine/collections) >= %{doctrine_collections_min_ver} with php-composer(doctrine/collections) < %{doctrine_collections_max_ver})
 BuildRequires: (php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver} with php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver})
 BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver})
+BuildRequires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_event_max_ver})
+BuildRequires: (php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver} with php-composer(doctrine/reflection) < %{doctrine_refl_max_ver})
+BuildRequires: (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
 %else
 BuildRequires: php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
 BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
@@ -85,8 +97,14 @@ BuildRequires: php-composer(doctrine/inflector) <  %{doctrine_inflector_max_ver}
 BuildRequires: php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver}
 BuildRequires: php-composer(doctrine/lexer) <  %{doctrine_lexer_max_ver}
 BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
+BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver}
+BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver}
+BuildRequires: php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver}
+BuildRequires: php-composer(doctrine/reflection) < %{doctrine_refl_max_ver}
+BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}
+BuildRequires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}
 %endif
-BuildRequires: php-composer(phpunit/phpunit) >= 5.7
+BuildRequires: phpunit6 >= 6.3
 ## phpcompatinfo (computed from version 2.8.1)
 BuildRequires: php-date
 BuildRequires: php-pcre
@@ -105,6 +123,9 @@ Requires:      (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with p
 Requires:      (php-composer(doctrine/collections) >= %{doctrine_collections_min_ver} with php-composer(doctrine/collections) < %{doctrine_collections_max_ver})
 Requires:      (php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver} with php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver})
 Requires:      (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver})
+Requires:      (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_event_max_ver})
+Requires:      (php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver} with php-composer(doctrine/reflection) < %{doctrine_refl_max_ver})
+Requires:      (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
 %else
 Requires:      php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
 Requires:      php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
@@ -116,6 +137,12 @@ Requires:      php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver}
 Requires:      php-composer(doctrine/inflector) <  %{doctrine_inflector_max_ver}
 Requires:      php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
 Requires:      php-composer(doctrine/lexer) <  %{doctrine_lexer_max_ver}
+Requires:      php-composer(doctrine/event-manager) < %{doctrine_event_max_ver}
+Requires:      php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver}
+Requires:      php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver}
+Requires:      php-composer(doctrine/reflection) < %{doctrine_refl_max_ver}
+Requires:      php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}
+Requires:      php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}
 %endif
 # phpcompatinfo (computed from version 2.8.1)
 Requires:      php-pcre
@@ -162,6 +189,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     '%{phpdir}/Doctrine/Common/Collections/autoload.php',
     '%{phpdir}/Doctrine/Common/Inflector/autoload.php',
     '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
+    '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
+    '%{phpdir}/Doctrine/Common/Reflection/autoload.php',
+    '%{phpdir}/Doctrine/Common/Persistence/autoload.php',
 ));
 AUTOLOAD
 
@@ -188,10 +218,9 @@ sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/Doctrine/Common/a
 
 : Upstream tests
 RETURN_CODE=0
-PHPUNIT=$(which phpunit)
 for PHP_EXEC in "" php71 php72 php73; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
+        $PHP_EXEC %{_bindir}/phpunit6 --verbose || RETURN_CODE=1
     fi
 done
 exit $RETURN_CODE
@@ -207,13 +236,18 @@ exit $RETURN_CODE
 %doc UPGRADE*
 %doc composer.json
 %{phpdir}/Doctrine/Common/*.php
-%{phpdir}/Doctrine/Common/Persistence
 %{phpdir}/Doctrine/Common/Proxy
-%{phpdir}/Doctrine/Common/Reflection
 %{phpdir}/Doctrine/Common/Util
 
 
 %changelog
+* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0
+- switch to phpunit6
+- add dependency on doctrine/event-manager
+- add dependency on doctrine/reflection
+- add dependency on doctrine/persistence
+
 * Wed Oct 17 2018 Remi Collet <remi@remirepo.net> - 2.8.1-1
 - update to 2.8.1
 - raise dependency on PHP 7.1