Skip to content

Commit

Permalink
PHP CS Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
charescape committed Sep 21, 2019
1 parent 2df4c3b commit 3a60eaa
Show file tree
Hide file tree
Showing 76 changed files with 371 additions and 352 deletions.
24 changes: 13 additions & 11 deletions src/Bootloader/CommandBootloader.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Spiral Framework.
*
Expand Down Expand Up @@ -36,15 +38,15 @@
*/
final class CommandBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
ConsoleBootloader::class,
];

/**
* @param ConsoleBootloader $console
* @param Container $container
*/
public function boot(ConsoleBootloader $console, Container $container)
public function boot(ConsoleBootloader $console, Container $container): void
{
$console->addCommand(Console\Command\ConfigureCommand::class);
$console->addCommand(Console\Command\UpdateCommand::class);
Expand Down Expand Up @@ -105,7 +107,7 @@ private function configureExtensions(ConsoleBootloader $console, Container $cont
/**
* @param ConsoleBootloader $console
*/
private function configureDatabase(ConsoleBootloader $console)
private function configureDatabase(ConsoleBootloader $console): void
{
$console->addCommand(Database\ListCommand::class);
$console->addCommand(Database\TableCommand::class);
Expand All @@ -115,7 +117,7 @@ private function configureDatabase(ConsoleBootloader $console)
* @param ConsoleBootloader $console
* @param ContainerInterface $container
*/
private function configureCycle(ConsoleBootloader $console, ContainerInterface $container)
private function configureCycle(ConsoleBootloader $console, ContainerInterface $container): void
{
$console->addCommand(Cycle\UpdateCommand::class);

Expand All @@ -134,16 +136,16 @@ private function configureCycle(ConsoleBootloader $console, ContainerInterface $
/**
* @param ConsoleBootloader $console
**/
private function configureTranslator(ConsoleBootloader $console)
private function configureTranslator(ConsoleBootloader $console): void
{
$console->addCommand(Translator\IndexCommand::class);
$console->addCommand(Translator\ExportCommand::class);
$console->addCommand(Translator\ResetCommand::class);

$console->addConfigureSequence(
function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output) {
function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output): void {
$files->ensureDirectory($config->getLocaleDirectory($config->getDefaultLocale()));
$output->writeln("<info>The default locale directory has been ensured.</info>");
$output->writeln('<info>The default locale directory has been ensured.</info>');
},
'<fg=magenta>[i18n]</fg=magenta> <fg=cyan>ensure default locale directory...</fg=cyan>'
);
Expand All @@ -157,7 +159,7 @@ function (FilesInterface $files, TranslatorConfig $config, OutputInterface $outp
/**
* @param ConsoleBootloader $console
*/
private function configureViews(ConsoleBootloader $console)
private function configureViews(ConsoleBootloader $console): void
{
$console->addCommand(Views\ResetCommand::class);
$console->addCommand(Views\CompileCommand::class);
Expand All @@ -171,7 +173,7 @@ private function configureViews(ConsoleBootloader $console)
/**
* @param ConsoleBootloader $console
*/
private function configureMigrations(ConsoleBootloader $console)
private function configureMigrations(ConsoleBootloader $console): void
{
$console->addCommand(Migrate\InitCommand::class);
$console->addCommand(Migrate\StatusCommand::class);
Expand All @@ -183,7 +185,7 @@ private function configureMigrations(ConsoleBootloader $console)
/**
* @param ConsoleBootloader $console
*/
private function configureGRPC(ConsoleBootloader $console)
private function configureGRPC(ConsoleBootloader $console): void
{
$console->addCommand(GRPC\GenerateCommand::class);
$console->addCommand(GRPC\ListCommand::class);
Expand All @@ -192,7 +194,7 @@ private function configureGRPC(ConsoleBootloader $console)
/**
* @param ConsoleBootloader $console
*/
private function configureEncrypter(ConsoleBootloader $console)
private function configureEncrypter(ConsoleBootloader $console): void
{
$console->addCommand(Encrypter\KeyCommand::class);
}
Expand Down
12 changes: 6 additions & 6 deletions src/Bootloader/ConsoleBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
*/
final class ConsoleBootloader extends Bootloader implements SingletonInterface
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
TokenizerBootloader::class,
];

const SINGLETONS = [
public const SINGLETONS = [
Console::class => Console::class,
LocatorInterface::class => CommandLocator::class
];
Expand All @@ -52,7 +52,7 @@ public function __construct(ConfiguratorInterface $config)
* @param KernelInterface $kernel
* @param ConsoleDispatcher $console
*/
public function boot(KernelInterface $kernel, ConsoleDispatcher $console)
public function boot(KernelInterface $kernel, ConsoleDispatcher $console): void
{
$kernel->addDispatcher($console);

Expand All @@ -69,7 +69,7 @@ public function boot(KernelInterface $kernel, ConsoleDispatcher $console)
/**
* @param string $command
*/
public function addCommand(string $command)
public function addCommand(string $command): void
{
$this->config->modify(
'console',
Expand All @@ -88,7 +88,7 @@ public function addConfigureSequence(
string $header,
string $footer = '',
array $options = []
) {
): void {
$this->config->modify(
'console',
$this->sequence('configure', $sequence, $header, $footer, $options)
Expand All @@ -106,7 +106,7 @@ public function addUpdateSequence(
string $header,
string $footer = '',
array $options = []
) {
): void {
$this->config->modify(
'console',
$this->sequence('update', $sequence, $header, $footer, $options)
Expand Down
4 changes: 2 additions & 2 deletions src/Bootloader/Cycle/AnnotatedBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@

final class AnnotatedBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
SchemaBootloader::class
];

/**
* @param SchemaBootloader $schema
*/
public function boot(SchemaBootloader $schema)
public function boot(SchemaBootloader $schema): void
{
AnnotationRegistry::registerLoader('class_exists');

Expand Down
8 changes: 4 additions & 4 deletions src/Bootloader/Cycle/CycleBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

final class CycleBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
DatabaseBootloader::class,
SchemaBootloader::class
];
Expand All @@ -47,9 +47,9 @@ final class CycleBootloader extends Bootloader
* @param FinalizerInterface $finalizer
* @param SchemaInterface|null $schema
*/
public function boot(Container $container, FinalizerInterface $finalizer, SchemaInterface $schema = null)
public function boot(Container $container, FinalizerInterface $finalizer, SchemaInterface $schema = null): void
{
$finalizer->addFinalizer(function () use ($container) {
$finalizer->addFinalizer(function () use ($container): void {
if ($container->hasInstance(ORMInterface::class)) {
$container->get(ORMInterface::class)->getHeap()->clean();
}
Expand All @@ -68,7 +68,7 @@ public function boot(Container $container, FinalizerInterface $finalizer, Schema
* @param Container $container
* @param SchemaInterface $schema
*/
public function bindRepositories(Container $container, SchemaInterface $schema)
public function bindRepositories(Container $container, SchemaInterface $schema): void
{
foreach ($schema->getRoles() as $role) {
$repository = $schema->define($role, SchemaInterface::REPOSITORY);
Expand Down
2 changes: 1 addition & 1 deletion src/Bootloader/Cycle/ProxiesBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

final class ProxiesBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
CycleBootloader::class
];

Expand Down
6 changes: 3 additions & 3 deletions src/Bootloader/Cycle/SchemaBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class SchemaBootloader extends Bootloader implements Container\SingletonIn
TokenizerBootloader::class
];

const BINDINGS = [
public const BINDINGS = [
SchemaInterface::class => [self::class, 'schema'],
Generator\GenerateRelations::class => [self::class, 'relationGenerator'],
];
Expand All @@ -47,7 +47,7 @@ final class SchemaBootloader extends Bootloader implements Container\SingletonIn
*/
public function __construct(Container $container)
{
$this->container = $container;
$this->container = $container;
$this->generators = [
self::GROUP_INDEX => [
// find available entities
Expand All @@ -71,7 +71,7 @@ public function __construct(Container $container)
* @param string $group
* @param mixed $generator
*/
public function addGenerator(string $group, $generator)
public function addGenerator(string $group, $generator): void
{
$this->generators[$group][] = $generator;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Bootloader/Database/DatabaseBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

final class DatabaseBootloader extends Bootloader implements SingletonInterface
{
const SINGLETONS = [
public const SINGLETONS = [
DatabaseProviderInterface::class => DatabaseManager::class,
];

const BINDINGS = [
public const BINDINGS = [
DatabaseInterface::class => Database::class
];

Expand All @@ -41,7 +41,7 @@ public function __construct(ConfiguratorInterface $config)
/**
* Init database config.
*/
public function boot()
public function boot(): void
{
$this->config->setDefaults('database', [
'default' => 'default',
Expand Down
4 changes: 2 additions & 2 deletions src/Bootloader/Database/DisconnectsBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ final class DisconnectsBootloader extends Bootloader
* @param FinalizerInterface $finalizer
* @param ContainerInterface $container
*/
public function boot(FinalizerInterface $finalizer, ContainerInterface $container)
public function boot(FinalizerInterface $finalizer, ContainerInterface $container): void
{
$finalizer->addFinalizer(function () use ($container) {
$finalizer->addFinalizer(function () use ($container): void {
/** @var DatabaseManager $dbal */
$dbal = $container->get(DatabaseManager::class);
foreach ($dbal->getDrivers() as $driver) {
Expand Down
6 changes: 3 additions & 3 deletions src/Bootloader/Database/MigrationsBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

final class MigrationsBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
TokenizerBootloader::class,
DatabaseBootloader::class
];

const SINGLETONS = [
public const SINGLETONS = [
Migrator::class => Migrator::class,
RepositoryInterface::class => FileRepository::class
];
Expand All @@ -39,7 +39,7 @@ public function boot(
ConfiguratorInterface $config,
EnvironmentInterface $env,
DirectoriesInterface $dirs
) {
): void {
if (!$dirs->has('migrations')) {
$dirs->set('migrations', $dirs->get('app') . 'migrations');
}
Expand Down
2 changes: 1 addition & 1 deletion src/Bootloader/DebugBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

final class DebugBootloader extends Bootloader
{
const SINGLETONS = [
public const SINGLETONS = [
Dumper::class => Dumper::class,
LogsInterface::class => LogFactory::class
];
Expand Down
2 changes: 1 addition & 1 deletion src/Bootloader/GRPC/GRPCBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class GRPCBootloader extends Bootloader
* @param KernelInterface $kernel
* @param GRPCDispatcher $grpc
*/
public function boot(KernelInterface $kernel, GRPCDispatcher $grpc)
public function boot(KernelInterface $kernel, GRPCDispatcher $grpc): void
{
$kernel->addDispatcher($grpc);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Bootloader/Http/CookiesBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

final class CookiesBootloader extends Bootloader implements SingletonInterface
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
HttpBootloader::class
];

Expand All @@ -36,7 +36,7 @@ public function __construct(ConfiguratorInterface $config)
/**
* @param HttpBootloader $http
*/
public function boot(HttpBootloader $http)
public function boot(HttpBootloader $http): void
{
$this->config->setDefaults('cookies', [
'domain' => '.%s',
Expand All @@ -52,7 +52,7 @@ public function boot(HttpBootloader $http)
*
* @param string $cookie
*/
public function whitelistCookie(string $cookie)
public function whitelistCookie(string $cookie): void
{
$this->config->modify('cookies', new Append('excluded', null, $cookie));
}
Expand Down
4 changes: 2 additions & 2 deletions src/Bootloader/Http/CsrfBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@

final class CsrfBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
HttpBootloader::class
];

/**
* @param ConfiguratorInterface $config
* @param HttpBootloader $http
*/
public function boot(ConfiguratorInterface $config, HttpBootloader $http)
public function boot(ConfiguratorInterface $config, HttpBootloader $http): void
{
$config->setDefaults('csrf', [
'cookie' => 'csrf-token',
Expand Down
2 changes: 1 addition & 1 deletion src/Bootloader/Http/DiactorosBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
final class DiactorosBootloader extends Bootloader
{
const SINGLETONS = [
public const SINGLETONS = [
ServerRequestFactoryInterface::class => ServerRequestFactory::class,
ResponseFactoryInterface::class => ResponseFactory::class,
StreamFactoryInterface::class => StreamFactory::class,
Expand Down
6 changes: 3 additions & 3 deletions src/Bootloader/Http/ErrorHandlerBootloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
*/
final class ErrorHandlerBootloader extends Bootloader
{
const DEPENDENCIES = [
public const DEPENDENCIES = [
HttpBootloader::class
];

const BINDINGS = [
public const BINDINGS = [
ErrorHandler\RendererInterface::class => ErrorHandler\PlainRenderer::class,
];

/**
* @param HttpBootloader $http
* @param EnvironmentInterface $env
*/
public function boot(HttpBootloader $http, EnvironmentInterface $env)
public function boot(HttpBootloader $http, EnvironmentInterface $env): void
{
$http->addMiddleware(new Autowire(
ErrorHandlerMiddleware::class,
Expand Down

0 comments on commit 3a60eaa

Please sign in to comment.