PHP CS Fix

.php_cs

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+return PhpCsFixer\Config::create()
+    ->setCacheFile(__DIR__ . '/.php_cs.cache')
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'binary_operator_spaces' => [
+            'default' => null,
+            'operators' => [
+                '|' => 'single_space',
+                '!==' => 'single_space',
+                '!=' => 'single_space',
+                '==' => 'single_space',
+                '===' => 'single_space',
+            ],
+        ],
+        'ordered_class_elements' => true,
+        'trailing_comma_in_multiline_array' => false,
+        'declare_strict_types' => true,
+        'linebreak_after_opening_tag' => true,
+        'blank_line_after_opening_tag' => true,
+        'single_quote' => true,
+        'lowercase_cast' => true,
+        'short_scalar_cast' => true,
+        'no_leading_import_slash' => true,
+        'declare_equal_normalize' => [
+            'space' => 'none',
+        ],
+        'new_with_braces' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'single_blank_line_before_namespace' => true,
+        'visibility_required' => ['property', 'method', 'const'],
+        'ternary_operator_spaces' => true,
+        'unary_operator_spaces' => true,
+        'return_type_declaration' => true,
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'phpdoc_separation' => false,
+        'yoda_style' => false,
+        'void_return' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+            ->exclude([
+                'vendor',
+                'bin',
+            ])
+    );

.travis.yml

@@ -27,6 +27,7 @@ install:
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpcs -n --report=code --standard=PSR12 --colors tests src
   - vendor/bin/phpcs -n --standard=PSR2 --colors src tests
 
 after_success:

composer.json

@@ -45,7 +45,8 @@
     "cycle/proxy-factory": "^1.0.3",
     "phpunit/phpunit": "~7.0",
     "mockery/mockery": "^1.1",
-    "squizlabs/php_codesniffer": "^3.4"
+    "squizlabs/php_codesniffer": "^3.5.0",
+    "friendsofphp/php-cs-fixer": "^v2.15.3"
   },
   "autoload": {
     "files": [

functions.php

@@ -33,7 +33,7 @@ function bind(string $alias, array $parameters = [])
      *
      * @param mixed $value
      */
-    function dumprr($value)
+    function dumprr($value): void
     {
         dump($value, Dumper::ERROR_LOG);
     }

src/Bootloader/CommandBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -37,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);
@@ -106,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);
@@ -116,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);
 
@@ -135,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>'
         );
@@ -158,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);
@@ -172,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);
@@ -184,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);
@@ -193,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);
     }

src/Bootloader/ConsoleBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -28,11 +29,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
     ];
@@ -52,7 +53,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);
 
@@ -69,7 +70,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',
@@ -88,7 +89,7 @@ public function addConfigureSequence(
         string $header,
         string $footer = '',
         array $options = []
-    ) {
+    ): void {
         $this->config->modify(
             'console',
             $this->sequence('configure', $sequence, $header, $footer, $options)
@@ -106,7 +107,7 @@ public function addUpdateSequence(
         string $header,
         string $footer = '',
         array $options = []
-    ) {
+    ): void {
         $this->config->modify(
             'console',
             $this->sequence('update', $sequence, $header, $footer, $options)

src/Bootloader/Cycle/AnnotatedBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -15,14 +16,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');
 

src/Bootloader/Cycle/CycleBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -28,7 +29,7 @@
 
 final class CycleBootloader extends Bootloader
 {
-    const DEPENDENCIES = [
+    public const DEPENDENCIES = [
         DatabaseBootloader::class,
         SchemaBootloader::class
     ];
@@ -47,9 +48,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();
             }
@@ -68,7 +69,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);

src/Bootloader/Cycle/ProxiesBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -17,7 +18,7 @@
 
 final class ProxiesBootloader extends Bootloader
 {
-    const DEPENDENCIES = [
+    public const DEPENDENCIES = [
         CycleBootloader::class
     ];
 

src/Bootloader/Cycle/SchemaBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -29,7 +30,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'],
     ];
@@ -71,7 +72,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;
     }

src/Bootloader/Database/DatabaseBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -19,11 +20,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
     ];
 
@@ -41,7 +42,7 @@ public function __construct(ConfiguratorInterface $config)
     /**
      * Init database config.
      */
-    public function boot()
+    public function boot(): void
     {
         $this->config->setDefaults('database', [
             'default'   => 'default',

src/Bootloader/Database/DisconnectsBootloader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Spiral Framework.
  *
@@ -23,9 +24,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) {