update to 1.12.6

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

3 files changed, 54 insertions, 20 deletions

diff --git a/composer.json b/composer.json
index a5b6215..e73d86b 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,11 @@
         "php": "^7.1",
         "doctrine/dbal": "^2.5.12",
         "doctrine/doctrine-cache-bundle": "~1.2",
+        "doctrine/persistence": "^1.3.3",
         "jdorn/sql-formatter": "^1.2.16",
         "symfony/cache": "^3.4.30|^4.3.3",
         "symfony/config": "^3.4.30|^4.3.3",
+        "symfony/service-contracts": "^1.1.1|^2.0",
         "symfony/console": "^3.4.30|^4.3.3",
         "symfony/dependency-injection": "^3.4.30|^4.3.3",
         "symfony/doctrine-bridge": "^3.4.30|^4.3.3",
@@ -39,6 +41,7 @@
     "require-dev": {
         "doctrine/coding-standard": "^6.0",
         "doctrine/orm": "^2.6",
+        "ocramius/proxy-manager": "^2.1",
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpunit": "^7.5",
         "symfony/phpunit-bridge": "^4.2",
diff --git a/php-doctrine-doctrine-bundle-vendor.patch b/php-doctrine-doctrine-bundle-vendor.patch
index 8903194..2452445 100644
--- a/php-doctrine-doctrine-bundle-vendor.patch
+++ b/php-doctrine-doctrine-bundle-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-bundle.spec b/php-doctrine-doctrine-bundle.spec
index 825c2bd..0c0aa3f 100644
--- a/php-doctrine-doctrine-bundle.spec
+++ b/php-doctrine-doctrine-bundle.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     doctrine
 %global github_name      DoctrineBundle
-%global github_version   1.12.1
-%global github_commit    1035bdda574f6beb39468c9a6b6066f5368a6b18
+%global github_version   1.12.6
+%global github_commit    08f944760ac471aa97a9b0386dfdb559db80b32d
 
 %global composer_vendor  doctrine
 %global composer_project doctrine-bundle
@@ -26,6 +26,9 @@
 # "doctrine/doctrine-cache-bundle": "~1.2"
 %global cache_bundle_min_ver 1.2
 %global cache_bundle_max_ver 2.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
@@ -47,6 +50,10 @@
 %global symfony_min_ver 3.4
 %global symfony_max_ver 5
 %global symfony_br_ver 4.3.3
+# "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
@@ -54,6 +61,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}
@@ -83,18 +93,27 @@ BuildRequires: php-theseer-autoload
 BuildRequires:(php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  < %{dbal_max_ver})
 BuildRequires:(php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver}  with php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_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:12
+# remirepo:18
 %else
 BuildRequires: php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 BuildRequires: php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 BuildRequires: php-composer(doctrine/doctrine-cache-bundle) <  %{cache_bundle_max_ver}
 BuildRequires: php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_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
@@ -128,10 +147,12 @@ Requires:      php(language)                                >= %{php_min_ver}
 %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/doctrine-cache-bundle) >= %{cache_bundle_min_ver}  with php-composer(doctrine/doctrine-cache-bundle) <  %{cache_bundle_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})
@@ -141,6 +162,8 @@ Requires:      php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 Requires:      php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 Requires:      php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver}
 Requires:      php-composer(doctrine/doctrine-cache-bundle) <  %{cache_bundle_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}
@@ -149,6 +172,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}
@@ -208,9 +233,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Bundle\\DoctrineBundle\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php',
-    '%{phpdir}/Doctrine/DBAL/autoload.php',
-    '%{phpdir}/jdorn-sql-formatter/autoload.php',
     [
         '%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
         '%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php',
@@ -229,7 +251,13 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     ], [
         '%{phpdir}/Symfony4/Component/DependencyInjection/autoload.php',
         '%{phpdir}/Symfony3/Component/DependencyInjection/autoload.php',
-]]);
+    ],
+    '%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php',
+    '%{phpdir}/Doctrine/DBAL/autoload.php',
+    '%{phpdir}/Doctrine/Persistence/autoload.php',
+    '%{phpdir}/jdorn-sql-formatter/autoload.php',
+    '%{phpdir}/Symfony/Contracts/autoload.php',
+]);
 
 \Fedora\Autoloader\Dependencies::optional([
     '%{phpdir}/Doctrine/ORM/autoload.php',
@@ -255,10 +283,15 @@ phpab -o bs.php Tests/DependencyInjection
 cat << 'EOF' | tee -a bs.php
 require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
+    [
+        '%{phpdir}/Twig2/autoload.php',
+        '%{phpdir}/Twig/autoload.php',
+    ],
     '%{phpdir}/Symfony4/Component/PropertyInfo/autoload.php',
     '%{phpdir}/Symfony4/Component/Validator/autoload.php',
     '%{phpdir}/Symfony4/Component/Yaml/autoload.php',
     '%{phpdir}/Symfony4/Bridge/Twig/autoload.php',
+    '%{phpdir}/ProxyManager/autoload.php',
 ]);
 EOF
 
@@ -269,7 +302,7 @@ RETURN_CODE=0
 for SCL in php php71 php72 php73 php74; do
     if which $SCL; then
         $SCL %{_bindir}/phpunit7 \
-            --filter '^((?!(testBacktraceLogged)).)*$' \
+            --filter '^((?!(testBacktraceLogged|testRender)).)*$' \
             --bootstrap bs.php \
             --verbose || RETURN_CODE=1
     fi
@@ -291,6 +324,15 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 1.12.6-1
+- update to 1.12.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> - 1.12.2-1
+- update to 1.12.2
+
 * Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 1.12.1-1
 - update to 1.12.1
 - add dependency on symfony/cache