From 279e734da13d87d30a190eb442bbf35a378696b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2019 14:03:10 +0100 Subject: - update to 4.4.0 - add ErrorHandler component - drop dependency on fig/link-util - raise dependency on symfony/contracts 1.1.8 - raise dependency on doctrine/doctrine-bundle 1.5 - raise dependency on monolog/monolog 1.25.1 - allow twig 3 (review #1774967) - allow doctrine-bundle 2 (review #1775102) - add dependency on sodium extension - add dependency on guzzlehttp/promises --- php-symfony4.spec | 141 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 107 insertions(+), 34 deletions(-) (limited to 'php-symfony4.spec') diff --git a/php-symfony4.spec b/php-symfony4.spec index 40343ce..b4aab1e 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.3.8 -%global github_commit 87fb08703e62882a7a6fdb17672070e0ee12dd65 +%global github_version 4.4.0 +%global github_commit 625a4dbfdafcb8cea8ff90a62b9c24b28694938d %global composer_vendor symfony %global composer_project symfony @@ -50,20 +50,20 @@ # "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 -%global doctrine_bundle_max_ver 2.0 +# "doctrine/doctrine-bundle": "^1.5|^2.0" +%global doctrine_bundle_min_ver 1.5 +%global doctrine_bundle_max_ver 3 # "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": "^2.1.10" %global email_validator_min_ver 2.1.10 %global email_validator_max_ver 3.0 -# "fig/link-util": "^1.0" -%global fig_link_util_min_ver 1.0 -%global fig_link_util_max_ver 2.0 -# "monolog/monolog": "~1.11" -%global monolog_min_ver 1.11 +# "guzzlehttp/promises": "^1.3.1" +%global guzzlehttp_promises_min_ver 1.3.1 +%global guzzlehttp_promises_max_ver 2 +# "monolog/monolog": "^1.25.1" +%global monolog_min_ver 1.25.1 %global monolog_max_ver 2.0 # "ocramius/proxy-manager": "~2.1" %global proxy_manager_min_ver 2.1 @@ -99,12 +99,12 @@ # 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.1.7" -%global symfony_contracts_min_ver 1.1.7 +# "symfony/*-contracts": "~1.1.8" +%global symfony_contracts_min_ver 1.1.8 %global symfony_contracts_max_ver 2 -# "twig/twig": "^1.41|^2.10" +# "twig/twig": "^1.41|^2.10|^3.0" %global twig_min_ver 1.41 -%global twig_max_ver 3.0 +%global twig_max_ver 4.0 # "masterminds/html5": "^2.6" %global masterminds_min_ver 2.6 %global masterminds_max_ver 3.0 @@ -138,7 +138,7 @@ %global symfony4_dir %{phpdir}/Symfony4 #%%global symfony4_doc_ver %%(echo "%%{github_version}" | awk 'BEGIN { FS="." } { print $1"."$2 }') -%global symfony4_doc_ver master +%global symfony4_doc_ver 4.4 Name: php-%{composer_project}4 Version: %{github_version} @@ -175,7 +175,7 @@ BuildRequires:(php-composer(doctrine/dbal) >= %{doctrine_dba BuildRequires:(php-composer(doctrine/doctrine-bundle) >= %{doctrine_bundle_min_ver} with php-composer(doctrine/doctrine-bundle) < %{doctrine_bundle_max_ver}) BuildRequires:(php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver}) BuildRequires:(php-composer(egulias/email-validator) >= %{email_validator_min_ver} with php-composer(egulias/email-validator) < %{email_validator_max_ver}) -BuildRequires:(php-composer(fig/link-util) >= %{fig_link_util_min_ver} with php-composer(fig/link-util) < %{fig_link_util_max_ver}) +BuildRequires:(php-composer(guzzlehttp/promises) >= %{guzzlehttp_promises_min_ver} with php-composer(guzzlehttp/promises) < %{guzzlehttp_promises_max_ver}) BuildRequires:(php-composer(masterminds/html5) >= %{masterminds_min_ver} with php-composer(masterminds/html5) < %{masterminds_max_ver}) BuildRequires:(php-composer(mongodb/mongodb) >= %{mongodb_min_ver} with php-composer(mongodb/mongodb) < %{mongodb_max_ver}) BuildRequires:(php-composer(monolog/monolog) >= %{monolog_min_ver} with php-composer(monolog/monolog) < %{monolog_max_ver}) @@ -217,8 +217,8 @@ 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(guzzlehttp/promises) < %{guzzlehttp_promises_max_ver} +BuildRequires: php-composer(guzzlehttp/promises) >= %{guzzlehttp_promises_min_ver} BuildRequires: php-composer(masterminds/html5) < %{masterminds_max_ver} BuildRequires: php-composer(masterminds/html5) >= %{masterminds_min_ver} BuildRequires: php-composer(mongodb/mongodb) < %{mongodb_max_ver} @@ -277,6 +277,7 @@ BuildRequires: php-reflection BuildRequires: php-session BuildRequires: php-simplexml BuildRequires: php-sockets +BuildRequires: php-sodium BuildRequires: php-spl BuildRequires: php-sysvsem BuildRequires: php-tokenizer @@ -311,6 +312,7 @@ 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}/error-handler) = %{version} Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version} Requires: php-composer(%{composer_vendor}/expression-language) = %{version} Requires: php-composer(%{composer_vendor}/filesystem) = %{version} @@ -468,7 +470,7 @@ License: MIT Requires: %{name}-common = %{version}-%{release} # composer.json: optional %if %{with_range_dependencies} -Suggests: php-composer(%{composer_vendor}/debug) +Suggests: php-composer(%{composer_vendor}/error-handler) %endif # phpcompatinfo for version 4.0.0-beta1 Requires: php-date @@ -609,7 +611,6 @@ License: MIT # composer.json Requires: php-composer(%{composer_vendor}/cache) = %{version} Requires: php-composer(%{composer_vendor}/config) = %{version} -Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} @@ -634,15 +635,17 @@ Requires: php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} %endif -# phpcompatinfo for version 4.0.0-beta1 +# phpcompatinfo for version 4.4.0 Requires: php-date Requires: php-dom Requires: php-fileinfo -Requires: php-hash +Requires: php-filter +Requires: php-iconv Requires: php-json Requires: php-mbstring Requires: php-pcre Requires: php-reflection +Requires: php-sodium Requires: php-spl %if %{with_range_dependencies} Suggests: php-pecl(apcu) @@ -678,8 +681,11 @@ 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 +# phpcompatinfo for version 4.4.0 +Requires: php-ctype +Requires: php-filter Requires: php-pcre +Requires: php-sodium Requires: php-spl # Composer @@ -698,8 +704,6 @@ Summary: Symfony Twig Bundle (version 4) License: MIT # composer.json -Requires: php-composer(%{composer_vendor}/config) = %{version} -Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version} @@ -733,10 +737,10 @@ Summary: Symfony WebProfiler Bundle (version 4) # composer.json Requires: php-composer(%{composer_vendor}/config) = %{version} +Requires: php-composer(%{composer_vendor}/framework-bundle) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/routing) = %{version} -Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version} -Requires: php-composer(%{composer_vendor}/var-dumper) = %{version} +Requires: php-composer(%{composer_vendor}/twig-bundle) = %{version} %if %{with_range_dependencies} Requires:(php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver}) %else @@ -1133,6 +1137,42 @@ Autoloader: %{symfony4_dir}/Component/Dotenv/autoload.php # ------------------------------------------------------------------------------ +%package error-handler + +Summary: Symfony ErrorHandler Component (version 4) +License: MIT +URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/error_handler.html + +Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-debug = %{version}-%{release} +Requires: %{name}-var-dumper = %{version}-%{release} +# composer.json: +%if %{with_range_dependencies} +Requires:(php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +%else +Requires: php-composer(psr/log) < %{psr_log_max_ver} +Requires: php-composer(psr/log) >= %{psr_log_min_ver} +%endif +# phpcompatinfo for version 4.4.0 +Requires: php-reflection +Requires: php-date +Requires: php-filter +Requires: php-json +Requires: php-mbstring +Requires: php-pcre +Requires: php-spl + +# Composer +Provides: php-composer(%{composer_vendor}/error-handler) = %{version} + +%description error-handler +The ErrorHandler component provides tools to manage errors and ease debugging +PHP code. + +Autoloader: %{symfony4_dir}/Component/ErrorHandler/autoload.php + +# ------------------------------------------------------------------------------ + %package event-dispatcher Summary: Symfony EventDispatcher Component (version 4) @@ -1295,10 +1335,13 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/client.html Requires: %{name}-common = %{version}-%{release} %if %{with_range_dependencies} +Requires:(php-composer(guzzlehttp/promises) >= %{guzzlehttp_promises_min_ver} with php-composer(guzzlehttp/promises) < %{guzzlehttp_promises_max_ver}) Requires:(php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) Requires:(php-composer(%{composer_vendor}/contracts) >= %{symfony_contracts_min_ver} with php-composer(%{composer_vendor}/contracts) < %{symfony_contracts_max_ver}) Requires:(php-composer(%{composer_vendor}/polyfill-php73) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php73) < %{symfony_polyfill_max_ver}) %else +Requires: php-composer(guzzlehttp/promises) < %{guzzlehttp_promises_max_ver} +Requires: php-composer(guzzlehttp/promises) >= %{guzzlehttp_promises_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(%{composer_vendor}/contracts) < %{symfony_contracts_max_ver} @@ -1376,7 +1419,7 @@ License: MIT URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/http_kernel.html # composer.json -Requires: php-composer(%{composer_vendor}/debug) = %{version} +Requires: php-composer(%{composer_vendor}/error-handler) = %{version} Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} %if %{with_range_dependencies} @@ -1387,7 +1430,6 @@ Suggests: php-composer(%{composer_vendor}/browser-kit) Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/dependency-injection) -Suggests: php-composer(%{composer_vendor}/var-dumper) %else Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} @@ -1543,11 +1585,14 @@ Requires: %{name}-mime = %{version}-%{release} %if %{with_range_dependencies} Requires:(php-composer(egulias/email-validator) >= %{email_validator_min_ver} with php-composer(egulias/email-validator) < %{email_validator_max_ver}) Requires:(php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +Requires:(php-composer(%{composer_vendor}/service-contracts) >= %{symfony_contracts_min_ver} with php-composer(%{composer_vendor}/service-contracts) < %{symfony_contracts_max_ver}) %else Requires: php-composer(egulias/email-validator) < %{email_validator_max_ver} Requires: php-composer(egulias/email-validator) >= %{email_validator_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} +Requires: php-composer(%{composer_vendor}/service-contracts) < %{symfony_contracts_max_ver} +Requires: php-composer(%{composer_vendor}/service-contracts) >= %{symfony_contracts_min_ver} %endif # phpcompatinfo for version 4.3.6 Requires: php-reflection @@ -1800,14 +1845,14 @@ Requires: php-composer(%{composer_vendor}/event-dispatcher-contracts) >= %{symfo Requires: php-composer(%{composer_vendor}/service-contracts) < %{symfony_contracts_max_ver} Requires: php-composer(%{composer_vendor}/service-contracts) >= %{symfony_contracts_min_ver} %endif -# phpcompatinfo for version 4.0.0-beta1 -Requires: php-ctype +# phpcompatinfo for version 4.4.0 Requires: php-date Requires: php-hash Requires: php-json Requires: php-pcre Requires: php-reflection Requires: php-session +Requires: php-sodium Requires: php-spl # Composer @@ -2118,15 +2163,15 @@ License: MIT Requires: %{name}-common = %{version}-%{release} # composer.json %if %{with_range_dependencies} -Requires:(php-composer(fig/link-util) >= %{fig_link_util_min_ver} with php-composer(fig/link-util) < %{fig_link_util_max_ver}) Requires:(php-composer(psr/link) >= %{psr_link_min_ver} with php-composer(psr/link) < %{psr_link_max_ver}) +Requires:(php-composer(%{composer_vendor}/polyfill-php72) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php72) < %{symfony_polyfill_max_ver}) # composer.json: optional Suggests: php-composer(%{composer_vendor}/http-kernel) %else -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} +Requires: php-composer(%{composer_vendor}/polyfill-php72) < %{symfony_polyfill_max_ver} +Requires: php-composer(%{composer_vendor}/polyfill-php72) >= %{symfony_polyfill_min_ver} %endif # phpcompatinfo for version 4.0.0-beta1 # @@ -2729,6 +2774,22 @@ exit $RET # ------------------------------------------------------------------------------ +%files error-handler + +%license src/Symfony/Component/ErrorHandler/LICENSE +%doc src/Symfony/Component/ErrorHandler/*.md +%doc src/Symfony/Component/ErrorHandler/composer.json + +%{symfony4_dir}/Component/ErrorHandler +%exclude %{symfony4_dir}/Component/ErrorHandler/LICENSE +%exclude %{symfony4_dir}/Component/ErrorHandler/*.md +%exclude %{symfony4_dir}/Component/ErrorHandler/autoload-dev.php +%exclude %{symfony4_dir}/Component/ErrorHandler/composer.json +#exclude #{symfony4_dir}/Component/ErrorHandler/phpunit.* +#exclude #{symfony4_dir}/Component/ErrorHandler/Tests + +# ------------------------------------------------------------------------------ + %files event-dispatcher %license src/Symfony/Component/EventDispatcher/LICENSE @@ -3232,6 +3293,18 @@ exit $RET # ############################################################################## %changelog +* Thu Nov 21 2019 Remi Collet - 4.4.0-1 +- update to 4.4.0 +- add ErrorHandler component +- drop dependency on fig/link-util +- raise dependency on symfony/contracts 1.1.8 +- raise dependency on doctrine/doctrine-bundle 1.5 +- raise dependency on monolog/monolog 1.25.1 +- allow twig 3 (review #1774967) +- allow doctrine-bundle 2 (review #1775102) +- add dependency on sodium extension +- add dependency on guzzlehttp/promises + * Wed Nov 13 2019 Remi Collet - 4.3.8-1 - update to 4.3.8 -- cgit