Update to 1.6.13

fix autoloader to allow symfony 2, 3 and 4
ensure we use same version of all component at build time
raise dependency on doctrine/doctrine-cache-bundle 1.2
raise dependency on twig/twig 1.12

2 files changed, 75 insertions, 52 deletions

diff --git a/composer.json b/composer.json
index 2827ba0..d1246b1 100644
--- a/composer.json
+++ b/composer.json
@@ -25,21 +25,21 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/framework-bundle": "~2.7|~3.0",
-        "symfony/console": "~2.7|~3.0",
-        "symfony/dependency-injection": "~2.7|~3.0",
+        "symfony/framework-bundle": "~2.7|~3.0|~4.0",
+        "symfony/console": "~2.7|~3.0|~4.0",
+        "symfony/dependency-injection": "~2.7|~3.0|~4.0",
         "doctrine/dbal": "~2.3",
         "jdorn/sql-formatter": "~1.1",
-        "symfony/doctrine-bridge": "~2.7|~3.0",
-        "doctrine/doctrine-cache-bundle": "~1.0"
+        "symfony/doctrine-bridge": "~2.7|~3.0|~4.0",
+        "doctrine/doctrine-cache-bundle": "~1.2"
     },
     "require-dev": {
         "doctrine/orm": "~2.3",
-        "symfony/yaml": "~2.7|~3.0",
-        "symfony/validator": "~2.7|~3.0",
-        "symfony/property-info": "~2.8|~3.0",
-        "symfony/phpunit-bridge": "~2.7|~3.0",
-        "twig/twig": "~1.10|~2.0",
+        "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.12|~2.0",
         "satooshi/php-coveralls": "^1.0",
         "phpunit/phpunit": "~4"
     },
diff --git a/php-doctrine-doctrine-bundle.spec b/php-doctrine-doctrine-bundle.spec
index 6b7352d..aaaafc7 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.6.7
-%global github_commit    a01d99bc6c9a6c8a8ace0012690099dd957ce9b9
+%global github_version   1.6.13
+%global github_commit    8cd4c2921b6cef14a78d98cd3f0fb81ba6a976f9
 
 %global composer_vendor  doctrine
 %global composer_project doctrine-bundle
@@ -23,8 +23,8 @@
 # "doctrine/dbal": "~2.3"
 %global dbal_min_ver 2.3
 %global dbal_max_ver 3.0
-# "doctrine/doctrine-cache-bundle": "~1.0"
-%global cache_bundle_min_ver 1.0
+# "doctrine/doctrine-cache-bundle": "~1.2"
+%global cache_bundle_min_ver 1.2
 %global cache_bundle_max_ver 2.0
 # "doctrine/orm": "~2.3"
 %global orm_min_ver 2.3
@@ -32,18 +32,22 @@
 # "jdorn/sql-formatter": "~1.1"
 %global sql_formatter_min_ver 1.1
 %global sql_formatter_max_ver 2.0
-# "symfony/console": "~2.7|~3.0"
-# "symfony/dependency-injection": "~2.7|~3.0"
-# "symfony/doctrine-bridge": "~2.7|~3.0"
-# "symfony/framework-bundle": "~2.7|~3.0"
-# "symfony/property-info": "~2.8|~3.0"
-# "symfony/validator": "~2.7|~3.0"
-# "symfony/yaml": "~2.7|~3.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|~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"
 %global symfony_min_ver 2.8
-%global symfony_max_ver 3.0
-# "twig/twig": "~1.10|~2.0"
-%global twig_min_ver 1.10
+%global symfony_max_ver 5
+# "twig/twig": "~1.12|~2.0"
+%global twig_min_ver 1.12
+%if 0%{?fedora} >= 26
 %global twig_max_ver 3
+%else
+%global twig_max_ver 2
+%endif
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -61,7 +65,6 @@ URL:           https://github.com/%{github_owner}/%{github_name}
 Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:     noarch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Tests
 %if %{with_tests}
 ## composer.json
@@ -71,20 +74,24 @@ BuildRequires: php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_mi
 BuildRequires: php-composer(doctrine/orm)                   >= %{orm_min_ver}
 BuildRequires: php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(symfony/console)                <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/console)                >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/dependency-injection)   <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/dependency-injection)   >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/doctrine-bridge)        <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/doctrine-bridge)        >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/framework-bundle)       <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/framework-bundle)       >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/property-info)          <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/property-info)          >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/validator)              <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/validator)              >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/yaml)                   <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/yaml)                   >= %{symfony_min_ver}
+%if 0%{?fedora} >= 27
+# ensure same version of all components is used
+BuildRequires: php-symfony3-console
+BuildRequires: php-symfony3-dependency-injection
+BuildRequires: php-symfony3-doctrine-bridge
+BuildRequires: php-symfony3-framework-bundle
+BuildRequires: php-symfony3-property-info
+BuildRequires: php-symfony3-validator
+BuildRequires: php-symfony3-yaml
+%else
+BuildRequires: php-symfony-console
+BuildRequires: php-symfony-dependency-injection
+BuildRequires: php-symfony-doctrine-bridge
+BuildRequires: php-symfony-framework-bundle
+BuildRequires: php-symfony-property-info
+BuildRequires: php-symfony-validator
+BuildRequires: php-symfony-yaml
+%endif
 BuildRequires: php-composer(twig/twig)                      <  %{twig_max_ver}
 BuildRequires: php-composer(twig/twig)                      >= %{twig_min_ver}
 ## phpcompatinfo (computed from version 1.6.7)
@@ -162,16 +169,31 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     '%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php',
     '%{phpdir}/Doctrine/DBAL/autoload.php',
     '%{phpdir}/jdorn-sql-formatter/autoload.php',
-    '%{phpdir}/Symfony/Bridge/Doctrine/autoload.php',
-    '%{phpdir}/Symfony/Bundle/FrameworkBundle/autoload.php',
-    '%{phpdir}/Symfony/Component/Console/autoload.php',
-    '%{phpdir}/Symfony/Component/DependencyInjection/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([
     '%{phpdir}/Doctrine/ORM/autoload.php',
-    '%{phpdir}/Symfony/Bundle/WebProfilerBundle/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',
     ],
@@ -180,7 +202,6 @@ AUTOLOAD
 
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle
 cp -pr * %{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/
 
@@ -194,7 +215,7 @@ BOOTSTRAP=%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/autoload.php
 
 : Upstream tests with SCLs if available
 SCL_RETURN_CODE=0
-for SCL in php56 php70 php71; do
+for SCL in php56 php70 php71 php72; do
     if which $SCL; then
         $SCL %{_bindir}/phpunit --verbose --bootstrap $BOOTSTRAP || SCL_RETURN_CODE=1
     fi
@@ -205,12 +226,7 @@ exit $SCL_RETURN_CODE
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license .rpm/licenses/*
 %doc .rpm/docs/*
@@ -220,6 +236,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 10 2017 Remi Collet <remi@remirepo.net> - 1.6.13-1
+- Update to 1.6.13
+- fix autoloader to allow symfony 2, 3 and 4
+- ensure we use same version of all component at build time
+- raise dependency on doctrine/doctrine-cache-bundle 1.2
+- raise dependency on twig/twig 1.12
+
 * Sat Mar 04 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.6.7-1
 - Updated to 1.6.7 (RHBZ #1416390)
 - Removed optional dependencies' conflicts