Add more types

composer · Feb 23, 2022 · 32845e0 · 32845e0
1 parent e52071a
commit 32845e0
Show file tree

Hide file tree

Showing 70 changed files with 793 additions and 840 deletions.
diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php
@@ -52,7 +52,7 @@ class DiagnoseCommand extends BaseCommand
     /**
      * @return void
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('diagnose')

diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php
@@ -456,11 +456,10 @@ function ($value) use ($autoload) {
     }
 
     /**
-     * @private
      * @param  string $author
      * @return array{name: string, email: string|null}
      */
-    public function parseAuthorString(string $author)
+    private function parseAuthorString(string $author)
     {
         if (Preg::isMatch('/^(?P<name>[- .,\p{L}\p{N}\p{Mn}\'’"()]+)(?:\s+<(?P<email>.+?)>)?$/u', $author, $match)) {
             $hasEmail = isset($match['email']) && '' !== $match['email'];
@@ -485,7 +484,7 @@ public function parseAuthorString(string $author)
      *
      * @return array<int, array{name: string, email?: string}>
      */
-    protected function formatAuthors(string $author)
+    protected function formatAuthors(string $author): array
     {
         $author = $this->parseAuthorString($author);
         if (null === $author['email']) {
@@ -504,7 +503,7 @@ protected function formatAuthors(string $author)
      *
      * @return string|null
      */
-    public function namespaceFromPackageName(string $packageName)
+    public function namespaceFromPackageName(string $packageName): ?string
     {
         if (!$packageName || strpos($packageName, '/') === false) {
             return null;
@@ -526,7 +525,7 @@ function ($part): string {
     /**
      * @return array<string, string>
      */
-    protected function getGitConfig()
+    protected function getGitConfig(): array
     {
         if (null !== $this->gitConfig) {
             return $this->gitConfig;
@@ -567,7 +566,7 @@ protected function getGitConfig()
      *
      * @return bool
      */
-    protected function hasVendorIgnore(string $ignoreFile, string $vendor = 'vendor')
+    protected function hasVendorIgnore(string $ignoreFile, string $vendor = 'vendor'): bool
     {
         if (!file_exists($ignoreFile)) {
             return false;
@@ -591,7 +590,7 @@ protected function hasVendorIgnore(string $ignoreFile, string $vendor = 'vendor'
      *
      * @return void
      */
-    protected function addVendorIgnore(string $ignoreFile, string $vendor = '/vendor/')
+    protected function addVendorIgnore(string $ignoreFile, string $vendor = '/vendor/'): void
     {
         $contents = "";
         if (file_exists($ignoreFile)) {
@@ -610,7 +609,7 @@ protected function addVendorIgnore(string $ignoreFile, string $vendor = '/vendor
      *
      * @return bool
      */
-    protected function isValidEmail(string $email)
+    protected function isValidEmail(string $email): bool
     {
         // assume it's valid if we can't validate it
         if (!function_exists('filter_var')) {

diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php
@@ -335,15 +335,6 @@ private function getPackagesByRequireKey(): array
         );
     }
 
-    /**
-     * @private
-     * @return void
-     */
-    public function markSolverComplete()
-    {
-        $this->dependencyResolutionCompleted = true;
-    }
-
     /**
      * @param array<string, string> $requirements
      * @param string $requireKey
@@ -358,7 +349,9 @@ private function doUpdate(InputInterface $input, OutputInterface $output, IOInte
         $composer = $this->requireComposer();
 
         $this->dependencyResolutionCompleted = false;
-        $composer->getEventDispatcher()->addListener(InstallerEvents::PRE_OPERATIONS_EXEC, array($this, 'markSolverComplete'), 10000);
+        $composer->getEventDispatcher()->addListener(InstallerEvents::PRE_OPERATIONS_EXEC, function (): void {
+            $this->dependencyResolutionCompleted = true;
+        }, 10000);
 
         if ($input->getOption('dry-run')) {
             $rootPackage = $composer->getPackage();
@@ -480,7 +473,7 @@ protected function interact(InputInterface $input, OutputInterface $output): voi
      * @param bool $hardExit
      * @return void
      */
-    public function revertComposerFile(bool $hardExit = true)
+    public function revertComposerFile(bool $hardExit = true): void
     {
         $io = $this->getIO();
 

diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
@@ -602,7 +602,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * @return string[]
      */
-    protected function getRootRequires()
+    protected function getRootRequires(): array
     {
         $rootPackage = $this->requireComposer()->getPackage();
 
@@ -677,7 +677,7 @@ protected function getPackage(InstalledRepository $installedRepo, RepositoryInte
      *
      * @return void
      */
-    protected function printPackageInfo(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null)
+    protected function printPackageInfo(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null): void
     {
         $io = $this->getIO();
 
@@ -705,7 +705,7 @@ protected function printPackageInfo(CompletePackageInterface $package, array $ve
      *
      * @return void
      */
-    protected function printMeta(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null)
+    protected function printMeta(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null): void
     {
         $io = $this->getIO();
         $io->write('<info>name</info>     : ' . $package->getPrettyName());
@@ -773,7 +773,7 @@ protected function printMeta(CompletePackageInterface $package, array $versions,
      *
      * @return void
      */
-    protected function printVersions(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo)
+    protected function printVersions(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo): void
     {
         $versions = array_keys($versions);
         $versions = Semver::rsort($versions);
@@ -802,7 +802,7 @@ protected function printVersions(CompletePackageInterface $package, array $versi
      *
      * @return void
      */
-    protected function printLinks(CompletePackageInterface $package, string $linkType, string $title = null)
+    protected function printLinks(CompletePackageInterface $package, string $linkType, string $title = null): void
     {
         $title = $title ?: $linkType;
         $io = $this->getIO();
@@ -820,7 +820,7 @@ protected function printLinks(CompletePackageInterface $package, string $linkTyp
      *
      * @return void
      */
-    protected function printLicenses(CompletePackageInterface $package)
+    protected function printLicenses(CompletePackageInterface $package): void
     {
         $spdxLicenses = new SpdxLicenses();
 
@@ -852,7 +852,7 @@ protected function printLicenses(CompletePackageInterface $package)
      *
      * @return void
      */
-    protected function printPackageInfoAsJson(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null)
+    protected function printPackageInfoAsJson(CompletePackageInterface $package, array $versions, InstalledRepository $installedRepo, PackageInterface $latestPackage = null): void
     {
         $json = array(
             'name' => $package->getPrettyName(),
@@ -1030,7 +1030,7 @@ private function appendLink(array $json, CompletePackageInterface $package, stri
      *
      * @return void
      */
-    protected function initStyles(OutputInterface $output)
+    protected function initStyles(OutputInterface $output): void
     {
         $this->colors = array(
             'green',
@@ -1052,7 +1052,7 @@ protected function initStyles(OutputInterface $output)
      * @param array<int, array<string, string|mixed[]>> $arrayTree
      * @return void
      */
-    protected function displayPackageTree(array $arrayTree)
+    protected function displayPackageTree(array $arrayTree): void
     {
         $io = $this->getIO();
         foreach ($arrayTree as $package) {
@@ -1101,7 +1101,7 @@ protected function generatePackageTree(
         PackageInterface $package,
         InstalledRepository $installedRepo,
         RepositoryInterface $remoteRepos
-    ) {
+    ): array {
         $requires = $package->getRequires();
         ksort($requires);
         $children = array();
@@ -1149,7 +1149,7 @@ protected function displayTree(
         array $packagesInTree,
         string $previousTreeBar = '├',
         int $level = 1
-    ) {
+    ): void {
         $previousTreeBar = str_replace('├', '│', $previousTreeBar);
         if (is_array($package) && isset($package['requires'])) {
             $requires = $package['requires'];
@@ -1202,7 +1202,7 @@ protected function addTree(
         InstalledRepository $installedRepo,
         RepositoryInterface $remoteRepos,
         array $packagesInTree
-    ) {
+    ): array {
         $children = array();
         list($package) = $this->getPackage(
             $installedRepo,

diff --git a/src/Composer/Config/ConfigSourceInterface.php b/src/Composer/Config/ConfigSourceInterface.php
@@ -29,7 +29,7 @@ interface ConfigSourceInterface
      *
      * @return void
      */
-    public function addRepository(string $name, $config, bool $append = true);
+    public function addRepository(string $name, $config, bool $append = true): void;
 
     /**
      * Remove a repository
@@ -38,7 +38,7 @@ public function addRepository(string $name, $config, bool $append = true);
      *
      * @return void
      */
-    public function removeRepository(string $name);
+    public function removeRepository(string $name): void;
 
     /**
      * Add a config setting
@@ -48,7 +48,7 @@ public function removeRepository(string $name);
      *
      * @return void
      */
-    public function addConfigSetting(string $name, $value);
+    public function addConfigSetting(string $name, $value): void;
 
     /**
      * Remove a config setting
@@ -57,7 +57,7 @@ public function addConfigSetting(string $name, $value);
      *
      * @return void
      */
-    public function removeConfigSetting(string $name);
+    public function removeConfigSetting(string $name): void;
 
     /**
      * Add a property
@@ -67,7 +67,7 @@ public function removeConfigSetting(string $name);
      *
      * @return void
      */
-    public function addProperty(string $name, $value);
+    public function addProperty(string $name, $value): void;
 
     /**
      * Remove a property
@@ -76,7 +76,7 @@ public function addProperty(string $name, $value);
      *
      * @return void
      */
-    public function removeProperty(string $name);
+    public function removeProperty(string $name): void;
 
     /**
      * Add a package link
@@ -87,7 +87,7 @@ public function removeProperty(string $name);
      *
      * @return void
      */
-    public function addLink(string $type, string $name, string $value);
+    public function addLink(string $type, string $name, string $value): void;
 
     /**
      * Remove a package link
@@ -97,12 +97,12 @@ public function addLink(string $type, string $name, string $value);
      *
      * @return void
      */
-    public function removeLink(string $type, string $name);
+    public function removeLink(string $type, string $name): void;
 
     /**
      * Gives a user-friendly name to this source (file path or so)
      *
      * @return string
      */
-    public function getName();
+    public function getName(): string;
 }
diff --git a/src/Composer/Config/JsonConfigSource.php b/src/Composer/Config/JsonConfigSource.php
@@ -52,15 +52,15 @@ public function __construct(JsonFile $file, bool $authConfig = false)
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->file->getPath();
     }
 
     /**
      * @inheritDoc
      */
-    public function addRepository($name, $config, $append = true)
+    public function addRepository(string $name, $config, bool $append = true): void
     {
         $this->manipulateJson('addRepository', function (&$config, $repo, $repoConfig) use ($append): void {
             // if converting from an array format to hashmap format, and there is a {"packagist.org":false} repo, we have
@@ -89,7 +89,7 @@ public function addRepository($name, $config, $append = true)
     /**
      * @inheritDoc
      */
-    public function removeRepository($name)
+    public function removeRepository(string $name): void
     {
         $this->manipulateJson('removeRepository', function (&$config, $repo): void {
             unset($config['repositories'][$repo]);
@@ -99,7 +99,7 @@ public function removeRepository($name)
     /**
      * @inheritDoc
      */
-    public function addConfigSetting($name, $value)
+    public function addConfigSetting(string $name, $value): void
     {
         $authConfig = $this->authConfig;
         $this->manipulateJson('addConfigSetting', function (&$config, $key, $val) use ($authConfig): void {
@@ -119,7 +119,7 @@ public function addConfigSetting($name, $value)
     /**
      * @inheritDoc
      */
-    public function removeConfigSetting($name)
+    public function removeConfigSetting(string $name): void
     {
         $authConfig = $this->authConfig;
         $this->manipulateJson('removeConfigSetting', function (&$config, $key) use ($authConfig): void {
@@ -139,7 +139,7 @@ public function removeConfigSetting($name)
     /**
      * @inheritDoc
      */
-    public function addProperty($name, $value)
+    public function addProperty(string $name, $value): void
     {
         $this->manipulateJson('addProperty', function (&$config, $key, $val): void {
             if (strpos($key, 'extra.') === 0 || strpos($key, 'scripts.') === 0) {
@@ -162,7 +162,7 @@ public function addProperty($name, $value)
     /**
      * @inheritDoc
      */
-    public function removeProperty($name)
+    public function removeProperty(string $name): void
     {
         $this->manipulateJson('removeProperty', function (&$config, $key): void {
             if (strpos($key, 'extra.') === 0 || strpos($key, 'scripts.') === 0) {
@@ -185,7 +185,7 @@ public function removeProperty($name)
     /**
      * @inheritDoc
      */
-    public function addLink($type, $name, $value)
+    public function addLink(string $type, string $name, string $value): void
     {
         $this->manipulateJson('addLink', function (&$config, $type, $name, $value): void {
             $config[$type][$name] = $value;
@@ -195,7 +195,7 @@ public function addLink($type, $name, $value)
     /**
      * @inheritDoc
      */
-    public function removeLink($type, $name)
+    public function removeLink(string $type, string $name): void
     {
         $this->manipulateJson('removeSubNode', function (&$config, $type, $name): void {
             unset($config[$type][$name]);