Update csfixer rules to v.3

.php-cs-fixer.dist.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Finder;
+use PhpCsFixer\Config;
+
+$finder = Finder::create()
+    ->files()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests');
+
+return (new Config())
+    ->setFinder($finder)
+    ->setRules([
+        '@PSR12' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'braces' => [
+            'allow_single_line_closure' => true,
+            'allow_single_line_anonymous_class_with_empty_body' => true,
+        ],
+        'concat_space' => ['spacing' => 'one'],
+        'declare_strict_types' => true,
+        'function_typehint_space' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_unused_imports' => true,
+        'normalize_index_brace' => true,
+        'ordered_imports' => [
+            'imports_order' => [
+                'class',
+                'function',
+                'const',
+            ],
+            'sort_algorithm' => 'alpha',
+        ],
+        'php_unit_method_casing' => ['case' => 'snake_case'],
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_line_span' => ['const' => 'single', 'property' => 'single', 'method' => 'multi'],
+        'phpdoc_order' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_var_annotation_correct_order' => true,
+        'phpdoc_var_without_name' => true,
+        'single_quote' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => ['arrays'],
+        ],
+        'trim_array_spaces' => true,
+        'void_return' => true,
+    ]);

src/CodeGenerator/Domain/CommandArgumentsParser.php

@@ -42,6 +42,7 @@ public function parse(string $desiredNamespace): CommandArguments
 
         foreach ($allPsr4Combinations as $psr4Combination) {
             $psr4Key = $psr4Combination . '\\';
+
             if (isset($psr4[$psr4Key])) {
                 return $this->foundPsr4($psr4Key, $psr4[$psr4Key], $desiredNamespace);
             }
@@ -80,8 +81,8 @@ private function allPossiblePsr4Combinations(string $desiredNamespace): array
 
     private function foundPsr4(string $psr4Key, string $psr4Value, string $desiredNamespace): CommandArguments
     {
-        $rootDir = substr($psr4Value, 0, -1);
-        $rootNamespace = substr($psr4Key, 0, -1);
+        $rootDir = mb_substr($psr4Value, 0, -1);
+        $rootNamespace = mb_substr($psr4Key, 0, -1);
         $targetDirectory = str_replace(['/', $rootNamespace, '\\'], ['\\', $rootDir, '/'], $desiredNamespace);
         $namespace = str_replace([$rootDir, '/'], [$rootNamespace, '\\'], $targetDirectory);
 

src/CodeGenerator/Domain/FilenameSanitizer.php

@@ -28,6 +28,7 @@ public static function expectedFilenames(string $glue = ', '): string
     public function sanitize(string $filename): string
     {
         $percents = [];
+
         foreach (self::EXPECTED_FILENAMES as $expected) {
             $percents[$expected] = similar_text($expected, $filename, $percent);
         }

src/Framework/AbstractConfig.php

@@ -11,7 +11,7 @@ abstract class AbstractConfig
     use ConfigResolverAwareTrait;
 
     /**
-     * @param mixed $default
+     * @param null|mixed $default
      *
      * @throws ConfigException
      *

src/Framework/AbstractFacade.php

@@ -12,7 +12,7 @@ abstract class AbstractFacade
 
     protected function getFactory(): AbstractFactory
     {
-        if ($this->factory === null) {
+        if (null === $this->factory) {
             $this->factory = $this->resolveFactory();
         }
 

src/Framework/ClassResolver/AbstractClassResolver.php

@@ -8,20 +8,16 @@
 
 abstract class AbstractClassResolver
 {
-    /** @var array<string,object|mixed> */
+    /** @var array<string,mixed|object> */
     protected static array $cachedInstances = [];
-
     protected static ?ClassResolverFactory $classResolverFactory = null;
     protected static ?ClassNameFinderInterface $classNameFinder = null;
-
     protected ?ClassInfo $classInfo = null;
 
     abstract public function resolve(object $callerClass): ?object;
 
-    abstract protected function getResolvableType(): string;
-
     /**
-     * @return mixed|null
+     * @return null|mixed
      */
     public function doResolve(object $callerClass)
     {
@@ -34,7 +30,7 @@ public function doResolve(object $callerClass)
 
         $resolvedClassName = $this->findClassName();
 
-        if ($resolvedClassName === null) {
+        if (null === $resolvedClassName) {
             return null;
         }
 
@@ -48,6 +44,15 @@ public function setCallerObject(object $callerClass): void
         $this->classInfo = new ClassInfo($callerClass);
     }
 
+    public function getClassInfo(): ClassInfo
+    {
+        assert($this->classInfo instanceof ClassInfo);
+
+        return $this->classInfo;
+    }
+
+    abstract protected function getResolvableType(): string;
+
     private function getCacheKey(): string
     {
         assert($this->classInfo instanceof ClassInfo);
@@ -65,7 +70,7 @@ private function findClassName(): ?string
 
     private function getClassNameFinder(): ClassNameFinderInterface
     {
-        if (static::$classNameFinder === null) {
+        if (null === static::$classNameFinder) {
             static::$classNameFinder = $this->getClassResolverFactory()->createClassNameFinder();
         }
 
@@ -74,22 +79,15 @@ private function getClassNameFinder(): ClassNameFinderInterface
 
     private function getClassResolverFactory(): ClassResolverFactory
     {
-        if (static::$classResolverFactory === null) {
+        if (null === static::$classResolverFactory) {
             static::$classResolverFactory = new ClassResolverFactory();
         }
 
         return static::$classResolverFactory;
     }
 
-    public function getClassInfo(): ClassInfo
-    {
-        assert($this->classInfo instanceof ClassInfo);
-
-        return $this->classInfo;
-    }
-
     /**
-     * @return object|null
+     * @return null|object
      */
     private function createInstance(string $resolvedClassName)
     {

src/Framework/ClassResolver/Config/ConfigResolver.php

@@ -17,7 +17,7 @@ public function resolve(object $callerClass): AbstractConfig
         /** @var ?AbstractConfig $resolved */
         $resolved = $this->doResolve($callerClass);
 
-        if ($resolved === null) {
+        if (null === $resolved) {
             throw new ConfigNotFoundException($this->getClassInfo());
         }
 

src/Framework/ClassResolver/DependencyProvider/DependencyProviderResolver.php

@@ -17,7 +17,7 @@ public function resolve(object $callerClass): AbstractDependencyProvider
         /** @var ?AbstractDependencyProvider $resolved */
         $resolved = $this->doResolve($callerClass);
 
-        if ($resolved === null) {
+        if (null === $resolved) {
             throw new DependencyProviderNotFoundException($this->getClassInfo());
         }
 

src/Framework/ClassResolver/Factory/FactoryResolver.php

@@ -21,7 +21,7 @@ public function resolve(object $callerClass): AbstractFactory
         /** @var ?AbstractFactory $resolved */
         $resolved = $this->doResolve($callerClass);
 
-        if ($resolved === null) {
+        if (null === $resolved) {
             throw new FactoryNotFoundException($this->getClassInfo());
         }