summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json3
-rw-r--r--php-symfony3.spec13
2 files changed, 9 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 607d4f2..75e9c91 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": ">=5.5.9",
"doctrine/common": "~2.4",
- "twig/twig": "~1.28|~2.0",
+ "twig/twig": "~1.34|~2.4",
"psr/cache": "~1.0",
"psr/log": "~1.0",
"symfony/polyfill-intl-icu": "~1.0",
@@ -106,7 +106,6 @@
"Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
"Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
"Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
- "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
"Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
"Symfony\\Bundle\\": "src/Symfony/Bundle/",
"Symfony\\Component\\": "src/Symfony/Component/"
diff --git a/php-symfony3.spec b/php-symfony3.spec
index 0ee156a..7dd6d5f 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.9
-%global github_commit 78c08f2faa42210db4fe6f4ece73891ca546a9a0
+%global github_version 3.2.10
+%global github_commit bc4a6030c67f8b9f4cb49bf519ad5355ffad55ee
%global composer_vendor symfony
%global composer_project symfony
@@ -85,9 +85,9 @@
# 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
-# "twig/twig": "~1.26|~2.0"
+# "twig/twig": "~1.34|~2.4"
# NOTE: Multiple major versions handled in autoloaders
-%global twig_min_ver 1.26
+%global twig_min_ver 1.34
%global twig_max_ver 3.0
# Build using "--without tests" to disable tests
@@ -1558,7 +1558,6 @@ 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}/property-access) = %{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}
@@ -2599,6 +2598,10 @@ exit $RET
# ##############################################################################
%changelog
+* Wed Jul 5 2017 Remi Collet <remi@remirepo.net> - 3.2.10-1
+- Update to 3.2.10
+- raise dependency on twig 1.34
+
* Sun Jun 11 2017 Shawn Iwinski <shawn@iwin.ski> - 3.2.9-1
- Update to 3.2.9
- Use php-composer(cache/integration-tests)