public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix types on mock tests (#10230) 

* Fix types on mock tests

* Added $tty again

Co-authored-by: Jakob Vibe <jv@ipw.dk>
pull/10227/head
jakobvibe 2021-10-27 14:56:39 +02:00 committed by GitHub
parent e89459d964
commit d06eb1ec3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Composer/Test/Mock/InstallationManagerMock.php
View File

@ -122,21 +122,25 @@ class InstallationManagerMock extends InstallationManager
parent::markAliasUninstalled($repo, $operation); parent::markAliasUninstalled($repo, $operation);
} }
/** @return string[] */
public function getTrace() public function getTrace()
{ {
return $this->trace; return $this->trace;
} }
/** @return PackageInterface[] */
public function getInstalledPackages() public function getInstalledPackages()
{ {
return $this->installed; return $this->installed;
} }
/** @return PackageInterface[][] */
public function getUpdatedPackages() public function getUpdatedPackages()
{ {
return $this->updated; return $this->updated;
} }
/** @return PackageInterface[] */
public function getUninstalledPackages() public function getUninstalledPackages()
{ {
return $this->uninstalled; return $this->uninstalled;
@ -147,6 +151,7 @@ class InstallationManagerMock extends InstallationManager
// noop // noop
} }
/** @return PackageInterface[] */
public function getInstalledPackagesByType() public function getInstalledPackagesByType()
{ {
return $this->installed; return $this->installed;

11
tests/Composer/Test/Mock/ProcessExecutorMock.php
View File

@ -45,6 +45,8 @@ class ProcessExecutorMock extends ProcessExecutor
* @param array<string|array{cmd: string, return?: int, stdout?: string, stderr?: string, callback?: callable}> $expectations * @param array<string|array{cmd: string, return?: int, stdout?: string, stderr?: string, callback?: callable}> $expectations
* @param bool $strict set to true if you want to provide *all* expected commands, and not just a subset you are interested in testing * @param bool $strict set to true if you want to provide *all* expected commands, and not just a subset you are interested in testing
* @param array{return: int, stdout?: string, stderr?: string} $defaultHandler default command handler for undefined commands if not in strict mode * @param array{return: int, stdout?: string, stderr?: string} $defaultHandler default command handler for undefined commands if not in strict mode
*
* @return void
*/ */
public function expects(array $expectations, $strict = false, array $defaultHandler = array('return' => 0, 'stdout' => '', 'stderr' => '')) public function expects(array $expectations, $strict = false, array $defaultHandler = array('return' => 0, 'stdout' => '', 'stderr' => ''))
{ {
@ -62,6 +64,7 @@ class ProcessExecutorMock extends ProcessExecutor
$this->defaultHandler = array_merge($this->defaultHandler, $defaultHandler); $this->defaultHandler = array_merge($this->defaultHandler, $defaultHandler);
} }
/** @return void */
public function assertComplete(TestCase $testCase) public function assertComplete(TestCase $testCase)
{ {
if ($this->expectations) { if ($this->expectations) {
@ -96,6 +99,14 @@ class ProcessExecutorMock extends ProcessExecutor
return $this->doExecute($command, $cwd, false); return $this->doExecute($command, $cwd, false);
} }
/**
*
* @param string $command
* @param string $cwd
* @param bool $tty
* @param callable $output
* @return mixed
*/
private function doExecute($command, $cwd, $tty, &$output = null) private function doExecute($command, $cwd, $tty, &$output = null)
{ {
$this->captureOutput = func_num_args() > 3; $this->captureOutput = func_num_args() > 3;