update to 4.2.2

add VarExporter component
add dependency on symfony/contracts
add dependency on doctrine/event-manager, doctrine/persistence and doctrine/reflection
raise dependency on doctrine/dbal 2.5
raise dependency on ocramius/proxy-manager 2.1

1 files changed, 141 insertions, 21 deletions

diff --git a/php-symfony4.spec b/php-symfony4.spec
index 0522c1e..4df5a3d 100644
--- a/php-symfony4.spec
+++ b/php-symfony4.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   4.1.10
-%global github_commit    96e5fca388141c3c2539f10aec422a143cb65bde
+%global github_version   4.2.2
+%global github_commit    4b3e32332fd3559a644a262be53228422e5393d3
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -31,15 +31,24 @@
 # "doctrine/cache": "~1.6"
 %global doctrine_cache_min_ver 1.6
 %global doctrine_cache_max_ver 2.0
-# "doctrine/common": "~2.4"
-%global doctrine_common_min_ver 2.4
-%global doctrine_common_max_ver 3.0
+# "doctrine/collections": "~1.0"
+%global doctrine_collections_min_ver 1.0
+%global doctrine_collections_max_ver 2
+# "doctrine/event-manager": "~1.0"
+%global doctrine_event_manager_min_ver 1.0
+%global doctrine_event_manager_max_ver 2
+# "doctrine/persistence": "~1.0"
+%global doctrine_persistence_min_ver 1.0
+%global doctrine_persistence_max_ver 2
+# "doctrine/reflection": "~1.0"
+%global doctrine_reflection_min_ver 1.0
+%global doctrine_reflection_max_ver 2
 # "doctrine/data-fixtures": "1.0.*"
 # ignore max version
 %global doctrine_datafixtures_min_ver 1.0.0
 %global doctrine_datafixtures_max_ver 2
-# "doctrine/dbal": "~2.4"
-%global doctrine_dbal_min_ver 2.4
+# "doctrine/dbal": "~2.5"
+%global doctrine_dbal_min_ver 2.5
 %global doctrine_dbal_max_ver 3.0
 # "doctrine/doctrine-bundle": "~1.4"
 %global doctrine_bundle_min_ver 1.4
@@ -56,9 +65,8 @@
 # "monolog/monolog": "~1.11"
 %global monolog_min_ver 1.11
 %global monolog_max_ver 2.0
-# "ocramius/proxy-manager": "~0.4|~1.0|~2.0"
-#     NOTE: Min version not 0.4 to force v1 or v2.
-%global proxy_manager_min_ver 1.0
+# "ocramius/proxy-manager": "~2.1"
+%global proxy_manager_min_ver 2.1
 %global proxy_manager_max_ver 3.0
 # "phpdocumentor/reflection-docblock": "^3.0|^4.0"
 # conflicts: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2"
@@ -88,6 +96,9 @@
 #     NOTE: Min version not 4.0 to restrict to single major version
 %global symfony_security_acl_min_ver 2.8
 %global symfony_security_acl_max_ver 3.0
+# "symfony/contracts": "~1.0.2"
+%global symfony_contracts_min_ver 1.0.2
+%global symfony_contracts_max_ver 2
 # "twig/twig": "^1.35|^2.4.4"
 %global twig_min_ver 1.35
 %global twig_max_ver 3.0
@@ -133,8 +144,14 @@ BuildRequires: php-composer(doctrine/annotations) <  %{doctrine_annotations_max_
 BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
 BuildRequires: php-composer(doctrine/cache) <  %{doctrine_cache_max_ver}
 BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
-BuildRequires: php-composer(doctrine/common) <  %{doctrine_common_max_ver}
-BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
+BuildRequires: php-composer(doctrine/collections) <  %{doctrine_collections_max_ver}
+BuildRequires: php-composer(doctrine/collections) >= %{doctrine_collections_min_ver}
+BuildRequires: php-composer(doctrine/event-manager) <  %{doctrine_event_manager_max_ver}
+BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_manager_min_ver}
+BuildRequires: php-composer(doctrine/persistence) <  %{doctrine_persistence_max_ver}
+BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_persistence_min_ver}
+BuildRequires: php-composer(doctrine/reflection) <  %{doctrine_reflection_max_ver}
+BuildRequires: php-composer(doctrine/reflection) >= %{doctrine_reflection_min_ver}
 BuildRequires: php-composer(doctrine/data-fixtures) <  %{doctrine_datafixtures_max_ver}
 BuildRequires: php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver}
 BuildRequires: php-composer(doctrine/dbal) <  %{doctrine_dbal_max_ver}
@@ -165,10 +182,12 @@ BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
 BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
 BuildRequires: php-composer(psr/simple-cache) <  %{psr_simple_cache_max_ver}
 BuildRequires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver}
-BuildRequires: php-composer(symfony/polyfill) <  %{symfony_polyfill_max_ver}
-BuildRequires: php-composer(symfony/polyfill) >= %{symfony_polyfill_min_ver}
-BuildRequires: php-composer(symfony/security-acl) <  %{symfony_security_acl_max_ver}
-BuildRequires: php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver}
+BuildRequires: php-composer(%{composer_vendor}/polyfill) <  %{symfony_polyfill_max_ver}
+BuildRequires: php-composer(%{composer_vendor}/polyfill) >= %{symfony_polyfill_min_ver}
+BuildRequires: php-composer(%{composer_vendor}/security-acl) <  %{symfony_security_acl_max_ver}
+BuildRequires: php-composer(%{composer_vendor}/security-acl) >= %{symfony_security_acl_min_ver}
+BuildRequires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+BuildRequires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 BuildRequires: php-composer(twig/twig) <  %{twig_max_ver}
 BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
 # phpcompatinfo for version 4.0.0-beta1
@@ -256,6 +275,7 @@ Requires:      php-composer(%{composer_vendor}/templating) = %{version}
 Requires:      php-composer(%{composer_vendor}/translation) = %{version}
 Requires:      php-composer(%{composer_vendor}/validator) = %{version}
 Requires:      php-composer(%{composer_vendor}/var-dumper) = %{version}
+Requires:      php-composer(%{composer_vendor}/var-exporter) = %{version}
 Requires:      php-composer(%{composer_vendor}/web-link) = %{version}
 Requires:      php-composer(%{composer_vendor}/workflow) = %{version}
 Requires:      php-composer(%{composer_vendor}/yaml) = %{version}
@@ -295,8 +315,14 @@ License:  MIT
 
 Requires: %{name}-common = %{version}-%{release}
 # composer.json
-Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
-Requires: php-composer(doctrine/common) <  %{doctrine_common_max_ver}
+Requires: php-composer(doctrine/collections) <  %{doctrine_collections_max_ver}
+Requires: php-composer(doctrine/collections) >= %{doctrine_collections_min_ver}
+Requires: php-composer(doctrine/event-manager) <  %{doctrine_event_manager_max_ver}
+Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_manager_min_ver}
+Requires: php-composer(doctrine/persistence) <  %{doctrine_persistence_max_ver}
+Requires: php-composer(doctrine/persistence) >= %{doctrine_persistence_min_ver}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/form)
@@ -340,6 +366,8 @@ Requires: %{name}-common = %{version}-%{release}
 Requires: php-composer(monolog/monolog) >= %{monolog_min_ver}
 Requires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/console)
@@ -432,6 +460,8 @@ Requires: %{name}-common = %{version}-%{release}
 # composer.json
 Requires: php-composer(twig/twig) >= %{twig_min_ver}
 Requires: php-composer(twig/twig) <  %{twig_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/asset)
@@ -503,6 +533,8 @@ License:  MIT
 # composer.json
 Requires: php-composer(%{composer_vendor}/cache) = %{version}
 Requires: php-composer(%{composer_vendor}/config) = %{version}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires: php-composer(%{composer_vendor}/filesystem) = %{version}
@@ -559,9 +591,13 @@ Summary:  Symfony Security Bundle (version 4)
 License:  MIT
 
 # composer.json
+Requires: php-composer(%{composer_vendor}/config) = %{version}
 Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
-Requires: php-composer(%{composer_vendor}/security) = %{version}
+Requires: php-composer(%{composer_vendor}/security-core) = %{version}
+Requires: php-composer(%{composer_vendor}/security-csrf) = %{version}
+Requires: php-composer(%{composer_vendor}/security-guard) = %{version}
+Requires: php-composer(%{composer_vendor}/security-http) = %{version}
 Requires: php-xml
 # phpcompatinfo for version 4.0.0-beta1
 Requires: php-pcre
@@ -612,6 +648,7 @@ Autoloader: %{symfony4_dir}/Bundle/TwigBundle/autoload.php
 Summary:  Symfony WebProfiler Bundle (version 4)
 
 # composer.json
+Requires: php-composer(%{composer_vendor}/config) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/routing) = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
@@ -737,6 +774,9 @@ Requires: php-composer(psr/log) <  %{psr_log_max_ver}
 Requires: php-composer(psr/log) >= %{psr_log_min_ver}
 Requires: php-composer(psr/simple-cache) <  %{psr_simple_cache_max_ver}
 Requires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
+Requires: php-composer(%{composer_vendor}/var-exporter) = %{version}
 # phpcompatinfo for version 4.0.0-beta1
 Requires: php-date
 Requires: php-hash
@@ -755,6 +795,7 @@ Suggests: php-pecl(redis)
 Provides: php-composer(%{composer_vendor}/cache) = %{version}
 Provides: php-composer(psr/cache-implementation) = 1.0
 Provides: php-composer(psr/simple-cache-implementation) = 1.0
+Provides: php-composer(%{composer_vendor}/cache-contracts-implementation) = 1.0
 
 %description cache
 The Cache component provides an extended PSR-6 [1] implementation for adding
@@ -808,6 +849,8 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/console.html
 
 # composer.json
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 Requires: php-composer(%{composer_vendor}/debug) = %{version}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -900,6 +943,8 @@ Requires: %{name}-common = %{version}-%{release}
 # composer.json
 Requires: php-composer(psr/container) >= %{psr_container_min_ver}
 Requires: php-composer(psr/container) <  %{psr_container_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/config)
@@ -920,6 +965,7 @@ Requires: php-spl
 # Composer
 Provides: php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Provides: php-composer(psr/container-implementation) = 1.0
+Provides: php-composer(%{composer_vendor}/service-contracts-implementation) = 1.0
 
 %description dependency-injection
 The Dependency Injection component allows you to standardize and centralize
@@ -988,6 +1034,9 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/event_dispatcher.html
 
 Requires: %{name}-common = %{version}-%{release}
+# composer.json:
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/dependency-injection)
@@ -1017,7 +1066,10 @@ Summary:  Symfony ExpressionLanguage Component (version 4)
 License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/expression_language.html
 
+# composer.json:
 Requires: php-composer(%{composer_vendor}/cache) = %{version}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # phpcompatinfo for version 4.0.0-beta1
 Requires: php-ctype
 Requires: php-pcre
@@ -1165,6 +1217,8 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/http_kernel.html
 
 # composer.json
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 Requires: php-composer(%{composer_vendor}/debug) = %{version}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
@@ -1479,6 +1533,8 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/security.html
 
 # composer.json
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
@@ -1573,6 +1629,9 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/stopwatch.html
 
 Requires: %{name}-common = %{version}-%{release}
+# composer.json
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # phpcompatinfo for version 4.0.0-beta1
 Requires: php-spl
 
@@ -1626,6 +1685,9 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/translation.html
 
 Requires: %{name}-common = %{version}-%{release}
+# composer.json
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/config)
@@ -1646,6 +1708,7 @@ Requires: php-tokenizer
 
 # Composer
 Provides: php-composer(%{composer_vendor}/translation) = %{version}
+Provides: php-composer(%{composer_vendor}/translation-contracts-implementation) = 1.0
 
 %description translation
 Translation provides tools for loading translation files and generating
@@ -1662,7 +1725,8 @@ License:  MIT
 URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/validator.html
 
 # composer.json
-Requires: php-composer(%{composer_vendor}/translation) = %{version}
+Requires: php-composer(%{composer_vendor}/contracts) <  %{symfony_contracts_max_ver}
+Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver}
 # composer.json: optional
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Suggests: php-composer(%{composer_vendor}/config)
@@ -1671,6 +1735,7 @@ Suggests: php-composer(%{composer_vendor}/http-foundation)
 Suggests: php-composer(%{composer_vendor}/intl)
 Suggests: php-composer(%{composer_vendor}/property-access)
 Suggests: php-composer(%{composer_vendor}/yaml)
+Suggests: php-composer(%{composer_vendor}/translation)
 Suggests: php-composer(doctrine/annotations)
 Suggests: php-composer(doctrine/cache)
 Suggests: php-composer(egulias/email-validator)
@@ -1753,6 +1818,33 @@ Autoloader: %{symfony4_dir}/Component/VarDumper/autoload.php
 
 # ------------------------------------------------------------------------------
 
+%package var-exporter
+
+Summary:  Symfony exporting data structure to plain PHP code (version 4)
+License:  MIT
+URL:      http://symfony.com/doc/%{symfony4_doc_ver}/components/var_exporter.html
+
+Requires: %{name}-common = %{version}-%{release}
+# phpcompatinfo for version 4.2.2
+Requires: php-reflection
+Requires: php-hash
+Requires: php-spl
+
+# Composer
+Provides: php-composer(%{composer_vendor}/var-exporter) = %{version}
+
+%description var-exporter
+The VarExporter component allows exporting any serializable PHP data structure
+to plain PHP code. While doing so, it preserves all the semantics associated
+with the serialization mechanism of PHP (__wakeup, __sleep, Serializable).
+
+It also provides an instantiator that allows creating and populating objects
+without calling their constructor nor any other methods.
+
+Autoloader: %{symfony4_dir}/Component/VarExporter/autoload.php
+
+# ------------------------------------------------------------------------------
+
 %package web-link
 
 Summary:  Symfony WebLink Component (version 4)
@@ -1841,6 +1933,9 @@ sed 's#__PHPDIR__#%{phpdir}#' -i $(basename %{SOURCE1})
 : Remove unnecessary files
 find src -name '.git*' -delete
 
+: Provided as separate package
+rm -rf src/Symfony/Contracts
+
 
 %build
 : Create common autoloader
@@ -1872,12 +1967,12 @@ AUTOLOAD
 : Create individual sub-package autoloaders
 for AUTOLOADER in $(./%{name}-generate-autoloaders.php)
 do
+    echo ">>>>>>>>>>>>>>>>>>>> Autoloader: $AUTOLOADER"
     sed \
         -e 's#__VERSION__#%{version}#' \
         -e 's#__RELEASE__#%{release}#' \
         -e 's#__PHPDIR__#%{phpdir}#' \
         -i $AUTOLOADER
-    echo ">>>>>>>>>>>>>>>>>>>> Autoloader: $AUTOLOADER"
     cat $AUTOLOADER
 done
 
@@ -2759,6 +2854,22 @@ exit $RET
 
 # ------------------------------------------------------------------------------
 
+%files var-exporter
+
+%license src/Symfony/Component/VarExporter/LICENSE
+%doc src/Symfony/Component/VarExporter/*.md
+%doc src/Symfony/Component/VarExporter/composer.json
+
+%{symfony4_dir}/Component/VarExporter
+%exclude %{symfony4_dir}/Component/VarExporter/LICENSE
+%exclude %{symfony4_dir}/Component/VarExporter/*.md
+%exclude %{symfony4_dir}/Component/VarExporter/autoload-dev.php
+%exclude %{symfony4_dir}/Component/VarExporter/composer.json
+%exclude %{symfony4_dir}/Component/VarExporter/phpunit.*
+%exclude %{symfony4_dir}/Component/VarExporter/Tests
+
+# ------------------------------------------------------------------------------
+
 %files web-link
 
 %license src/Symfony/Component/WebLink/LICENSE
@@ -2808,6 +2919,15 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon Jan  7 2019 Remi Collet <remi@remirepo.net> - 4.2.2-1
+- update to 4.2.2
+- add VarExporter component
+- add dependency on symfony/contracts
+- add dependency on doctrine/event-manager, doctrine/persistence
+  and doctrine/reflection
+- raise dependency on doctrine/dbal 2.5
+- raise dependency on ocramius/proxy-manager 2.1
+
 * Mon Jan  7 2019 Remi Collet <remi@remirepo.net> - 4.1.10-1
 - update to 4.1.10