Commit 51b887d
committed
Merge branch '7.4' into 8.0
* 7.4: (40 commits)
[PropertyInfo] treat mixed[] the same as array when getting types from docblocks
treat `mixed[]` the same as `array` when getting types from docblocks
install ext-zstd on PHP 8.5 as well
fix merge
[Console] Fix profile invokable command
sync ControllerHelper docblock with latest AbstractController changes
fix: Typehint for `createForm` in abstractController
[Notifier][Mercure] Add support for Mercure 0.7
register attribute loader arguments in a forward-compatible way
ensure compatibility with RelayCluster 0.20.0
mark test using a Redis connection as an integration test
ensure compatibility with Relay extension 0.20.0
[FrameworkBundle] Allow backed enum to be used in initial_marking workflow configuration
[DependencyInjection] Fix `query_string` env processor for URLs without query string
[HttpFoundation] Fix Expires response header for EventStream
Bump Symfony version to 7.4.1
Update VERSION for 7.4.0
Update CHANGELOG for 7.4.0
-
[DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports
...File tree
2 files changed
+24
-6
lines changed- Authenticator/Passport/Badge
- Tests/Authenticator/Passport/Badge
2 files changed
+24
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
58 | | - | |
59 | | - | |
| 57 | + | |
60 | 58 | | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | 59 | | |
65 | 60 | | |
66 | 61 | | |
| |||
73 | 68 | | |
74 | 69 | | |
75 | 70 | | |
| 71 | + | |
| 72 | + | |
76 | 73 | | |
77 | 74 | | |
78 | 75 | | |
| |||
131 | 128 | | |
132 | 129 | | |
133 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
134 | 142 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
65 | 75 | | |
0 commit comments