Skip to content

Commit 99cd933

Browse files
committed
BC fix.
1 parent 6c982e1 commit 99cd933

4 files changed

Lines changed: 96 additions & 16 deletions

File tree

‎pkg/async-event-dispatcher/DependencyInjection/Configuration.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ class Configuration implements ConfigurationInterface
1313
public function getConfigTreeBuilder()
1414
{
1515
$tb = new TreeBuilder('enqueue_async_event_dispatcher');
16-
$rootNode = $tb->getRootNode();
16+
17+
if (method_exists($tb, 'getRootNode')) {
18+
$rootNode = $tb->getRootNode();
19+
} else {
20+
$rootNode = $tb->root('enqueue_async_event_dispatcher');
21+
}
1722

1823
$rootNode->children()
1924
->scalarNode('context_service')->isRequired()->cannotBeEmpty()->end()

‎pkg/enqueue-bundle/DependencyInjection/Configuration.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ public function __construct(bool $debug)
2525
public function getConfigTreeBuilder(): TreeBuilder
2626
{
2727
$tb = new TreeBuilder('enqueue');
28-
$rootNode = $tb->getRootNode();
28+
29+
if (method_exists($tb, 'getRootNode')) {
30+
$rootNode = $tb->getRootNode();
31+
} else {
32+
$rootNode = $tb->root('enqueue');
33+
}
2934

3035
$rootNode
3136
->requiresAtLeastOneElement()

‎pkg/enqueue/Tests/Symfony/DependencyInjection/TransportFactoryTest.php‎

Lines changed: 78 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ public function testThrowIfEmptyNameGivenOnConstruction()
3838
public function testShouldAllowAddConfigurationAsStringDsn()
3939
{
4040
$tb = new TreeBuilder('foo');
41-
$rootNode = $tb->getRootNode();
41+
42+
if (method_exists($tb, 'getRootNode')) {
43+
$rootNode = $tb->getRootNode();
44+
} else {
45+
$rootNode = $tb->root('foo');
46+
}
4247

4348
$rootNode->append(TransportFactory::getConfiguration());
4449

@@ -60,7 +65,12 @@ public function testShouldAllowAddConfigurationAsStringDsn()
6065
public function testShouldAllowAddConfigurationAsDsnWithoutSlashes()
6166
{
6267
$tb = new TreeBuilder('foo');
63-
$rootNode = $tb->getRootNode();
68+
69+
if (method_exists($tb, 'getRootNode')) {
70+
$rootNode = $tb->getRootNode();
71+
} else {
72+
$rootNode = $tb->root('foo');
73+
}
6474

6575
$rootNode->append(TransportFactory::getConfiguration());
6676

@@ -77,7 +87,12 @@ public function testShouldAllowAddConfigurationAsDsnWithoutSlashes()
7787
public function testShouldSetNullTransportIfNullGiven()
7888
{
7989
$tb = new TreeBuilder('foo');
80-
$rootNode = $tb->getRootNode();
90+
91+
if (method_exists($tb, 'getRootNode')) {
92+
$rootNode = $tb->getRootNode();
93+
} else {
94+
$rootNode = $tb->root('foo');
95+
}
8196

8297
$rootNode->append(TransportFactory::getConfiguration());
8398

@@ -94,7 +109,12 @@ public function testShouldSetNullTransportIfNullGiven()
94109
public function testShouldSetNullTransportIfEmptyStringGiven()
95110
{
96111
$tb = new TreeBuilder('foo');
97-
$rootNode = $tb->getRootNode();
112+
113+
if (method_exists($tb, 'getRootNode')) {
114+
$rootNode = $tb->getRootNode();
115+
} else {
116+
$rootNode = $tb->root('foo');
117+
}
98118

99119
$rootNode->append(TransportFactory::getConfiguration());
100120

@@ -111,7 +131,12 @@ public function testShouldSetNullTransportIfEmptyStringGiven()
111131
public function testShouldSetNullTransportIfEmptyArrayGiven()
112132
{
113133
$tb = new TreeBuilder('foo');
114-
$rootNode = $tb->getRootNode();
134+
135+
if (method_exists($tb, 'getRootNode')) {
136+
$rootNode = $tb->getRootNode();
137+
} else {
138+
$rootNode = $tb->root('foo');
139+
}
115140

116141
$rootNode->append(TransportFactory::getConfiguration());
117142

@@ -128,7 +153,12 @@ public function testShouldSetNullTransportIfEmptyArrayGiven()
128153
public function testThrowIfEmptyDsnGiven()
129154
{
130155
$tb = new TreeBuilder('foo');
131-
$rootNode = $tb->getRootNode();
156+
157+
if (method_exists($tb, 'getRootNode')) {
158+
$rootNode = $tb->getRootNode();
159+
} else {
160+
$rootNode = $tb->root('foo');
161+
}
132162

133163
$rootNode->append(TransportFactory::getConfiguration());
134164

@@ -141,7 +171,12 @@ public function testThrowIfEmptyDsnGiven()
141171
public function testThrowIfFactoryClassAndFactoryServiceSetAtTheSameTime()
142172
{
143173
$tb = new TreeBuilder('foo');
144-
$rootNode = $tb->getRootNode();
174+
175+
if (method_exists($tb, 'getRootNode')) {
176+
$rootNode = $tb->getRootNode();
177+
} else {
178+
$rootNode = $tb->root('foo');
179+
}
145180

146181
$rootNode->append(TransportFactory::getConfiguration());
147182

@@ -160,7 +195,12 @@ public function testThrowIfFactoryClassAndFactoryServiceSetAtTheSameTime()
160195
public function testThrowIfConnectionFactoryClassUsedWithFactoryClassAtTheSameTime()
161196
{
162197
$tb = new TreeBuilder('foo');
163-
$rootNode = $tb->getRootNode();
198+
199+
if (method_exists($tb, 'getRootNode')) {
200+
$rootNode = $tb->getRootNode();
201+
} else {
202+
$rootNode = $tb->root('foo');
203+
}
164204

165205
$rootNode->append(TransportFactory::getConfiguration());
166206

@@ -179,7 +219,12 @@ public function testThrowIfConnectionFactoryClassUsedWithFactoryClassAtTheSameTi
179219
public function testThrowIfConnectionFactoryClassUsedWithFactoryServiceAtTheSameTime()
180220
{
181221
$tb = new TreeBuilder('foo');
182-
$rootNode = $tb->getRootNode();
222+
223+
if (method_exists($tb, 'getRootNode')) {
224+
$rootNode = $tb->getRootNode();
225+
} else {
226+
$rootNode = $tb->root('foo');
227+
}
183228

184229
$rootNode->append(TransportFactory::getConfiguration());
185230
$processor = new Processor();
@@ -197,7 +242,12 @@ public function testThrowIfConnectionFactoryClassUsedWithFactoryServiceAtTheSame
197242
public function testShouldAllowSetFactoryClass()
198243
{
199244
$tb = new TreeBuilder('foo');
200-
$rootNode = $tb->getRootNode();
245+
246+
if (method_exists($tb, 'getRootNode')) {
247+
$rootNode = $tb->getRootNode();
248+
} else {
249+
$rootNode = $tb->root('foo');
250+
}
201251

202252
$rootNode->append(TransportFactory::getConfiguration());
203253
$processor = new Processor();
@@ -215,7 +265,12 @@ public function testShouldAllowSetFactoryClass()
215265
public function testShouldAllowSetFactoryService()
216266
{
217267
$tb = new TreeBuilder('foo');
218-
$rootNode = $tb->getRootNode();
268+
269+
if (method_exists($tb, 'getRootNode')) {
270+
$rootNode = $tb->getRootNode();
271+
} else {
272+
$rootNode = $tb->root('foo');
273+
}
219274

220275
$rootNode->append(TransportFactory::getConfiguration());
221276
$processor = new Processor();
@@ -233,7 +288,12 @@ public function testShouldAllowSetFactoryService()
233288
public function testShouldAllowSetConnectionFactoryClass()
234289
{
235290
$tb = new TreeBuilder('foo');
236-
$rootNode = $tb->getRootNode();
291+
292+
if (method_exists($tb, 'getRootNode')) {
293+
$rootNode = $tb->getRootNode();
294+
} else {
295+
$rootNode = $tb->root('foo');
296+
}
237297

238298
$rootNode->append(TransportFactory::getConfiguration());
239299
$processor = new Processor();
@@ -251,7 +311,12 @@ public function testShouldAllowSetConnectionFactoryClass()
251311
public function testThrowIfExtraOptionGiven()
252312
{
253313
$tb = new TreeBuilder('foo');
254-
$rootNode = $tb->getRootNode();
314+
315+
if (method_exists($tb, 'getRootNode')) {
316+
$rootNode = $tb->getRootNode();
317+
} else {
318+
$rootNode = $tb->root('foo');
319+
}
255320

256321
$rootNode->append(TransportFactory::getConfiguration());
257322
$processor = new Processor();

‎pkg/simple-client/SimpleClient.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,12 @@ public function build(array $configs): void
307307
private function createConfiguration(): NodeInterface
308308
{
309309
$tb = new TreeBuilder('enqueue');
310-
$rootNode = $tb->getRootNode();
310+
311+
if (method_exists($tb, 'getRootNode')) {
312+
$rootNode = $tb->getRootNode();
313+
} else {
314+
$rootNode = $tb->root('enqueue');
315+
}
311316

312317
$rootNode
313318
->beforeNormalization()

0 commit comments

Comments
 (0)