diff options
| author | Remi Collet <remi@remirepo.net> | 2017-08-01 16:36:30 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-08-01 16:36:30 +0200 |
| commit | fcf867a3a00a1fd08fb2b5d09b114610a24d5697 (patch) | |
| tree | cdf876ad6f7da407d864a71dc30aa02b9c1a4d97 | |
| parent | 9ed30dcdd10597bcc3b1951138cad442ac6cfd9e (diff) | |
v3.2.12
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-symfony3.spec | 18 |
2 files changed, 16 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 75e9c91..8730dd6 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=5.5.9", + "ext-xml": "*", "doctrine/common": "~2.4", "twig/twig": "~1.34|~2.4", "psr/cache": "~1.0", @@ -94,7 +95,7 @@ "sensio/framework-extra-bundle": "^3.0.2" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0", + "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0", "phpdocumentor/type-resolver": "<0.2.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, diff --git a/php-symfony3.spec b/php-symfony3.spec index 288d43f..4781388 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.11 -%global github_commit 697ece8d9a4e07349bf5d222204fc878b3199f03 +%global github_version 3.2.12 +%global github_commit d65d8fad37fdbb599b13f0aade2407ae88465a58 %global composer_vendor symfony %global composer_project symfony @@ -62,8 +62,8 @@ # 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" -%global phpdocumentor_reflection_docblock_min_ver 3.0 +# "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0" +%global phpdocumentor_reflection_docblock_min_ver 3.2 %global phpdocumentor_reflection_docblock_max_ver 4.0 # "psr/cache": "~1.0" %global psr_cache_min_ver 1.0 @@ -446,6 +446,7 @@ 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} @@ -535,6 +536,7 @@ 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 # composer.json: optional %if 0%{?fedora} Suggests: php-composer(%{composer_vendor}/security-acl) @@ -1835,6 +1837,9 @@ 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 %if !%{with_sensio_framework_extra_bundle} : Skip tests requiring "sensio/framework-extra-bundle" @@ -2600,6 +2605,11 @@ exit $RET # ############################################################################## %changelog +* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 3.2.12-1 +- Update to 3.2.12 +- add dependency on php-xml +- raise dependency on phpdocumentor/reflection-docblock 3.2 + * Wed Jul 5 2017 Remi Collet <remi@remirepo.net> - 3.2.11-1 - Update to 3.2.11 |