added narrowspark/coding-standard

cs fixes and phpstan fixes

Author: danielbannert

.travis.yml

@@ -20,6 +20,7 @@ before_install:
     chmod a+x ./build/travis/configure_php.sh
     chmod a+x ./build/travis/script.sh
   - ./build/travis/configure_php.sh
+  - composer validate
 
 install:
   - composer global require hirak/prestissimo

composer.json

@@ -26,11 +26,9 @@
     "require-dev": {
         "composer/composer": "^1.6.0",
         "mockery/mockery": "^1.0.0",
-        "narrowspark/php-cs-fixer-config": "^3.0.1",
+        "narrowspark/coding-standard": "^1.0.0",
         "narrowspark/testing-helper": "^6.0.0",
-        "phpstan/phpstan": "^0.9.0",
-        "phpstan/phpstan-phpunit": "^0.9.0",
-        "phpunit/phpunit": "^7.0.0",
+        "phpunit/phpunit": "^7.2.0",
         "symfony/phpunit-bridge": "^4.0.8"
     },
     "config": {

phpstan.neon

@@ -1,17 +1,25 @@
 includes:
+#    - vendor/pepakriz/phpstan-exception-rules/extension.neon
+    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
+#    - vendor/phpstan/phpstan-strict-rules/rules.neon
+#    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
 
 parameters:
     autoload_directories:
         - %currentWorkingDirectory%/src
 
+    excludes_analyse:
+        - %currentWorkingDirectory%/src/Discovery/Prefetcher/CurlDownloader.php
+
     ignoreErrors:
         # QuestionInstallationManager
         - '#Call to an undefined method Composer\\Installer\\InstallationManager::getOperations#'
         - '#\$package of method Composer\\Package\\Version\\VersionSelector\:\:findRecommendedRequireVersion\(\) expects Composer\\Package\\PackageInterface, Composer\\Package\\PackageInterface\|true given#'
         # ScriptExecutor
         - '#Call to static method cerebroBinary\(\) on an unknown class Viserio\\Component\\Console\\Application#'
+        - '#Parameter \#1 \$stream of class Symfony\\Component\\Console\\Output\\StreamOutput constructor expects resource, resource\|false given#'
 
         - '#Call to an undefined method Composer\\DependencyResolver\\Operation\\OperationInterface\:\:getPackage#'
 
@@ -22,5 +30,6 @@ parameters:
         - '#Call to an undefined method Composer\\Downloader\\DownloaderInterface\:\:getCacheKey#'
         # ParallelDownloader
         - '#Call to an undefined static method Composer\\Util\\RemoteFilesystem\:\:getRemoteContents#'
+        - '#Call to function method_exists\(\) with #'
         # Discovery
         - '#does not call parent constructor from Composer\\Repository\\ComposerRepository#'

src/Common/Configurator/AbstractConfigurator.php

@@ -92,7 +92,7 @@ protected function write($messages): void
      */
     protected function isFileMarked(string $packageName, string $file): bool
     {
-        return \is_file($file) && \mb_strpos(\file_get_contents($file), \sprintf('###> %s ###', $packageName)) !== false;
+        return \is_file($file) && \mb_strpos((string) \file_get_contents($file), \sprintf('###> %s ###', $packageName)) !== false;
     }
 
     /**

src/Common/Traits/ExpandTargetDirTrait.php

@@ -5,8 +5,8 @@
 trait ExpandTargetDirTrait
 {
     /**
-     * @param array  $options
-     * @param string $target
+     * @param string[] $options
+     * @param string   $target
      *
      * @return string
      */

src/Discovery/ClassFinder.php

@@ -20,7 +20,7 @@ public static function find(string $directory): array
 
         /** @var \SplFileInfo $file */
         foreach ($finder as $file) {
-            $realPath = $file->getRealPath();
+            $realPath = (string) $file->getRealPath();
             $class    = self::findClassOrTraitOrInterface($realPath);
 
             // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
@@ -50,7 +50,7 @@ public static function find(string $directory): array
     private static function findClassOrTraitOrInterface(string $path): ?string
     {
         $namespace = null;
-        $tokens    = \token_get_all(\file_get_contents($path));
+        $tokens    = \token_get_all((string) \file_get_contents($path));
 
         foreach ($tokens as $key => $token) {
             if (\is_array($token)) {

src/Discovery/Configurator/EnvConfigurator.php

@@ -75,7 +75,7 @@ public function unconfigure(PackageContract $package): void
             $contents = \preg_replace(
                 \sprintf('{%s*###> %s ###.*###< %s ###%s+}s', "\n", $package->getName(), $package->getName(), "\n"),
                 '',
-                \file_get_contents($env),
+                (string) \file_get_contents($env),
                 -1,
                 $count
             );

src/Discovery/Configurator/GitIgnoreConfigurator.php

@@ -54,7 +54,7 @@ public function unconfigure(PackageContract $package): void
         $contents = \preg_replace(
             \sprintf('{%s*###> %s ###.*###< %s ###%s+}s', "\n", $package->getName(), $package->getName(), "\n"),
             "\n",
-            \file_get_contents($file),
+            (string) \file_get_contents($file),
             -1,
             $count
         );

src/Discovery/Discovery.php

@@ -310,6 +310,10 @@ public function onCommand(CommandEvent $event): void
         if ($event->getInput()->hasOption('no-suggest')) {
             $event->getInput()->setOption('no-suggest', true);
         }
+
+        if ($event->getInput()->hasOption('remove-vcs')) {
+            $event->getInput()->setOption('remove-vcs', true);
+        }
     }
 
     /**
@@ -621,11 +625,11 @@ private function updateComposerLock(): void
             $lockFile,
             $this->composer->getRepositoryManager(),
             $this->composer->getInstallationManager(),
-            $composerJson
+            (string) $composerJson
         );
 
         $lockData                  = $locker->getLockData();
-        $lockData['_content-hash'] = Locker::getContentHash($composerJson);
+        $lockData['_content-hash'] = Locker::getContentHash((string) $composerJson);
 
         $lockFile->write($lockData);
     }
@@ -786,14 +790,16 @@ private function doUninstall(PackageContract $package, PackageConfigurator $pack
      */
     private function getErrorMessage(): ?string
     {
-        $errorMessage = null;
-
         if (! \extension_loaded('openssl')) {
-            $errorMessage = 'You must enable the openssl extension in your "php.ini" file.';
-        } elseif (\version_compare('1.6', Composer::VERSION, '>')) {
-            $errorMessage = \sprintf('Your version "%s" of Composer is too old; Please upgrade.', Composer::VERSION);
+            return 'You must enable the openssl extension in your "php.ini" file.';
+        }
+
+        \preg_match_all('/\d+.\d+.\d+/m', Composer::VERSION, $matches, \PREG_SET_ORDER, 0);
+
+        if ($matches !== null && \version_compare('1.6.0', $matches[0], '<=')) {
+            return \sprintf('Your version "%s" of Composer is too old; Please upgrade.', Composer::VERSION);
         }
 
-        return $errorMessage;
+        return null;
     }
 }

src/Discovery/Installer/ConfiguratorInstaller.php

@@ -121,7 +121,7 @@ protected function saveConfiguratorsToLockFile(array $autoload, string $name): a
         }
 
         if ($this->lock->has(self::LOCK_KEY)) {
-            $configurators = \array_merge($this->lock->get(self::LOCK_KEY), $configurators);
+            $configurators = \array_merge((array) $this->lock->get(self::LOCK_KEY), $configurators);
         }
 
         $this->lock->add(self::LOCK_KEY, $configurators);