backport

3 files changed, 96 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13af741
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
+
diff --git a/php-symfony3.spec b/php-symfony3.spec
index 63868c8..be9ce46 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -1,3 +1,4 @@
+# remirepo spec file for php-symfony3
 #
 # Fedora spec file for php-symfony3
 #
@@ -201,7 +202,10 @@ BuildRequires: php-composer(fedora/autoloader)
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
 Requires:      php-composer(%{composer_vendor}/monolog-bridge) = %{version}
 #Requires:      php-composer(%%{composer_vendor}/phpunit-bridge) = %%{version}
+%if 0%{?fedora} >= 26
+# this requires ZF and thus PHP 7
 Requires:      php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version}
+%endif
 Requires:      php-composer(%{composer_vendor}/twig-bridge) = %{version}
 # Bundles
 Requires:      php-composer(%{composer_vendor}/debug-bundle) = %{version}
@@ -274,12 +278,14 @@ Requires: %{name}-common = %{version}-%{release}
 Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
 Requires: php-composer(doctrine/common) <  %{doctrine_common_max_ver}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/form)
 Suggests: php-composer(%{composer_vendor}/validator)
 Suggests: php-composer(%{composer_vendor}/property-info)
 Suggests: php-composer(doctrine/data-fixtures)
 Suggests: php-composer(doctrine/dbal)
 Suggests: php-composer(doctrine/orm)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires: php-ctype
 Requires: php-date
@@ -316,8 +322,10 @@ Requires: php-composer(monolog/monolog) >= %{monolog_min_ver}
 Requires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/console)
 Suggests: php-composer(%{composer_vendor}/event-dispatcher)
+%endif
 
 # phpcompatinfo (computed from version 3.2.4)
 Requires: php-pcre
@@ -398,6 +406,7 @@ Requires: %{name}-common = %{version}-%{release}
 Requires: php-composer(twig/twig) >= %{twig_min_ver}
 Requires: php-composer(twig/twig) <  %{twig_max_ver}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/asset)
 Suggests: php-composer(%{composer_vendor}/expression-language)
 Suggests: php-composer(%{composer_vendor}/finder)
@@ -410,6 +419,7 @@ Suggests: php-composer(%{composer_vendor}/templating)
 Suggests: php-composer(%{composer_vendor}/translation)
 Suggests: php-composer(%{composer_vendor}/var-dumper)
 Suggests: php-composer(%{composer_vendor}/yaml)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires: php-hash
 Requires: php-json
@@ -437,8 +447,10 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
 Requires: php-composer(%{composer_vendor}/var-dumper) = %{version}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/config) = %{version}
 Suggests: php-composer(%{composer_vendor}/dependency-injection) = %{version}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 #     <none>
 
@@ -473,6 +485,7 @@ 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}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/console)
 Suggests: php-composer(%{composer_vendor}/form)
 Suggests: php-composer(%{composer_vendor}/process)
@@ -480,6 +493,7 @@ Suggests: php-composer(%{composer_vendor}/property-info)
 Suggests: php-composer(%{composer_vendor}/serializer)
 Suggests: php-composer(%{composer_vendor}/validator)
 Suggests: php-composer(%{composer_vendor}/yaml)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires: php-dom
 Requires: php-fileinfo
@@ -492,7 +506,9 @@ Requires: php-posix
 Requires: php-reflection
 Requires: php-spl
 Requires: php-tokenizer
+%if 0%{?fedora}
 Suggests: php-pcntl
+%endif
 
 # Composer
 Provides: php-composer(%{composer_vendor}/framework-bundle) = %{version}
@@ -520,7 +536,9 @@ 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}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests: php-composer(%{composer_vendor}/security-acl)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires: php-pcre
 Requires: php-spl
@@ -603,7 +621,9 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-hash
 Requires:  php-spl
@@ -626,7 +646,9 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/browser_kit.htm
 # composer.json
 Requires:  php-composer(%{composer_vendor}/dom-crawler) = %{version}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests:  php-composer(%{composer_vendor}/process) = %{version}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-date
 Requires:  php-pcre
@@ -662,8 +684,10 @@ Requires:  php-pcre
 Requires:  php-pdo
 Requires:  php-reflection
 Requires:  php-spl
+%if 0%{?fedora}
 Suggests:  php-pecl(apcu)
 Suggests:  php-pecl(opcache)
+%endif
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/cache) = %{version}
@@ -692,8 +716,10 @@ Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
 Requires:  php-tokenizer
+%if 0%{?fedora}
 Suggests:  php-pecl(apcu)
 Suggests:  php-xcache
+%endif
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/class-loader) = %{version}
@@ -756,6 +782,7 @@ Summary:   Symfony Console Component (version 3)
 URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/console.html
 
 # composer.json
+%if 0%{?fedora}
 Suggests:  php-composer(%{composer_vendor}/debug) = %{version}
 # composer.json: optional
 Suggests:  php-composer(%{composer_vendor}/event-dispatcher) = %{version}
@@ -763,6 +790,7 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-date
 Requires:  php-dom
@@ -821,7 +849,9 @@ Requires: php-json
 Requires: php-pcre
 Requires: php-reflection
 Requires: php-spl
+%if 0%{?fedora}
 Suggests: php-pecl(Xdebug)
+%endif
 
 # Composer
 Provides: php-composer(%{composer_vendor}/debug) = %{version}
@@ -840,10 +870,12 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/dependency_inje
 
 Requires: %{name}-common = %{version}-%{release}
 # 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-dom
 Requires:  php-hash
@@ -870,7 +902,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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-dom
 Requires:  php-libxml
@@ -895,8 +929,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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-pcre
 Requires:  php-spl
@@ -994,10 +1030,12 @@ Requires:  php-composer(%{composer_vendor}/intl) = %{version}
 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-ctype
 Requires:  php-date
@@ -1038,7 +1076,9 @@ Requires:  php-reflection
 Requires:  php-session
 Requires:  php-sockets
 Requires:  php-spl
+%if 0%{?fedora}
 Suggests:  php-pecl(mongo)
+%endif
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/http-foundation) = %{version}
@@ -1070,6 +1110,7 @@ Requires:  php-composer(%{composer_vendor}/http-foundation) = %{version}
 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}
@@ -1077,6 +1118,7 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-date
 Requires:  php-hash
@@ -1085,10 +1127,12 @@ Requires:  php-reflection
 Requires:  php-session
 Requires:  php-spl
 Requires:  php-tokenizer
+%if 0%{?fedora}
 Suggests:  php-pecl(apcu)
 Suggests:  php-pecl(opcache)
 Suggests:  php-pecl(Xdebug)
 Suggests:  php-xcache
+%endif
 
 # Composer
 Provides:  php-composer(%{composer_vendor}/http-kernel) = %{version}
@@ -1231,7 +1275,9 @@ Requires:  php-composer(%{composer_vendor}/inflector) = %{version}
 Requires:  php-composer(%{composer_vendor}/polyfill-php70) <  %{symfony_polyfill_max_ver}
 Requires:  php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests:  php-composer(psr/cache-implementation)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1256,10 +1302,12 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/property_info.h
 # composer.json
 Requires:  php-composer(%{composer_vendor}/inflector) = %{version}
 # composer.json: optional
+%if 0%{?fedora}
 Suggests:  php-composer(%{composer_vendor}/doctrine-bridge)
 Suggests:  php-composer(%{composer_vendor}/serializer)
 Suggests:  php-composer(psr/cache-implementation)
 Suggests:  php-phpdocumentor-reflection-docblock3
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1282,6 +1330,7 @@ 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}
@@ -1289,6 +1338,7 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1322,11 +1372,13 @@ Requires:  php-composer(%{composer_vendor}/polyfill-util) <  %{symfony_polyfill_
 Requires:  php-composer(%{composer_vendor}/polyfill-util) >= %{symfony_polyfill_min_ver}
 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-date
 Requires:  php-hash
@@ -1367,6 +1419,7 @@ 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}
@@ -1377,6 +1430,7 @@ 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(psr/cache-implementation)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-ctype
 Requires:  php-date
@@ -1425,8 +1479,10 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-ctype
 Requires:  php-hash
@@ -1456,10 +1512,12 @@ 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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-dom
 Requires:  php-intl
@@ -1489,6 +1547,7 @@ URL:       http://symfony.com/doc/%{symfony3_doc_ver}/components/validator.html
 # composer.json
 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}
@@ -1502,6 +1561,7 @@ 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(psr/cache-implementation)
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-ctype
 Requires:  php-date
@@ -1547,9 +1607,11 @@ Requires: php-posix
 Requires: php-reflection
 Requires: php-spl
 Requires: php-xml
+%if 0%{?fedora}
 Suggests: php-mysql
 Suggests: php-pecl(amqp)
 Suggests: php-pgsql
+%endif
 
 # Composer
 Provides: php-composer(%{composer_vendor}/var-dumper) = %{version}
@@ -1600,7 +1662,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}
+%endif
 # phpcompatinfo (computed from version 3.2.4)
 Requires:  php-ctype
 Requires:  php-date
@@ -1679,6 +1743,11 @@ ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version}
 
 %check
 %if %{with_tests}
+: Ensure TZ is set
+cp -pf %{_sysconfdir}/php.ini .
+echo "date.timezone=UTC" >> php.ini
+export PHPRC=$PWD/php.ini
+
 : Set up PSR-0 path for PHPUnit
 mkdir psr0
 ln -s %{buildroot}%{symfony3_dir} psr0/Symfony
@@ -1755,6 +1824,12 @@ rm -f %{buildroot}%{symfony3_dir}/Bundle/FrameworkBundle/Tests/Functional/Annota
 : Run tests
 RET=0
 for PKG in %{buildroot}%{phpdir}/Symfony3/*/*; do
+%if 0%{?rhel} == 6
+    if [ "$(basename $PKG)" = "DomCrawler" ]; then
+        : Skip as libxml is too old
+        continue
+    fi
+%endif
     if [ "$(basename $PKG)" = "PhpUnit" ]; then
         continue
     elif [ -d $PKG ]; then
@@ -1784,6 +1859,13 @@ if (in_array(basename('$PKG'), [
     require_once '%{phpdir}/Psr/Log/autoload.php';
 }
 
+// Missing in require-dev (use Error class from PHP 7)
+if (in_array(basename('$PKG'), [
+    'Console',
+])) {
+    require_once '%{phpdir}/Symfony/Polyfill/autoload.php';
+}
+
 // For cache component's require-dev.
 if ('Cache' == basename('$PKG')) {
     require_once '%{phpdir}/Doctrine/Common/Cache/autoload.php';
@@ -2495,6 +2577,9 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon May  8 2017 Remi Collet <remi@remirepo.net> - 3.2.8-1
+- backport for remi repository
+
 * Sun May 07 2017 Shawn Iwinski <shawn@iwin.ski> - 3.2.8-1
 - Update to 3.2.8