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

Not actual parameters

pull/5954/head
golodnyi 2016-12-08 22:04:38 +07:00
parent e54c7478ee
commit 1cced223d8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/StatusCommand.php
View File

@ -89,7 +89,7 @@ EOT
$errors[$targetDir] = $targetDir . ' is a symbolic link.'; $errors[$targetDir] = $targetDir . ' is a symbolic link.';
} }
if ($changes = $downloader->getLocalChanges($package, $targetDir, true)) { if ($changes = $downloader->getLocalChanges($package, $targetDir)) {
$errors[$targetDir] = $changes; $errors[$targetDir] = $changes;
} }
} }

2
src/Composer/Downloader/FossilDownloader.php
View File

@ -31,7 +31,7 @@ class FossilDownloader extends VcsDownloader
$url = ProcessExecutor::escape($url); $url = ProcessExecutor::escape($url);
$ref = ProcessExecutor::escape($package->getSourceReference()); $ref = ProcessExecutor::escape($package->getSourceReference());
$repoFile = $path . '.fossil'; $repoFile = $path . '.fossil';
$this->io->writeError(" Cloning ".$package->getSourceReference($repoFile)); $this->io->writeError(" Cloning ".$package->getSourceReference());
$command = sprintf('fossil clone %s %s', $url, ProcessExecutor::escape($repoFile)); $command = sprintf('fossil clone %s %s', $url, ProcessExecutor::escape($repoFile));
if (0 !== $this->process->execute($command, $ignoredOutput)) { if (0 !== $this->process->execute($command, $ignoredOutput)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());

2
src/Composer/Repository/CompositeRepository.php
View File

@ -102,7 +102,7 @@ class CompositeRepository extends BaseRepository
$matches = array(); $matches = array();
foreach ($this->repositories as $repository) { foreach ($this->repositories as $repository) {
/* @var $repository RepositoryInterface */ /* @var $repository RepositoryInterface */
$matches[] = $repository->search($query, $mode, $type); $matches[] = $repository->search($query, $mode);
} }
return $matches ? call_user_func_array('array_merge', $matches) : array(); return $matches ? call_user_func_array('array_merge', $matches) : array();

4
src/Composer/Repository/Vcs/PerforceDriver.php
View File

@ -38,8 +38,8 @@ class PerforceDriver extends VcsDriver
} }
$this->initPerforce($this->repoConfig); $this->initPerforce($this->repoConfig);
$this->perforce->p4Login($this->io); $this->perforce->p4Login();
$this->perforce->checkStream($this->depot); $this->perforce->checkStream();
$this->perforce->writeP4ClientSpec(); $this->perforce->writeP4ClientSpec();
$this->perforce->connectClient(); $this->perforce->connectClient();