Merge pull request #10 from phpactor/maestro-sync

dantleech · web-flow · commit 33bd5056dca6 · 2019-06-27T20:21:52.000+02:00
Update Meta and CI
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-vendor/
-composer.lock
-phpunit.xml
-composer.phar
-tests/Integration/workspace
+/vendor
+/tests/Workspace
+/tests/Assets/workspace
+/phpbench.json
+/composer.lock
+/.php_cs.cache
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,19 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('lib')
+    ->in('tests')
+    ->exclude([
+        'Integration/Composer/project'
+    ])
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'no_unused_imports' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;
+
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,21 @@
 language: php
+
 php:
-    - 7.0
     - 7.1
-
+    - 7.2
+    - 7.3
+    
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.composer/cache
+    directories:
+        - $HOME/.composer/cache
 
 before_script:
-  - composer install
+    - composer install
 
-script: 
-  - phpunit
+script:
+    - ./vendor/bin/php-cs-fixer fix --dry-run
+    - ./vendor/bin/phpstan analyse lib -c phpstan.neon
+    - ./vendor/bin/phpunit
+    
diff --git a/composer.json b/composer.json
@@ -13,8 +13,10 @@
         "webmozart/path-util": "^2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1",
-        "symfony/filesystem": "^3.2"
+        "phpunit/phpunit": "~7.0",
+        "symfony/filesystem": "^3.2",
+        "friendsofphp/php-cs-fixer": "~2.15.0",
+        "phpstan/phpstan": "~0.11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/Adapter/Composer/ComposerClassToFile.php b/lib/Adapter/Composer/ComposerClassToFile.php
@@ -5,7 +5,6 @@
 use Phpactor\ClassFileConverter\Domain\ClassToFile;
 use Composer\Autoload\ClassLoader;
 use Phpactor\ClassFileConverter\Domain\ClassName;
-use Phpactor\ClassFileConverter\Domain\FilePath;
 use Phpactor\ClassFileConverter\Domain\FilePathCandidates;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -103,7 +102,8 @@ private function getFileCandidates(ClassName $className, array $prefixes)
             $paths = array_map(function ($path) {
                 if (!file_exists($path)) {
                     $this->logger->warning(sprintf(
-                        'Composer mapped path "%s" does not exist', $path
+                        'Composer mapped path "%s" does not exist',
+                        $path
                     ));
 
                     return $path;
diff --git a/lib/Adapter/Composer/ComposerFileToClass.php b/lib/Adapter/Composer/ComposerFileToClass.php
@@ -73,7 +73,6 @@ private function populateCandidates(FilePath $filePath, array $prefixes)
     {
         $candidates = [];
         foreach ($prefixes as $classPrefix => $pathPrefixes) {
-
             $pathPrefixes = (array) $pathPrefixes;
 
             // remove any relativeness from the paths
@@ -85,7 +84,6 @@ private function populateCandidates(FilePath $filePath, array $prefixes)
             }, $pathPrefixes);
 
             foreach ($pathPrefixes as $pathPrefix) {
-
                 if ((string) $filePath == $pathPrefix) {
                     $candidates[] = [ $pathPrefix, $classPrefix ];
                     continue;
diff --git a/lib/Adapter/Composer/Psr0NameInflector.php b/lib/Adapter/Composer/Psr0NameInflector.php
@@ -14,7 +14,7 @@ public function inflectToRelativePath(string $prefix, ClassName $className, stri
             $className = implode('\\', $elements);
         }
 
-        $relativePath = str_replace('\\', '/', $className).'.php';
+        $relativePath = str_replace('\\', '/', (string) $className).'.php';
 
         return FilePath::fromParts([$mappedPath, $relativePath]);
     }
diff --git a/lib/Adapter/Simple/ClassScanner.php b/lib/Adapter/Simple/ClassScanner.php
@@ -2,6 +2,8 @@
 
 namespace Phpactor\ClassFileConverter\Adapter\Simple;
 
+use RuntimeException;
+
 /**
  * Return the class name from a file.
  *
@@ -17,6 +19,13 @@ public function getClassNameFromFile($file)
 
         $fp = fopen($file, 'r');
 
+        if (false === $fp) {
+            throw new RuntimeException(sprintf(
+                'Could not open file "%s"',
+                $file
+            ));
+        }
+
         $class = $namespace = $buffer = '';
         $i = 0;
 
diff --git a/lib/Adapter/Simple/SimpleClassToFile.php b/lib/Adapter/Simple/SimpleClassToFile.php
@@ -44,7 +44,7 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates
             if (ClassName::fromString(
                 $this->classScanner->getClassNameFromFile($phpFile->getPathName())
             ) == $className) {
-            $candidates[] = FilePath::fromString($phpFile->getPathName());
+                $candidates[] = FilePath::fromString($phpFile->getPathName());
             }
         }
 
diff --git a/lib/Adapter/Simple/SimpleFileToClass.php b/lib/Adapter/Simple/SimpleFileToClass.php
@@ -6,7 +6,6 @@
 use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
 use Phpactor\ClassFileConverter\Domain\FilePath;
 use Phpactor\ClassFileConverter\Domain\ClassName;
-use Phpactor\ClassFileConverter\Adapter\Simple\ClassScanner;
 
 class SimpleFileToClass implements FileToClass
 {
diff --git a/lib/ClassToFileConverter.php b/lib/ClassToFileConverter.php
@@ -5,15 +5,9 @@
 use Phpactor\ClassFileConverter\Adapter\Composer\ComposerFileToClass;
 use Phpactor\ClassFileConverter\Adapter\Composer\ComposerClassToFile;
 use Phpactor\ClassFileConverter\Domain\ClassToFileFileToClass;
-use Phpactor\ClassFileConverter\Domain\FilePath;
-use Phpactor\ClassFileConverter\Domain\ClassName;
-use Phpactor\ClassFileConverter\Domain\FilePathCandidates;
-use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
 use Composer\Autoload\ClassLoader;
 use Phpactor\ClassFileConverter\Domain\ChainClassToFile;
 use Phpactor\ClassFileConverter\Domain\ChainFileToClass;
-use Phpactor\ClassFileConverter\Domain\ClassToFile;
-use Phpactor\ClassFileConverter\Domain\FileToClass;
 
 /**
  * Facade for the library.
diff --git a/lib/Domain/ClassName.php b/lib/Domain/ClassName.php
@@ -25,7 +25,7 @@ public function __toString()
 
     public function namespace()
     {
-        return substr($this->fullyQualifiedName, 0, strrpos($this->fullyQualifiedName, '\\'));
+        return substr($this->fullyQualifiedName, 0, (int) strrpos($this->fullyQualifiedName, '\\'));
     }
 
     public function name()
diff --git a/lib/Domain/ClassToFileFileToClass.php b/lib/Domain/ClassToFileFileToClass.php
@@ -10,12 +10,12 @@ final class ClassToFileFileToClass implements ClassToFile, FileToClass
     public function __construct(ClassToFile $classToFile, FileToClass $fileToClass)
     {
         $this->classToFile = $classToFile;
-        $this->fileToClassCandidates = $fileToClass;
+        $this->fileToClass = $fileToClass;
     }
 
     public function fileToClassCandidates(FilePath $filePath): ClassNameCandidates
     {
-        return $this->fileToClassCandidates->fileToClassCandidates($filePath);
+        return $this->fileToClass->fileToClassCandidates($filePath);
     }
 
     public function classToFileCandidates(ClassName $className): FilePathCandidates
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,9 @@
+includes:
+    - vendor/phpstan/phpstan/conf/config.level7.neon
+
+parameters:
+    ignoreErrors:
+        
+    paths:
+        - lib
+
diff --git a/tests/Integration/ClassToFileConverterTest.php b/tests/Integration/ClassToFileConverterTest.php
@@ -6,7 +6,6 @@
 use Phpactor\ClassFileConverter\Domain\FilePath;
 use Phpactor\ClassFileConverter\Domain\ClassName;
 
-
 /**
  * @runTestsInSeparateProcesses
  */
@@ -27,12 +26,14 @@ public function testCreateForComposer()
         $converter = ClassToFileConverter::fromComposerAutoloader($this->classLoader);
         $candidates = $converter->fileToClassCandidates(FilePath::fromString(__FILE__));
         $this->assertEquals(
-            __CLASS__, (string) $candidates->best()
+            __CLASS__,
+            (string) $candidates->best()
         );
 
         $candidates = $converter->classToFileCandidates(ClassName::fromString(__CLASS__));
         $this->assertEquals(
-            __FILE__, (string) $candidates->best()
+            __FILE__,
+            (string) $candidates->best()
         );
     }
 
@@ -44,12 +45,14 @@ public function testCreateForComposers()
         $converter = ClassToFileConverter::fromComposerAutoloaders([$this->classLoader]);
         $candidates = $converter->fileToClassCandidates(FilePath::fromString(__FILE__));
         $this->assertEquals(
-            __CLASS__, (string) $candidates->best()
+            __CLASS__,
+            (string) $candidates->best()
         );
 
         $candidates = $converter->classToFileCandidates(ClassName::fromString(__CLASS__));
         $this->assertEquals(
-            __FILE__, (string) $candidates->best()
+            __FILE__,
+            (string) $candidates->best()
         );
     }
 }
diff --git a/tests/Integration/IntegrationTestCase.php b/tests/Integration/IntegrationTestCase.php
@@ -19,6 +19,6 @@ protected function initWorkspace()
 
     protected function workspacePath()
     {
-        return __DIR__.'/workspace';
+        return __DIR__.'/../Workspace';
     }
 }
diff --git a/tests/Integration/Simple/SimpleClassToFileTest.php b/tests/Integration/Simple/SimpleClassToFileTest.php
@@ -2,11 +2,8 @@
 
 namespace Phpactor\ClassFileConverter\Tests\Integration\Simple;
 
-use Phpactor\ClassFileConverter\Tests\Integration\IntegrationTestCase;
-use Symfony\Component\Filesystem\Filesystem;
 use Phpactor\ClassFileConverter\Adapter\Simple\SimpleClassToFile;
 use Phpactor\ClassFileConverter\Domain\FilePath;
-use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
 use Phpactor\ClassFileConverter\Domain\ClassName;
 use Phpactor\ClassFileConverter\Domain\FilePathCandidates;
 
@@ -29,7 +26,7 @@ public function testClassToFile()
         $candidates = $this->classToFile->classToFileCandidates(ClassName::fromString('Acme\\Foobar'));
 
         $this->assertEquals(FilePathCandidates::fromFilePaths([
-            FilePath::fromString(__DIR__ . '/../workspace/lib/Foobar.php')
+            FilePath::fromString(__DIR__ . '/../../Workspace/lib/Foobar.php')
         ]), $candidates);
     }
 
@@ -38,7 +35,7 @@ public function testClassToFileDeeper()
         $candidates = $this->classToFile->classToFileCandidates(ClassName::fromString('Acme\\NamespaceHere\\Hallo'));
 
         $this->assertEquals(FilePathCandidates::fromFilePaths([
-            FilePath::fromString(__DIR__ . '/../workspace/lib/NamespaceHere/Hallo.php')
+            FilePath::fromString(__DIR__ . '/../../Workspace/lib/NamespaceHere/Hallo.php')
         ]), $candidates);
     }
 
diff --git a/tests/Integration/Simple/SimpleFileToClassTest.php b/tests/Integration/Simple/SimpleFileToClassTest.php
@@ -2,8 +2,6 @@
 
 namespace Phpactor\ClassFileConverter\Tests\Integration\Simple;
 
-use Phpactor\ClassFileConverter\Tests\Integration\IntegrationTestCase;
-use Symfony\Component\Filesystem\Filesystem;
 use Phpactor\ClassFileConverter\Adapter\Simple\SimpleFileToClass;
 use Phpactor\ClassFileConverter\Domain\FilePath;
 use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
diff --git a/tests/Integration/Simple/SimpleTestCase.php b/tests/Integration/Simple/SimpleTestCase.php
@@ -4,10 +4,6 @@
 
 use Phpactor\ClassFileConverter\Tests\Integration\IntegrationTestCase;
 use Symfony\Component\Filesystem\Filesystem;
-use Phpactor\ClassFileConverter\Adapter\Simple\SimpleFileToClass;
-use Phpactor\ClassFileConverter\Domain\FilePath;
-use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;
-use Phpactor\ClassFileConverter\Domain\ClassName;
 
 class SimpleTestCase extends IntegrationTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public function inflectToRelativePath(string $prefix, ClassName $className, stri`
`14`	`14`	`$className = implode('\\', $elements);`
`15`	`15`	`}`
`16`	`16`
`17`		`- $relativePath = str_replace('\\', '/', $className).'.php';`
	`17`	`+ $relativePath = str_replace('\\', '/', (string) $className).'.php';`
`18`	`18`
`19`	`19`	`return FilePath::fromParts([$mappedPath, $relativePath]);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates`
`44`	`44`	`if (ClassName::fromString(`
`45`	`45`	`$this->classScanner->getClassNameFromFile($phpFile->getPathName())`
`46`	`46`	`) == $className) {`
`47`		`- $candidates[] = FilePath::fromString($phpFile->getPathName());`
	`47`	`+ $candidates[] = FilePath::fromString($phpFile->getPathName());`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use Phpactor\ClassFileConverter\Domain\ClassNameCandidates;`
`7`	`7`	`use Phpactor\ClassFileConverter\Domain\FilePath;`
`8`	`8`	`use Phpactor\ClassFileConverter\Domain\ClassName;`
`9`		`-use Phpactor\ClassFileConverter\Adapter\Simple\ClassScanner;`
`10`	`9`
`11`	`10`	`class SimpleFileToClass implements FileToClass`
`12`	`11`	`{`