Commit fc05855
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
2 files changed
+14
-4
lines changed- Tests/Store
2 files changed
+14
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 | | |
15 | 18 | | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
19 | 22 | | |
20 | 23 | | |
21 | | - | |
| 24 | + | |
22 | 25 | | |
23 | 26 | | |
24 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
25 | 35 | | |
26 | 36 | | |
27 | | - | |
| 37 | + | |
28 | 38 | | |
29 | 39 | | |
30 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
| 34 | + | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
0 commit comments