- update to 1.12.0

- add dependency on symfony/config
- raise build dependency on Symfony 4.3.3

3 files changed, 76 insertions, 45 deletions

diff --git a/composer.json b/composer.json
index 4e36d0d..9ad06ef 100644
--- a/composer.json
+++ b/composer.json
@@ -25,35 +25,39 @@
     ],
     "require": {
         "php": "^7.1",
-        "symfony/framework-bundle": "^3.4|^4.1",
-        "symfony/config": "^3.4|^4.1",
-        "symfony/console": "^3.4|^4.1",
-        "symfony/dependency-injection": "^3.4|^4.1",
         "doctrine/dbal": "^2.5.12",
+        "doctrine/doctrine-cache-bundle": "~1.2",
         "jdorn/sql-formatter": "^1.2.16",
-        "symfony/doctrine-bridge": "^3.4|^4.1",
-        "doctrine/doctrine-cache-bundle": "~1.2"
+        "symfony/config": "^3.4.30|^4.3.3",
+        "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",
+        "symfony/framework-bundle": "^3.4.30|^4.3.3"
     },
     "require-dev": {
+        "doctrine/coding-standard": "^6.0",
         "doctrine/orm": "^2.6",
-        "symfony/cache": "^3.4|^4.1",
-        "symfony/yaml": "^3.4|^4.1",
-        "symfony/validator": "^3.4|^4.1",
-        "symfony/property-info": "^3.4|^4.1",
-        "symfony/phpunit-bridge": "^4.2",
-        "twig/twig": "^1.34|^2.4",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpunit/phpunit": "7.0",
-        "symfony/web-profiler-bundle": "^3.4|^4.1",
-        "doctrine/coding-standard": "^6.0"
+        "phpunit/phpunit": "^7.5",
+        "symfony/cache": "^3.4.30|^4.3.3",
+        "symfony/phpunit-bridge": "^4.2",
+        "symfony/property-info": "^3.4.30|^4.3.3",
+        "symfony/twig-bridge": "^3.4|^4.1",
+        "symfony/validator": "^3.4.30|^4.3.3",
+        "symfony/web-profiler-bundle": "^3.4.30|^4.3.3",
+        "symfony/yaml": "^3.4.30|^4.3.3",
+        "twig/twig": "^1.34|^2.12"
+    },
+    "config": {
+        "sort-packages": true
     },
     "conflict": {
         "doctrine/orm": "<2.6",
         "twig/twig": "<1.34|>=2.0,<2.4"
     },
     "suggest": {
-        "symfony/web-profiler-bundle": "To use the data collector.",
-        "doctrine/orm": "The Doctrine ORM integration is optional in the bundle."
+        "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
+        "symfony/web-profiler-bundle": "To use the data collector."
     },
     "autoload": {
         "psr-4": { "Doctrine\\Bundle\\DoctrineBundle\\": "" }
@@ -63,7 +67,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.11.x-dev"
+            "dev-master": "1.12.x-dev"
         }
     }
 }
diff --git a/php-doctrine-doctrine-bundle-vendor.patch b/php-doctrine-doctrine-bundle-vendor.patch
index 7eb2638..8903194 100644
--- a/php-doctrine-doctrine-bundle-vendor.patch
+++ b/php-doctrine-doctrine-bundle-vendor.patch
@@ -1,6 +1,6 @@
 diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
---- ./Tests/ProfilerTest.php.rpm	2019-05-13 08:27:20.088593657 +0200
-+++ ./Tests/ProfilerTest.php	2019-05-13 08:27:53.090782715 +0200
+--- ./Tests/ProfilerTest.php.rpm	2019-11-20 15:05:37.038969160 +0100
++++ ./Tests/ProfilerTest.php	2019-11-20 15:07:34.760380533 +0100
 @@ -41,7 +41,7 @@ class ProfilerTest extends BaseTestCase
          $this->collector->addLogger('foo', $this->logger);
  
@@ -9,11 +9,11 @@ diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
 +        $twigLoaderFilesystem->addPath('/usr/share/php/Symfony4/Bundle/WebProfilerBundle/Resources/views', 'WebProfiler');
          $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
  
-         $this->twig->addExtension(new CodeExtension('', '', ''));
+         $fragmentHandler = $this->getMockBuilder(FragmentHandler::class)->disableOriginalConstructor()->getMock();
 diff -up ./Tests/ServiceRepositoryTest.php.rpm ./Tests/ServiceRepositoryTest.php
---- ./Tests/ServiceRepositoryTest.php.rpm	2019-05-13 08:11:25.000000000 +0200
-+++ ./Tests/ServiceRepositoryTest.php	2019-05-13 08:27:20.089593662 +0200
-@@ -35,7 +35,7 @@ class ServiceRepositoryTest extends Test
+--- ./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
diff --git a/php-doctrine-doctrine-bundle.spec b/php-doctrine-doctrine-bundle.spec
index 9d99004..63f21aa 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.11.2
-%global github_commit    28101e20776d8fa20a00b54947fbae2db0d09103
+%global github_version   1.12.0
+%global github_commit    a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115
 
 %global composer_vendor  doctrine
 %global composer_project doctrine-bundle
@@ -32,17 +32,21 @@
 # "jdorn/sql-formatter": "^1.2.16"
 %global sql_formatter_min_ver 1.2.16
 %global sql_formatter_max_ver 2.0
-# "symfony/console": "^3.4|^4.1"
-# "symfony/dependency-injection": "^3.4|^4.1"
-# "symfony/doctrine-bridge": "^3.4|^4.1"
-# "symfony/framework-bundle": "~^3.4|^4.1"
-# "symfony/property-info": "^3.4|^4.1"
-# "symfony/validator": "^3.4|^4.1"
-# "symfony/yaml": "^3.4|^4.1"
-# "symfony/web-profiler-bundle": "^3.4|^4.1"
+# "symfony/config": "^3.4.30|^4.3.3",
+# "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"
+# "symfony/framework-bundle": "^3.4.30|^4.3.3"
+# "symfony/cache": "^3.4.30|^4.3.3",
+# "symfony/property-info": "^3.4.30|^4.3.3"
+# "symfony/twig-bridge": "^3.4|^4.1",
+# "symfony/validator": "^3.4.30|^4.3.3"
+# "symfony/web-profiler-bundle": "^3.4.30|^4.3.3"
+# "symfony/yaml": "^3.4.30|^4.3.3"
 %global symfony_min_ver 3.4
 %global symfony_max_ver 5
-# "twig/twig": "~1.34|~2.4"
+%global symfony_br_ver 4.3.3
+# "twig/twig": "~1.34|~2.12"
 %global twig_min_ver 1.34
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global twig_max_ver 3
@@ -94,15 +98,20 @@ BuildRequires: php-composer(twig/twig)                      <  %{twig_max_ver}
 BuildRequires: php-composer(twig/twig)                      >= %{twig_min_ver}
 %endif
 # ensure same version of all components is used
-BuildRequires: php-symfony4-console
-BuildRequires: php-symfony4-dependency-injection
-BuildRequires: php-symfony4-doctrine-bridge
-BuildRequires: php-symfony4-framework-bundle
-BuildRequires: php-symfony4-property-info
-BuildRequires: php-symfony4-validator
-BuildRequires: php-symfony4-yaml
-BuildRequires: php-symfony4-web-profiler-bundle
-BuildRequires: phpunit7
+# "require"
+BuildRequires: php-symfony4-config                >= %{symfony_br_ver}
+BuildRequires: php-symfony4-console               >= %{symfony_br_ver}
+BuildRequires: php-symfony4-dependency-injection  >= %{symfony_br_ver}
+BuildRequires: php-symfony4-doctrine-bridge       >= %{symfony_br_ver}
+BuildRequires: php-symfony4-framework-bundle      >= %{symfony_br_ver}
+# "require-dev"
+BuildRequires: php-symfony4-cache                 >= %{symfony_br_ver}
+BuildRequires: php-symfony4-property-info         >= %{symfony_br_ver}
+BuildRequires: php-symfony4-twig-bridge           >= %{symfony_br_ver}
+BuildRequires: php-symfony4-validator             >= %{symfony_br_ver}
+BuildRequires: php-symfony4-web-profiler-bundle   >= %{symfony_br_ver}
+BuildRequires: php-symfony4-yaml                  >= %{symfony_br_ver}
+BuildRequires: phpunit7 >= 7.5
 ## phpcompatinfo (computed from version 1.11.0)
 BuildRequires: php-dom
 BuildRequires: php-pcre
@@ -119,11 +128,12 @@ Requires:      php(language)                                >= %{php_min_ver}
 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(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            <  %{sql_formatter_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/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:16
+# remirepo:18
 %else
 Requires:      php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 Requires:      php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
@@ -131,6 +141,8 @@ Requires:      php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_mi
 Requires:      php-composer(doctrine/doctrine-cache-bundle) <  %{cache_bundle_max_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/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/dependency-injection)   >= %{symfony_min_ver}
@@ -202,6 +214,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
         '%{phpdir}/Symfony4/Bundle/FrameworkBundle/autoload.php',
         '%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php',
     ], [
+        '%{phpdir}/Symfony4/Component/Config/autoload.php',
+        '%{phpdir}/Symfony3/Component/Config/autoload.php',
+    ], [
         '%{phpdir}/Symfony4/Component/Console/autoload.php',
         '%{phpdir}/Symfony3/Component/Console/autoload.php',
     ], [
@@ -232,6 +247,13 @@ cp -pr * %{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/
 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}/Symfony4/Component/Cache/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',
+]);
 EOF
 
 sed -e '/listener/d' phpunit.xml.dist >phpunit.xml
@@ -263,6 +285,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.12.0-1
+- update to 1.12.0
+- add dependency on symfony/config
+- raise build dependency on Symfony 4.3.3
+
 * Tue Jun  4 2019 Remi Collet <remi@remirepo.net> - 1.11.2-1
 - update to 1.11.2