Skip to content

Commit 2205a3c

Browse files
authored
Merge pull request #561 from TomHAnderson/hotfix/phpcs
Hotfix/phpcs
2 parents 221c150 + 6141a1d commit 2205a3c

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ install:
6969
script:
7070
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
7171
- if [[ $TEST_COVERAGE == 'true' ]]; then php build/coverage-checker.php build/clover.xml 70 ; fi
72-
- if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
72+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
7373

7474
after_script:
7575
- if [[ $TEST_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

src/DoctrineORMModule/CliConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private function getObjectManagerName()
123123
{
124124
$arguments = new ArgvInput();
125125

126-
if (!$arguments->hasParameterOption('--object-manager')) {
126+
if (! $arguments->hasParameterOption('--object-manager')) {
127127
return $this->defaultObjectManagerName;
128128
}
129129

src/DoctrineORMModule/Service/ConfigurationFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
135135
$config->setSecondLevelCacheEnabled();
136136
$config->setSecondLevelCacheConfiguration($cacheConfiguration);
137137
}
138-
139-
if($filterSchemaAssetsExpression = $options->getFilterSchemaAssetsExpression()) {
138+
139+
if ($filterSchemaAssetsExpression = $options->getFilterSchemaAssetsExpression()) {
140140
$config->setFilterSchemaAssetsExpression($filterSchemaAssetsExpression);
141141
}
142142

src/DoctrineORMModule/Service/DBALConnectionFactory.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
4141
];
4242
$params = array_merge($params, $options->getParams());
4343

44-
if (
45-
array_key_exists('platform', $params)
44+
if (array_key_exists('platform', $params)
4645
&& is_string($params['platform'])
4746
&& $container->has($params['platform'])
4847
) {

tests/DoctrineORMModuleTest/Service/ConfigurationFactoryTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@ public function testDefaultMetadatFactory()
219219
$this->serviceManager->setService('config', $config);
220220
$factory = new ConfigurationFactory('test_default');
221221
$ormConfig = $factory->createService($this->serviceManager);
222-
$this->assertEquals(\Doctrine\ORM\Mapping\ClassMetadataFactory::class, $ormConfig->getClassMetadataFactoryName());
222+
$this->assertEquals(
223+
\Doctrine\ORM\Mapping\ClassMetadataFactory::class,
224+
$ormConfig->getClassMetadataFactoryName()
225+
);
223226
}
224227

225228
public function testWillInstantiateConfigWithoutEntityListenerResolverSetting()
@@ -236,7 +239,10 @@ public function testWillInstantiateConfigWithoutEntityListenerResolverSetting()
236239

237240
$ormConfig = $this->factory->createService($this->serviceManager);
238241

239-
$this->assertInstanceOf(\Doctrine\ORM\Mapping\EntityListenerResolver::class, $ormConfig->getEntityListenerResolver());
242+
$this->assertInstanceOf(
243+
\Doctrine\ORM\Mapping\EntityListenerResolver::class,
244+
$ormConfig->getEntityListenerResolver()
245+
);
240246
}
241247

242248
public function testWillInstantiateConfigWithEntityListenerResolverObject()

0 commit comments

Comments
 (0)