Skip to content

Commit 1c28235

Browse files
committed
fixes CS
1 parent 50aa45d commit 1c28235

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,23 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
7575

7676
/**
7777
* Naming pattern for the configuration service id, for example
78-
* 'doctrine.orm.%s_configuration'
78+
* 'doctrine.orm.%s_configuration'.
79+
*
7980
* @var string
8081
*/
8182
private $configurationPattern;
8283

8384
/**
8485
* Method name to call on the configuration service. This depends on the
85-
* Doctrine implementation. For example addEntityNamespace
86+
* Doctrine implementation. For example addEntityNamespace.
87+
*
8688
* @var string
8789
*/
8890
private $registerAliasMethodName;
8991

9092
/**
9193
* Map of alias to namespace.
94+
*
9295
* @var string[]
9396
*/
9497
private $aliasMap;

Form/Type/DoctrineType.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,13 @@ public function configureOptions(OptionsResolver $resolver)
136136

137137
// Unless the choices are given explicitly, load them on demand
138138
if (null === $options['choices']) {
139-
140139
$hash = null;
141140
$qbParts = null;
142141

143142
// If there is no QueryBuilder we can safely cache DoctrineChoiceLoader,
144143
// also if concrete Type can return important QueryBuilder parts to generate
145144
// hash key we go for it as well
146145
if (!$options['query_builder'] || false !== ($qbParts = $type->getQueryBuilderPartsForCachingHash($options['query_builder']))) {
147-
148146
$hash = CachingFactoryDecorator::generateHash(array(
149147
$options['em'],
150148
$options['class'],

Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
162162

163163
$newEmConfigs = $method->invoke($this->extension, $emConfigs, $bundles);
164164

165-
$this->assertEquals($newEmConfigs["em1"], array_merge(array(
165+
$this->assertEquals($newEmConfigs['em1'], array_merge(array(
166166
'auto_mapping' => false,
167167
), $expectedEm1));
168-
$this->assertEquals($newEmConfigs["em2"], array_merge(array(
168+
$this->assertEquals($newEmConfigs['em2'], array_merge(array(
169169
'auto_mapping' => false,
170170
), $expectedEm2));
171171
}

Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
/**
1717
* @since 2.5.4
18+
*
1819
* @author Bernhard Schussek <[email protected]>
1920
* @group legacy
2021
*/

0 commit comments

Comments
 (0)