Yet again on QA

wecodemore · Nov 7, 2023 · 6744e48 · 6744e48
1 parent 0af25de
commit 6744e48
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/php-qa.yml b/.github/workflows/php-qa.yml
@@ -101,7 +101,7 @@ jobs:
 
             -   name: Check Psalm
                 if: ${{ matrix.dependency-versions == 'highest' }}
-                run: ./vendor/bin/psalm ${{ ((github.event_name == 'pull_request') && '--output-format=github ') || '' }} --no-suggestions --find-unused-psalm-suppress --no-diff --no-cache --no-file-cache --php-version=${{ matrix.php-ver }}
+                run: ./vendor/bin/psalm ${{ ((github.event_name == 'pull_request') && '--output-format=github ') || '' }} --no-suggestions --no-diff --no-cache --no-file-cache --php-version=${{ matrix.php-ver }}
 
             -   name: Run unit tests
                 run: ./vendor/bin/phpunit ${{ ((env.USE_COVERAGE == 'yes') && '--coverage-html=coverage-report') || '--no-coverage' }}
@@ -119,7 +119,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php-ver: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+                php-ver: [ '7.4', '8.0', '8.1', '8.2' ]
         steps:
             -   name: Checkout
                 uses: actions/checkout@v3

diff --git a/composer.json b/composer.json
@@ -92,7 +92,8 @@
         "qa": [
              "@cs",
              "@psalm",
-             "@tests:unit:no-cov"
+             "@tests:unit:no-cov",
+             "@tests:integration"
         ]
     },
     "extra": {

diff --git a/src/Util/PackageFinder.php b/src/Util/PackageFinder.php
@@ -84,7 +84,7 @@ public function findPathOf(PackageInterface $package): string
     {
         $path = $this->installationManager->getInstallPath($package);
 
-        return is_string($path) ? $this->filesystem->normalizePath($path) : '';
+        return $path ? $this->filesystem->normalizePath($path) : '';
     }
 
     /**

diff --git a/tests/integration/Util/PackageFinderTest.php b/tests/integration/Util/PackageFinderTest.php
@@ -34,9 +34,8 @@ public function testFindByType(): void
             $names[] = $plugin->getName();
         }
 
-        static::assertCount(3, $names);
+        static::assertCount(2, $names);
         static::assertTrue(in_array('composer/installers', $names, true));
-        static::assertTrue(in_array('composer/package-versions-deprecated', $names, true));
         static::assertTrue(
             in_array('dealerdirect/phpcodesniffer-composer-installer', $names, true)
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ public function findPathOf(PackageInterface $package): string @@
         {
             $path = $this->installationManager->getInstallPath($package);
-            return is_string($path) ? $this->filesystem->normalizePath($path) : '';
+            return $path ? $this->filesystem->normalizePath($path) : '';
         }
         /**
@@ Expand Down @@