summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json1
-rw-r--r--php-symfony3.spec11
-rw-r--r--src/Symfony/Bundle/SecurityBundle/composer.json2
-rw-r--r--src/Symfony/Bundle/WebProfilerBundle/composer.json2
4 files changed, 10 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 42397d7..9ad5e39 100644
--- a/composer.json
+++ b/composer.json
@@ -103,6 +103,7 @@
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
},
"conflict": {
+ "monolog/monolog": ">=2",
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
"phpdocumentor/type-resolver": "<0.3.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
diff --git a/php-symfony3.spec b/php-symfony3.spec
index 3bff174..2eac775 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.35
-%global github_commit 2adc85d49cbe14e346068fa7e9c2e1f08ab31de6
+%global github_version 3.4.36
+%global github_commit 0a6fccb5772ad2467253e6849d589bd09d9eb195
%global composer_vendor symfony
%global composer_project symfony
@@ -118,7 +118,7 @@
Name: php-%{composer_project}3
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Symfony PHP framework (version 3)
# MIT and CC-BY-SA:
@@ -657,7 +657,7 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver}
Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver}
Requires: php-composer(%{composer_vendor}/routing) = %{version}
-Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
+Requires: php-composer(%{composer_vendor}/twig-bundle) = %{version}
Requires: php-composer(%{composer_vendor}/var-dumper) = %{version}
%if %{with_range_dependencies}
Requires:(php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver})
@@ -2877,6 +2877,9 @@ exit $RET
# ##############################################################################
%changelog
+* Mon Dec 2 2019 Remi Collet <remi@remirepo.net> - 3.4.36-1
+- update to 3.4.36
+
* Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 3.4.35-2
- use range dependencies
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 1f0e56e..1a8057b 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -19,7 +19,7 @@
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
"symfony/config": "~3.4|~4.0",
- "symfony/security": "~3.4.15|~4.0.15|^4.1.4",
+ "symfony/security": "~3.4.36|~4.3.9|^4.4.1",
"symfony/dependency-injection": "^3.4.3|^4.0.3",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/polyfill-php70": "~1.0"
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index 241a5e3..c82ef0f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -20,7 +20,7 @@
"symfony/http-kernel": "~3.4.25|^4.2.6",
"symfony/polyfill-php70": "~1.0",
"symfony/routing": "~2.8|~3.0|~4.0",
- "symfony/twig-bridge": "~2.8|~3.0|~4.0",
+ "symfony/twig-bundle": "~2.8|~3.0|~4.0",
"symfony/var-dumper": "~3.3|~4.0",
"twig/twig": "~1.34|~2.4"
},