update to 3.3.6 (from Fedora)

2 files changed, 386 insertions, 144 deletions

diff --git a/php-symfony3-generate-autoloaders.php b/php-symfony3-generate-autoloaders.php
index 915d3a3..9b6f152 100755
--- a/php-symfony3-generate-autoloaders.php
+++ b/php-symfony3-generate-autoloaders.php
@@ -53,6 +53,10 @@ final class AutoloadGenerator {
             'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
             'path' => 'Egulias/EmailValidator/autoload.php',
         ],
+        'fig/link-util' => [
+            'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
+            'path' => 'Fig/Link/autoload.php',
+        ],
         'monolog/monolog' => [
             'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
             'path' => 'Monolog/autoload.php',
@@ -70,10 +74,22 @@ final class AutoloadGenerator {
             'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
             'path' => 'Psr/Cache/autoload.php',
         ],
+        'psr/container' => [
+            'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
+            'path' => 'Psr/Container/autoload.php',
+        ],
+        'psr/link' => [
+            'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
+            'path' => 'Psr/Link/autoload.php',
+        ],
         'psr/log' => [
             'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
             'path' => 'Psr/Log/autoload.php',
         ],
+        'psr/simple-cache' => [
+            'prefix' => 'FEDORA_SYMFONY3_PHP_DIR',
+            'path' => 'Psr/SimpleCache/autoload.php',
+        ],
         'symfony/asset' => [
             'prefix' => 'FEDORA_SYMFONY3_DIR',
             'path' => 'Component/Asset/autoload.php',
@@ -297,6 +313,10 @@ final class AutoloadGenerator {
             'prefix' => 'FEDORA_SYMFONY3_DIR',
             'path' => 'Component/VarDumper/autoload.php',
         ],
+        'symfony/web-link' => [
+            'prefix' => 'FEDORA_SYMFONY3_DIR',
+            'path' => 'Component/WebLink/autoload.php',
+        ],
         'symfony/web-profiler-bundle' => [
             'prefix' => 'FEDORA_SYMFONY3_DIR',
             'path' => 'Bundle/WebProfilerBundle/autoload.php',
diff --git a/php-symfony3.spec b/php-symfony3.spec
index 21ca5b7..f0155b2 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   3.2.13
-%global github_commit    e1aabd6f50fb4586b330f9ac54b4bcdf7352a0f8
+%global github_version   3.3.6
+%global github_commit    6f80cbd2dd89c5308b14e03d806356fac72c263e
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -52,25 +52,41 @@
 # "doctrine/orm": "~2.4,>=2.4.5"
 %global doctrine_orm_min_ver 2.4.5
 %global doctrine_orm_max_ver 3.0
-# "egulias/email-validator": "~1.2,>=1.2.1"
-%global email_validator_min_ver 1.2.1
+# "egulias/email-validator": "~1.2,>=1.2.8|~2.0"
+#     NOTE: Min version not 3.0 to restrict to single major version
+%global email_validator_min_ver 1.2.8
 %global email_validator_max_ver 2.0
-# "monolog/monolog": "~1.11"
-%global monolog_min_ver 1.11
+# "fig/link-util": "^1.0"
+%global fig_link_util_min_ver 1.0
+%global fig_link_util_max_ver 2.0
+# "monolog/monolog": "~1.19"
+%global monolog_min_ver 1.19
 %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
 %global proxy_manager_max_ver 3.0
-# "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0"
-%global phpdocumentor_reflection_docblock_min_ver 3.2
+# "phpdocumentor/reflection-docblock": "^3.0"
+#     NOTE: Conflicts with 3.2.0
+#         - https://github.com/symfony/symfony/pull/23549
+#         - https://github.com/symfony/symfony/pull/23794
+%global phpdocumentor_reflection_docblock_min_ver 3.0
 %global phpdocumentor_reflection_docblock_max_ver 4.0
 # "psr/cache": "~1.0"
 %global psr_cache_min_ver 1.0
 %global psr_cache_max_ver 2.0
+# "psr/container": "^1.0"
+%global psr_container_min_ver 1.0
+%global psr_container_max_ver 2.0
+# "psr/link": "^1.0"
+%global psr_link_min_ver 1.0
+%global psr_link_max_ver 2.0
 # "psr/log": "~1.0"
 %global psr_log_min_ver 1.0
 %global psr_log_max_ver 2.0
+# "psr/simple-cache": "^1.0"
+%global psr_simple_cache_min_ver 1.0
+%global psr_simple_cache_max_ver 2.0
 # "sensio/framework-extra-bundle": "^3.0.2"
 %global sensio_framework_extra_bundle_min_ver 1.0
 %global sensio_framework_extra_bundle_max_ver 2.0
@@ -104,7 +120,7 @@
 
 Name:          php-%{composer_project}3
 Version:       %{github_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Symfony PHP framework (version 3)
 
 Group:         Development/Libraries
@@ -120,8 +136,8 @@ Source1:       %{name}-generate-autoloaders.php
 BuildArch:     noarch
 # Tests
 %if %{with_tests}
+BuildRequires: composer
 ## composer.json
-### Force version to 4.8 for autoloader
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(cache/integration-tests) <  %{cache_integration_tests_max_ver}
 BuildRequires: php-composer(cache/integration-tests) >= %{cache_integration_tests_min_ver}
@@ -141,17 +157,26 @@ BuildRequires: php-composer(doctrine/orm) <  %{doctrine_orm_max_ver}
 BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver}
 BuildRequires: php-composer(egulias/email-validator) <  %{email_validator_max_ver}
 BuildRequires: php-composer(egulias/email-validator) >= %{email_validator_min_ver}
+BuildRequires: php-composer(fig/link-util) <  %{fig_link_util_max_ver}
+BuildRequires: php-composer(fig/link-util) >= %{fig_link_util_min_ver}
 BuildRequires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 BuildRequires: php-composer(monolog/monolog) >= %{monolog_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(phpdocumentor/reflection-docblock) <  %{phpdocumentor_reflection_docblock_max_ver}
 BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
+BuildConflicts: php-composer(phpdocumentor/reflection-docblock) = 3.2.0
 BuildRequires: php-composer(phpunit/phpunit)
 BuildRequires: php-composer(psr/cache) <  %{psr_cache_max_ver}
 BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
+BuildRequires: php-composer(psr/container) <  %{psr_container_max_ver}
+BuildRequires: php-composer(psr/container) >= %{psr_container_min_ver}
+BuildRequires: php-composer(psr/link) <  %{psr_link_max_ver}
+BuildRequires: php-composer(psr/link) >= %{psr_link_min_ver}
 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}
@@ -162,7 +187,7 @@ BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
 BuildRequires: php-composer(sensio/framework-extra-bundle) <  %{sensio_framework_extra_bundle_max_ver}
 BuildRequires: php-composer(sensio/framework-extra-bundle) >= %{sensio_framework_extra_bundle_min_ver}
 %endif
-## phpcompatinfo (computed from version 3.2.4)
+## phpcompatinfo (computed from version 3.3.6)
 BuildRequires: php-ctype
 BuildRequires: php-curl
 BuildRequires: php-date
@@ -209,6 +234,7 @@ Requires:      php-composer(%{composer_vendor}/framework-bundle) = %{version}
 Requires:      php-composer(%{composer_vendor}/security-bundle) = %{version}
 Requires:      php-composer(%{composer_vendor}/twig-bundle) = %{version}
 Requires:      php-composer(%{composer_vendor}/web-profiler-bundle) = %{version}
+Requires:      php-composer(%{composer_vendor}/web-server-bundle) = %{version}
 # Components
 Requires:      php-composer(%{composer_vendor}/asset) = %{version}
 Requires:      php-composer(%{composer_vendor}/browser-kit) = %{version}
@@ -220,6 +246,7 @@ Requires:      php-composer(%{composer_vendor}/css-selector) = %{version}
 Requires:      php-composer(%{composer_vendor}/debug) = %{version}
 Requires:      php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:      php-composer(%{composer_vendor}/dom-crawler) = %{version}
+Requires:      php-composer(%{composer_vendor}/dotenv) = %{version}
 Requires:      php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires:      php-composer(%{composer_vendor}/expression-language) = %{version}
 Requires:      php-composer(%{composer_vendor}/filesystem) = %{version}
@@ -227,6 +254,7 @@ Requires:      php-composer(%{composer_vendor}/finder) = %{version}
 Requires:      php-composer(%{composer_vendor}/form) = %{version}
 Requires:      php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires:      php-composer(%{composer_vendor}/http-kernel) = %{version}
+Requires:      php-composer(%{composer_vendor}/inflector) = %{version}
 Requires:      php-composer(%{composer_vendor}/intl) = %{version}
 Requires:      php-composer(%{composer_vendor}/ldap) = %{version}
 Requires:      php-composer(%{composer_vendor}/options-resolver) = %{version}
@@ -241,6 +269,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}/web-link) = %{version}
 Requires:      php-composer(%{composer_vendor}/workflow) = %{version}
 Requires:      php-composer(%{composer_vendor}/yaml) = %{version}
 
@@ -254,13 +283,14 @@ NOTE: Does not require PHPUnit bridge.
 
 # ##############################################################################
 
-%package   common
+%package  common
 
-Summary:   Symfony common (version 3)
+Summary:  Symfony common (version 3)
 
-Requires:  php(language) >= %{php_min_ver}
+Requires: php(language) >= %{php_min_ver}
+Requires: composer
 # Autoloader
-Requires:  php-composer(fedora/autoloader)
+Requires: php-composer(fedora/autoloader)
 
 %description common
 %{summary}.
@@ -284,7 +314,7 @@ Suggests: php-composer(doctrine/data-fixtures)
 Suggests: php-composer(doctrine/dbal)
 Suggests: php-composer(doctrine/orm)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-ctype
 Requires: php-date
 Requires: php-hash
@@ -325,7 +355,7 @@ Suggests: php-composer(%{composer_vendor}/console)
 Suggests: php-composer(%{composer_vendor}/event-dispatcher)
 %endif
 
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-pcre
 
 # Composer
@@ -349,10 +379,10 @@ Summary:  Symfony PHPUnit Bridge (version 3)
 Requires: php(language) >= 5.3.3
 # composer.json: optional
 %if 0%{?fedora}
-Suggests: php-composer(%{composer_vendor}/debug) = %{version}
+Suggests: php-composer(%{composer_vendor}/debug)
 Suggests: php-pecl(zip)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-date
 Requires: php-pcre
 Requires: php-posix
@@ -381,7 +411,7 @@ Summary:  Symfony ProxyManager Bridge (version 3)
 Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver}
 Requires: php-composer(ocramius/proxy-manager) <  %{proxy_manager_max_ver}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-reflection
 Requires: php-spl
 
@@ -418,9 +448,10 @@ Suggests: php-composer(%{composer_vendor}/stopwatch)
 Suggests: php-composer(%{composer_vendor}/templating)
 Suggests: php-composer(%{composer_vendor}/translation)
 Suggests: php-composer(%{composer_vendor}/var-dumper)
+Suggests: php-composer(%{composer_vendor}/web-link)
 Suggests: php-composer(%{composer_vendor}/yaml)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-hash
 Requires: php-json
 Requires: php-pcre
@@ -446,13 +477,12 @@ Summary:  Symfony Debug Bundle (version 3)
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
 Requires: php-composer(%{composer_vendor}/var-dumper) = %{version}
-Requires: php-xml
 # composer.json: optional
 %if 0%{?fedora}
-Suggests: php-composer(%{composer_vendor}/config) = %{version}
-Suggests: php-composer(%{composer_vendor}/dependency-injection) = %{version}
+Suggests: php-composer(%{composer_vendor}/config)
+Suggests: php-composer(%{composer_vendor}/dependency-injection)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 #     <none>
 
 # Composer
@@ -480,22 +510,22 @@ Requires: php-composer(%{composer_vendor}/finder) = %{version}
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/routing) = %{version}
-Requires: php-composer(%{composer_vendor}/security-core) = %{version}
-Requires: php-composer(%{composer_vendor}/security-csrf) = %{version}
 Requires: php-composer(%{composer_vendor}/stopwatch) = %{version}
 Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
 Requires: php-composer(doctrine/cache) <  %{doctrine_cache_max_ver}
+Requires: php-xml
 # composer.json: optional
 %if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/console)
 Suggests: php-composer(%{composer_vendor}/form)
-Suggests: php-composer(%{composer_vendor}/process)
 Suggests: php-composer(%{composer_vendor}/property-info)
 Suggests: php-composer(%{composer_vendor}/serializer)
 Suggests: php-composer(%{composer_vendor}/validator)
+Suggests: php-composer(%{composer_vendor}/web-link)
 Suggests: php-composer(%{composer_vendor}/yaml)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
+Requires: php-date
 Requires: php-dom
 Requires: php-fileinfo
 Requires: php-filter
@@ -503,12 +533,11 @@ Requires: php-hash
 Requires: php-json
 Requires: php-mbstring
 Requires: php-pcre
-Requires: php-posix
 Requires: php-reflection
 Requires: php-spl
 Requires: php-tokenizer
 %if 0%{?fedora}
-Suggests: php-pcntl
+Suggests: php-pecl(apcu)
 %endif
 
 # Composer
@@ -532,16 +561,16 @@ Autoloader: %{symfony3_dir}/Bundle/FrameworkBundle/autoload.php
 Summary:  Symfony Security Bundle (version 3)
 
 # composer.json
+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}/polyfill-php70) >= %{symfony_polyfill_min_ver}
 Requires: php-composer(%{composer_vendor}/polyfill-php70) <  %{symfony_polyfill_max_ver}
-Requires: php-xml
+Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver}
+Requires: php-composer(%{composer_vendor}/security) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/security-acl)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-pcre
 Requires: php-spl
 
@@ -566,7 +595,7 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
 Requires: php-composer(twig/twig) <  %{twig_max_ver}
 Requires: php-composer(twig/twig) >= %{twig_min_ver}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-ctype
 Requires: php-reflection
 Requires: php-spl
@@ -599,7 +628,7 @@ Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
 Requires: php-composer(%{composer_vendor}/var-dumper) = %{version}
 Requires: php-composer(twig/twig) <  %{twig_max_ver}
 Requires: php-composer(twig/twig) >= %{twig_min_ver}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-pcre
 Requires: php-spl
 
@@ -616,6 +645,34 @@ Autoloader: %{symfony3_dir}/Bundle/WebProfilerBundle/autoload.php
 
 # ------------------------------------------------------------------------------
 
+%package  web-server-bundle
+
+Summary:  Symfony WebServer Bundle (version 3)
+
+License:  MIT
+
+# composer.json
+Requires: php-composer(%{composer_vendor}/console) = %{version}
+Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
+Requires: php-composer(%{composer_vendor}/process) = %{version}
+# phpcompatinfo (computed from version 3.3.6)
+Requires: php-ctype
+Requires: php-posix
+Requires: php-spl
+%if 0%{?fedora}
+Suggests: php-pcntl
+%endif
+
+# Composer
+Provides: php-composer(%{composer_vendor}/web-server-bundle) = %{version}
+
+%description web-server-bundle
+%{summary}.
+
+Autoloader: %{symfony3_dir}/Bundle/WebServerBundle/autoload.php
+
+# ------------------------------------------------------------------------------
+
 %package   asset
 
 Summary:   Symfony Asset Component (version 3)
@@ -624,10 +681,11 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/asset.html
 Requires: %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/http-foundation) = %{version}
+Suggests:  php-composer(%{composer_vendor}/http-foundation)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-hash
+Requires:  php-json
 Requires:  php-spl
 
 # Composer
@@ -649,9 +707,9 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/browser_kit.htm
 Requires:  php-composer(%{composer_vendor}/dom-crawler) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/process) = %{version}
+Suggests:  php-composer(%{composer_vendor}/process)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -680,7 +738,9 @@ Requires:  php-composer(psr/cache) <  %{psr_cache_max_ver}
 Requires:  php-composer(psr/cache) >= %{psr_cache_min_ver}
 Requires:  php-composer(psr/log) <  %{psr_log_max_ver}
 Requires:  php-composer(psr/log) >= %{psr_log_min_ver}
-# phpcompatinfo (computed from version 3.2.4)
+Requires:  php-composer(psr/simple-cache) <  %{psr_simple_cache_max_ver}
+Requires:  php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver}
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-hash
 Requires:  php-pcre
@@ -689,12 +749,15 @@ Requires:  php-reflection
 Requires:  php-spl
 %if 0%{?fedora}
 Suggests:  php-pecl(apcu)
+Suggests:  php-pecl(memcached)
 Suggests:  php-pecl(opcache)
+Suggests:  php-pecl(redis)
 %endif
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/cache) = %{version}
 Provides:  php-composer(psr/cache-implementation) = 1.0
+Provides:  php-composer(psr/simple-cache-implementation) = 1.0
 
 %description cache
 The Cache component provides an extended PSR-6 [1] implementation for adding
@@ -713,7 +776,7 @@ Summary:   Symfony ClassLoader Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/class_loader.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-hash
 Requires:  php-pcre
 Requires:  php-reflection
@@ -761,13 +824,17 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/config.html
 # composer.json
 Requires:  php-composer(%{composer_vendor}/filesystem) = %{version}
 # composer.json: optional
-Requires:  php-composer(%{composer_vendor}/yaml) = %{version}
-# phpcompatinfo (computed from version 3.2.4)
+%if 0%{?fedora}
+Suggests:  php-composer(%{composer_vendor}/yaml)
+%endif
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-dom
+Requires:  php-hash
 Requires:  php-json
 Requires:  php-libxml
 Requires:  php-pcre
+Requires:  php-reflection
 Requires:  php-spl
 
 # Composer
@@ -791,13 +858,12 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/console.html
 Requires:  php-composer(%{composer_vendor}/debug) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/event-dispatcher) = %{version}
-Suggests:  php-composer(%{composer_vendor}/filesystem) = %{version}
-Suggests:  php-composer(%{composer_vendor}/process) = %{version}
-Suggests:  php-composer(psr/log) >= %{psr_log_min_ver}
-Suggests:  php-composer(psr/log) <  %{psr_log_max_ver}
+Suggests:  php-composer(%{composer_vendor}/event-dispatcher)
+Suggests:  php-composer(%{composer_vendor}/filesystem)
+Suggests:  php-composer(%{composer_vendor}/process)
+Suggests:  php-composer(psr/log)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-dom
 Requires:  php-json
@@ -828,7 +894,7 @@ Summary:   Symfony CssSelector Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/css_selector.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 
 # Composer
@@ -850,7 +916,7 @@ Requires: %{name}-common = %{version}-%{release}
 # composer.json
 Requires:  php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log) <  %{psr_log_max_ver}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-json
 Requires: php-pcre
 Requires: php-reflection
@@ -875,14 +941,18 @@ Summary:   Symfony DependencyInjection Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/dependency_injection.html
 
 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}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/expression-language) = %{version}
-Suggests:  php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version}
-Suggests:  php-composer(%{composer_vendor}/yaml) = %{version}
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/expression-language)
+Suggests:  php-composer(%{composer_vendor}/finder)
+Suggests:  php-composer(%{composer_vendor}/proxy-manager-bridge)
+Suggests:  php-composer(%{composer_vendor}/yaml)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-dom
 Requires:  php-hash
 Requires:  php-libxml
@@ -892,6 +962,7 @@ Requires:  php-spl
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
+Provides:  php-composer(psr/container-implementation) = 1.0
 
 %description dependency-injection
 The Dependency Injection component allows you to standardize and centralize
@@ -909,9 +980,9 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/dom_crawler.htm
 Requires: %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/css-selector) = %{version}
+Suggests:  php-composer(%{composer_vendor}/css-selector)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-dom
 Requires:  php-libxml
 Requires:  php-mbstring
@@ -928,6 +999,27 @@ Autoloader: %{symfony3_dir}/Component/DomCrawler/autoload.php
 
 # ------------------------------------------------------------------------------
 
+%package   dotenv
+
+Summary:   Registers environment variables from a .env file (version 3)
+URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/dotenv.html
+
+Requires: %{name}-common = %{version}-%{release}
+# phpcompatinfo (computed from version 3.3.6)
+Requires:  php-pcre
+Requires:  php-spl
+
+# Composer
+Provides:  php-composer(%{composer_vendor}/dotenv) = %{version}
+
+%description dotenv
+The Dotenv Component parses .env files to make environment variables stored in
+them accessible via getenv(), $_ENV or $_SERVER.
+
+Autoloader: %{symfony3_dir}/Component/Dotenv/autoload.php
+
+# ------------------------------------------------------------------------------
+
 %package   event-dispatcher
 
 Summary:   Symfony EventDispatcher Component (version 3)
@@ -936,10 +1028,10 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/event_dispatche
 Requires: %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
-Suggests:  php-composer(%{composer_vendor}/http-kernel) = %{version}
+Suggests:  php-composer(%{composer_vendor}/dependency-injection)
+Suggests:  php-composer(%{composer_vendor}/http-kernel)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 Requires:  php-spl
 
@@ -963,7 +1055,7 @@ Summary:   Symfony ExpressionLanguage Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/expression_language.html
 
 Requires:  php-composer(%{composer_vendor}/cache) = %{version}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-pcre
 Requires:  php-spl
@@ -986,7 +1078,7 @@ Summary:   Symfony Filesystem Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/filesystem.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-hash
 Requires:  php-pcre
@@ -1009,7 +1101,7 @@ Summary:   Symfony Finder Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/finder.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -1037,12 +1129,12 @@ Requires:  php-composer(%{composer_vendor}/options-resolver) = %{version}
 Requires:  php-composer(%{composer_vendor}/property-access) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/framework-bundle) = %{version}
-Suggests:  php-composer(%{composer_vendor}/security-csrf) = %{version}
-Suggests:  php-composer(%{composer_vendor}/twig-bridge) = %{version}
-Suggests:  php-composer(%{composer_vendor}/validator) = %{version}
+Suggests:  php-composer(%{composer_vendor}/framework-bundle)
+Suggests:  php-composer(%{composer_vendor}/security-csrf)
+Suggests:  php-composer(%{composer_vendor}/twig-bridge)
+Suggests:  php-composer(%{composer_vendor}/validator)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
@@ -1069,7 +1161,7 @@ Summary:   Symfony HttpFoundation Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/http_foundation.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-fileinfo
 Requires:  php-filter
@@ -1078,7 +1170,6 @@ Requires:  php-json
 Requires:  php-mbstring
 Requires:  php-pcre
 Requires:  php-pdo
-Requires:  php-reflection
 Requires:  php-session
 Requires:  php-sockets
 Requires:  php-spl
@@ -1117,17 +1208,19 @@ Requires:  php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log) <  %{psr_log_max_ver}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/browser-kit) = %{version}
-Suggests:  php-composer(%{composer_vendor}/class-loader) = %{version}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/console) = %{version}
-Suggests:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
-Suggests:  php-composer(%{composer_vendor}/finder) = %{version}
-Suggests:  php-composer(%{composer_vendor}/var-dumper) = %{version}
+Suggests:  php-composer(%{composer_vendor}/browser-kit)
+Suggests:  php-composer(%{composer_vendor}/class-loader)
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/console)
+Suggests:  php-composer(%{composer_vendor}/dependency-injection)
+Suggests:  php-composer(%{composer_vendor}/finder)
+Suggests:  php-composer(%{composer_vendor}/var-dumper)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
+Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
+Requires:  php-json
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-session
@@ -1137,7 +1230,6 @@ Requires:  php-tokenizer
 Suggests:  php-pecl(apcu)
 Suggests:  php-pecl(opcache)
 Suggests:  php-pecl(Xdebug)
-Suggests:  php-xcache
 %endif
 
 # Composer
@@ -1161,7 +1253,7 @@ Autoloader: %{symfony3_dir}/Component/HttpKernel/autoload.php
 Summary:   Symfony Inflector Component (version 3)
 
 Requires: %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 
 # Composer
@@ -1182,7 +1274,7 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/intl.html
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 Requires:  php-intl
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-json
@@ -1216,11 +1308,11 @@ Requires:  php-composer(%{composer_vendor}/options-resolver) = %{version}
 Requires:  php-composer(%{composer_vendor}/polyfill-php56) <  %{symfony_polyfill_max_ver}
 Requires:  php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver}
 Requires:  php-ldap
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-spl
 
 # Composer
-Provides:  php-composer(%{composer_vendor}/ldap)     = %{version}
+Provides:  php-composer(%{composer_vendor}/ldap) = %{version}
 
 %description ldap
 %{summary}.
@@ -1235,7 +1327,7 @@ Summary:   Symfony OptionsResolver Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/options_resolver.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-reflection
 Requires:  php-spl
 
@@ -1256,9 +1348,10 @@ Summary:   Symfony Process Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/process.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 Requires:  php-posix
+Requires:  php-reflection
 Requires:  php-spl
 
 # Composer
@@ -1284,7 +1377,7 @@ Requires:  php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill
 %if 0%{?fedora}
 Suggests:  php-composer(psr/cache-implementation)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
@@ -1315,8 +1408,9 @@ Suggests:  php-composer(psr/cache-implementation)
 ## NOTE: Not php-composer(phpdocumentor/reflection-docblock) to ensure
 ##       php-phpdocumentor-reflection-docblock2 is not chosen
 Suggests:  php-phpdocumentor-reflection-docblock
+Conflicts: php-composer(phpdocumentor/reflection-docblock) = 3.2.0
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
@@ -1339,15 +1433,14 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/routing.html
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
-Suggests:  php-composer(%{composer_vendor}/expression-language) = %{version}
-Suggests:  php-composer(%{composer_vendor}/http-foundation) = %{version}
-Suggests:  php-composer(%{composer_vendor}/yaml) = %{version}
-Suggests:  php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
-Suggests:  php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/dependency-injection)
+Suggests:  php-composer(%{composer_vendor}/expression-language)
+Suggests:  php-composer(%{composer_vendor}/http-foundation)
+Suggests:  php-composer(%{composer_vendor}/yaml)
+Suggests:  php-composer(doctrine/annotations)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
@@ -1381,13 +1474,13 @@ Requires:  php-composer(%{composer_vendor}/polyfill-util) >= %{symfony_polyfill_
 Requires:  php-composer(%{composer_vendor}/property-access) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/expression-language) = %{version}
-Suggests:  php-composer(%{composer_vendor}/form) = %{version}
-Suggests:  php-composer(%{composer_vendor}/ldap) = %{version}
-Suggests:  php-composer(%{composer_vendor}/routing) = %{version}
-Suggests:  php-composer(%{composer_vendor}/validator) = %{version}
+Suggests:  php-composer(%{composer_vendor}/expression-language)
+Suggests:  php-composer(%{composer_vendor}/form)
+Suggests:  php-composer(%{composer_vendor}/ldap)
+Suggests:  php-composer(%{composer_vendor}/routing)
+Suggests:  php-composer(%{composer_vendor}/validator)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-date
 Requires:  php-hash
 Requires:  php-json
@@ -1428,21 +1521,20 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/serializer.html
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/http-foundation) = %{version}
-Suggests:  php-composer(%{composer_vendor}/property-access) = %{version}
-Suggests:  php-composer(%{composer_vendor}/property-info) = %{version}
-Suggests:  php-composer(%{composer_vendor}/yaml) = %{version}
-Suggests:  php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
-Suggests:  php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
-Suggests:  php-composer(doctrine/cache) <  %{doctrine_cache_max_ver}
-Suggests:  php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/http-foundation)
+Suggests:  php-composer(%{composer_vendor}/property-access)
+Suggests:  php-composer(%{composer_vendor}/property-info)
+Suggests:  php-composer(%{composer_vendor}/yaml)
+Suggests:  php-composer(doctrine/annotations)
+Suggests:  php-composer(doctrine/cache)
 Suggests:  php-composer(psr/cache-implementation)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-dom
+Requires:  php-filter
 Requires:  php-json
 Requires:  php-libxml
 Requires:  php-pcre
@@ -1467,7 +1559,7 @@ Summary:  Symfony Stopwatch Component (version 3)
 URL:      http://symfony.com/doc/%{symfony3_doc_ver}/components/stopwatch.html
 
 Requires: %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-spl
 
 # Composer
@@ -1488,10 +1580,9 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/templating.html
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(psr/log) <  %{psr_log_max_ver}
-Suggests:  php-composer(psr/log) >= %{psr_log_min_ver}
+Suggests:  php-composer(psr/log)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-hash
 Requires:  php-iconv
@@ -1521,12 +1612,11 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/translation.htm
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/yaml) = %{version}
-Suggests:  php-composer(psr/log) <  %{psr_log_max_ver}
-Suggests:  php-composer(psr/log) >= %{psr_log_min_ver}
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/yaml)
+Suggests:  php-composer(psr/log)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-dom
 Requires:  php-intl
 Requires:  php-json
@@ -1556,23 +1646,21 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/validator.html
 Requires:  php-composer(%{composer_vendor}/translation) = %{version}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/config) = %{version}
-Suggests:  php-composer(%{composer_vendor}/expression-language) = %{version}
-Suggests:  php-composer(%{composer_vendor}/http-foundation) = %{version}
-Suggests:  php-composer(%{composer_vendor}/intl) = %{version}
-Suggests:  php-composer(%{composer_vendor}/yaml) = %{version}
-Suggests:  php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
-Suggests:  php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
-Suggests:  php-composer(doctrine/cache) <  %{doctrine_cache_max_ver}
-Suggests:  php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
-Suggests:  php-composer(egulias/email-validator) <  %{email_validator_max_ver}
-Suggests:  php-composer(egulias/email-validator) >= %{email_validator_min_ver}
+Suggests:  php-composer(%{composer_vendor}/config)
+Suggests:  php-composer(%{composer_vendor}/expression-language)
+Suggests:  php-composer(%{composer_vendor}/http-foundation)
+Suggests:  php-composer(%{composer_vendor}/intl)
+Suggests:  php-composer(%{composer_vendor}/yaml)
+Suggests:  php-composer(doctrine/annotations)
+Suggests:  php-composer(doctrine/cache)
+Suggests:  php-composer(egulias/email-validator)
 Suggests:  php-composer(psr/cache-implementation)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-filter
+Requires:  php-gd
 Requires:  php-intl
 Requires:  php-json
 Requires:  php-mbstring
@@ -1601,7 +1689,7 @@ URL:      http://symfony.com/doc/%{symfony3_doc_ver}/components/var_dumper.html
 Requires: %{name}-common = %{version}-%{release}
 # composer.json: optional
 ## ext-symfony_debug
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-curl
 Requires: php-date
 Requires: php-dom
@@ -1640,6 +1728,33 @@ Autoloader: %{symfony3_dir}/Component/VarDumper/autoload.php
 
 # ------------------------------------------------------------------------------
 
+%package  web-link
+
+Summary:  Symfony WebLink Component (version 3)
+
+Requires: %{name}-common = %{version}-%{release}
+# composer.json
+Requires:  php-composer(fig/link-util) <  %{fig_link_util_max_ver}
+Requires:  php-composer(fig/link-util) >= %{fig_link_util_min_ver}
+Requires:  php-composer(psr/link) <  %{psr_link_max_ver}
+Requires:  php-composer(psr/link) >= %{psr_link_min_ver}
+# composer.json: optional
+%if 0%{?fedora}
+Suggests:  php-composer(%{composer_vendor}/http-kernel)
+%endif
+# phpcompatinfo (computed from version 3.3.6)
+#     <none>
+
+# Composer
+Provides: php-composer(%{composer_vendor}/web-link) = %{version}
+
+%description web-link
+%{summary}.
+
+Autoloader: %{symfony3_dir}/Component/WebLink/autoload.php
+
+# ------------------------------------------------------------------------------
+
 %package  workflow
 
 Summary:  Symfony Workflow Component (version 3)
@@ -1647,7 +1762,7 @@ URL:      http://symfony.com/doc/%{symfony3_doc_ver}/components/workflow.html
 
 # composer.json
 Requires:  php-composer(%{composer_vendor}/property-access) = %{version}
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires: php-pcre
 Requires: php-spl
 
@@ -1670,9 +1785,9 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/yaml.html
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json: optional
 %if 0%{?fedora}
-Suggests:  php-composer(%{composer_vendor}/console) = %{version}
+Suggests:  php-composer(%{composer_vendor}/console)
 %endif
-# phpcompatinfo (computed from version 3.2.4)
+# phpcompatinfo (computed from version 3.3.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-json
@@ -1720,6 +1835,10 @@ if (!defined('FEDORA_SYMFONY3_DIR')) {
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bridge\\', FEDORA_SYMFONY3_DIR.'/Bridge', true);
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bundle\\', FEDORA_SYMFONY3_DIR.'/Bundle', true);
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\', FEDORA_SYMFONY3_DIR.'/Component', true);
+
+\Fedora\Autoloader\Dependencies::required([
+    '%{phpdir}/Composer/autoload.php',
+]);
 AUTOLOAD
 
 : Create individual sub-package autoloaders
@@ -1761,6 +1880,24 @@ require_once dirname(__DIR__).'/autoload-common.php';
 AUTOLOAD
 done
 
+: Create dummy Composer autoloader for tests
+%if %{with_tests}
+pushd src/Symfony
+cat <<COMPOSER_JSON | tee composer.json
+{
+    "autoload": {
+        "files": [
+            "autoload.php"
+        ]
+    }
+}
+COMPOSER_JSON
+composer dumpautoload
+rm -f composer.json
+ln -s ../autoload.php vendor/composer/autoload.php
+popd
+%endif
+
 
 %install
 mkdir -p %{buildroot}%{symfony3_dir}
@@ -1803,6 +1940,13 @@ sed \
 rm -f %{buildroot}%{symfony3_dir}/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
 
 : Skip tests that fail in a mock environment
+rm -f \
+    %{buildroot}%{symfony3_dir}/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php \
+    %{buildroot}%{symfony3_dir}/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php \
+    %{buildroot}%{symfony3_dir}/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php \
+    %{buildroot}%{symfony3_dir}/Component/Workflow/Tests/DependencyInjection/ValidateWorkflowsPassTest.php
+sed 's/function testGetVendor/function SKIP_testGetVendor/' \
+    -i %{buildroot}%{symfony3_dir}/Component/Config/Tests/Resource/ComposerResourceTest.php
 sed \
     -e 's/function testAskHiddenResponse/function SKIP_testAskHiddenResponse/' \
     -e 's/function testLegacyAskHiddenResponse/function SKIP_testLegacyAskHiddenResponse/' \
@@ -1833,13 +1977,14 @@ sed 's/function testHandleClassNotFound/function SKIP_testHandleClassNotFound/'
 : Skip Intl JSON tests
 rm -rf %{buildroot}%{symfony3_dir}/Component/Intl/Tests/Data/Provider/Json
 : Skip tests known to fail
-sed -e 's/testValidateAndDecode(/SKIP_testValidateAndDecode(/' \
-    -i %{buildroot}%{symfony3_dir}/Component/Security/Http/Tests/Firewall/DigestDataTest.php
 sed -e 's/function testFormat(/function SKIP_testFormat(/' \
     -i %{buildroot}%{symfony3_dir}/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
-: Skip tests related for phpdocumentor/reflection-docblock
-sed -e "/'collection'/d" \
-    -i %{buildroot}%{symfony3_dir}/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
+
+: Skip tests known to fail
+sed \
+    -e 's/function testConstructorWithSimpleTypes/function SKIP_testConstructorWithSimpleTypes/' \
+    -e 's/function testStaticCreateWithSimpleTypes/function SKIP_testStaticCreateWithSimpleTypes/' \
+    -i %{buildroot}%{symfony3_dir}/Component/HttpFoundation/Tests/JsonResponseTest.php
 
 %if !%{with_sensio_framework_extra_bundle}
 : Skip tests requiring "sensio/framework-extra-bundle"
@@ -1865,6 +2010,15 @@ for PKG in %{buildroot}%{symfony3_dir}/*/*; do
 <?php
 require_once '${PKG}/autoload.php';
 require_once '%{buildroot}%{symfony3_dir}/Bridge/PhpUnit/bootstrap.php';
+require_once '%{buildroot}%{symfony3_dir}/vendor/autoload.php';
+
+// For require-dev "fig/link-util".
+if (in_array(basename('$PKG'), [
+    'Twig',
+    'FrameworkBundle'
+])) {
+    require_once '%{phpdir}/Fig/Link/autoload.php';
+}
 
 // For require-dev or suggest "psr/cache-implementation".
 if (in_array(basename('$PKG'), [
@@ -1897,6 +2051,20 @@ if ('Cache' == basename('$PKG')) {
     require_once '%{phpdir}/Doctrine/Common/Cache/autoload.php';
     require_once '%{phpdir}/Doctrine/DBAL/autoload.php';
 }
+
+// For workflow component's require-dev.
+if ('Workflow' == basename('$PKG')) {
+    require_once '%{phpdir}/Psr/Cache/autoload.php';
+}
+
+// Missing
+if ('VarDumper' == basename('$PKG')) {
+    if  (file_exists('%{phpdir}/Twig/autoload.php')) {
+        require_once '%{phpdir}/Twig/autoload.php';
+    } else {
+        require_once '%{phpdir}/Twig2/autoload.php';
+    }
+}
 BOOTSTRAP
 
         %{_bindir}/php -d include_path=.:${PSR0}:%{buildroot}%{phpdir}:%{phpdir} \
@@ -1917,6 +2085,7 @@ exit $RET
 %else
 %doc %{_docdir}/%{name}-%{version}
 %endif
+%{symfony3_dir}/Bundle/FullStack.php
 
 
 # ##############################################################################
@@ -1935,6 +2104,7 @@ exit $RET
      %{symfony3_dir}/Bundle/autoload.php
 %dir %{symfony3_dir}/Component
      %{symfony3_dir}/Component/autoload.php
+%exclude %{symfony3_dir}/vendor
 
 # ------------------------------------------------------------------------------
 
@@ -2089,6 +2259,21 @@ exit $RET
 
 # ------------------------------------------------------------------------------
 
+%files web-server-bundle
+
+%doc src/Symfony/Bundle/WebServerBundle/*.md
+%doc src/Symfony/Bundle/WebServerBundle/composer.json
+%license src/Symfony/Bundle/WebServerBundle/LICENSE
+
+%{symfony3_dir}/Bundle/WebServerBundle
+%exclude %{symfony3_dir}/Bundle/WebServerBundle/*.md
+%exclude %{symfony3_dir}/Bundle/WebServerBundle/composer.json
+%exclude %{symfony3_dir}/Bundle/WebServerBundle/LICENSE
+%exclude %{symfony3_dir}/Bundle/WebServerBundle/phpunit.*
+#%%exclude %%{symfony3_dir}/Bundle/WebServerBundle/Tests
+
+# ------------------------------------------------------------------------------
+
 %files asset
 
 %license src/Symfony/Component/Asset/LICENSE
@@ -2225,6 +2410,21 @@ exit $RET
 
 # ------------------------------------------------------------------------------
 
+%files dotenv
+
+%license src/Symfony/Component/Dotenv/LICENSE
+%doc src/Symfony/Component/Dotenv/*.md
+%doc src/Symfony/Component/Dotenv/composer.json
+
+%{symfony3_dir}/Component/Dotenv
+%exclude %{symfony3_dir}/Component/Dotenv/LICENSE
+%exclude %{symfony3_dir}/Component/Dotenv/*.md
+%exclude %{symfony3_dir}/Component/Dotenv/composer.json
+%exclude %{symfony3_dir}/Component/Dotenv/phpunit.*
+%exclude %{symfony3_dir}/Component/Dotenv/Tests
+
+# ------------------------------------------------------------------------------
+
 %files dom-crawler
 
 %license src/Symfony/Component/DomCrawler/LICENSE
@@ -2574,6 +2774,21 @@ exit $RET
 
 # ------------------------------------------------------------------------------
 
+%files web-link
+
+%license src/Symfony/Component/WebLink/LICENSE
+%doc src/Symfony/Component/WebLink/*.md
+%doc src/Symfony/Component/WebLink/composer.json
+
+%{symfony3_dir}/Component/WebLink
+%exclude %{symfony3_dir}/Component/WebLink/LICENSE
+%exclude %{symfony3_dir}/Component/WebLink/*.md
+%exclude %{symfony3_dir}/Component/WebLink/composer.json
+%exclude %{symfony3_dir}/Component/WebLink/phpunit.*
+%exclude %{symfony3_dir}/Component/WebLink/Tests
+
+# ------------------------------------------------------------------------------
+
 %files workflow
 
 %license src/Symfony/Component/Workflow/LICENSE
@@ -2605,6 +2820,13 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon Aug 14 2017 Shawn Iwinski <shawn@iwin.ski> - 3.3.6-2
+- Fix dotenv sub-package Composer provide
+
+* Sun Aug 13 2017 Shawn Iwinski <shawn@iwin.ski> - 3.3.6-1
+- Update to 3.3.6 (RHBZ #1460525)
+- Remove versions from suggested dependencies
+
 * Wed Aug  2 2017 Remi Collet <remi@remirepo.net> - 3.2.13-1
 - Update to 3.2.13