fixed psalm issues after rebasing

maglnet · Nov 10, 2020 · d5f5993 · d5f5993
1 parent 26fd182
commit d5f5993
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/src/ComposerRequireChecker/Cli/CheckCommand.php b/src/ComposerRequireChecker/Cli/CheckCommand.php
@@ -28,6 +28,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Webmozart\Assert\Assert;
 
 use function array_diff;
 use function count;
@@ -165,8 +166,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     }
 
     /**
-     * @return array<array-key, mixed>
-     *
      * @throws InvalidJson
      * @throws NotReadable
      */
@@ -178,7 +177,10 @@ private function getCheckOptions(InputInterface $input): Options
             return new Options();
         }
 
-        return new Options(JsonLoader::getData($fileName));
+        $config = JsonLoader::getData($fileName);
+        Assert::isMap($config);
+
+        return new Options($config);
     }
 
     /**

diff --git a/src/ComposerRequireChecker/Cli/Options.php b/src/ComposerRequireChecker/Cli/Options.php
@@ -55,6 +55,9 @@ class Options
      */
     public function __construct(array $options = [])
     {
+        /**
+         * @var mixed $option
+         */
         foreach ($options as $key => $option) {
             $methodName = 'set' . $this->getCamelCase($key);
             if (! method_exists($this, $methodName)) {

diff --git a/src/ComposerRequireChecker/FileLocator/LocateAllFilesByExtension.php b/src/ComposerRequireChecker/FileLocator/LocateAllFilesByExtension.php
@@ -9,7 +9,6 @@
 use SplFileInfo;
 use Traversable;
 
-use function assert;
 use function implode;
 use function preg_match;
 use function preg_quote;
@@ -54,7 +53,6 @@ private function filterFilesByExtension(Traversable $files, string $fileExtensio
         $blacklistMatcher = '{(' . implode('|', $this->prepareBlacklistPatterns($blacklist)) . ')}';
 
         foreach ($files as $file) {
-            assert($file instanceof SplFileInfo);
             if ($blacklist && preg_match($blacklistMatcher, $file->getPathname())) {
                 continue;
             }

diff --git a/...ComposerRequireChecker/FileLocator/LocateComposerPackageDirectDependenciesSourceFiles.php b/...ComposerRequireChecker/FileLocator/LocateComposerPackageDirectDependenciesSourceFiles.php
@@ -12,17 +12,15 @@
 use function array_key_exists;
 use function assert;
 use function dirname;
-use function file_get_contents;
 use function is_string;
-use function json_decode;
 
 final class LocateComposerPackageDirectDependenciesSourceFiles
 {
     public function __invoke(string $composerJsonPath): Generator
     {
         $packageDir = dirname($composerJsonPath);
 
-        $composerJson    = json_decode(file_get_contents($composerJsonPath), true);
+        $composerJson    = JsonLoader::getData($composerJsonPath);
         $configVendorDir = $composerJson['config']['vendor-dir'] ?? 'vendor';
         assert(is_string($configVendorDir));
         $vendorDirs = [];

diff --git a/src/ComposerRequireChecker/JsonLoader.php b/src/ComposerRequireChecker/JsonLoader.php
@@ -28,8 +28,11 @@ class JsonLoader
      */
     public static function getData(string $path): array
     {
+        $content = self::getFileContentFromPath($path);
+
         try {
-            $decodedData = json_decode(self::getFileContentFromPath($path), true, 512, JSON_THROW_ON_ERROR);
+            $decodedData = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
+            Assert::isArray($decodedData);
         } catch (Throwable $exception) {
             throw new InvalidJson('error parsing ' . $path . ': ' . $exception->getMessage(), 0, $exception);
         }

diff --git a/src/ComposerRequireChecker/NodeVisitor/DefinedSymbolCollector.php b/src/ComposerRequireChecker/NodeVisitor/DefinedSymbolCollector.php
@@ -108,12 +108,12 @@ private function recordDefinedConstDefinition(Node $node): void
             return;
         }
 
-        if (
-            $node->name->hasAttribute('namespacedName')
-            && $node->name->getAttribute('namespacedName') instanceof Node\Name\FullyQualified
-            && $node->name->getAttribute('namespacedName')->toString() !== 'define'
-        ) {
-            return;
+        if ($node->name->hasAttribute('namespacedName')) {
+            /** @var mixed $namespacedName */
+            $namespacedName = $node->name->getAttribute('namespacedName');
+            if ($namespacedName instanceof Node\Name\FullyQualified && $namespacedName->toString() !== 'define') {
+                return;
+            }
         }
 
         if (! ($node->args[0]->value instanceof Node\Scalar\String_)) {

diff --git a/test/ComposerRequireCheckerTest/JsonLoaderTest.php b/test/ComposerRequireCheckerTest/JsonLoaderTest.php
@@ -31,8 +31,8 @@ public function testHasErrorWithInvalidFile(): void
     public function testHasDataWithValidFileButNoArrayContent(): void
     {
         $path = __DIR__ . '/../fixtures/validJsonNotAnArray.json';
-        $this->expectException(InvalidJsonException::class);
-        new JsonLoader($path);
+        $this->expectException(InvalidJson::class);
+        JsonLoader::getData($path);
     }
 
     public function testHasDataWithValidFile(): void