Skip to content

Commit 93b4abf

Browse files
mcg-webmcg-web
authored
Merge pull request #427 from mcg-web/remove-deprecated-messages
Remove deprecation messages for symfony 4.2
2 parents 4d85286 + 6325269 commit 93b4abf

12 files changed

+58
-52
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ jobs:
4848
env: SYMFONY_VERSION=4.2.*
4949
- php: nightly
5050
env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
51-
- php: 7.2
51+
52+
- stage: Code Quality
53+
php: 7.2
5254
env: COVERAGE
5355
before_script:
5456
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}

‎src/Config/CustomScalarTypeDefinition.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
6-
75
class CustomScalarTypeDefinition extends TypeDefinition
86
{
97
public function getDefinition()
108
{
11-
$builder = new TreeBuilder();
12-
$node = $builder->root('_custom_scalar_config');
9+
$node = self::createNode('_custom_scalar_config');
1310

1411
$node
1512
->children()

‎src/Config/EnumTypeDefinition.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
6-
75
class EnumTypeDefinition extends TypeDefinition
86
{
97
public function getDefinition()
108
{
11-
$builder = new TreeBuilder();
12-
$node = $builder->root('_enum_config');
9+
$node = self::createNode('_enum_config');
1310

1411
$node
1512
->children()

‎src/Config/InputObjectTypeDefinition.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
6-
75
class InputObjectTypeDefinition extends TypeDefinition
86
{
97
public function getDefinition()
108
{
11-
$builder = new TreeBuilder();
12-
$node = $builder->root('_input_object_config');
9+
$node = self::createNode('_input_object_config');
1310

1411
$node
1512
->children()

‎src/Config/InterfaceTypeDefinition.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
6-
75
class InterfaceTypeDefinition extends TypeWithOutputFieldsDefinition
86
{
97
public function getDefinition()
108
{
11-
$builder = new TreeBuilder();
12-
$node = $builder->root('_interface_config');
9+
$node = self::createNode('_interface_config');
1310

1411
$node
1512
->children()

‎src/Config/ObjectTypeDefinition.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
namespace Overblog\GraphQLBundle\Config;
44

55
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
6-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
76

87
class ObjectTypeDefinition extends TypeWithOutputFieldsDefinition
98
{
109
public function getDefinition()
1110
{
12-
$builder = new TreeBuilder();
13-
$node = $builder->root('_object_config');
11+
$node = self::createNode('_object_config');
1412

1513
$node
1614
->children()

‎src/Config/TypeDefinition.php‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5+
use Overblog\GraphQLBundle\DependencyInjection\Configuration;
56
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
67

78
abstract class TypeDefinition
@@ -22,16 +23,14 @@ public static function create()
2223

2324
protected function resolveTypeSection()
2425
{
25-
$builder = new TreeBuilder();
26-
$node = $builder->root('resolveType', 'variable');
26+
$node = self::createNode('resolveType', 'variable');
2727

2828
return $node;
2929
}
3030

3131
protected function nameSection()
3232
{
33-
$builder = new TreeBuilder();
34-
$node = $builder->root('name', 'scalar');
33+
$node = self::createNode('name', 'scalar');
3534
$node->isRequired();
3635
$node->validate()
3736
->ifTrue(function ($name) {
@@ -45,24 +44,21 @@ protected function nameSection()
4544

4645
protected function defaultValueSection()
4746
{
48-
$builder = new TreeBuilder();
49-
$node = $builder->root('defaultValue', 'variable');
47+
$node = self::createNode('defaultValue', 'variable');
5048

5149
return $node;
5250
}
5351

5452
protected function descriptionSection()
5553
{
56-
$builder = new TreeBuilder();
57-
$node = $builder->root('description', 'scalar');
54+
$node = self::createNode('description', 'scalar');
5855

5956
return $node;
6057
}
6158

6259
protected function deprecationReasonSelection()
6360
{
64-
$builder = new TreeBuilder();
65-
$node = $builder->root('deprecationReason', 'scalar');
61+
$node = self::createNode('deprecationReason', 'scalar');
6662

6763
$node->info('Text describing why this field is deprecated. When not empty - field will not be returned by introspection queries (unless forced)');
6864

@@ -71,8 +67,7 @@ protected function deprecationReasonSelection()
7167

7268
protected function typeSelection($isRequired = false)
7369
{
74-
$builder = new TreeBuilder();
75-
$node = $builder->root('type', 'scalar');
70+
$node = self::createNode('type', 'scalar');
7671

7772
$node->info('One of internal or custom types.');
7873

@@ -82,4 +77,17 @@ protected function typeSelection($isRequired = false)
8277

8378
return $node;
8479
}
80+
81+
/**
82+
* @internal
83+
*
84+
* @param string $name
85+
* @param string $type
86+
*
87+
* @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition
88+
*/
89+
protected static function createNode($name, $type = 'array')
90+
{
91+
return Configuration::getRootNodeWithoutDeprecation(new TreeBuilder($name, $type), $name, $type);
92+
}
8593
}

‎src/Config/TypeWithOutputFieldsDefinition.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Overblog\GraphQLBundle\Config;
44

55
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
6-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
76

87
abstract class TypeWithOutputFieldsDefinition extends TypeDefinition
98
{
@@ -14,8 +13,7 @@ abstract class TypeWithOutputFieldsDefinition extends TypeDefinition
1413
*/
1514
protected function outputFieldsSelection($name = 'fields')
1615
{
17-
$builder = new TreeBuilder();
18-
$node = $builder->root($name);
16+
$node = self::createNode($name);
1917
$node
2018
->isRequired()
2119
->requiresAtLeastOneElement();

‎src/Config/UnionTypeDefinition.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Overblog\GraphQLBundle\Config;
44

5-
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
6-
75
class UnionTypeDefinition extends TypeDefinition
86
{
97
public function getDefinition()
108
{
11-
$builder = new TreeBuilder();
12-
$node = $builder->root('_union_config');
9+
$node = self::createNode('_union_config');
1310

1411
$node
1512
->children()

‎src/DependencyInjection/Configuration.php‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public function getConfigTreeBuilder()
3939
{
4040
$treeBuilder = new TreeBuilder(self::NAME);
4141

42-
// BC layer for symfony/config 4.1 and older
43-
$rootNode = \method_exists($treeBuilder, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root(self::NAME);
42+
$rootNode = self::getRootNodeWithoutDeprecation($treeBuilder, self::NAME);
4443

4544
$rootNode
4645
->children()
@@ -58,7 +57,7 @@ private function batchingMethodSection()
5857
{
5958
$builder = new TreeBuilder('batching_method', 'enum');
6059
/** @var EnumNodeDefinition $node */
61-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('batching_method', 'enum');
60+
$node = self::getRootNodeWithoutDeprecation($builder, 'batching_method', 'enum');
6261

6362
$node
6463
->values(['relay', 'apollo'])
@@ -72,7 +71,7 @@ private function errorsHandlerSection()
7271
{
7372
$builder = new TreeBuilder('errors_handler');
7473
/** @var ArrayNodeDefinition $node */
75-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('errors_handler');
74+
$node = self::getRootNodeWithoutDeprecation($builder, 'errors_handler');
7675
$node
7776
->treatFalseLike(['enabled' => false])
7877
->treatTrueLike(['enabled' => true])
@@ -138,7 +137,7 @@ private function servicesSection()
138137
{
139138
$builder = new TreeBuilder('services');
140139
/** @var ArrayNodeDefinition $node */
141-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('services');
140+
$node = self::getRootNodeWithoutDeprecation($builder, 'services');
142141
$node
143142
->addDefaultsIfNotSet()
144143
->children()
@@ -180,7 +179,7 @@ private function definitionsSchemaSection()
180179
{
181180
$builder = new TreeBuilder('schema');
182181
/** @var ArrayNodeDefinition $node */
183-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('schema');
182+
$node = self::getRootNodeWithoutDeprecation($builder, 'schema');
184183
$node
185184
->beforeNormalization()
186185
->ifTrue(function ($v) {
@@ -216,7 +215,7 @@ private function definitionsAutoMappingSection()
216215
{
217216
$builder = new TreeBuilder('auto_mapping');
218217
/** @var ArrayNodeDefinition $node */
219-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('auto_mapping');
218+
$node = self::getRootNodeWithoutDeprecation($builder, 'auto_mapping');
220219
$node
221220
->treatFalseLike(['enabled' => false])
222221
->treatTrueLike(['enabled' => true])
@@ -237,7 +236,7 @@ private function definitionsAutoMappingSection()
237236
private function definitionsMappingsSection()
238237
{
239238
$builder = new TreeBuilder('mappings');
240-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root('mappings');
239+
$node = self::getRootNodeWithoutDeprecation($builder, 'mappings');
241240
$node
242241
->children()
243242
->arrayNode('auto_discover')
@@ -292,7 +291,7 @@ private function builderSection($name)
292291
{
293292
$builder = new TreeBuilder($name);
294293
/** @var ArrayNodeDefinition $node */
295-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name);
294+
$node = self::getRootNodeWithoutDeprecation($builder, $name);
296295
$node->beforeNormalization()
297296
->ifTrue(function ($v) {
298297
return \is_array($v) && !empty($v);
@@ -332,7 +331,7 @@ private function securityQuerySection($name, $disabledValue)
332331
{
333332
$builder = new TreeBuilder($name, 'scalar');
334333
/** @var ScalarNodeDefinition $node */
335-
$node = \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name, 'scalar');
334+
$node = self::getRootNodeWithoutDeprecation($builder, $name, 'scalar');
336335
$node->beforeNormalization()
337336
->ifTrue(function ($v) {
338337
return \is_string($v) && \is_numeric($v);
@@ -363,4 +362,19 @@ private function securityQuerySection($name, $disabledValue)
363362

364363
return $node;
365364
}
365+
366+
/**
367+
* @internal
368+
*
369+
* @param TreeBuilder $builder
370+
* @param string|null $name
371+
* @param string $type
372+
*
373+
* @return ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition
374+
*/
375+
public static function getRootNodeWithoutDeprecation(TreeBuilder $builder, $name, $type = 'array')
376+
{
377+
// BC layer for symfony/config 4.1 and older
378+
return \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name, $type);
379+
}
366380
}

0 commit comments

Comments
 (0)