From e149e760ffc540409cf120a214b4c62e4233413c Mon Sep 17 00:00:00 2001 From: Daniel Bannert Date: Wed, 25 Oct 2017 13:18:59 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../DBAL/Provider/DoctrineDBALServiceProvider.php | 2 +- .../Tests/Provider/DoctrineDBALServiceProviderTest.php | 1 - .../Extensions/Provider/ExtensionsServiceProvider.php | 1 - .../Migration/Provider/ConsoleCommandsServiceProvider.php | 2 +- .../Tests/Provider/ConsoleCommandsServiceProviderTest.php | 1 - .../ORM/Provider/ConsoleCommandsServiceProvider.php | 2 +- .../Tests/Provider/ConsoleCommandsServiceProviderTest.php | 1 - .../Testing/Provider/ConsoleCommandsServiceProvider.php | 4 ++-- .../Provider/DoctrineORMTestingServiceProvider.php | 8 ++++---- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/Viserio/Bridge/Doctrine/DBAL/Provider/DoctrineDBALServiceProvider.php b/src/Viserio/Bridge/Doctrine/DBAL/Provider/DoctrineDBALServiceProvider.php index 6b2b9452a..9119cebd2 100644 --- a/src/Viserio/Bridge/Doctrine/DBAL/Provider/DoctrineDBALServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/DBAL/Provider/DoctrineDBALServiceProvider.php @@ -6,8 +6,8 @@ use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Connection as DoctrineConnection; use Doctrine\DBAL\DriverManager; -use Psr\Container\ContainerInterface; use Interop\Container\ServiceProviderInterface; +use Psr\Container\ContainerInterface; use Viserio\Bridge\Doctrine\DBAL\Connection; use Viserio\Component\Contract\OptionsResolver\ProvidesDefaultOptions as ProvidesDefaultOptionsContract; use Viserio\Component\Contract\OptionsResolver\RequiresComponentConfig as RequiresComponentConfigContract; diff --git a/src/Viserio/Bridge/Doctrine/DBAL/Tests/Provider/DoctrineDBALServiceProviderTest.php b/src/Viserio/Bridge/Doctrine/DBAL/Tests/Provider/DoctrineDBALServiceProviderTest.php index ef7e12089..e66b85488 100644 --- a/src/Viserio/Bridge/Doctrine/DBAL/Tests/Provider/DoctrineDBALServiceProviderTest.php +++ b/src/Viserio/Bridge/Doctrine/DBAL/Tests/Provider/DoctrineDBALServiceProviderTest.php @@ -5,7 +5,6 @@ use Doctrine\Common\EventManager; use Doctrine\DBAL\Configuration; use PHPUnit\Framework\TestCase; -use Symfony\Component\Console\Helper\HelperSet; use Viserio\Bridge\Doctrine\DBAL\Connection; use Viserio\Bridge\Doctrine\DBAL\Provider\DoctrineDBALServiceProvider; use Viserio\Component\Container\Container; diff --git a/src/Viserio/Bridge/Doctrine/Extensions/Provider/ExtensionsServiceProvider.php b/src/Viserio/Bridge/Doctrine/Extensions/Provider/ExtensionsServiceProvider.php index 619547b87..4c4116048 100644 --- a/src/Viserio/Bridge/Doctrine/Extensions/Provider/ExtensionsServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/Extensions/Provider/ExtensionsServiceProvider.php @@ -8,7 +8,6 @@ use Interop\Container\ServiceProviderInterface; use LaravelDoctrine\Fluent\Extensions\GedmoExtensions; use LaravelDoctrine\Fluent\FluentDriver; -use Psr\Container\ContainerInterface; use Viserio\Component\Contract\OptionsResolver\ProvidesDefaultOptions as ProvidesDefaultOptionsContract; use Viserio\Component\Contract\OptionsResolver\RequiresComponentConfig as RequiresComponentConfigContract; use Viserio\Component\OptionsResolver\Traits\OptionsResolverTrait; diff --git a/src/Viserio/Bridge/Doctrine/Migration/Provider/ConsoleCommandsServiceProvider.php b/src/Viserio/Bridge/Doctrine/Migration/Provider/ConsoleCommandsServiceProvider.php index 2c7c775b4..104fa1122 100644 --- a/src/Viserio/Bridge/Doctrine/Migration/Provider/ConsoleCommandsServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/Migration/Provider/ConsoleCommandsServiceProvider.php @@ -9,8 +9,8 @@ use Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand; use Doctrine\DBAL\Migrations\Tools\Console\Command\StatusCommand; use Doctrine\DBAL\Migrations\Tools\Console\Command\VersionCommand; -use Psr\Container\ContainerInterface; use Interop\Container\ServiceProviderInterface; +use Psr\Container\ContainerInterface; use Viserio\Bridge\Doctrine\DBAL\Connection; use Viserio\Component\Console\Application; use Viserio\Component\Contract\OptionsResolver\RequiresComponentConfig as RequiresComponentConfigContract; diff --git a/src/Viserio/Bridge/Doctrine/Migration/Tests/Provider/ConsoleCommandsServiceProviderTest.php b/src/Viserio/Bridge/Doctrine/Migration/Tests/Provider/ConsoleCommandsServiceProviderTest.php index fb14f779b..5790f9b1a 100644 --- a/src/Viserio/Bridge/Doctrine/Migration/Tests/Provider/ConsoleCommandsServiceProviderTest.php +++ b/src/Viserio/Bridge/Doctrine/Migration/Tests/Provider/ConsoleCommandsServiceProviderTest.php @@ -14,7 +14,6 @@ use Viserio\Component\Console\Application; use Viserio\Component\Console\Provider\ConsoleServiceProvider; use Viserio\Component\Container\Container; -use Viserio\Component\OptionsResolver\Provider\OptionsResolverServiceProvider; class ConsoleCommandsServiceProviderTest extends TestCase { diff --git a/src/Viserio/Bridge/Doctrine/ORM/Provider/ConsoleCommandsServiceProvider.php b/src/Viserio/Bridge/Doctrine/ORM/Provider/ConsoleCommandsServiceProvider.php index 987261621..f18820abc 100644 --- a/src/Viserio/Bridge/Doctrine/ORM/Provider/ConsoleCommandsServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/ORM/Provider/ConsoleCommandsServiceProvider.php @@ -20,8 +20,8 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; -use Psr\Container\ContainerInterface; use Interop\Container\ServiceProviderInterface; +use Psr\Container\ContainerInterface; use Symfony\Component\Console\Helper\HelperSet; use Viserio\Component\Console\Application; diff --git a/src/Viserio/Bridge/Doctrine/ORM/Tests/Provider/ConsoleCommandsServiceProviderTest.php b/src/Viserio/Bridge/Doctrine/ORM/Tests/Provider/ConsoleCommandsServiceProviderTest.php index 636cf0d50..0bc201cf2 100644 --- a/src/Viserio/Bridge/Doctrine/ORM/Tests/Provider/ConsoleCommandsServiceProviderTest.php +++ b/src/Viserio/Bridge/Doctrine/ORM/Tests/Provider/ConsoleCommandsServiceProviderTest.php @@ -10,7 +10,6 @@ use Doctrine\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommand; use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand; use Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand; -use Doctrine\ORM\Tools\Console\Command\GenerateProxyCommand; use Doctrine\ORM\Tools\Console\Command\GenerateRepositoriesCommand; use Doctrine\ORM\Tools\Console\Command\InfoCommand; use Doctrine\ORM\Tools\Console\Command\MappingDescribeCommand; diff --git a/src/Viserio/Bridge/Doctrine/Testing/Provider/ConsoleCommandsServiceProvider.php b/src/Viserio/Bridge/Doctrine/Testing/Provider/ConsoleCommandsServiceProvider.php index 25457fd74..7e7ec0f9f 100644 --- a/src/Viserio/Bridge/Doctrine/Testing/Provider/ConsoleCommandsServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/Testing/Provider/ConsoleCommandsServiceProvider.php @@ -2,8 +2,8 @@ declare(strict_types=1); namespace Viserio\Bridge\Doctrine\Testing\Provider; -use Psr\Container\ContainerInterface; use Interop\Container\ServiceProviderInterface; +use Psr\Container\ContainerInterface; use Viserio\Bridge\Doctrine\Testing\Commands\LoadDataFixturesDoctrineCommand; use Viserio\Component\Console\Application; @@ -40,7 +40,7 @@ public static function extendConsole( ?Application $console = null ): ?Application { if ($console !== null) { - $console->add(new LoadDataFixturesDoctrineCommand()); + $console->add(new LoadDataFixturesDoctrineCommand()); } return $console; diff --git a/src/Viserio/Bridge/Doctrine/Testing/Provider/DoctrineORMTestingServiceProvider.php b/src/Viserio/Bridge/Doctrine/Testing/Provider/DoctrineORMTestingServiceProvider.php index 2ae7b6900..f4e05f1ce 100644 --- a/src/Viserio/Bridge/Doctrine/Testing/Provider/DoctrineORMTestingServiceProvider.php +++ b/src/Viserio/Bridge/Doctrine/Testing/Provider/DoctrineORMTestingServiceProvider.php @@ -5,11 +5,11 @@ use Doctrine\Common\Persistence\ManagerRegistry; use Faker\Factory as FakerFactory; use Faker\Generator as FakerGenerator; -use Psr\Container\ContainerInterface; use Interop\Container\ServiceProviderInterface; -use Viserio\Component\Contract\OptionsResolver\RequiresComponentConfig as RequiresComponentConfigContract; -use Viserio\Component\Contract\OptionsResolver\ProvidesDefaultOptions as ProvidesDefaultOptionsContract; +use Psr\Container\ContainerInterface; use Viserio\Bridge\Doctrine\Testing\Factory as EntityFactory; +use Viserio\Component\Contract\OptionsResolver\ProvidesDefaultOptions as ProvidesDefaultOptionsContract; +use Viserio\Component\Contract\OptionsResolver\RequiresComponentConfig as RequiresComponentConfigContract; class DoctrineORMTestingServiceProvider implements ServiceProviderInterface, @@ -49,7 +49,7 @@ public static function getDimensions(): iterable public static function getDefaultOptions(): iterable { return [ - 'locale' => FakerFactory::DEFAULT_LOCALE + 'locale' => FakerFactory::DEFAULT_LOCALE, ]; }