Skip to content

Commit 4d03450

Browse files
ogizanagiogizanagi
committed
[FrameworkBundle][Console] JsonDescriptor: Respect original output
1 parent d9f1727 commit 4d03450

File tree

8 files changed

+70
-70
lines changed

8 files changed

+70
-70
lines changed

‎Tests/Fixtures/Descriptor/builder_1_public.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"shared": true,
1010
"synchronized": false,
1111
"abstract": true,
12+
"autowire": false,
13+
"autowiring_types": [],
1214
"file": null,
1315
"factory_class": "Full\\Qualified\\FactoryClass",
1416
"factory_method": "get",
15-
"tags": [],
16-
"autowire": false,
17-
"autowiring_types": []
17+
"tags": []
1818
}
1919
},
2020
"aliases": {

‎Tests/Fixtures/Descriptor/builder_1_services.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"shared": true,
1010
"synchronized": false,
1111
"abstract": true,
12+
"autowire": false,
13+
"autowiring_types": [],
1214
"file": null,
1315
"factory_class": "Full\\Qualified\\FactoryClass",
1416
"factory_method": "get",
15-
"tags": [],
16-
"autowire": false,
17-
"autowiring_types": []
17+
"tags": []
1818
},
1919
"definition_2": {
2020
"class": "Full\\Qualified\\Class2",
@@ -25,6 +25,8 @@
2525
"shared": true,
2626
"synchronized": false,
2727
"abstract": false,
28+
"autowire": false,
29+
"autowiring_types": [],
2830
"file": "\/path\/to\/file",
2931
"factory_service": "factory.service",
3032
"factory_method": "get",
@@ -46,9 +48,7 @@
4648
"name": "tag2",
4749
"parameters": []
4850
}
49-
],
50-
"autowire": false,
51-
"autowiring_types": []
51+
]
5252
}
5353
},
5454
"aliases": {

‎Tests/Fixtures/Descriptor/builder_1_tag1.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"shared": true,
1010
"synchronized": false,
1111
"abstract": false,
12+
"autowire": false,
13+
"autowiring_types": [],
1214
"file": "\/path\/to\/file",
1315
"factory_service": "factory.service",
1416
"factory_method": "get",
@@ -30,9 +32,7 @@
3032
"name": "tag2",
3133
"parameters": []
3234
}
33-
],
34-
"autowire": false,
35-
"autowiring_types": []
35+
]
3636
}
3737
},
3838
"aliases": [],

‎Tests/Fixtures/Descriptor/builder_1_tags.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"shared": true,
1010
"synchronized": false,
1111
"abstract": false,
12+
"autowire": false,
13+
"autowiring_types": [],
1214
"file": "\/path\/to\/file",
1315
"factory_service": "factory.service",
14-
"factory_method": "get",
15-
"autowire": false,
16-
"autowiring_types": []
16+
"factory_method": "get"
1717
}
1818
],
1919
"tag2": [
@@ -26,11 +26,11 @@
2626
"shared": true,
2727
"synchronized": false,
2828
"abstract": false,
29+
"autowire": false,
30+
"autowiring_types": [],
2931
"file": "\/path\/to\/file",
3032
"factory_service": "factory.service",
31-
"factory_method": "get",
32-
"autowire": false,
33-
"autowiring_types": []
33+
"factory_method": "get"
3434
}
3535
]
3636
}

‎Tests/Fixtures/Descriptor/definition_1.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"shared": true,
88
"synchronized": false,
99
"abstract": true,
10+
"autowire": false,
11+
"autowiring_types": [],
1012
"file": null,
1113
"factory_class": "Full\\Qualified\\FactoryClass",
1214
"factory_method": "get",
13-
"tags": [],
14-
"autowire": false,
15-
"autowiring_types": []
15+
"tags": []
1616
}

‎Tests/Fixtures/Descriptor/definition_2.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"shared": true,
88
"synchronized": false,
99
"abstract": false,
10+
"autowire": false,
11+
"autowiring_types": [],
1012
"file": "\/path\/to\/file",
1113
"factory_service": "factory.service",
1214
"factory_method": "get",
@@ -28,7 +30,5 @@
2830
"name": "tag2",
2931
"parameters": []
3032
}
31-
],
32-
"autowire": false,
33-
"autowiring_types": []
33+
]
3434
}

‎Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"class": "Full\\Qualified\\Class1",
3-
"scope": "container",
4-
"public": true,
5-
"synthetic": false,
6-
"lazy": true,
7-
"shared": true,
8-
"synchronized": true,
9-
"abstract": true,
10-
"file": null,
11-
"factory_class": "Full\\Qualified\\FactoryClass",
12-
"factory_method": "get",
13-
"tags": [],
14-
"autowire": false,
15-
"autowiring_types": []
2+
"class": "Full\\Qualified\\Class1",
3+
"scope": "container",
4+
"public": true,
5+
"synthetic": false,
6+
"lazy": true,
7+
"shared": true,
8+
"synchronized": true,
9+
"abstract": true,
10+
"autowire": false,
11+
"autowiring_types": [],
12+
"file": null,
13+
"factory_class": "Full\\Qualified\\FactoryClass",
14+
"factory_method": "get",
15+
"tags": []
1616
}

‎Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"class": "Full\\Qualified\\Class2",
3-
"scope": "container",
4-
"public": false,
5-
"synthetic": true,
6-
"lazy": false,
7-
"shared": true,
8-
"synchronized": false,
9-
"abstract": false,
10-
"file": "\/path\/to\/file",
11-
"factory_service": "factory.service",
12-
"factory_method": "get",
13-
"tags": [
14-
{
15-
"name": "tag1",
16-
"parameters": {
17-
"attr1": "val1",
18-
"attr2": "val2"
19-
}
20-
},
21-
{
22-
"name": "tag1",
23-
"parameters": {
24-
"attr3": "val3"
25-
}
26-
},
27-
{
28-
"name": "tag2",
29-
"parameters": []
30-
}
31-
],
32-
"autowire": false,
33-
"autowiring_types": []
2+
"class": "Full\\Qualified\\Class2",
3+
"scope": "container",
4+
"public": false,
5+
"synthetic": true,
6+
"lazy": false,
7+
"shared": true,
8+
"synchronized": false,
9+
"abstract": false,
10+
"autowire": false,
11+
"autowiring_types": [],
12+
"file": "\/path\/to\/file",
13+
"factory_service": "factory.service",
14+
"factory_method": "get",
15+
"tags": [
16+
{
17+
"name": "tag1",
18+
"parameters": {
19+
"attr1": "val1",
20+
"attr2": "val2"
21+
}
22+
},
23+
{
24+
"name": "tag1",
25+
"parameters": {
26+
"attr3": "val3"
27+
}
28+
},
29+
{
30+
"name": "tag2",
31+
"parameters": []
32+
}
33+
]
3434
}

0 commit comments

Comments
 (0)