summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-04-03 11:15:43 +0200
committerRemi Collet <remi@remirepo.net>2019-04-03 11:15:43 +0200
commit112ad4799771c3788f6cdcbd0ce63b4a07e57aa6 (patch)
treede85f61b1f1c0c7998e248ee76185a313e3ba93d
parentdf534cefd70b8c58a73ebadc99798be1bc1a81fb (diff)
v4.2.5
-rw-r--r--php-symfony4.spec16
-rw-r--r--src/Symfony/Bridge/Twig/composer.json2
-rw-r--r--src/Symfony/Bundle/FrameworkBundle/composer.json4
-rw-r--r--src/Symfony/Bundle/TwigBundle/composer.json2
-rw-r--r--src/Symfony/Component/Routing/composer.json3
-rw-r--r--src/Symfony/Component/Security/composer.json1
6 files changed, 16 insertions, 12 deletions
diff --git a/php-symfony4.spec b/php-symfony4.spec
index d8cfee4..7072d4e 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.2.4
-%global github_commit 7998cfb802cd3b91719a9b428f0f97ea5bbabe10
+%global github_version 4.2.5
+%global github_commit 5365a36a024503583a9841c177802ab1211cb5b8
%global composer_vendor symfony
%global composer_project symfony
@@ -99,8 +99,8 @@
# "symfony/contracts": "~1.0.2"
%global symfony_contracts_min_ver 1.0.2
%global symfony_contracts_max_ver 2
-# "twig/twig": "^1.37.1|^2.6.2"
-%global twig_min_ver 1.37.1
+# "twig/twig": "^1.38.1|^2.7.1"
+%global twig_min_ver 1.38.1
%global twig_max_ver 3.0
# Build using "--without tests" to disable tests
@@ -1504,10 +1504,9 @@ Requires: %{name}-common = %{version}-%{release}
# composer.json: optional
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
Suggests: php-composer(%{composer_vendor}/config)
-Suggests: php-composer(%{composer_vendor}/dependency-injection)
+Suggests: php-composer(%{composer_vendor}/yaml)
Suggests: php-composer(%{composer_vendor}/expression-language)
Suggests: php-composer(%{composer_vendor}/http-foundation)
-Suggests: php-composer(%{composer_vendor}/yaml)
Suggests: php-composer(doctrine/annotations)
%endif
# phpcompatinfo for version 4.0.0-beta1
@@ -1549,6 +1548,7 @@ Suggests: php-composer(%{composer_vendor}/validator)
Suggests: php-composer(psr/container)
%endif
# phpcompatinfo for version 4.0.0-beta1
+Requires: php-ctype
Requires: php-date
Requires: php-hash
Requires: php-json
@@ -2919,6 +2919,10 @@ exit $RET
# ##############################################################################
%changelog
+* Wed Apr 3 2019 Remi Collet <remi@remirepo.net> - 4.2.5-1
+- update to 4.2.5
+- raise dependency on twig 1.38.1
+
* Mon Mar 4 2019 Remi Collet <remi@remirepo.net> - 4.2.4-1
- update to 4.2.4
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 2403423..9405dc2 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"symfony/contracts": "^1.0.2",
- "twig/twig": "^1.37.1|^2.6.2"
+ "twig/twig": "^1.38.1|^2.7.1"
},
"require-dev": {
"symfony/asset": "~3.4|~4.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index e185549..44bb6b0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -21,9 +21,9 @@
"symfony/cache": "~4.2",
"symfony/config": "~4.2",
"symfony/contracts": "^1.0.2",
- "symfony/dependency-injection": "^4.2",
+ "symfony/dependency-injection": "^4.2.5",
"symfony/event-dispatcher": "^4.1",
- "symfony/http-foundation": "^4.1.2",
+ "symfony/http-foundation": "^4.2.5",
"symfony/http-kernel": "^4.2",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~3.4|~4.0",
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index d9526cf..6bd99f0 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -27,7 +27,7 @@
"require-dev": {
"symfony/asset": "~3.4|~4.0",
"symfony/stopwatch": "~3.4|~4.0",
- "symfony/dependency-injection": "~4.1",
+ "symfony/dependency-injection": "^4.2.5",
"symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
"symfony/form": "~3.4|~4.0",
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
index be489ee..27b6d99 100644
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@@ -37,8 +37,7 @@
"symfony/config": "For using the all-in-one router or any loader",
"symfony/yaml": "For using the YAML loader",
"symfony/expression-language": "For using expression matching",
- "doctrine/annotations": "For using the annotation loader",
- "symfony/dependency-injection": "For loading routes from a service"
+ "doctrine/annotations": "For using the annotation loader"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Routing\\": "" },
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index 6cf567f..8afb892 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -32,6 +32,7 @@
"require-dev": {
"psr/container": "^1.0",
"symfony/finder": "~3.4|~4.0",
+ "symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~3.4|~4.0",
"symfony/validator": "~3.4|~4.0",