update to 2.0.6

add dependency on doctrine/persistence
add dependency on symfony/service-contracts
add build dependency on ocramius/proxy-manager

3 files changed, 44 insertions, 18 deletions

diff --git a/composer.json b/composer.json
index cbdb76b..bed6ef9 100644
--- a/composer.json
+++ b/composer.json
@@ -27,17 +27,20 @@
     "require": {
         "php": "^7.1",
         "doctrine/dbal": "^2.9.0",
+        "doctrine/persistence": "^1.3.3",
         "jdorn/sql-formatter": "^1.2.16",
         "symfony/cache": "^4.3.3|^5.0",
         "symfony/config": "^4.3.3|^5.0",
         "symfony/console": "^3.4.30|^4.3.3|^5.0",
         "symfony/dependency-injection": "^4.3.3|^5.0",
         "symfony/doctrine-bridge": "^4.3.7|^5.0",
-        "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0"
+        "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0",
+        "symfony/service-contracts": "^1.1.1|^2.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^6.0",
         "doctrine/orm": "^2.6",
+        "ocramius/proxy-manager": "^2.1",
         "phpunit/phpunit": "^7.5",
         "symfony/phpunit-bridge": "^4.2",
         "symfony/property-info": "^4.3.3|^5.0",
diff --git a/php-doctrine-doctrine-bundle2-vendor.patch b/php-doctrine-doctrine-bundle2-vendor.patch
index 8903194..2452445 100644
--- a/php-doctrine-doctrine-bundle2-vendor.patch
+++ b/php-doctrine-doctrine-bundle2-vendor.patch
@@ -10,15 +10,4 @@ diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
          $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
  
          $fragmentHandler = $this->getMockBuilder(FragmentHandler::class)->disableOriginalConstructor()->getMock();
-diff -up ./Tests/ServiceRepositoryTest.php.rpm ./Tests/ServiceRepositoryTest.php
---- ./Tests/ServiceRepositoryTest.php.rpm	2019-11-20 14:45:37.000000000 +0100
-+++ ./Tests/ServiceRepositoryTest.php	2019-11-20 15:05:37.038969160 +0100
-@@ -36,7 +36,7 @@ class ServiceRepositoryTest extends Test
-     public function testRepositoryServiceWiring()
-     {
-         // needed for older versions of Doctrine
--        AnnotationRegistry::registerFile(__DIR__ . '/../vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
-+        AnnotationRegistry::registerFile('/usr/share/php/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
- 
-         $container = new ContainerBuilder(new ParameterBag([
-             'kernel.name' => 'app',
+
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 4932dbb..34441fb 100644
--- a/php-doctrine-doctrine-bundle2.spec
+++ b/php-doctrine-doctrine-bundle2.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-doctrine-doctrine-bundle2
 #
-# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
 #                         Remi Collet <remi@fedoraproject.org>
 #
 # License: MIT
@@ -13,8 +13,8 @@
 
 %global github_owner     doctrine
 %global github_name      DoctrineBundle
-%global github_version   2.0.2
-%global github_commit    f96fac225563f5b3b4eeb2f80eb982b7f56484d8
+%global github_version   2.0.6
+%global github_commit    0ef972d3b730f975c80db9fffa4b2a0258c91442
 %global major            2
 
 %global composer_vendor  doctrine
@@ -25,6 +25,9 @@
 # "doctrine/dbal": "^2.9.0"
 %global dbal_min_ver 2.9
 %global dbal_max_ver 3.0
+# "doctrine/persistence": "^1.3.3",
+%global persistence_min_ver 1.3.3
+%global persistence_max_ver 2
 # "doctrine/orm": "~2.6"
 %global orm_min_ver 2.6
 %global orm_max_ver 3.0
@@ -45,6 +48,10 @@
 %global symfony_min_ver 4.3.7
 %global symfony_max_ver 5
 %global symfony_br_ver  %{symfony_min_ver}
+# "symfony/service-contracts": "^1.1.1|^2.0",
+# TODO v2 is not yet packaged
+%global contracts_min_ver 1.1.1
+%global contracts_max_ver 2
 # "twig/twig": "^1.34|^2.12"
 %global twig_min_ver 1.34
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -52,6 +59,9 @@
 %else
 %global twig_max_ver 2
 %endif
+# "ocramius/proxy-manager": "^2.1",
+%global proxy_manager_min_ver 2.1
+%global proxy_manager_max_ver 3
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -80,16 +90,25 @@ BuildRequires: php-theseer-autoload
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:(php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  < %{dbal_max_ver})
 BuildRequires:(php-composer(doctrine/orm)                   >= %{orm_min_ver}           with php-composer(doctrine/orm)                   < %{orm_max_ver})
+BuildRequires:(php-composer(doctrine/persistence)           >= %{persistence_min_ver}   with php-composer(doctrine/persistence)           < %{orm_max_ver})
 BuildRequires:(php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            < %{sql_formatter_max_ver})
+BuildRequires:(php-composer(symfony/service-contracts)      >= %{contracts_min_ver}     with php-composer(symfony/service-contracts)      < %{contracts_max_ver})
+BuildRequires:(php-composer(ocramius/proxy-manager)         >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager)         < %{proxy_manager_max_ver})
 BuildRequires:(php-composer(twig/twig)                      >= %{twig_min_ver}          with php-composer(twig/twig)                      < %{twig_max_ver})
-# remirepo:10
+# remirepo:16
 %else
 BuildRequires: php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 BuildRequires: php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
+BuildRequires: php-composer(doctrine/persistence)           <  %{persistence_max_ver}
+BuildRequires: php-composer(doctrine/persistence)           >= %{persistence_min_ver}
 BuildRequires: php-composer(doctrine/orm)                   <  %{orm_max_ver}
 BuildRequires: php-composer(doctrine/orm)                   >= %{orm_min_ver}
 BuildRequires: php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver}
 BuildRequires: php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
+BuildRequires: php-composer(symfony/service-contracts)      <  %{contracts_max_ver}
+BuildRequires: php-composer(symfony/service-contracts)      >= %{contracts_min_ver}
+BuildRequires: php-composer(ocramius/proxy-manager)         <  %{proxy_manager_max_ver}
+BuildRequires: php-composer(ocramius/proxy-manager)         >= %{proxy_manager_min_ver}
 BuildRequires: php-composer(twig/twig)                      <  %{twig_max_ver}
 BuildRequires: php-composer(twig/twig)                      >= %{twig_min_ver}
 %endif
@@ -122,17 +141,21 @@ Requires:      php(language)                                >= %{php_min_ver}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:     (php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  <  %{dbal_max_ver})
+Requires:     (php-composer(doctrine/persistence)           >= %{persistence_min_ver}   with php-composer(doctrine/persistence)           < %{orm_max_ver})
 Requires:     (php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver})
 Requires:     (php-composer(symfony/cache)                  >= %{symfony_min_ver}       with php-composer(symfony/cache)                  <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/config)                 >= %{symfony_min_ver}       with php-composer(symfony/config)                 <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/console)                >= %{symfony_min_ver}       with php-composer(symfony/console)                <  %{symfony_max_ver})
+Requires:     (php-composer(symfony/service-contracts)      >= %{contracts_min_ver}     with php-composer(symfony/service-contracts)      < %{contracts_max_ver})
 Requires:     (php-composer(symfony/dependency-injection)   >= %{symfony_min_ver}       with php-composer(symfony/dependency-injection)   <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/doctrine-bridge)        >= %{symfony_min_ver}       with php-composer(symfony/doctrine-bridge)        <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/framework-bundle)       >= %{symfony_min_ver}       with php-composer(symfony/framework-bundle)       <  %{symfony_max_ver})
-# remirepo:18
+# remirepo:22
 %else
 Requires:      php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 Requires:      php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
+Requires:      php-composer(doctrine/persistence)           <  %{persistence_max_ver}
+Requires:      php-composer(doctrine/persistence)           >= %{persistence_min_ver}
 Requires:      php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
 Requires:      php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver}
 Requires:      php-composer(symfony/cache)                  >= %{symfony_min_ver}
@@ -141,6 +164,8 @@ Requires:      php-composer(symfony/config)                 >= %{symfony_min_ver
 Requires:      php-composer(symfony/config)                 <  %{symfony_max_ver}
 Requires:      php-composer(symfony/console)                >= %{symfony_min_ver}
 Requires:      php-composer(symfony/console)                <  %{symfony_max_ver}
+Requires:      php-composer(symfony/service-contracts)      <  %{contracts_max_ver}
+Requires:      php-composer(symfony/service-contracts)      >= %{contracts_min_ver}
 Requires:      php-composer(symfony/dependency-injection)   >= %{symfony_min_ver}
 Requires:      php-composer(symfony/dependency-injection)   <  %{symfony_max_ver}
 Requires:      php-composer(symfony/doctrine-bridge)        >= %{symfony_min_ver}
@@ -201,7 +226,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/DBAL/autoload.php',
+    '%{phpdir}/Doctrine/Persistence/autoload.php',
     '%{phpdir}/jdorn-sql-formatter/autoload.php',
+    '%{phpdir}/Symfony/Contracts/autoload.php',
     [
         '%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
         '%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php',
@@ -250,6 +277,7 @@ require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle%{major}/autoload.p
     '%{phpdir}/Symfony4/Component/Validator/autoload.php',
     '%{phpdir}/Symfony4/Component/Yaml/autoload.php',
     '%{phpdir}/Symfony4/Bridge/Twig/autoload.php',
+    '%{phpdir}/ProxyManager/autoload.php',
 ]);
 EOF
 
@@ -283,6 +311,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 2.0.6-1
+- update to 2.0.6
+- add dependency on doctrine/persistence
+- add dependency on symfony/service-contracts
+- add build dependency on ocramius/proxy-manager
+
 * Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 2.0.2-1
 - update to 2.0.2
 - add dependency on symfony/cache