summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-symfony3.spec11
2 files changed, 9 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 8c7d87c..6d5065d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
- "doctrine/common": "~2.4@stable",
+ "doctrine/common": "~2.4",
"fig/link-util": "^1.0",
"twig/twig": "^1.35|^2.4.4",
"psr/cache": "~1.0",
@@ -104,7 +104,7 @@
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
- "phpdocumentor/type-resolver": "<0.2.1",
+ "phpdocumentor/type-resolver": "<0.3.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
"provide": {
diff --git a/php-symfony3.spec b/php-symfony3.spec
index ea77c35..5b20cd6 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.4.14
-%global github_commit f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e
+%global github_version 3.4.15
+%global github_commit 5bb5c2d4b0d5cf10672015b68519a199e6ac27c1
%global composer_vendor symfony
%global composer_project symfony
@@ -49,9 +49,9 @@
# "doctrine/doctrine-bundle": "~1.4"
%global doctrine_bundle_min_ver 1.4
%global doctrine_bundle_max_ver 2.0
-# "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0"
+# "doctrine/orm": "~2.4,>=2.4.5"
%global doctrine_orm_min_ver 2.4.5
-%global doctrine_orm_max_ver 2.7.0
+%global doctrine_orm_max_ver 3.0
# "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
@@ -2807,6 +2807,9 @@ exit $RET
# ##############################################################################
%changelog
+* Tue Aug 28 2018 Remi Collet <remi@remirepo.net> - 3.4.15-1
+- update to 3.4.15
+
* Wed Aug 01 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.14-1
- Update to 3.4.14 (CVE-2018-14773 / CVE-2018-14774)
- Add conflict php-composer(phpdocumentor/type-resolver) < 0.3.0