Remove extra lines
parent
3177b21324
commit
5b754c797e
|
@ -174,7 +174,6 @@ class Cache
|
||||||
/**
|
/**
|
||||||
* Copy a file into the cache
|
* Copy a file into the cache
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function copyFrom(string $file, string $source)
|
public function copyFrom(string $file, string $source)
|
||||||
|
@ -198,7 +197,6 @@ class Cache
|
||||||
/**
|
/**
|
||||||
* Copy a file out of the cache
|
* Copy a file out of the cache
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function copyTo(string $file, string $target)
|
public function copyTo(string $file, string $target)
|
||||||
|
|
|
@ -282,7 +282,6 @@ abstract class BaseCommand extends Command
|
||||||
/**
|
/**
|
||||||
* Returns preferSource and preferDist values based on the configuration.
|
* Returns preferSource and preferDist values based on the configuration.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return bool[] An array composed of the preferSource and preferDist values
|
* @return bool[] An array composed of the preferSource and preferDist values
|
||||||
*/
|
*/
|
||||||
protected function getPreferredInstallOptions(Config $config, InputInterface $input, bool $keepVcsRequiresPreferSource = false)
|
protected function getPreferredInstallOptions(Config $config, InputInterface $input, bool $keepVcsRequiresPreferSource = false)
|
||||||
|
|
|
@ -40,7 +40,6 @@ class Compiler
|
||||||
*
|
*
|
||||||
* @param string $pharFile The full path to the file to create
|
* @param string $pharFile The full path to the file to create
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
*/
|
*/
|
||||||
public function compile(string $pharFile = 'composer.phar'): void
|
public function compile(string $pharFile = 'composer.phar'): void
|
||||||
|
|
|
@ -49,8 +49,6 @@ abstract class ArchiveDownloader extends FileDownloader
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*
|
*
|
||||||
*
|
|
||||||
*
|
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
* @throws \UnexpectedValueException
|
* @throws \UnexpectedValueException
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -258,7 +258,6 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
|
||||||
* @param bool $update if true (update) the changes can be stashed and reapplied after an update,
|
* @param bool $update if true (update) the changes can be stashed and reapplied after an update,
|
||||||
* if false (remove) the changes should be assumed to be lost if the operation is not aborted
|
* if false (remove) the changes should be assumed to be lost if the operation is not aborted
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @throws \RuntimeException in case the operation must be aborted
|
* @throws \RuntimeException in case the operation must be aborted
|
||||||
*/
|
*/
|
||||||
protected function cleanChanges(PackageInterface $package, string $path, bool $update): PromiseInterface
|
protected function cleanChanges(PackageInterface $package, string $path, bool $update): PromiseInterface
|
||||||
|
@ -274,8 +273,6 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
|
||||||
/**
|
/**
|
||||||
* Reapply previously stashes changes if applicable, only called after an update (regardless if successful or not)
|
* Reapply previously stashes changes if applicable, only called after an update (regardless if successful or not)
|
||||||
*
|
*
|
||||||
*
|
|
||||||
*
|
|
||||||
* @throws \RuntimeException in case the operation must be aborted or the patch does not apply cleanly
|
* @throws \RuntimeException in case the operation must be aborted or the patch does not apply cleanly
|
||||||
*/
|
*/
|
||||||
protected function reapplyChanges(string $path): void
|
protected function reapplyChanges(string $path): void
|
||||||
|
|
|
@ -234,7 +234,6 @@ interface IOInterface extends LoggerInterface
|
||||||
/**
|
/**
|
||||||
* Loads authentications from a config instance
|
* Loads authentications from a config instance
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function loadConfiguration(Config $config);
|
public function loadConfiguration(Config $config);
|
||||||
|
|
|
@ -625,7 +625,6 @@ class Installer
|
||||||
*
|
*
|
||||||
* @param array<int, array<string, string>> $aliases
|
* @param array<int, array<string, string>> $aliases
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
|
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
|
||||||
* @phpstan-return self::ERROR_*
|
* @phpstan-return self::ERROR_*
|
||||||
*/
|
*/
|
||||||
|
@ -811,7 +810,6 @@ class Installer
|
||||||
/**
|
/**
|
||||||
* @param array<int, array<string, string>> $rootAliases
|
* @param array<int, array<string, string>> $rootAliases
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $rootAliases
|
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $rootAliases
|
||||||
*/
|
*/
|
||||||
private function createRepositorySet(bool $forUpdate, PlatformRepository $platformRepo, array $rootAliases = [], ?RepositoryInterface $lockedRepository = null): RepositorySet
|
private function createRepositorySet(bool $forUpdate, PlatformRepository $platformRepo, array $rootAliases = [], ?RepositoryInterface $lockedRepository = null): RepositorySet
|
||||||
|
|
|
@ -32,7 +32,6 @@ class JsonFormatter
|
||||||
*
|
*
|
||||||
* Originally licensed under MIT by Dave Perrett <mail@recursive-design.com>
|
* Originally licensed under MIT by Dave Perrett <mail@recursive-design.com>
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @param bool $unescapeUnicode Un escape unicode
|
* @param bool $unescapeUnicode Un escape unicode
|
||||||
* @param bool $unescapeSlashes Un escape slashes
|
* @param bool $unescapeSlashes Un escape slashes
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -61,7 +61,6 @@ class RootPackageLoader extends ArrayLoader
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return RootPackage|RootAliasPackage
|
* @return RootPackage|RootAliasPackage
|
||||||
*
|
*
|
||||||
* @phpstan-param class-string<RootPackage> $class
|
* @phpstan-param class-string<RootPackage> $class
|
||||||
|
|
|
@ -339,7 +339,6 @@ class Locker
|
||||||
* @param array<string, string|false> $platformOverrides
|
* @param array<string, string|false> $platformOverrides
|
||||||
* @param bool $write Whether to actually write data to disk, useful in tests and for --dry-run
|
* @param bool $write Whether to actually write data to disk, useful in tests and for --dry-run
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
|
* @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
|
||||||
*/
|
*/
|
||||||
public function setLockData(array $packages, ?array $devPackages, array $platformReqs, array $platformDevReqs, array $aliases, string $minimumStability, array $stabilityFlags, bool $preferStable, bool $preferLowest, array $platformOverrides, bool $write = true): bool
|
public function setLockData(array $packages, ?array $devPackages, array $platformReqs, array $platformDevReqs, array $aliases, string $minimumStability, array $stabilityFlags, bool $preferStable, bool $preferLowest, array $platformOverrides, bool $write = true): bool
|
||||||
|
|
|
@ -537,7 +537,6 @@ class Package extends BasePackage
|
||||||
*
|
*
|
||||||
* @param array $autoload Mapping of autoloading rules
|
* @param array $autoload Mapping of autoloading rules
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param AutoloadRules $autoload
|
* @phpstan-param AutoloadRules $autoload
|
||||||
*/
|
*/
|
||||||
public function setAutoload(array $autoload): void
|
public function setAutoload(array $autoload): void
|
||||||
|
@ -558,7 +557,6 @@ class Package extends BasePackage
|
||||||
*
|
*
|
||||||
* @param array $devAutoload Mapping of dev autoloading rules
|
* @param array $devAutoload Mapping of dev autoloading rules
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param DevAutoloadRules $devAutoload
|
* @phpstan-param DevAutoloadRules $devAutoload
|
||||||
*/
|
*/
|
||||||
public function setDevAutoload(array $devAutoload): void
|
public function setDevAutoload(array $devAutoload): void
|
||||||
|
|
|
@ -234,7 +234,6 @@ interface PackageInterface
|
||||||
/**
|
/**
|
||||||
* Returns the stability of this package: one of (dev, alpha, beta, RC, stable)
|
* Returns the stability of this package: one of (dev, alpha, beta, RC, stable)
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-return 'stable'|'RC'|'beta'|'alpha'|'dev'
|
* @phpstan-return 'stable'|'RC'|'beta'|'alpha'|'dev'
|
||||||
*/
|
*/
|
||||||
public function getStability(): string;
|
public function getStability(): string;
|
||||||
|
|
|
@ -37,7 +37,6 @@ interface PluginInterface
|
||||||
/**
|
/**
|
||||||
* Apply plugin modifications to Composer
|
* Apply plugin modifications to Composer
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function activate(Composer $composer, IOInterface $io);
|
public function activate(Composer $composer, IOInterface $io);
|
||||||
|
@ -49,7 +48,6 @@ interface PluginInterface
|
||||||
* uninstalled, but also before it gets upgraded to a new version
|
* uninstalled, but also before it gets upgraded to a new version
|
||||||
* so the old one can be deactivated and the new one activated.
|
* so the old one can be deactivated and the new one activated.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function deactivate(Composer $composer, IOInterface $io);
|
public function deactivate(Composer $composer, IOInterface $io);
|
||||||
|
@ -59,7 +57,6 @@ interface PluginInterface
|
||||||
*
|
*
|
||||||
* This will be called after deactivate.
|
* This will be called after deactivate.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function uninstall(Composer $composer, IOInterface $io);
|
public function uninstall(Composer $composer, IOInterface $io);
|
||||||
|
|
|
@ -148,7 +148,6 @@ class PluginManager
|
||||||
* @param bool $failOnMissingClasses By default this silently skips plugins that can not be found, but if set to true it fails with an exception
|
* @param bool $failOnMissingClasses By default this silently skips plugins that can not be found, but if set to true it fails with an exception
|
||||||
* @param bool $isGlobalPlugin Set to true to denote plugins which are installed in the global Composer directory
|
* @param bool $isGlobalPlugin Set to true to denote plugins which are installed in the global Composer directory
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @throws \UnexpectedValueException
|
* @throws \UnexpectedValueException
|
||||||
*/
|
*/
|
||||||
public function registerPackage(PackageInterface $package, bool $failOnMissingClasses = false, bool $isGlobalPlugin = false): void
|
public function registerPackage(PackageInterface $package, bool $failOnMissingClasses = false, bool $isGlobalPlugin = false): void
|
||||||
|
@ -304,8 +303,6 @@ class PluginManager
|
||||||
* If it's of type composer-installer it is unregistered from the installers
|
* If it's of type composer-installer it is unregistered from the installers
|
||||||
* instead for BC
|
* instead for BC
|
||||||
*
|
*
|
||||||
*
|
|
||||||
*
|
|
||||||
* @throws \UnexpectedValueException
|
* @throws \UnexpectedValueException
|
||||||
*/
|
*/
|
||||||
public function deactivatePackage(PackageInterface $package): void
|
public function deactivatePackage(PackageInterface $package): void
|
||||||
|
@ -329,8 +326,6 @@ class PluginManager
|
||||||
* If it's of type composer-installer it is unregistered from the installers
|
* If it's of type composer-installer it is unregistered from the installers
|
||||||
* instead for BC
|
* instead for BC
|
||||||
*
|
*
|
||||||
*
|
|
||||||
*
|
|
||||||
* @throws \UnexpectedValueException
|
* @throws \UnexpectedValueException
|
||||||
*/
|
*/
|
||||||
public function uninstallPackage(PackageInterface $package): void
|
public function uninstallPackage(PackageInterface $package): void
|
||||||
|
@ -446,7 +441,6 @@ class PluginManager
|
||||||
*
|
*
|
||||||
* @param RepositoryInterface $repo Repository to scan for plugins to install
|
* @param RepositoryInterface $repo Repository to scan for plugins to install
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
*/
|
*/
|
||||||
private function loadRepository(RepositoryInterface $repo, bool $isGlobalRepo): void
|
private function loadRepository(RepositoryInterface $repo, bool $isGlobalRepo): void
|
||||||
|
|
|
@ -324,7 +324,6 @@ class Filesystem
|
||||||
* Some systems can't rename and also don't have proc_open,
|
* Some systems can't rename and also don't have proc_open,
|
||||||
* which requires this solution.
|
* which requires this solution.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function copyThenRemove(string $source, string $target)
|
public function copyThenRemove(string $source, string $target)
|
||||||
|
@ -716,7 +715,6 @@ class Filesystem
|
||||||
/**
|
/**
|
||||||
* return true if that directory is a symlink.
|
* return true if that directory is a symlink.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isSymlinkedDirectory(string $directory)
|
public function isSymlinkedDirectory(string $directory)
|
||||||
|
@ -762,7 +760,6 @@ class Filesystem
|
||||||
/**
|
/**
|
||||||
* Creates an NTFS junction.
|
* Creates an NTFS junction.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function junction(string $target, string $junction)
|
public function junction(string $target, string $junction)
|
||||||
|
@ -857,7 +854,6 @@ class Filesystem
|
||||||
/**
|
/**
|
||||||
* Copy file using stream_copy_to_stream to work around https://bugs.php.net/bug.php?id=6463
|
* Copy file using stream_copy_to_stream to work around https://bugs.php.net/bug.php?id=6463
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function safeCopy(string $source, string $target)
|
public function safeCopy(string $source, string $target)
|
||||||
|
|
|
@ -60,7 +60,6 @@ class ProxyHelper
|
||||||
/**
|
/**
|
||||||
* Returns http context options for the proxy url
|
* Returns http context options for the proxy url
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return array{http: array{proxy: string, header?: string}}
|
* @return array{http: array{proxy: string, header?: string}}
|
||||||
*/
|
*/
|
||||||
public static function getContextOptions(string $proxyUrl): array
|
public static function getContextOptions(string $proxyUrl): array
|
||||||
|
|
|
@ -69,7 +69,6 @@ class NoProxyPattern
|
||||||
/**
|
/**
|
||||||
* Returns false is the url cannot be parsed, otherwise a data object
|
* Returns false is the url cannot be parsed, otherwise a data object
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return bool|stdClass
|
* @return bool|stdClass
|
||||||
*/
|
*/
|
||||||
protected function getUrlData(string $url)
|
protected function getUrlData(string $url)
|
||||||
|
@ -165,7 +164,6 @@ class NoProxyPattern
|
||||||
/**
|
/**
|
||||||
* Finds or creates rule data for a hostname
|
* Finds or creates rule data for a hostname
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return null|stdClass Null if the hostname is invalid
|
* @return null|stdClass Null if the hostname is invalid
|
||||||
*/
|
*/
|
||||||
private function getRule(int $index, string $hostName): ?stdClass
|
private function getRule(int $index, string $hostName): ?stdClass
|
||||||
|
@ -239,7 +237,6 @@ class NoProxyPattern
|
||||||
* IPv4 addresses are always mapped to IPv6, which simplifies handling
|
* IPv4 addresses are always mapped to IPv6, which simplifies handling
|
||||||
* and comparison.
|
* and comparison.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return mixed[] in_addr, size
|
* @return mixed[] in_addr, size
|
||||||
*/
|
*/
|
||||||
private function ipGetAddr(string $host): array
|
private function ipGetAddr(string $host): array
|
||||||
|
@ -355,7 +352,6 @@ class NoProxyPattern
|
||||||
/**
|
/**
|
||||||
* Splits the hostname into host and port components
|
* Splits the hostname into host and port components
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return mixed[] host, port, if there was error
|
* @return mixed[] host, port, if there was error
|
||||||
*/
|
*/
|
||||||
private function splitHostPort(string $hostName): array
|
private function splitHostPort(string $hostName): array
|
||||||
|
|
|
@ -308,7 +308,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
|
||||||
*
|
*
|
||||||
* @param string $executableName The name of the binary to test.
|
* @param string $executableName The name of the binary to test.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @throws \PHPUnit\Framework\SkippedTestError
|
* @throws \PHPUnit\Framework\SkippedTestError
|
||||||
*/
|
*/
|
||||||
protected function skipIfNotExecutable(string $executableName): void
|
protected function skipIfNotExecutable(string $executableName): void
|
||||||
|
@ -326,7 +325,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
|
||||||
/**
|
/**
|
||||||
* Transforms an escaped non-Windows command to match Windows escaping.
|
* Transforms an escaped non-Windows command to match Windows escaping.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @return string The transformed command
|
* @return string The transformed command
|
||||||
*/
|
*/
|
||||||
protected function getCmd(string $cmd): string
|
protected function getCmd(string $cmd): string
|
||||||
|
|
|
@ -541,7 +541,6 @@ class AuthHelperTest extends TestCase
|
||||||
/**
|
/**
|
||||||
* @param array<string, string|null> $auth
|
* @param array<string, string|null> $auth
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* @phpstan-param array{username: string|null, password: string|null} $auth
|
* @phpstan-param array{username: string|null, password: string|null} $auth
|
||||||
*/
|
*/
|
||||||
private function expectsAuthentication(string $origin, array $auth): void
|
private function expectsAuthentication(string $origin, array $auth): void
|
||||||
|
|
Loading…
Reference in New Issue