Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf90d2a9

Browse files
wouterjnicolas-grekas
authored andcommitted
[Bridges][Bundles] Convert to native return types
1 parentf9c9ec7 commitf90d2a9

File tree

77 files changed

+148
-1720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+148
-1720
lines changed

‎.github/expected-missing-return-types.diff‎

Lines changed: 19 additions & 1219 deletions
Large diffs are not rendered by default.

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public function __construct(
3939
$this->managers =$registry->getManagerNames();
4040
}
4141

42-
/**
43-
* @return void
44-
*/
45-
publicfunctioncollect(Request$request,Response$response,\Throwable$exception =null)
42+
publicfunctioncollect(Request$request,Response$response,\Throwable$exception =null):void
4643
{
4744
$this->data = [
4845
'queries' =>$this->collectQueries(),
@@ -62,51 +59,33 @@ private function collectQueries(): array
6259
return$queries;
6360
}
6461

65-
/**
66-
* @return void
67-
*/
68-
publicfunctionreset()
62+
publicfunctionreset():void
6963
{
7064
$this->data = [];
7165
$this->debugDataHolder->reset();
7266
}
7367

74-
/**
75-
* @return array
76-
*/
77-
publicfunctiongetManagers()
68+
publicfunctiongetManagers():array
7869
{
7970
return$this->data['managers'];
8071
}
8172

82-
/**
83-
* @return array
84-
*/
85-
publicfunctiongetConnections()
73+
publicfunctiongetConnections():array
8674
{
8775
return$this->data['connections'];
8876
}
8977

90-
/**
91-
* @return int
92-
*/
93-
publicfunctiongetQueryCount()
78+
publicfunctiongetQueryCount():int
9479
{
9580
returnarray_sum(array_map('count',$this->data['queries']));
9681
}
9782

98-
/**
99-
* @return array
100-
*/
101-
publicfunctiongetQueries()
83+
publicfunctiongetQueries():array
10284
{
10385
return$this->data['queries'];
10486
}
10587

106-
/**
107-
* @return int
108-
*/
109-
publicfunctiongetTime()
88+
publicfunctiongetTime():int
11089
{
11190
$time =0;
11291
foreach ($this->data['queries']as$queries) {

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ abstract class AbstractDoctrineExtension extends Extension
3838
/**
3939
* @param array $objectManager A configured object manager
4040
*
41-
* @return void
42-
*
4341
* @throws \InvalidArgumentException
4442
*/
45-
protectedfunctionloadMappingInformation(array$objectManager,ContainerBuilder$container)
43+
protectedfunctionloadMappingInformation(array$objectManager,ContainerBuilder$container):void
4644
{
4745
if ($objectManager['auto_mapping']) {
4846
// automatically register bundle mappings
@@ -107,10 +105,8 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
107105
* Register the alias for this mapping driver.
108106
*
109107
* Aliases can be used in the Query languages of all the Doctrine object managers to simplify writing tasks.
110-
*
111-
* @return void
112108
*/
113-
protectedfunctionsetMappingDriverAlias(array$mappingConfig,string$mappingName)
109+
protectedfunctionsetMappingDriverAlias(array$mappingConfig,string$mappingName):void
114110
{
115111
if (isset($mappingConfig['alias'])) {
116112
$this->aliasMap[$mappingConfig['alias']] =$mappingConfig['prefix'];
@@ -122,11 +118,9 @@ protected function setMappingDriverAlias(array $mappingConfig, string $mappingNa
122118
/**
123119
* Register the mapping driver configuration for later use with the object managers metadata driver chain.
124120
*
125-
* @return void
126-
*
127121
* @throws \InvalidArgumentException
128122
*/
129-
protectedfunctionsetMappingDriverConfig(array$mappingConfig,string$mappingName)
123+
protectedfunctionsetMappingDriverConfig(array$mappingConfig,string$mappingName):void
130124
{
131125
$mappingDirectory =$mappingConfig['dir'];
132126
if (!is_dir($mappingDirectory)) {
@@ -178,10 +172,8 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
178172

179173
/**
180174
* Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
181-
*
182-
* @return void
183175
*/
184-
protectedfunctionregisterMappingDrivers(array$objectManager,ContainerBuilder$container)
176+
protectedfunctionregisterMappingDrivers(array$objectManager,ContainerBuilder$container):void
185177
{
186178
// configure metadata driver for each bundle based on the type of mapping files found
187179
if ($container->hasDefinition($this->getObjectManagerElementName($objectManager['name'].'_metadata_driver'))) {
@@ -235,11 +227,9 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
235227
/**
236228
* Assertion if the specified mapping information is valid.
237229
*
238-
* @return void
239-
*
240230
* @throws \InvalidArgumentException
241231
*/
242-
protectedfunctionassertValidMappingConfiguration(array$mappingConfig,string$objectManagerName)
232+
protectedfunctionassertValidMappingConfiguration(array$mappingConfig,string$objectManagerName):void
243233
{
244234
if (!$mappingConfig['type'] || !$mappingConfig['dir'] || !$mappingConfig['prefix']) {
245235
thrownew \InvalidArgumentException(sprintf('Mapping definitions for Doctrine manager "%s" require at least the "type", "dir" and "prefix" options.',$objectManagerName));
@@ -325,11 +315,9 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
325315
/**
326316
* Loads a configured object manager metadata, query or result cache driver.
327317
*
328-
* @return void
329-
*
330318
* @throws \InvalidArgumentException in case of unknown driver type
331319
*/
332-
protectedfunctionloadObjectManagerCacheDriver(array$objectManager,ContainerBuilder$container,string$cacheName)
320+
protectedfunctionloadObjectManagerCacheDriver(array$objectManager,ContainerBuilder$container,string$cacheName):void
333321
{
334322
$this->loadCacheDriver($cacheName,$objectManager['name'],$objectManager[$cacheName.'_driver'],$container);
335323
}

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ public function __construct(string $managerType)
2828
$this->managerType =$managerType;
2929
}
3030

31-
/**
32-
* @return void
33-
*/
34-
publicfunctionprocess(ContainerBuilder$container)
31+
publicfunctionprocess(ContainerBuilder$container):void
3532
{
3633
$this->updateValidatorMappingFiles($container,'xml','xml');
3734
$this->updateValidatorMappingFiles($container,'yaml','yml');

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ public function __construct(string $connectionsParameter, string $managerTemplat
5353
$this->tagPrefix =$tagPrefix;
5454
}
5555

56-
/**
57-
* @return void
58-
*/
59-
publicfunctionprocess(ContainerBuilder$container)
56+
publicfunctionprocess(ContainerBuilder$container):void
6057
{
6158
if (!$container->hasParameter($this->connectionsParameter)) {
6259
return;

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,8 @@ public function __construct(Definition|Reference $driver, array $namespaces, arr
130130

131131
/**
132132
* Register mappings and alias with the metadata drivers.
133-
*
134-
* @return void
135133
*/
136-
publicfunctionprocess(ContainerBuilder$container)
134+
publicfunctionprocess(ContainerBuilder$container):void
137135
{
138136
if (!$this->enabled($container)) {
139137
return;

‎src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ public function __construct(string $key, string $providerId)
3333
$this->providerId =$providerId;
3434
}
3535

36-
/**
37-
* @return void
38-
*/
39-
publicfunctioncreate(ContainerBuilder$container,string$id,array$config)
36+
publicfunctioncreate(ContainerBuilder$container,string$id,array$config):void
4037
{
4138
$container
4239
->setDefinition($id,newChildDefinition($this->providerId))
@@ -46,18 +43,12 @@ public function create(ContainerBuilder $container, string $id, array $config)
4643
;
4744
}
4845

49-
/**
50-
* @return string
51-
*/
52-
publicfunctiongetKey()
46+
publicfunctiongetKey():string
5347
{
5448
return$this->key;
5549
}
5650

57-
/**
58-
* @return void
59-
*/
60-
publicfunctionaddConfiguration(NodeDefinition$node)
51+
publicfunctionaddConfiguration(NodeDefinition$node):void
6152
{
6253
$node
6354
->children()

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function guessPattern(string $class, string $property): ?ValueGuess
159159
*
160160
* @return array{0:ClassMetadata<T>, 1:string}|null
161161
*/
162-
protectedfunctiongetMetadata(string$class)
162+
protectedfunctiongetMetadata(string$class): ?array
163163
{
164164
// normalize class name
165165
$class =self::getRealClass(ltrim($class,'\\'));

‎src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ public static function getSubscribedEvents(): array
3838
];
3939
}
4040

41-
/**
42-
* @return void
43-
*/
44-
publicfunctiononSubmit(FormEvent$event)
41+
publicfunctiononSubmit(FormEvent$event):void
4542
{
4643
$collection =$event->getForm()->getData();
4744
$data =$event->getData();

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,7 @@ public function __construct(ManagerRegistry $registry)
9797
$this->registry =$registry;
9898
}
9999

100-
/**
101-
* @return void
102-
*/
103-
publicfunctionbuildForm(FormBuilderInterface$builder,array$options)
100+
publicfunctionbuildForm(FormBuilderInterface$builder,array$options):void
104101
{
105102
if ($options['multiple'] &&interface_exists(Collection::class)) {
106103
$builder
@@ -110,10 +107,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
110107
}
111108
}
112109

113-
/**
114-
* @return void
115-
*/
116-
publicfunctionconfigureOptions(OptionsResolver$resolver)
110+
publicfunctionconfigureOptions(OptionsResolver$resolver):void
117111
{
118112
$choiceLoader =function (Options$options) {
119113
// Unless the choices are given explicitly, load them on demand
@@ -238,10 +232,7 @@ public function getParent(): string
238232
return ChoiceType::class;
239233
}
240234

241-
/**
242-
* @return void
243-
*/
244-
publicfunctionreset()
235+
publicfunctionreset():void
245236
{
246237
$this->idReaders = [];
247238
$this->entityLoaders = [];

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp