Update coding standard (#24)

Author: dantleech

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
 
             -
                 name: "Run friendsofphp/php-cs-fixer"
-                run: "vendor/bin/php-cs-fixer fix --dry-run --diff --verbose"
+                run: "vendor/bin/php-cs-fixer fix --dry-run --diff --verbose --allow-risky=yes"
     phpstan:
         name: "PHPStan (${{ matrix.php-version }})"
 

.php_cs.dist

@@ -2,13 +2,23 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in('lib')
+    ->in('tests')
+    ->exclude([
+        'Workspace',
+        'Integration/Composer/project'
+    ])
 ;
 
 return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
         'no_unused_imports' => true,
         'array_syntax' => ['syntax' => 'short'],
+        'void_return' => true,
+        'ordered_class_elements' => true,
+        'single_quote' => true,
+        'heredoc_indentation' => true,
+        'global_namespace_import' => true,
     ])
     ->setFinder($finder)
 ;

lib/Adapter/Composer/ComposerClassToFile.php

@@ -75,7 +75,7 @@ private function getStrategies(): array
         ];
     }
 
-    private function resolveFile(&$candidates, array $prefixes, NameInflector $inflector, ClassName $className)
+    private function resolveFile(&$candidates, array $prefixes, NameInflector $inflector, ClassName $className): void
     {
         $fileCandidates = $this->getFileCandidates($className, $prefixes);
 

lib/Adapter/Composer/ComposerFileToClass.php

@@ -7,6 +7,7 @@
 use Phpactor\ClassFileConverter\Domain\FileToClass;
 use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
 use Webmozart\PathUtil\Path;
+use InvalidArgumentException;
 
 final class ComposerFileToClass implements FileToClass
 {
@@ -23,7 +24,7 @@ public function __construct(ClassLoader $classLoader)
     public function fileToClassCandidates(FilePath $filePath): ClassNameCandidates
     {
         if (false === $filePath->isAbsolute()) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new InvalidArgumentException(sprintf(
                 'Path must be absolute'
             ));
         }

lib/Domain/ChainClassToFile.php

@@ -28,7 +28,7 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates
         return FilePathCandidates::fromFilePaths($paths);
     }
 
-    private function add(ClassToFile $classToFile)
+    private function add(ClassToFile $classToFile): void
     {
         $this->converters[] = $classToFile;
     }

lib/Domain/ChainFileToClass.php

@@ -28,7 +28,7 @@ public function fileToClassCandidates(FilePath $filePath): ClassNameCandidates
         return ClassNameCandidates::fromClassNames($classNames);
     }
 
-    private function add(FileToClass $fileToClass)
+    private function add(FileToClass $fileToClass): void
     {
         $this->converters[] = $fileToClass;
     }

lib/Domain/ClassName.php

@@ -10,6 +10,11 @@ private function __construct()
     {
     }
 
+    public function __toString()
+    {
+        return $this->fullyQualifiedName;
+    }
+
     public static function fromString($string)
     {
         $new = new self();
@@ -18,11 +23,6 @@ public static function fromString($string)
         return $new;
     }
 
-    public function __toString()
-    {
-        return $this->fullyQualifiedName;
-    }
-
     public function namespace()
     {
         return substr($this->fullyQualifiedName, 0, (int) strrpos($this->fullyQualifiedName, '\\'));

lib/Domain/ClassNameCandidates.php

@@ -2,7 +2,11 @@
 
 namespace Phpactor\ClassFileConverter\Domain;
 
-final class ClassNameCandidates implements \IteratorAggregate
+use IteratorAggregate;
+use ArrayIterator;
+use RuntimeException;
+
+final class ClassNameCandidates implements IteratorAggregate
 {
     private $classNames = [];
 
@@ -20,7 +24,7 @@ public static function fromClassNames(array $classNames)
 
     public function getIterator()
     {
-        return new \ArrayIterator(array_values($this->classNames));
+        return new ArrayIterator(array_values($this->classNames));
     }
 
     public function noneFound(): bool
@@ -31,15 +35,15 @@ public function noneFound(): bool
     public function best(): ClassName
     {
         if (empty($this->classNames)) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 'There are no class name candidates'
             );
         }
 
         return reset($this->classNames);
     }
 
-    private function add(ClassName $className)
+    private function add(ClassName $className): void
     {
         $this->classNames[$className->__toString()] = $className;
     }

lib/Domain/FilePath.php

@@ -14,14 +14,14 @@ private function __construct(string $path)
         $this->path = $path;
     }
 
-    public function isAbsolute(): bool
+    public function __toString()
     {
-        return Path::isAbsolute($this->path);
+        return $this->path;
     }
 
-    public function __toString()
+    public function isAbsolute(): bool
     {
-        return $this->path;
+        return Path::isAbsolute($this->path);
     }
 
     public static function fromString($path): FilePath

lib/Domain/FilePathCandidates.php

@@ -2,7 +2,11 @@
 
 namespace Phpactor\ClassFileConverter\Domain;
 
-final class FilePathCandidates implements \IteratorAggregate
+use IteratorAggregate;
+use RuntimeException;
+use ArrayIterator;
+
+final class FilePathCandidates implements IteratorAggregate
 {
     private $filePaths = [];
 
@@ -28,15 +32,15 @@ public function toArray(): array
         return $this->filePaths;
     }
 
-    public function add(FilePath $filePath)
+    public function add(FilePath $filePath): void
     {
         $this->filePaths[] = $filePath;
     }
 
     public function best(): FilePath
     {
         if (empty($this->filePaths)) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 'There are no file path candidates'
             );
         }
@@ -51,6 +55,6 @@ public function noneFound(): bool
 
     public function getIterator()
     {
-        return new \ArrayIterator($this->filePaths);
+        return new ArrayIterator($this->filePaths);
     }
 }