Final type additions

phpstan/baseline.neon

@@ -1095,11 +1095,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Command/ShowCommand.php
 
-		-
-			message: "#^Only booleans are allowed in &&, Composer\\\\Package\\\\PackageInterface\\|false\\|null given on the right side\\.$#"
-			count: 1
-			path: ../src/Composer/Command/ShowCommand.php
-
 		-
 			message: "#^Only booleans are allowed in &&, Composer\\\\Package\\\\PackageInterface\\|null given on the left side\\.$#"
 			count: 1
@@ -3530,11 +3525,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Package/Loader/ArrayLoader.php
 
-		-
-			message: "#^Method Composer\\\\Package\\\\Loader\\\\ArrayLoader\\:\\:createObject\\(\\) should return Composer\\\\Package\\\\CompletePackage but returns PackageClass of Composer\\\\Package\\\\CompletePackageInterface\\.$#"
-			count: 1
-			path: ../src/Composer/Package/Loader/ArrayLoader.php
-
 		-
 			message: "#^Only booleans are allowed in &&, string\\|false given on the left side\\.$#"
 			count: 1
@@ -3616,12 +3606,12 @@ parameters:
 			path: ../src/Composer/Package/Loader/RootPackageLoader.php
 
 		-
-			message: "#^Parameter \\#2 \\$class \\(class\\-string\\<PackageClass of Composer\\\\Package\\\\RootPackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:load\\(\\) should be contravariant with parameter \\$class \\(class\\-string\\<Composer\\\\Package\\\\CompletePackageInterface\\>\\) of method Composer\\\\Package\\\\Loader\\\\ArrayLoader\\:\\:load\\(\\)$#"
+			message: "#^Parameter \\#2 \\$class \\(class\\-string\\<Composer\\\\Package\\\\RootPackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:load\\(\\) should be contravariant with parameter \\$class \\(class\\-string\\<Composer\\\\Package\\\\CompletePackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\ArrayLoader\\:\\:load\\(\\)$#"
 			count: 1
 			path: ../src/Composer/Package/Loader/RootPackageLoader.php
 
 		-
-			message: "#^Parameter \\#2 \\$class \\(class\\-string\\<PackageClass of Composer\\\\Package\\\\RootPackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:load\\(\\) should be contravariant with parameter \\$class \\(class\\-string\\<Composer\\\\Package\\\\CompletePackageInterface\\>\\) of method Composer\\\\Package\\\\Loader\\\\LoaderInterface\\:\\:load\\(\\)$#"
+			message: "#^Parameter \\#2 \\$class \\(class\\-string\\<Composer\\\\Package\\\\RootPackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:load\\(\\) should be contravariant with parameter \\$class \\(class\\-string\\<Composer\\\\Package\\\\CompletePackage\\>\\) of method Composer\\\\Package\\\\Loader\\\\LoaderInterface\\:\\:load\\(\\)$#"
 			count: 1
 			path: ../src/Composer/Package/Loader/RootPackageLoader.php
 
@@ -4595,11 +4585,6 @@ parameters:
 			count: 10
 			path: ../src/Composer/Repository/Vcs/GitBitbucketDriver.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: ../src/Composer/Repository/Vcs/GitBitbucketDriver.php
-
 		-
 			message: "#^Property Composer\\\\Repository\\\\Vcs\\\\GitBitbucketDriver\\:\\:\\$branches \\(array\\<string, string\\>\\) does not accept array\\<int\\|string, mixed\\>\\.$#"
 			count: 1
@@ -4720,11 +4705,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Repository/Vcs/GitHubDriver.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: ../src/Composer/Repository/Vcs/GitHubDriver.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#"
 			count: 2
@@ -4797,7 +4777,7 @@ parameters:
 
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
+			count: 1
 			path: ../src/Composer/Repository/Vcs/GitLabDriver.php
 
 		-
@@ -5020,11 +5000,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Repository/VcsRepository.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, array given\\.$#"
-			count: 2
-			path: ../src/Composer/Repository/VcsRepository.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, array\\<Composer\\\\Package\\\\BasePackage\\> given\\.$#"
 			count: 1

src/Composer/Autoload/AutoloadGenerator.php

@@ -1364,12 +1364,7 @@ protected function sortPackageMap(array $packageMap)
     }
 }
 
-/**
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequire(string $fileIdentifier, string $file)
+function composerRequire(string $fileIdentifier, string $file): void
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

src/Composer/Command/InitCommand.php

@@ -459,7 +459,7 @@ function ($value) use ($autoload) {
      * @param  string $author
      * @return array{name: string, email: string|null}
      */
-    private function parseAuthorString(string $author)
+    private function parseAuthorString(string $author): array
     {
         if (Preg::isMatch('/^(?P<name>[- .,\p{L}\p{N}\p{Mn}\'’"()]+)(?:\s+<(?P<email>.+?)>)?$/u', $author, $match)) {
             $hasEmail = isset($match['email']) && '' !== $match['email'];

src/Composer/Command/ShowCommand.php

@@ -294,7 +294,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (
                 $input->getOption('outdated')
                 && $input->getOption('strict')
-                && $latestPackage
+                && null !== $latestPackage
                 && $latestPackage->getFullPrettyVersion() !== $package->getFullPrettyVersion()
                 && (!$latestPackage instanceof CompletePackageInterface || !$latestPackage->isAbandoned())
             ) {
@@ -415,7 +415,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     foreach ($packages[$type] as $package) {
                         if (is_object($package)) {
                             $latestPackage = $this->findLatestPackage($package, $composer, $platformRepo, $showMinorOnly, $platformReqFilter);
-                            if ($latestPackage === false) {
+                            if ($latestPackage === null) {
                                 continue;
                             }
 
@@ -628,7 +628,7 @@ protected function getVersionStyle(PackageInterface $latestPackage, PackageInter
      * @throws \InvalidArgumentException
      * @return array{CompletePackageInterface|null, array<string, string>}
      */
-    protected function getPackage(InstalledRepository $installedRepo, RepositoryInterface $repos, string $name, $version = null)
+    protected function getPackage(InstalledRepository $installedRepo, RepositoryInterface $repos, string $name, $version = null): array
     {
         $name = strtolower($name);
         $constraint = is_string($version) ? $this->versionParser->parseConstraints($version) : $version;
@@ -1287,10 +1287,8 @@ private function writeTreeLine(string $line): void
 
     /**
      * Given a package, this finds the latest package matching it
-     *
-     * @return PackageInterface|false
      */
-    private function findLatestPackage(PackageInterface $package, Composer $composer, PlatformRepository $platformRepo, bool $minorOnly, PlatformRequirementFilterInterface $platformReqFilter)
+    private function findLatestPackage(PackageInterface $package, Composer $composer, PlatformRepository $platformRepo, bool $minorOnly, PlatformRequirementFilterInterface $platformReqFilter): ?PackageInterface
     {
         // find the latest version allowed in this repo set
         $name = $package->getName();
@@ -1320,7 +1318,7 @@ private function findLatestPackage(PackageInterface $package, Composer $composer
             $candidate = $candidate->getAliasOf();
         }
 
-        return $candidate;
+        return $candidate !== false ? $candidate : null;
     }
 
     /**

src/Composer/DependencyResolver/Decisions.php

@@ -288,7 +288,7 @@ public function toString(Pool $pool = null): string
         return $str;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->toString();
     }

src/Composer/DependencyResolver/Pool.php

@@ -268,7 +268,7 @@ public function getUnacceptableFixedOrLockedPackages(): array
         return $this->unacceptableFixedOrLockedPackages;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         $str = "Pool:\n";
 

src/Composer/DependencyResolver/Rule.php

@@ -78,7 +78,7 @@ abstract public function getLiterals(): array;
      */
     abstract public function getHash();
 
-    abstract public function __toString();
+    abstract public function __toString(): string;
 
     /**
      * @param Rule $rule

src/Composer/DependencyResolver/RuleSet.php

@@ -195,7 +195,7 @@ public function getPrettyString(RepositorySet $repositorySet = null, Request $re
         return $string;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getPrettyString();
     }

src/Composer/EventDispatcher/EventDispatcher.php

@@ -81,7 +81,7 @@ public function __construct(PartialComposer $composer, IOInterface $io, ProcessE
      * @param bool $runScripts
      * @return $this
      */
-    public function setRunScripts(bool $runScripts = true)
+    public function setRunScripts(bool $runScripts = true): self
     {
         $this->runScripts = (bool) $runScripts;
 

src/Composer/InstalledVersions.php

@@ -21,6 +21,8 @@
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {