- update to 1.11.0

- raise dependency on PHP 7.1
- raise dependency on symfony 3.4
- use phpunit7

4 files changed, 77 insertions, 50 deletions

diff --git a/composer.json b/composer.json
index 86e04d7..4e36d0d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,28 +24,32 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|^7.0",
-        "symfony/framework-bundle": "^2.7.22|~3.0|~4.0",
-        "symfony/console": "~2.7|~3.0|~4.0",
-        "symfony/dependency-injection": "~2.7|~3.0|~4.0",
+        "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",
         "jdorn/sql-formatter": "^1.2.16",
-        "symfony/doctrine-bridge": "~2.7|~3.0|~4.0",
+        "symfony/doctrine-bridge": "^3.4|^4.1",
         "doctrine/doctrine-cache-bundle": "~1.2"
     },
     "require-dev": {
-        "doctrine/orm": "~2.4",
-        "symfony/yaml": "~2.7|~3.0|~4.0",
-        "symfony/validator": "~2.7|~3.0|~4.0",
-        "symfony/property-info": "~2.8|~3.0|~4.0",
-        "symfony/phpunit-bridge": "~2.7|~3.0|~4.0",
-        "twig/twig": "~1.26|~2.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": "^4.8.36|^5.7|^6.4",
-        "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0"
+        "phpunit/phpunit": "7.0",
+        "symfony/web-profiler-bundle": "^3.4|^4.1",
+        "doctrine/coding-standard": "^6.0"
     },
     "conflict": {
-        "symfony/http-foundation": "<2.6"
+        "doctrine/orm": "<2.6",
+        "twig/twig": "<1.34|>=2.0,<2.4"
     },
     "suggest": {
         "symfony/web-profiler-bundle": "To use the data collector.",
@@ -59,7 +63,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.9.x-dev"
+            "dev-master": "1.11.x-dev"
         }
     }
 }
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..d58b604
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-doctrine-doctrine-bundle-get-source.sh
\ No newline at end of file
diff --git a/php-doctrine-doctrine-bundle-vendor.patch b/php-doctrine-doctrine-bundle-vendor.patch
index d3c9e13..7eb2638 100644
--- a/php-doctrine-doctrine-bundle-vendor.patch
+++ b/php-doctrine-doctrine-bundle-vendor.patch
@@ -1,19 +1,19 @@
 diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
---- ./Tests/ProfilerTest.php.rpm	2019-01-08 08:34:53.547673232 +0100
-+++ ./Tests/ProfilerTest.php	2019-01-08 08:35:26.067868176 +0100
-@@ -42,7 +42,7 @@ class ProfilerTest extends BaseTestCase
+--- ./Tests/ProfilerTest.php.rpm	2019-05-13 08:27:20.088593657 +0200
++++ ./Tests/ProfilerTest.php	2019-05-13 08:27:53.090782715 +0200
+@@ -41,7 +41,7 @@ class ProfilerTest extends BaseTestCase
          $this->collector->addLogger('foo', $this->logger);
  
-         $twigLoaderFilesystem = new Twig_Loader_Filesystem(__DIR__ . '/../Resources/views/Collector');
+         $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../Resources/views/Collector');
 -        $twigLoaderFilesystem->addPath(__DIR__ . '/../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler');
 +        $twigLoaderFilesystem->addPath('/usr/share/php/Symfony4/Bundle/WebProfilerBundle/Resources/views', 'WebProfiler');
-         $this->twig = new Twig_Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
+         $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
  
          $this->twig->addExtension(new CodeExtension('', '', ''));
 diff -up ./Tests/ServiceRepositoryTest.php.rpm ./Tests/ServiceRepositoryTest.php
---- ./Tests/ServiceRepositoryTest.php.rpm	2019-01-08 08:31:26.000000000 +0100
-+++ ./Tests/ServiceRepositoryTest.php	2019-01-08 08:34:53.547673232 +0100
-@@ -36,7 +36,7 @@ class ServiceRepositoryTest extends Test
+--- ./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
      public function testRepositoryServiceWiring()
      {
          // needed for older versions of Doctrine
diff --git a/php-doctrine-doctrine-bundle.spec b/php-doctrine-doctrine-bundle.spec
index da9e266..48c91a1 100644
--- a/php-doctrine-doctrine-bundle.spec
+++ b/php-doctrine-doctrine-bundle.spec
@@ -12,38 +12,38 @@
 
 %global github_owner     doctrine
 %global github_name      DoctrineBundle
-%global github_version   1.10.2
-%global github_commit    1f99e6645030542079c57d4680601a4a8778a1bd
+%global github_version   1.11.0
+%global github_commit    6e15d2d9a8f90c0f9b5664b0db92686ff14fcd7d
 
 %global composer_vendor  doctrine
 %global composer_project doctrine-bundle
 
-# "php": "^5.5.9|^7.0"
-%global php_min_ver 5.5.9
+# "php": "^7.1"
+%global php_min_ver 7.1
 # "doctrine/dbal": "^2.5.12"
 %global dbal_min_ver 2.5.12
 %global dbal_max_ver 3.0
 # "doctrine/doctrine-cache-bundle": "~1.2"
 %global cache_bundle_min_ver 1.2
 %global cache_bundle_max_ver 2.0
-# "doctrine/orm": "~2.4"
-%global orm_min_ver 2.4
+# "doctrine/orm": "~2.6"
+%global orm_min_ver 2.6
 %global orm_max_ver 3.0
 # "jdorn/sql-formatter": "^1.2.16"
 %global sql_formatter_min_ver 1.2.16
 %global sql_formatter_max_ver 2.0
-# "symfony/console": "~2.7|~3.0|~4.0"
-# "symfony/dependency-injection": "~2.7|~3.0|~4.0"
-# "symfony/doctrine-bridge": "~2.7|~3.0|~4.0"
-# "symfony/framework-bundle": "~2.7.22|~3.0|~4.0"
-# "symfony/property-info": "~2.8|~3.0|~4.0"
-# "symfony/validator": "~2.7|~3.0|~4.0"
-# "symfony/yaml": "~2.7|~3.0|~4.0"
-# "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0"
-%global symfony_min_ver 2.8
+# "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"
+%global symfony_min_ver 3.4
 %global symfony_max_ver 5
-# "twig/twig": "~1.26|~2.0"
-%global twig_min_ver 1.26
+# "twig/twig": "~1.34|~2.4"
+%global twig_min_ver 1.34
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global twig_max_ver 3
 %else
@@ -73,12 +73,14 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language)                                >= %{php_min_ver}
 BuildRequires: php-theseer-autoload
+# remirepo:1
 %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/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(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            < %{sql_formatter_max_ver})
 BuildRequires:(php-composer(twig/twig)                      >= %{twig_min_ver}          with php-composer(twig/twig)                      < %{twig_max_ver})
+# remirepo:12
 %else
 BuildRequires: php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 BuildRequires: php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
@@ -88,7 +90,6 @@ 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(phpunit/phpunit)
 BuildRequires: php-composer(twig/twig)                      <  %{twig_max_ver}
 BuildRequires: php-composer(twig/twig)                      >= %{twig_min_ver}
 %endif
@@ -101,8 +102,8 @@ BuildRequires: php-symfony4-property-info
 BuildRequires: php-symfony4-validator
 BuildRequires: php-symfony4-yaml
 BuildRequires: php-symfony4-web-profiler-bundle
-BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 1.6.7)
+BuildRequires: phpunit7
+## phpcompatinfo (computed from version 1.11.0)
 BuildRequires: php-dom
 BuildRequires: php-pcre
 BuildRequires: php-reflection
@@ -113,6 +114,17 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 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/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/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
+%else
 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}
@@ -127,7 +139,8 @@ Requires:      php-composer(symfony/doctrine-bridge)        >= %{symfony_min_ver
 Requires:      php-composer(symfony/doctrine-bridge)        <  %{symfony_max_ver}
 Requires:      php-composer(symfony/framework-bundle)       >= %{symfony_min_ver}
 Requires:      php-composer(symfony/framework-bundle)       <  %{symfony_max_ver}
-# phpcompatinfo (computed from version 1.6.7)
+%endif
+# phpcompatinfo (computed from version 1.11.0)
 Requires:      php-pcre
 Requires:      php-reflection
 Requires:      php-spl
@@ -138,10 +151,12 @@ Requires:      php-composer(fedora/autoloader)
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
 # Weak dependencies
+# remirepo:1
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Suggests:      php-composer(doctrine/orm)
 Suggests:      php-composer(symfony/web-profiler-bundle)
 Suggests:      php-composer(twig/twig)
+# remirepo:1
 %endif
 
 %description
@@ -183,19 +198,15 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     [
         '%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
         '%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php',
-        '%{phpdir}/Symfony/Bridge/Doctrine/autoload.php',
     ], [
         '%{phpdir}/Symfony4/Bundle/FrameworkBundle/autoload.php',
         '%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php',
-        '%{phpdir}/Symfony/Bundle/FrameworkBundle/autoload.php',
     ], [
         '%{phpdir}/Symfony4/Component/Console/autoload.php',
         '%{phpdir}/Symfony3/Component/Console/autoload.php',
-        '%{phpdir}/Symfony/Component/Console/autoload.php',
     ], [
         '%{phpdir}/Symfony4/Component/DependencyInjection/autoload.php',
         '%{phpdir}/Symfony3/Component/DependencyInjection/autoload.php',
-        '%{phpdir}/Symfony/Component/DependencyInjection/autoload.php',
 ]]);
 
 \Fedora\Autoloader\Dependencies::optional([
@@ -203,7 +214,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     [
         '%{phpdir}/Symfony4/Bundle/WebProfilerBundle/autoload.php',
         '%{phpdir}/Symfony3/Bundle/WebProfilerBundle/autoload.php',
-        '%{phpdir}/Symfony/Bundle/WebProfilerBundle/autoload.php',
     ], [
         '%{phpdir}/Twig2/autoload.php',
         '%{phpdir}/Twig/autoload.php',
@@ -224,11 +234,16 @@ cat << 'EOF' | tee -a bs.php
 require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/autoload.php';
 EOF
 
+sed -e '/listener/d' phpunit.xml.dist >phpunit.xml
+
 : Upstream tests with SCLs if available
 RETURN_CODE=0
 for SCL in php php71 php72 php73; do
     if which $SCL; then
-        $SCL %{_bindir}/phpunit --verbose --bootstrap bs.php || RETURN_CODE=1
+        $SCL %{_bindir}/phpunit7 \
+            --filter '^((?!(testBacktraceLogged)).)*$' \
+            --bootstrap bs.php \
+            --verbose || RETURN_CODE=1
     fi
 done
 exit $RETURN_CODE
@@ -238,6 +253,7 @@ exit $RETURN_CODE
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license .rpm/licenses/*
 %doc .rpm/docs/*
@@ -247,6 +263,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon May 13 2019 Remi Collet <remi@remirepo.net> - 1.11.0-1
+- update to 1.11.0
+- raise dependency on PHP 7.1
+- raise dependency on symfony 3.4
+- use phpunit7
+
 * Fri Feb  8 2019 Remi Collet <remi@remirepo.net> - 1.10.2-1
 - update to 1.10.2