Skip to content

Commit feb4a2a

Browse files
greg0iregreg0ire
committed
Fix cs
1 parent c13adbc commit feb4a2a

File tree

6 files changed

+61
-49
lines changed

6 files changed

+61
-49
lines changed

‎DependencyInjection/CompilerPass/ConfigureDependencyFactoryPass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
99
use Symfony\Component\DependencyInjection\ContainerBuilder;
1010
use Symfony\Component\DependencyInjection\Reference;
11+
1112
use function sprintf;
1213

1314
class ConfigureDependencyFactoryPass implements CompilerPassInterface
1415
{
15-
public function process(ContainerBuilder $container) : void
16+
public function process(ContainerBuilder $container): void
1617
{
1718
$preferredEm = $container->getParameter('doctrine.migrations.preferred_em');
1819
$diDefinition = $container->getDefinition('doctrine.migrations.dependency_factory');

‎DependencyInjection/Configuration.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use ReflectionClass;
88
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
99
use Symfony\Component\Config\Definition\ConfigurationInterface;
10+
1011
use function array_filter;
1112
use function array_keys;
1213
use function constant;
@@ -29,7 +30,7 @@ class Configuration implements ConfigurationInterface
2930
*
3031
* @return TreeBuilder The config tree builder
3132
*/
32-
public function getConfigTreeBuilder() : TreeBuilder
33+
public function getConfigTreeBuilder(): TreeBuilder
3334
{
3435
$treeBuilder = new TreeBuilder('doctrine_migrations');
3536

@@ -59,8 +60,8 @@ public function getConfigTreeBuilder() : TreeBuilder
5960
->defaultValue([])
6061
->validate()
6162
->ifTrue(static function ($v) {
62-
return count(array_filter(array_keys($v), static function (string $doctrineService) : bool {
63-
return strpos($doctrineService, 'Doctrine\Migrations\\') !==0;
63+
return count(array_filter(array_keys($v), static function (string $doctrineService): bool {
64+
return strpos($doctrineService, 'Doctrine\Migrations\\') !== 0;
6465
}));
6566
})
6667
->thenInvalid('Valid services for the DoctrineMigrationsBundle must be in the "Doctrine\Migrations" namespace.')
@@ -74,8 +75,8 @@ public function getConfigTreeBuilder() : TreeBuilder
7475
->defaultValue([])
7576
->validate()
7677
->ifTrue(static function ($v) {
77-
return count(array_filter(array_keys($v), static function (string $doctrineService) : bool {
78-
return strpos($doctrineService, 'Doctrine\Migrations\\') !==0;
78+
return count(array_filter(array_keys($v), static function (string $doctrineService): bool {
79+
return strpos($doctrineService, 'Doctrine\Migrations\\') !== 0;
7980
}));
8081
})
8182
->thenInvalid('Valid callables for the DoctrineMigrationsBundle must be in the "Doctrine\Migrations" namespace.')
@@ -135,11 +136,7 @@ public function getConfigTreeBuilder() : TreeBuilder
135136
return false;
136137
}
137138

138-
if (is_string($v) && in_array(strtoupper($v), $organizeMigrationModes, true)) {
139-
return false;
140-
}
141-
142-
return true;
139+
return ! is_string($v) || ! in_array(strtoupper($v), $organizeMigrationModes, true);
143140
})
144141
->thenInvalid('Invalid organize migrations mode value %s')
145142
->end()
@@ -155,13 +152,12 @@ public function getConfigTreeBuilder() : TreeBuilder
155152
return $treeBuilder;
156153
}
157154

158-
159155
/**
160156
* Find organize migrations modes for their names
161157
*
162158
* @return string[]
163159
*/
164-
private function getOrganizeMigrationsModes() : array
160+
private function getOrganizeMigrationsModes(): array
165161
{
166162
$constPrefix = 'VERSIONS_ORGANIZATION_';
167163
$prefixLen = strlen($constPrefix);

‎DependencyInjection/DoctrineMigrationsExtension.php

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1616
use Symfony\Component\DependencyInjection\Reference;
1717
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
18+
1819
use function array_keys;
1920
use function explode;
2021
use function implode;
@@ -32,7 +33,7 @@ class DoctrineMigrationsExtension extends Extension
3233
*
3334
* @param string[][]|array<string, array<string, array<string, string>|string>> $configs
3435
*/
35-
public function load(array $configs, ContainerBuilder $container) : void
36+
public function load(array $configs, ContainerBuilder $container): void
3637
{
3738
$configuration = new Configuration();
3839

@@ -82,19 +83,23 @@ public function load(array $configs, ContainerBuilder $container) : void
8283
$container->setDefinition('doctrine.migrations.storage.table_storage', $storageDefinition);
8384
$container->setAlias('doctrine.migrations.metadata_storage', 'doctrine.migrations.storage.table_storage');
8485

85-
if ($storageConfiguration['table_name']!== null) {
86+
if ($storageConfiguration['table_name'] !== null) {
8687
$storageDefinition->addMethodCall('setTableName', [$storageConfiguration['table_name']]);
8788
}
88-
if ($storageConfiguration['version_column_name']!== null) {
89+
90+
if ($storageConfiguration['version_column_name'] !== null) {
8991
$storageDefinition->addMethodCall('setVersionColumnName', [$storageConfiguration['version_column_name']]);
9092
}
91-
if ($storageConfiguration['version_column_length']!== null) {
93+
94+
if ($storageConfiguration['version_column_length'] !== null) {
9295
$storageDefinition->addMethodCall('setVersionColumnLength', [$storageConfiguration['version_column_length']]);
9396
}
94-
if ($storageConfiguration['executed_at_column_name']!== null) {
97+
98+
if ($storageConfiguration['executed_at_column_name'] !== null) {
9599
$storageDefinition->addMethodCall('setExecutedAtColumnName', [$storageConfiguration['executed_at_column_name']]);
96100
}
97-
if ($storageConfiguration['execution_time_column_name']!== null) {
101+
102+
if ($storageConfiguration['execution_time_column_name'] !== null) {
98103
$storageDefinition->addMethodCall('setExecutionTimeColumnName', [$storageConfiguration['execution_time_column_name']]);
99104
}
100105

@@ -111,20 +116,21 @@ public function load(array $configs, ContainerBuilder $container) : void
111116
$container->setParameter('doctrine.migrations.preferred_connection', $config['connection']);
112117
}
113118

114-
private function checkIfBundleRelativePath(string $path, ContainerBuilder $container) : string
119+
private function checkIfBundleRelativePath(string $path, ContainerBuilder $container): string
115120
{
116121
if (isset($path[0]) && $path[0] === '@') {
117122
$pathParts = explode('/', $path);
118123
$bundleName = substr($pathParts[0], 1);
119124

120125
$bundlePath = $this->getBundlePath($bundleName, $container);
126+
121127
return $bundlePath . substr($path, strlen('@' . $bundleName));
122128
}
123129

124130
return $path;
125131
}
126132

127-
private function getBundlePath(string $bundleName, ContainerBuilder $container) : string
133+
private function getBundlePath(string $bundleName, ContainerBuilder $container): string
128134
{
129135
$bundleMetadata = $container->getParameter('kernel.bundles_metadata');
130136

@@ -144,12 +150,12 @@ private function getBundlePath(string $bundleName, ContainerBuilder $container)
144150
*
145151
* @return string The XSD base path
146152
*/
147-
public function getXsdValidationBasePath() : string
153+
public function getXsdValidationBasePath(): string
148154
{
149155
return __DIR__ . '/../Resources/config/schema';
150156
}
151157

152-
public function getNamespace() : string
158+
public function getNamespace(): string
153159
{
154160
return 'http://symfony.com/schema/dic/doctrine/migrations/3.0';
155161
}

‎Tests/DependencyInjection/DoctrineCommandsTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@
2727
use Symfony\Component\DependencyInjection\ContainerBuilder;
2828
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
2929
use Symfony\Component\HttpKernel\KernelInterface;
30+
3031
use function sys_get_temp_dir;
3132

3233
class DoctrineCommandsTest extends TestCase
3334
{
3435
/**
3536
* @dataProvider getCommands
3637
*/
37-
public function testCommandRegistered(string $name, string $instance) : void
38+
public function testCommandRegistered(string $name, string $instance): void
3839
{
3940
$application = $this->getApplication();
4041

@@ -44,7 +45,7 @@ public function testCommandRegistered(string $name, string $instance) : void
4445
/**
4546
* @return string[][]
4647
*/
47-
public function getCommands() : array
48+
public function getCommands(): array
4849
{
4950
return [
5051
['doctrine:migrations:diff', DiffCommand::class],
@@ -81,7 +82,7 @@ private function getKernel(ContainerBuilder $container)
8182
return $kernel;
8283
}
8384

84-
private function getApplication() : Application
85+
private function getApplication(): Application
8586
{
8687
$container = new ContainerBuilder(new ParameterBag([
8788
'kernel.debug' => false,

‎Tests/DependencyInjection/DoctrineMigrationsExtensionTest.php

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
2828
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
2929
use Symfony\Component\DependencyInjection\Reference;
30+
3031
use function assert;
3132
use function method_exists;
3233
use function sys_get_temp_dir;
3334

3435
class DoctrineMigrationsExtensionTest extends TestCase
3536
{
36-
public function testXmlConfigs() : void
37+
public function testXmlConfigs(): void
3738
{
3839
$container = $this->getContainerBuilder();
3940

@@ -53,7 +54,7 @@ public function testXmlConfigs() : void
5354
$this->assertConfigs($config);
5455
}
5556

56-
public function testFullConfig() : void
57+
public function testFullConfig(): void
5758
{
5859
$config = [
5960
'storage' => [
@@ -90,7 +91,7 @@ public function testFullConfig() : void
9091
$this->assertConfigs($config);
9192
}
9293

93-
public function testNoConfigsAreNeeded() : void
94+
public function testNoConfigsAreNeeded(): void
9495
{
9596
$container = $this->getContainer([]);
9697

@@ -104,7 +105,7 @@ public function testNoConfigsAreNeeded() : void
104105
self::assertSame([], $config->getMigrationDirectories());
105106
}
106107

107-
public function testBundleRelativePathResolution() : void
108+
public function testBundleRelativePathResolution(): void
108109
{
109110
$container = $this->getContainer([
110111
'migrations_paths' => [
@@ -128,7 +129,7 @@ public function testBundleRelativePathResolution() : void
128129
], $config->getMigrationDirectories());
129130
}
130131

131-
private function assertConfigs(?object $config) : void
132+
private function assertConfigs(?object $config): void
132133
{
133134
self::assertInstanceOf(Configuration::class, $config);
134135
self::assertSame([
@@ -152,7 +153,7 @@ private function assertConfigs(?object $config) : void
152153
self::assertSame('doctrine_migration_executed_at_column_test', $storage->getExecutedAtColumnName());
153154
}
154155

155-
public function testCustomSorter() : void
156+
public function testCustomSorter(): void
156157
{
157158
$config = [
158159
'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
@@ -163,8 +164,8 @@ public function testCustomSorter() : void
163164
$conn = $this->createMock(Connection::class);
164165
$container->set('doctrine.dbal.default_connection', $conn);
165166

166-
$sorter = new class() implements Comparator{
167-
public function compare(Version $a, Version $b) : int
167+
$sorter = new class () implements Comparator{
168+
public function compare(Version $a, Version $b): int
168169
{
169170
return 1;
170171
}
@@ -178,7 +179,7 @@ public function compare(Version $a, Version $b) : int
178179
self::assertSame($sorter, $di->getVersionComparator());
179180
}
180181

181-
public function testServicesAreLazy() : void
182+
public function testServicesAreLazy(): void
182183
{
183184
$config = [
184185
'services' => [Comparator::class => 'my_sorter'],
@@ -188,8 +189,8 @@ public function testServicesAreLazy() : void
188189
$conn = $this->createMock(Connection::class);
189190
$container->set('doctrine.dbal.default_connection', $conn);
190191

191-
$sorterFactory = new class() {
192-
public function __invoke() : void
192+
$sorterFactory = new class () {
193+
public function __invoke(): void
193194
{
194195
throw new Exception('This method should not be invoked.');
195196
}
@@ -206,7 +207,7 @@ public function __invoke() : void
206207
self::assertInstanceOf(DependencyFactory::class, $di);
207208
}
208209

209-
public function testServiceFactory() : void
210+
public function testServiceFactory(): void
210211
{
211212
$mockComparator = $this->createMock(Comparator::class);
212213
$config = [
@@ -218,7 +219,7 @@ public function testServiceFactory() : void
218219
$conn = $this->createMock(Connection::class);
219220
$container->set('doctrine.dbal.default_connection', $conn);
220221

221-
$sorterFactory = new class($mockComparator) {
222+
$sorterFactory = new class ($mockComparator) {
222223
/** @var Comparator */
223224
private $comparator;
224225

@@ -227,7 +228,7 @@ public function __construct(Comparator $comparator)
227228
$this->comparator = $comparator;
228229
}
229230

230-
public function __invoke(DependencyFactory $di) : Comparator
231+
public function __invoke(DependencyFactory $di): Comparator
231232
{
232233
return $this->comparator;
233234
}
@@ -241,7 +242,7 @@ public function __invoke(DependencyFactory $di) : Comparator
241242
self::assertSame($mockComparator, $di->getVersionComparator());
242243
}
243244

244-
public function testCustomConnection() : void
245+
public function testCustomConnection(): void
245246
{
246247
$config = [
247248
'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
@@ -259,8 +260,7 @@ public function testCustomConnection() : void
259260
self::assertSame($conn, $di->getConnection());
260261
}
261262

262-
263-
public function testPrefersEntityManagerOverConnection() : void
263+
public function testPrefersEntityManagerOverConnection(): void
264264
{
265265
$config = [
266266
'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
@@ -278,7 +278,7 @@ public function testPrefersEntityManagerOverConnection() : void
278278
self::assertSame($em, $di->getEntityManager());
279279
}
280280

281-
public function testCustomEntityManager() : void
281+
public function testCustomEntityManager(): void
282282
{
283283
$config = [
284284
'em' => 'custom',
@@ -302,7 +302,7 @@ public function testCustomEntityManager() : void
302302
self::assertSame($em, $di->getConnection()->getEm());
303303
}
304304

305-
public function testCustomMetadataStorage() : void
305+
public function testCustomMetadataStorage(): void
306306
{
307307
$config = [
308308
'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
@@ -324,7 +324,7 @@ public function testCustomMetadataStorage() : void
324324
self::assertSame($mockStorage, $di->getMetadataStorage());
325325
}
326326

327-
public function testInvalidService() : void
327+
public function testInvalidService(): void
328328
{
329329
$this->expectException(InvalidConfigurationException::class);
330330
$this->expectExceptionMessage('Invalid configuration for path "doctrine_migrations.services": Valid services for the DoctrineMigrationsBundle must be in the "Doctrine\Migrations" namespace.');
@@ -341,7 +341,7 @@ public function testInvalidService() : void
341341
$container->compile();
342342
}
343343

344-
public function testCanNotSpecifyBothEmAndConnection() : void
344+
public function testCanNotSpecifyBothEmAndConnection(): void
345345
{
346346
$this->expectExceptionMessage('You cannot specify both "connection" and "em" in the DoctrineMigrationsBundle configurations');
347347
$this->expectException(InvalidArgumentException::class);
@@ -360,7 +360,7 @@ public function testCanNotSpecifyBothEmAndConnection() : void
360360
/**
361361
* @param mixed[] $config
362362
*/
363-
private function getContainer(array $config) : ContainerBuilder
363+
private function getContainer(array $config): ContainerBuilder
364364
{
365365
$container = $this->getContainerBuilder();
366366

@@ -377,9 +377,10 @@ private function getContainer(array $config) : ContainerBuilder
377377
return $container;
378378
}
379379

380-
private function getContainerBuilder() : ContainerBuilder
380+
private function getContainerBuilder(): ContainerBuilder
381381
{
382382
$bundle = new TestBundle();
383+
383384
return new ContainerBuilder(new ParameterBag([
384385
'kernel.debug' => false,
385386
'kernel.bundles' => [$bundle->getName() => TestBundle::class],

0 commit comments

Comments
 (0)