Skip to content

Commit 9be951d

Browse files
committed
native functions added to php-cs-fixer exclude, updated \ prefixes
1 parent 5dba156 commit 9be951d

File tree

13 files changed

+99
-98
lines changed

13 files changed

+99
-98
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
'native_constant_invocation' => true,
2323
'native_function_invocation' => [
2424
'include' => ['@all'],
25+
'exclude' => ['service', 'abstract_arg', 'param', 'tagged_locator', 'tagged_iterator', 'inline_service', 'env'],
2526
],
2627
'no_alias_functions' => true,
2728
'nullable_type_declaration_for_default_null_value' => true,

src/Resources/config/commands.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,50 @@
2424
$services->set('fos_elastica.command.create', CreateCommand::class)
2525
->tag('console.command', ['command' => 'fos:elastica:create'])
2626
->args([
27-
\service('fos_elastica.index_manager'),
28-
\service('fos_elastica.mapping_builder'),
29-
\service('fos_elastica.config_manager'),
30-
\service('fos_elastica.alias_processor'),
27+
service('fos_elastica.index_manager'),
28+
service('fos_elastica.mapping_builder'),
29+
service('fos_elastica.config_manager'),
30+
service('fos_elastica.alias_processor'),
3131
])
3232
;
3333

3434
$services->set('fos_elastica.command.delete', DeleteCommand::class)
3535
->tag('console.command', ['command' => 'fos:elastica:delete'])
3636
->args([
37-
\service('fos_elastica.index_manager'),
37+
service('fos_elastica.index_manager'),
3838
])
3939
;
4040

4141
$services->set('fos_elastica.command.populate', PopulateCommand::class)
4242
->tag('console.command', ['command' => 'fos:elastica:populate'])
4343
->args([
44-
\service('event_dispatcher'),
45-
\service('fos_elastica.index_manager'),
46-
\service('fos_elastica.pager_provider_registry'),
47-
\service('fos_elastica.pager_persister_registry'),
48-
\service('fos_elastica.resetter'),
44+
service('event_dispatcher'),
45+
service('fos_elastica.index_manager'),
46+
service('fos_elastica.pager_provider_registry'),
47+
service('fos_elastica.pager_persister_registry'),
48+
service('fos_elastica.resetter'),
4949
])
5050
;
5151

5252
$services->set('fos_elastica.command.reset', ResetCommand::class)
5353
->tag('console.command', ['command' => 'fos:elastica:reset'])
5454
->args([
55-
\service('fos_elastica.index_manager'),
56-
\service('fos_elastica.resetter'),
55+
service('fos_elastica.index_manager'),
56+
service('fos_elastica.resetter'),
5757
])
5858
;
5959

6060
$services->set('fos_elastica.command.templates_reset', ResetTemplatesCommand::class)
6161
->tag('console.command', ['command' => 'fos:elastica:reset-templates'])
6262
->args([
63-
\service('fos_elastica.template_resetter'),
63+
service('fos_elastica.template_resetter'),
6464
])
6565
;
6666

6767
$services->set('fos_elastica.command.search', SearchCommand::class)
6868
->tag('console.command', ['command' => 'fos:elastica:search'])
6969
->args([
70-
\service('fos_elastica.index_manager'),
70+
service('fos_elastica.index_manager'),
7171
])
7272
;
7373
};

src/Resources/config/config.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
$services->set('fos_elastica.client_prototype', Client::class)
3333
->abstract()
34-
->arg('$config', \abstract_arg('configuration for Ruflin Client'))
35-
->arg('$forbiddenCodes', \abstract_arg('list of forbidden codes for Client'))
36-
->arg('$logger', \abstract_arg('logger for Ruflin Client'))
37-
->call('setStopwatch', [\service('debug.stopwatch')->nullOnInvalid()])
38-
->call('setEventDispatcher', [\service('event_dispatcher')->nullOnInvalid()])
34+
->arg('$config', abstract_arg('configuration for Ruflin Client'))
35+
->arg('$forbiddenCodes', abstract_arg('list of forbidden codes for Client'))
36+
->arg('$logger', abstract_arg('logger for Ruflin Client'))
37+
->call('setStopwatch', [service('debug.stopwatch')->nullOnInvalid()])
38+
->call('setEventDispatcher', [service('event_dispatcher')->nullOnInvalid()])
3939
;
4040

4141
$services->set(RoundRobinResurrect::class)
@@ -57,30 +57,30 @@
5757

5858
$services->set('fos_elastica.data_collector', ElasticaDataCollector::class)
5959
->tag('data_collector', ['template' => '@FOSElastica/Collector/elastica.html.twig', 'id' => 'elastica'])
60-
->args([\service('fos_elastica.logger')])
60+
->args([service('fos_elastica.logger')])
6161
;
6262

6363
$services->set('fos_elastica.paginator.subscriber', PaginateElasticaQuerySubscriber::class)
6464
->tag('kernel.event_subscriber')
65-
->args([\service('request_stack')])
65+
->args([service('request_stack')])
6666
;
6767

6868
$services->set('fos_elastica.logger', ElasticaLogger::class)
6969
->args([
70-
\service('logger')->nullOnInvalid(),
71-
\param('kernel.debug'),
70+
service('logger')->nullOnInvalid(),
71+
param('kernel.debug'),
7272
])
7373
->tag('monolog.logger', ['channel' => 'elastica'])
7474
;
7575

7676
$services->set('fos_elastica.mapping_builder', MappingBuilder::class)
77-
->args([\service('event_dispatcher')])
77+
->args([service('event_dispatcher')])
7878
;
7979

8080
$services->set('fos_elastica.property_accessor', PropertyAccessor::class)
8181
->args([
82-
\param('fos_elastica.property_accessor.magicCall'),
83-
\param('fos_elastica.property_accessor.throwExceptionOnInvalidIndex'),
82+
param('fos_elastica.property_accessor.magicCall'),
83+
param('fos_elastica.property_accessor.throwExceptionOnInvalidIndex'),
8484
])
8585
;
8686
};

src/Resources/config/event_listener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919

2020
$services->set('fos_elastica.populate_listener', PopulateListener::class)
2121
->tag('kernel.event_listener', ['event' => PostIndexPopulateEvent::class, 'method' => 'onPostIndexPopulate', 'priority' => -9999])
22-
->args([\service('fos_elastica.resetter')])
22+
->args([service('fos_elastica.resetter')])
2323
;
2424
};

src/Resources/config/index.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,52 +35,52 @@
3535

3636
$services->set('fos_elastica.index_prototype', Index::class)
3737
->abstract()
38-
->args([\abstract_arg('index name')])
38+
->args([abstract_arg('index name')])
3939
;
4040

4141
$services->set('fos_elastica.index_template_prototype', IndexTemplate::class)
4242
->abstract()
43-
->args([\abstract_arg('index template name')])
43+
->args([abstract_arg('index template name')])
4444
;
4545

4646
$services->set('fos_elastica.index_manager', IndexManager::class)
4747
->args([
48-
\abstract_arg('indexes'),
49-
\service('fos_elastica.index'),
48+
abstract_arg('indexes'),
49+
service('fos_elastica.index'),
5050
])
5151
;
5252
$services->alias(IndexManager::class, 'fos_elastica.index_manager');
5353

5454
$services->set('fos_elastica.index_template_manager', IndexTemplateManager::class)
55-
->args([\abstract_arg('indexes templates')])
55+
->args([abstract_arg('indexes templates')])
5656
;
5757
$services->alias(IndexTemplateManager::class, 'fos_elastica.index_template_manager');
5858

5959
$services->set('fos_elastica.resetter', Resetter::class)
6060
->args([
61-
\service('fos_elastica.config_manager'),
62-
\service('fos_elastica.index_manager'),
63-
\service('fos_elastica.alias_processor'),
64-
\service('fos_elastica.mapping_builder'),
65-
\service('event_dispatcher'),
61+
service('fos_elastica.config_manager'),
62+
service('fos_elastica.index_manager'),
63+
service('fos_elastica.alias_processor'),
64+
service('fos_elastica.mapping_builder'),
65+
service('event_dispatcher'),
6666
])
6767
;
6868
$services->alias(Resetter::class, 'fos_elastica.resetter');
6969

7070
$services->set('fos_elastica.template_resetter', TemplateResetter::class)
7171
->args([
72-
\service('fos_elastica.config_manager.index_templates'),
73-
\service('fos_elastica.mapping_builder'),
74-
\service('fos_elastica.index_template_manager'),
72+
service('fos_elastica.config_manager.index_templates'),
73+
service('fos_elastica.mapping_builder'),
74+
service('fos_elastica.index_template_manager'),
7575
])
7676
;
7777
$services->alias(TemplateResetter::class, 'fos_elastica.template_resetter');
7878

7979
$services->set('fos_elastica.finder', TransformedFinder::class)
8080
->abstract()
8181
->args([
82-
\abstract_arg('searchable'),
83-
\abstract_arg('transformer'),
82+
abstract_arg('searchable'),
83+
abstract_arg('transformer'),
8484
])
8585
;
8686
};

src/Resources/config/messenger.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
$services->set('fos_elastica.async_pager_persister', AsyncPagerPersister::class)
2020
->args([
21-
\service('fos_elastica.pager_persister_registry'),
22-
\service('fos_elastica.pager_provider_registry'),
23-
\service('fos_elastica.messenger.bus'),
21+
service('fos_elastica.pager_persister_registry'),
22+
service('fos_elastica.pager_provider_registry'),
23+
service('fos_elastica.messenger.bus'),
2424
])
2525
->tag('fos_elastica.pager_persister', ['persisterName' => 'async'])
2626
;

src/Resources/config/mongodb.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
$services->set('fos_elastica.pager_provider.prototype.mongodb', MongoDBPagerProvider::class)
2424
->abstract()
2525
->args([
26-
\service('doctrine_mongodb'),
27-
\service('fos_elastica.doctrine.register_listeners'),
28-
\abstract_arg('model'),
26+
service('doctrine_mongodb'),
27+
service('fos_elastica.doctrine.register_listeners'),
28+
abstract_arg('model'),
2929
[],
3030
])
3131
;
3232

3333
$services->set('fos_elastica.doctrine.register_listeners', RegisterListenersService::class)
34-
->args([\service('event_dispatcher')])
34+
->args([service('event_dispatcher')])
3535
;
3636

3737
$services->set('fos_elastica.listener.prototype.mongodb', Listener::class)
3838
->abstract()
3939
->args([
40-
\abstract_arg('object persister'),
41-
\service('fos_elastica.indexable'),
40+
abstract_arg('object persister'),
41+
service('fos_elastica.indexable'),
4242
[],
4343
null,
4444
])
@@ -47,17 +47,17 @@
4747
$services->set('fos_elastica.elastica_to_model_transformer.prototype.mongodb', ElasticaToModelTransformer::class)
4848
->abstract()
4949
->args([
50-
\service('doctrine_mongodb'),
51-
\abstract_arg('model'),
50+
service('doctrine_mongodb'),
51+
abstract_arg('model'),
5252
[],
5353
])
54-
->call('setPropertyAccessor', [\service('fos_elastica.property_accessor')])
54+
->call('setPropertyAccessor', [service('fos_elastica.property_accessor')])
5555
;
5656

5757
$services->set('fos_elastica.manager.mongodb', RepositoryManager::class)
5858
->args([
59-
\service('doctrine_mongodb'),
60-
\service('fos_elastica.repository_manager'),
59+
service('doctrine_mongodb'),
60+
service('fos_elastica.repository_manager'),
6161
])
6262
;
6363
};

src/Resources/config/orm.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
$services->set('fos_elastica.pager_provider.prototype.orm', ORMPagerProvider::class)
2424
->abstract()
2525
->args([
26-
\service('doctrine'),
27-
\service('fos_elastica.doctrine.register_listeners'),
28-
\abstract_arg('model'),
26+
service('doctrine'),
27+
service('fos_elastica.doctrine.register_listeners'),
28+
abstract_arg('model'),
2929
[],
3030
])
3131
;
3232

3333
$services->set('fos_elastica.doctrine.register_listeners', RegisterListenersService::class)
34-
->args([\service('event_dispatcher')])
34+
->args([service('event_dispatcher')])
3535
;
3636

3737
$services->set('fos_elastica.listener.prototype.orm', Listener::class)
3838
->abstract()
3939
->args([
40-
\abstract_arg('object persister'),
41-
\service('fos_elastica.indexable'),
40+
abstract_arg('object persister'),
41+
service('fos_elastica.indexable'),
4242
[],
4343
null,
4444
])
@@ -47,17 +47,17 @@
4747
$services->set('fos_elastica.elastica_to_model_transformer.prototype.orm', ElasticaToModelTransformer::class)
4848
->abstract()
4949
->args([
50-
\service('doctrine'),
51-
\abstract_arg('model'),
50+
service('doctrine'),
51+
abstract_arg('model'),
5252
[],
5353
])
54-
->call('setPropertyAccessor', [\service('fos_elastica.property_accessor')])
54+
->call('setPropertyAccessor', [service('fos_elastica.property_accessor')])
5555
;
5656

5757
$services->set('fos_elastica.manager.orm', RepositoryManager::class)
5858
->args([
59-
\service('doctrine'),
60-
\service('fos_elastica.repository_manager'),
59+
service('doctrine'),
60+
service('fos_elastica.repository_manager'),
6161
])
6262
;
6363
};

src/Resources/config/persister.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,44 @@
2323

2424
$services->set('fos_elastica.in_place_pager_persister', InPlacePagerPersister::class)
2525
->args([
26-
\service('fos_elastica.persister_registry'),
27-
\service('event_dispatcher'),
26+
service('fos_elastica.persister_registry'),
27+
service('event_dispatcher'),
2828
])
2929
->tag('fos_elastica.pager_persister', ['persisterName' => 'in_place'])
3030
;
3131

3232
$services->set('fos_elastica.pager_persister_registry', PagerPersisterRegistry::class)
33-
->args([\tagged_locator('fos_elastica.pager_persister', 'persisterName')])
33+
->args([tagged_locator('fos_elastica.pager_persister', 'persisterName')])
3434
;
3535

3636
$services->set('fos_elastica.persister_registry', PersisterRegistry::class)
37-
->args([\tagged_locator('fos_elastica.persister', 'index')])
37+
->args([tagged_locator('fos_elastica.persister', 'index')])
3838
;
3939

4040
$services->set('fos_elastica.filter_objects_listener', FilterObjectsListener::class)
41-
->args([\service('fos_elastica.indexable')])
41+
->args([service('fos_elastica.indexable')])
4242
->tag('kernel.event_subscriber')
4343
;
4444

4545
$services->set('fos_elastica.object_persister', ObjectPersister::class)
4646
->abstract()
4747
->args([
48-
\abstract_arg('index'),
49-
\abstract_arg('model to elastica transformer'),
50-
\abstract_arg('model'),
51-
\abstract_arg('properties mapping'),
52-
\abstract_arg('options'),
48+
abstract_arg('index'),
49+
abstract_arg('model to elastica transformer'),
50+
abstract_arg('model'),
51+
abstract_arg('properties mapping'),
52+
abstract_arg('options'),
5353
])
5454
;
5555

5656
$services->set('fos_elastica.object_serializer_persister', ObjectSerializerPersister::class)
5757
->abstract()
5858
->args([
59-
\abstract_arg('type'),
60-
\abstract_arg('model to elastica transformer'),
61-
\abstract_arg('model'),
62-
\abstract_arg('serializer'),
63-
\abstract_arg('options'),
59+
abstract_arg('type'),
60+
abstract_arg('model to elastica transformer'),
61+
abstract_arg('model'),
62+
abstract_arg('serializer'),
63+
abstract_arg('options'),
6464
])
6565
;
6666
};

0 commit comments

Comments
 (0)