Fix phpstan feedback

composer · Dec 8, 2020 · 26f3f0f · 26f3f0f
1 parent 76d45b0
commit 26f3f0f
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 47 deletions.
diff --git a/composer.json b/composer.json
@@ -104,7 +104,8 @@
         "composer/semver": "^1 || ^3",
         "symfony/phpunit-bridge": "^4.2 || ^5",
         "phpstan/phpstan": "^0.12.55",
-        "symfony/process": "^2.3"
+        "symfony/process": "^2.3",
+        "phpstan/phpstan-phpunit": "^0.12.16"
     },
     "scripts": {
         "test": "SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 vendor/bin/simple-phpunit",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,3 +3,6 @@ parameters:
     paths:
         - src
         - tests
+
+includes:
+    - vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/src/Composer/Installers/BaseInstaller.php b/src/Composer/Installers/BaseInstaller.php
@@ -74,8 +74,8 @@ public function getInstallPath(PackageInterface $package, $frameworkType = '')
     /**
      * For an installer to override to modify the vars per installer.
      *
-     * @param  array{name: string, vendor: string, type: string} $vars
-     * @return array{name: string, vendor: string, type: string}
+     * @param  array<string, string> $vars This will normally receive array{name: string, vendor: string, type: string}
+     * @return array<string, string>
      */
     public function inflectPackageVars($vars)
     {

diff --git a/tests/Composer/Installers/Test/BitrixInstallerTest.php b/tests/Composer/Installers/Test/BitrixInstallerTest.php
@@ -31,8 +31,8 @@ final function setUp()
     }
 
     /**
-     * @param string $vars
-     * @param string $expectedVars
+     * @param string[] $vars
+     * @param string[] $expectedVars
      *
      * @covers ::inflectPackageVars
      *

diff --git a/tests/Composer/Installers/Test/CakePHPInstallerTest.php b/tests/Composer/Installers/Test/CakePHPInstallerTest.php
@@ -12,8 +12,14 @@
 
 class CakePHPInstallerTest extends TestCase
 {
+    /**
+     * @var Composer
+     */
     private $composer;
-    private $io;
+    /**
+     * @var Package
+     */
+    private $package;
 
     /**
      * setUp
@@ -23,7 +29,6 @@ class CakePHPInstallerTest extends TestCase
     public function setUp()
     {
         $this->package = new Package('CamelCased', '1.0', '1.0');
-        $this->io = $this->getMockBuilder('Composer\IO\PackageInterface')->getMock();
         $this->composer = new Composer();
         $this->composer->setConfig(new Config(false));
     }

diff --git a/tests/Composer/Installers/Test/CiviCrmInstallerTest.php b/tests/Composer/Installers/Test/CiviCrmInstallerTest.php
@@ -9,7 +9,7 @@
 class CiviCrmInstallerTest extends BaseTestCase
 {
     /**
-     * @var VgmcpInstaller
+     * @var CiviCrmInstaller
      */
     private $installer;
 

diff --git a/tests/Composer/Installers/Test/GravInstallerTest.php b/tests/Composer/Installers/Test/GravInstallerTest.php
@@ -44,7 +44,7 @@ public function testInflectPackageVars()
     }
 
     /**
-     * @param $package  \Composer\Package\PackageInterface
+     * @param \Composer\Package\PackageInterface $package
      */
     public function getPackageVars($package)
     {

diff --git a/tests/Composer/Installers/Test/InstallerTest.php b/tests/Composer/Installers/Test/InstallerTest.php
@@ -660,26 +660,4 @@ public function dataForTestDisabledInstallers()
             array(array("drupal", "true"), "cakephp-plugin", true),
         );
     }
-
-    /**
-     * @param string      $exception
-     * @param string|null $message
-     * @param int|null    $code
-     * @return void
-     */
-    public function setExpectedException($exception, $message = null, $code = null)
-    {
-        if (!class_exists('PHPUnit\Framework\Error\Notice')) {
-            $exception = str_replace('PHPUnit\\Framework\\Error\\', 'PHPUnit_Framework_Error_', $exception);
-        }
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exception);
-            if (null !== $message) {
-                $this->expectExceptionMessage($message);
-            }
-        } else {
-            /** @phpstan-ignore-next-line */
-            parent::setExpectedException($exception, $message, $code);
-        }
-    }
 }
diff --git a/tests/Composer/Installers/Test/PimcoreInstallerTest.php b/tests/Composer/Installers/Test/PimcoreInstallerTest.php
@@ -9,6 +9,7 @@ class PimcoreInstallerTest extends TestCase
 {
     private $composer;
     private $io;
+    private $package;
 
     /**
      * setUp
@@ -18,7 +19,6 @@ class PimcoreInstallerTest extends TestCase
     public function setUp()
     {
         $this->package = new Package('CamelCased', '1.0', '1.0');
-        $this->io = $this->getMockBuilder('Composer\IO\PackageInterface')->getMock();
         $this->composer = new Composer();
     }
 

diff --git a/tests/Composer/Installers/Test/PiwikInstallerTest.php b/tests/Composer/Installers/Test/PiwikInstallerTest.php
@@ -18,11 +18,6 @@ class PiwikInstallerTest extends TestCase
      */
     private $composer;
 
-    /**
-     * @var PackageInterface
-     */
-    private $io;
-
     /**
      * @var Package
      */
@@ -36,7 +31,6 @@ class PiwikInstallerTest extends TestCase
     public function setUp()
     {
         $this->package = new Package('VisitSummary', '1.0', '1.0');
-        $this->io = $this->getMockBuilder('Composer\IO\PackageInterface')->getMock();
         $this->composer = new Composer();
     }
 

diff --git a/tests/Composer/Installers/Test/SiteDirectInstallerTest.php b/tests/Composer/Installers/Test/SiteDirectInstallerTest.php
@@ -49,7 +49,7 @@ public function testInstallPath($data, $expected)
     }
 
     /**
-     * @param $data
+     * @param string[] $data
      * @return string
      */
     private function createPackage($data)

diff --git a/tests/Composer/Installers/Test/TestCase.php b/tests/Composer/Installers/Test/TestCase.php
@@ -15,7 +15,7 @@
 use Composer\Package\Version\VersionParser;
 use Composer\Package\Package;
 use Composer\Package\AliasPackage;
-use Composer\Package\LinkConstraint\VersionConstraint;
+use Composer\Semver\Constraint\Constraint;
 use Composer\Util\Filesystem;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
@@ -34,7 +34,7 @@ protected static function getVersionParser()
 
     protected function getVersionConstraint($operator, $version)
     {
-        return new VersionConstraint(
+        return new Constraint(
             $operator,
             self::getVersionParser()->normalize($version)
         );
@@ -62,4 +62,26 @@ protected function ensureDirectoryExistsAndClear($directory)
         }
         mkdir($directory, 0777, true);
     }
+
+    /**
+     * @param string      $exception
+     * @param string|null $message
+     * @param int|null    $code
+     * @return void
+     */
+    public function setExpectedException($exception, $message = null, $code = null)
+    {
+        if (!class_exists('PHPUnit\Framework\Error\Notice')) {
+            $exception = str_replace('PHPUnit\\Framework\\Error\\', 'PHPUnit_Framework_Error_', $exception);
+        }
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exception);
+            if (null !== $message) {
+                $this->expectExceptionMessage($message);
+            }
+        } else {
+            /** @phpstan-ignore-next-line */
+            parent::setExpectedException($exception, $message, $code);
+        }
+    }
 }
diff --git a/tests/Composer/Installers/Test/YawikInstallerTest.php b/tests/Composer/Installers/Test/YawikInstallerTest.php
@@ -18,11 +18,6 @@ class YawikInstallerTest extends TestCase
      */
     private $composer;
 
-    /**
-     * @var PackageInterface
-     */
-    private $io;
-
     /**
      * @var Package
      */
@@ -36,7 +31,6 @@ class YawikInstallerTest extends TestCase
     public function setUp()
     {
         $this->package = new Package('YawikCompanyRegistration', '1.0', '1.0');
-        $this->io = $this->getMockBuilder('Composer\IO\PackageInterface')->getMock();
         $this->composer = new Composer();
     }