Commit 25229e8
committed
Merge branch '6.4' into 7.0
* 6.4:
[Process] remove fixing of legacy bug, when PTS functionality is enabled
DX: re-apply self_accessor and phpdoc_types_order by PHP CS Fixer
[HttpClient] Psr18Client: parse HTTP Reason Phrase for Response
fix test
Fix wrong yaml parse null test
[AssetMapper] Fixing merge from multiple PR's
Bump Symfony version to 5.4.31
Update VERSION for 5.4.30
Update CONTRIBUTORS for 5.4.30
Update CHANGELOG for 5.4.30
Fix wrong merge
[AssetMapper] Allowing circular references in JavaScriptImportPathCompiler
[AssetMapper] Fix file deleting errors & remove nullable MappedAsset on JS import
[Lock] Fix mongodb extension requirement in tests
[Yaml] Remove dead code
[AssetMapper] Fix in-file imports to resolve via filesystem
throw better exception in TranslatableNormalizer, add to changelog
Passing null to Inline::parse is not allowed
Fix passing null to trim()File tree
3 files changed
+12
-4
lines changed- Tests/Session/Storage/Handler
3 files changed
+12
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
307 | 307 | | |
308 | 308 | | |
309 | 309 | | |
| 310 | + | |
| 311 | + | |
310 | 312 | | |
311 | 313 | | |
312 | 314 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
| 73 | + | |
72 | 74 | | |
73 | 75 | | |
74 | 76 | | |
| |||
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | | - | |
| 33 | + | |
33 | 34 | | |
34 | | - | |
35 | | - | |
36 | 35 | | |
37 | | - | |
| 36 | + | |
38 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
39 | 43 | | |
40 | 44 | | |
41 | 45 | | |
| |||
0 commit comments