Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit fc758a0

Browse files
Merge branch '3.4' into 4.0
* 3.4: SCA with Php Inspections (EA Extended) Add test case for #25264 Fixed the null value exception case. Remove rc/beta suffix from composer.json files Throw an exception is expression language is not installed Fail as early and noisily as possible [Console][DI] Fail gracefully [FrameworkBundle] Fix visibility of a test helper [link] clear the cache after linking [DI] Trigger deprecation when setting a to-be-private synthetic service [link] Prevent warnings when running link with 2.7 [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message do not eagerly filter comment lines [WebProfilerBundle], [TwigBundle] Fix Profiler breaking XHTML pages (Content-Type: application/xhtml+xml)
2 parents eba8a0f + 3e2df40 commit fc758a0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Csrf/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"symfony/security-core": "~3.4|~4.0"
2121
},
2222
"require-dev": {
23-
"symfony/http-foundation": "~3.4-beta5|~4.0-beta5"
23+
"symfony/http-foundation": "~3.4|~4.0"
2424
},
2525
"conflict": {
26-
"symfony/http-foundation": "<3.4-beta5|~4.0,<4.0-beta5"
26+
"symfony/http-foundation": "<3.4"
2727
},
2828
"suggest": {
2929
"symfony/http-foundation": "For using the class SessionTokenStorage."

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/event-dispatcher": "~3.4|~4.0",
21-
"symfony/http-foundation": "~3.4-beta5|~4.0-beta5",
21+
"symfony/http-foundation": "~3.4|~4.0",
2222
"symfony/http-kernel": "~3.4|~4.0",
2323
"symfony/property-access": "~3.4|~4.0"
2424
},

0 commit comments

Comments
 (0)