Commit 51ea5a9
committed
Merge branch '7.4' into 8.0
* 7.4:
Add `TEST_GENERATE_FIXTURES=1` to generate fixtures in tests
[Config] Fix array shape for `canBeEnabled` / `canBeDisabled`
[DoctrineBridge] Remove unnecassary check
[JsonStreamer] Add synthetic properties support
Resolved Conflicts:
- src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
- src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
- src/Symfony/Component/JsonStreamer/Tests/JsonStreamReaderTest.php1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
147 | | - | |
| 147 | + | |
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| |||
0 commit comments