From 2a13bb2649151932407aae1a37a356179b1f5199 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Mon, 12 Nov 2018 12:23:32 -0200 Subject: [PATCH] Fixes from PHPStan (#7687) * fix docblocks * remove redundant conditional * fix wrong variable name * fix wrong namespaces * add missing private members * remove unused/redundant arguments * move testcase class * exclude TestCase.php * Tweak RuleWatchGraph type hints * Tweak doc comment --- .travis.yml | 2 +- src/Composer/Command/BaseCommand.php | 2 +- src/Composer/Command/ShowCommand.php | 54 +++++++++---------- .../DependencyResolver/RuleSetGenerator.php | 4 +- .../DependencyResolver/RuleWatchGraph.php | 6 +-- src/Composer/Downloader/GitDownloader.php | 6 +-- .../Downloader/PearPackageExtractor.php | 6 +-- .../EventDispatcher/EventDispatcher.php | 2 +- .../Package/Archiver/GitExcludeFilter.php | 2 +- .../Package/Archiver/HgExcludeFilter.php | 2 +- src/Composer/Package/Archiver/ZipArchiver.php | 2 +- .../Repository/ArtifactRepository.php | 2 +- .../Repository/Pear/BaseChannelReader.php | 8 +-- .../Repository/Pear/ChannelReader.php | 6 +-- .../Repository/Pear/ChannelRest10Reader.php | 18 +++---- .../Repository/Pear/ChannelRest11Reader.php | 10 ++-- .../Pear/PackageDependencyParser.php | 16 +++--- src/Composer/Util/Filesystem.php | 4 +- src/Composer/Util/NoProxyPattern.php | 2 +- src/Composer/Util/Perforce.php | 6 +-- src/Composer/Util/StreamContextFactory.php | 2 +- src/Composer/Util/TlsHelper.php | 2 +- tests/Composer/Test/AllFunctionalTest.php | 2 +- tests/Composer/Test/ApplicationTest.php | 2 +- .../Test/Autoload/AutoloadGeneratorTest.php | 2 +- .../Test/Autoload/ClassMapGeneratorTest.php | 2 +- tests/Composer/Test/CacheTest.php | 2 +- .../Composer/Test/Command/InitCommandTest.php | 2 +- .../Test/Command/RunScriptCommandTest.php | 2 +- tests/Composer/Test/ComposerTest.php | 2 +- .../Test/Config/JsonConfigSourceTest.php | 4 +- tests/Composer/Test/ConfigTest.php | 2 +- tests/Composer/Test/DefaultConfigTest.php | 2 +- .../DependencyResolver/DefaultPolicyTest.php | 2 +- .../Test/DependencyResolver/PoolTest.php | 2 +- .../Test/DependencyResolver/RequestTest.php | 2 +- .../Test/DependencyResolver/RuleSetTest.php | 2 +- .../Test/DependencyResolver/RuleTest.php | 2 +- .../Test/DependencyResolver/SolverTest.php | 5 +- .../Test/Downloader/FileDownloaderTest.php | 2 +- .../Test/Downloader/FossilDownloaderTest.php | 2 +- .../Test/Downloader/GitDownloaderTest.php | 2 +- .../Test/Downloader/HgDownloaderTest.php | 2 +- .../Downloader/PearPackageExtractorTest.php | 2 +- .../Downloader/PerforceDownloaderTest.php | 2 +- .../Test/Downloader/XzDownloaderTest.php | 2 +- .../Test/Downloader/ZipDownloaderTest.php | 8 +-- .../EventDispatcher/EventDispatcherTest.php | 2 +- tests/Composer/Test/IO/ConsoleIOTest.php | 2 +- tests/Composer/Test/IO/NullIOTest.php | 2 +- .../Test/Installer/LibraryInstallerTest.php | 2 +- tests/Composer/Test/InstallerTest.php | 2 +- tests/Composer/Test/Mock/FactoryMock.php | 2 +- .../Archiver/ArchivableFilesFinderTest.php | 2 +- .../Test/Package/Archiver/ArchiverTest.php | 2 +- .../Test/Package/CompletePackageTest.php | 2 +- .../Test/Package/RootAliasPackageTest.php | 2 +- .../Test/Plugin/PluginInstallerTest.php | 4 +- .../StrictConfirmationQuestionTest.php | 2 +- .../Test/Repository/ArrayRepositoryTest.php | 2 +- .../Repository/ArtifactRepositoryTest.php | 8 +-- .../Repository/ComposerRepositoryTest.php | 2 +- .../Repository/CompositeRepositoryTest.php | 2 +- .../Repository/FilesystemRepositoryTest.php | 2 +- .../Test/Repository/PathRepositoryTest.php | 14 ++--- .../Repository/Pear/ChannelReaderTest.php | 2 +- .../Pear/ChannelRest10ReaderTest.php | 4 +- .../Pear/ChannelRest11ReaderTest.php | 4 +- .../Pear/PackageDependencyParserTest.php | 2 +- .../Test/Repository/PearRepositoryTest.php | 2 +- .../Test/Repository/RepositoryFactoryTest.php | 2 +- .../Test/Repository/RepositoryManagerTest.php | 2 +- .../Test/Repository/Vcs/FossilDriverTest.php | 2 +- .../Repository/Vcs/GitBitbucketDriverTest.php | 2 +- .../Test/Repository/Vcs/GitHubDriverTest.php | 2 +- .../Test/Repository/Vcs/GitLabDriverTest.php | 4 +- .../Test/Repository/Vcs/HgDriverTest.php | 2 +- .../Repository/Vcs/PerforceDriverTest.php | 2 +- .../Test/Repository/Vcs/SvnDriverTest.php | 2 +- .../Test/Repository/VcsRepositoryTest.php | 2 +- tests/Composer/{ => Test}/TestCase.php | 2 +- .../Test/Util/ConfigValidatorTest.php | 2 +- tests/Composer/Test/Util/ErrorHandlerTest.php | 2 +- tests/Composer/Test/Util/FilesystemTest.php | 2 +- .../Test/Util/ProcessExecutorTest.php | 2 +- tests/bootstrap.php | 2 +- 86 files changed, 163 insertions(+), 166 deletions(-) rename tests/Composer/{ => Test}/TestCase.php (99%) diff --git a/.travis.yml b/.travis.yml index 064782fa2..c1511b6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ before_script: script: # run test suite directories in parallel using GNU parallel - - ls -d tests/Composer/Test/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && exit 1);' + - ls -d tests/Composer/Test/* | grep -v TestCase.php | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && exit 1);' before_deploy: - php -d phar.readonly=0 bin/compile diff --git a/src/Composer/Command/BaseCommand.php b/src/Composer/Command/BaseCommand.php index d6b014d7d..888b2a7f2 100644 --- a/src/Composer/Command/BaseCommand.php +++ b/src/Composer/Command/BaseCommand.php @@ -33,7 +33,7 @@ use Symfony\Component\Console\Command\Command; abstract class BaseCommand extends Command { /** - * @var Composer + * @var Composer|null */ private $composer; diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index e73d6ead9..cc0fe0154 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -737,7 +737,7 @@ EOT /** * Display the tree * - * @param $arrayTree + * @param array $arrayTree */ protected function displayPackageTree(array $arrayTree) { @@ -782,7 +782,7 @@ EOT /** * Generate the package tree * - * @param PackageInterface|string $package + * @param PackageInterface $package * @param RepositoryInterface $installedRepo * @param RepositoryInterface $distantRepos * @return array @@ -792,38 +792,36 @@ EOT RepositoryInterface $installedRepo, RepositoryInterface $distantRepos ) { - if (is_object($package)) { - $requires = $package->getRequires(); - ksort($requires); - $children = array(); - foreach ($requires as $requireName => $require) { - $packagesInTree = array($package->getName(), $requireName); + $requires = $package->getRequires(); + ksort($requires); + $children = array(); + foreach ($requires as $requireName => $require) { + $packagesInTree = array($package->getName(), $requireName); - $treeChildDesc = array( - 'name' => $requireName, - 'version' => $require->getPrettyConstraint(), - ); - - $deepChildren = $this->addTree($requireName, $require, $installedRepo, $distantRepos, $packagesInTree); - - if ($deepChildren) { - $treeChildDesc['requires'] = $deepChildren; - } - - $children[] = $treeChildDesc; - } - $tree = array( - 'name' => $package->getPrettyName(), - 'version' => $package->getPrettyVersion(), - 'description' => $package->getDescription(), + $treeChildDesc = array( + 'name' => $requireName, + 'version' => $require->getPrettyConstraint(), ); - if ($children) { - $tree['requires'] = $children; + $deepChildren = $this->addTree($requireName, $require, $installedRepo, $distantRepos, $packagesInTree); + + if ($deepChildren) { + $treeChildDesc['requires'] = $deepChildren; } - return $tree; + $children[] = $treeChildDesc; } + $tree = array( + 'name' => $package->getPrettyName(), + 'version' => $package->getPrettyVersion(), + 'description' => $package->getDescription(), + ); + + if ($children) { + $tree['requires'] = $children; + } + + return $tree; } /** diff --git a/src/Composer/DependencyResolver/RuleSetGenerator.php b/src/Composer/DependencyResolver/RuleSetGenerator.php index 60617ba43..6117c1d95 100644 --- a/src/Composer/DependencyResolver/RuleSetGenerator.php +++ b/src/Composer/DependencyResolver/RuleSetGenerator.php @@ -50,7 +50,7 @@ class RuleSetGenerator * reason for generating this rule * @param mixed $reasonData Any data, e.g. the requirement name, * that goes with the reason - * @return Rule The generated rule or null if tautological + * @return Rule|null The generated rule or null if tautological */ protected function createRequireRule(PackageInterface $package, array $providers, $reason, $reasonData = null) { @@ -117,7 +117,7 @@ class RuleSetGenerator * reason for generating this rule * @param mixed $reasonData Any data, e.g. the package name, that * goes with the reason - * @return Rule The generated rule + * @return Rule|null The generated rule */ protected function createRule2Literals(PackageInterface $issuer, PackageInterface $provider, $reason, $reasonData = null) { diff --git a/src/Composer/DependencyResolver/RuleWatchGraph.php b/src/Composer/DependencyResolver/RuleWatchGraph.php index a9f7414b2..31a22414d 100644 --- a/src/Composer/DependencyResolver/RuleWatchGraph.php +++ b/src/Composer/DependencyResolver/RuleWatchGraph.php @@ -127,9 +127,9 @@ class RuleWatchGraph * * The rule node's watched literals are updated accordingly. * - * @param $fromLiteral mixed A literal the node used to watch - * @param $toLiteral mixed A literal the node should watch now - * @param $node mixed The rule node to be moved + * @param int $fromLiteral A literal the node used to watch + * @param int $toLiteral A literal the node should watch now + * @param RuleWatchNode $node The rule node to be moved */ protected function moveWatch($fromLiteral, $toLiteral, $node) { diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index 740c4e3ec..869d5330b 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -433,7 +433,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface } /** - * @param $path + * @param string $path * @throws \RuntimeException */ protected function discardChanges($path) @@ -447,7 +447,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface } /** - * @param $path + * @param string $path * @throws \RuntimeException */ protected function stashChanges($path) @@ -461,7 +461,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface } /** - * @param $path + * @param string $path * @throws \RuntimeException */ protected function viewDiff($path) diff --git a/src/Composer/Downloader/PearPackageExtractor.php b/src/Composer/Downloader/PearPackageExtractor.php index 44267d558..5eaf3edcd 100644 --- a/src/Composer/Downloader/PearPackageExtractor.php +++ b/src/Composer/Downloader/PearPackageExtractor.php @@ -73,8 +73,8 @@ class PearPackageExtractor * Perform copy actions on files * * @param array $files array of copy actions ('from', 'to') with relative paths - * @param $source string path to source dir. - * @param $target string path to destination dir + * @param string $source path to source dir. + * @param string $target path to destination dir * @param array $roles array [role => roleRoot] relative root for files having that role * @param array $vars list of values can be used for replacement tasks */ @@ -135,7 +135,7 @@ class PearPackageExtractor */ private function buildCopyActions($source, array $roles, $vars) { - /** @var $package \SimpleXmlElement */ + /** @var \SimpleXmlElement $package */ $package = simplexml_load_string(file_get_contents($this->combine($source, 'package.xml'))); if (false === $package) { throw new \RuntimeException('Package definition file is not valid.'); diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php index 145944b07..98c9a6c66 100644 --- a/src/Composer/EventDispatcher/EventDispatcher.php +++ b/src/Composer/EventDispatcher/EventDispatcher.php @@ -264,7 +264,7 @@ class EventDispatcher $finder = new PhpExecutableFinder(); $phpPath = $finder->find(); if (!$phpPath) { - throw new \RuntimeException('Failed to locate PHP binary to execute '.$scriptName); + throw new \RuntimeException('Failed to locate PHP binary to execute '.$phpPath); } $allowUrlFOpenFlag = ' -d allow_url_fopen=' . ProcessExecutor::escape(ini_get('allow_url_fopen')); diff --git a/src/Composer/Package/Archiver/GitExcludeFilter.php b/src/Composer/Package/Archiver/GitExcludeFilter.php index 0cdc98c81..f79734855 100644 --- a/src/Composer/Package/Archiver/GitExcludeFilter.php +++ b/src/Composer/Package/Archiver/GitExcludeFilter.php @@ -64,7 +64,7 @@ class GitExcludeFilter extends BaseExcludeFilter * * @param string $line A line from .gitattributes * - * @return array An exclude pattern for filter() + * @return array|null An exclude pattern for filter() */ public function parseGitAttributesLine($line) { diff --git a/src/Composer/Package/Archiver/HgExcludeFilter.php b/src/Composer/Package/Archiver/HgExcludeFilter.php index 3e2b25d5c..b83b7756b 100644 --- a/src/Composer/Package/Archiver/HgExcludeFilter.php +++ b/src/Composer/Package/Archiver/HgExcludeFilter.php @@ -54,7 +54,7 @@ class HgExcludeFilter extends BaseExcludeFilter * * @param string $line A line from .hgignore * - * @return array An exclude pattern for filter() + * @return array|null An exclude pattern for filter() */ public function parseHgIgnoreLine($line) { diff --git a/src/Composer/Package/Archiver/ZipArchiver.php b/src/Composer/Package/Archiver/ZipArchiver.php index d1d7573f3..65694cb88 100644 --- a/src/Composer/Package/Archiver/ZipArchiver.php +++ b/src/Composer/Package/Archiver/ZipArchiver.php @@ -37,7 +37,7 @@ class ZipArchiver implements ArchiverInterface if ($res === true) { $files = new ArchivableFilesFinder($sources, $excludes, $ignoreFilters); foreach ($files as $file) { - /** @var $file \SplFileInfo */ + /** @var \SplFileInfo $file */ $filepath = strtr($file->getPath()."/".$file->getFilename(), '\\', '/'); $localname = str_replace($sources.'/', '', $filepath); if ($file->isDir()) { diff --git a/src/Composer/Repository/ArtifactRepository.php b/src/Composer/Repository/ArtifactRepository.php index 0184cb4d5..079d34c54 100644 --- a/src/Composer/Repository/ArtifactRepository.php +++ b/src/Composer/Repository/ArtifactRepository.php @@ -84,7 +84,7 @@ class ArtifactRepository extends ArrayRepository implements ConfigurableReposito * Find a file by name, returning the one that has the shortest path. * * @param \ZipArchive $zip - * @param $filename + * @param string $filename * @return bool|int */ private function locateFile(\ZipArchive $zip, $filename) diff --git a/src/Composer/Repository/Pear/BaseChannelReader.php b/src/Composer/Repository/Pear/BaseChannelReader.php index d11a96d7b..9b26eb9db 100644 --- a/src/Composer/Repository/Pear/BaseChannelReader.php +++ b/src/Composer/Repository/Pear/BaseChannelReader.php @@ -44,8 +44,8 @@ abstract class BaseChannelReader /** * Read content from remote filesystem. * - * @param $origin string server - * @param $path string relative path to content + * @param string $origin server + * @param string $path relative path to content * @throws \UnexpectedValueException * @return \SimpleXMLElement */ @@ -63,8 +63,8 @@ abstract class BaseChannelReader /** * Read xml content from remote filesystem * - * @param $origin string server - * @param $path string relative path to content + * @param string $origin server + * @param string $path relative path to content * @throws \UnexpectedValueException * @return \SimpleXMLElement */ diff --git a/src/Composer/Repository/Pear/ChannelReader.php b/src/Composer/Repository/Pear/ChannelReader.php index 00b62b89c..73cc9152e 100644 --- a/src/Composer/Repository/Pear/ChannelReader.php +++ b/src/Composer/Repository/Pear/ChannelReader.php @@ -44,7 +44,7 @@ class ChannelReader extends BaseChannelReader /** * Reads PEAR channel through REST interface and builds list of packages * - * @param $url string PEAR Channel url + * @param string $url PEAR Channel url * @throws \UnexpectedValueException * @return ChannelInfo */ @@ -70,8 +70,8 @@ class ChannelReader extends BaseChannelReader /** * Reads channel supported REST interfaces and selects one of them * - * @param $channelXml \SimpleXMLElement - * @param $supportedVersions string[] supported PEAR REST protocols + * @param \SimpleXMLElement $channelXml + * @param string[] $supportedVersions supported PEAR REST protocols * @return array|null hash with selected version and baseUrl */ private function selectRestVersion($channelXml, $supportedVersions) diff --git a/src/Composer/Repository/Pear/ChannelRest10Reader.php b/src/Composer/Repository/Pear/ChannelRest10Reader.php index 92498dae9..489914d5d 100644 --- a/src/Composer/Repository/Pear/ChannelRest10Reader.php +++ b/src/Composer/Repository/Pear/ChannelRest10Reader.php @@ -39,7 +39,7 @@ class ChannelRest10Reader extends BaseChannelReader /** * Reads package descriptions using PEAR Rest 1.0 interface * - * @param $baseUrl string base Url interface + * @param string $baseUrl base Url interface * * @return PackageInfo[] */ @@ -52,7 +52,7 @@ class ChannelRest10Reader extends BaseChannelReader * Read list of packages from * {baseUrl}/p/packages.xml * - * @param $baseUrl string + * @param string $baseUrl * @return PackageInfo[] */ private function readPackages($baseUrl) @@ -75,8 +75,8 @@ class ChannelRest10Reader extends BaseChannelReader * Read package info from * {baseUrl}/p/{package}/info.xml * - * @param $baseUrl string - * @param $packageName string + * @param string $baseUrl + * @param string $packageName * @return PackageInfo */ private function readPackage($baseUrl, $packageName) @@ -105,8 +105,8 @@ class ChannelRest10Reader extends BaseChannelReader * Read package releases from * {baseUrl}/p/{package}/allreleases.xml * - * @param $baseUrl string - * @param $packageName string + * @param string $baseUrl + * @param string $packageName * @throws \Composer\Downloader\TransportException|\Exception * @return ReleaseInfo[] hash array with keys as version numbers */ @@ -146,9 +146,9 @@ class ChannelRest10Reader extends BaseChannelReader * Read package dependencies from * {baseUrl}/p/{package}/deps.{version}.txt * - * @param $baseUrl string - * @param $packageName string - * @param $version string + * @param string $baseUrl + * @param string $packageName + * @param string $version * @return DependencyInfo[] */ private function readPackageReleaseDependencies($baseUrl, $packageName, $version) diff --git a/src/Composer/Repository/Pear/ChannelRest11Reader.php b/src/Composer/Repository/Pear/ChannelRest11Reader.php index 22cd61cc0..f9e05f5be 100644 --- a/src/Composer/Repository/Pear/ChannelRest11Reader.php +++ b/src/Composer/Repository/Pear/ChannelRest11Reader.php @@ -35,7 +35,7 @@ class ChannelRest11Reader extends BaseChannelReader /** * Reads package descriptions using PEAR Rest 1.1 interface * - * @param $baseUrl string base Url interface + * @param string $baseUrl base Url interface * * @return PackageInfo[] */ @@ -48,7 +48,7 @@ class ChannelRest11Reader extends BaseChannelReader * Read list of channel categories from * {baseUrl}/c/categories.xml * - * @param $baseUrl string + * @param string $baseUrl * @return PackageInfo[] */ private function readChannelPackages($baseUrl) @@ -70,8 +70,8 @@ class ChannelRest11Reader extends BaseChannelReader * Read packages from * {baseUrl}/c/{category}/packagesinfo.xml * - * @param $baseUrl string - * @param $categoryName string + * @param string $baseUrl + * @param string $categoryName * @return PackageInfo[] */ private function readCategoryPackages($baseUrl, $categoryName) @@ -92,7 +92,7 @@ class ChannelRest11Reader extends BaseChannelReader /** * Parses package node. * - * @param $packageInfo \SimpleXMLElement xml element describing package + * @param \SimpleXMLElement $packageInfo xml element describing package * @return PackageInfo */ private function parsePackage($packageInfo) diff --git a/src/Composer/Repository/Pear/PackageDependencyParser.php b/src/Composer/Repository/Pear/PackageDependencyParser.php index dc6879d6d..24f8fb9f9 100644 --- a/src/Composer/Repository/Pear/PackageDependencyParser.php +++ b/src/Composer/Repository/Pear/PackageDependencyParser.php @@ -22,7 +22,7 @@ class PackageDependencyParser /** * Builds dependency information. It detects used package.xml format. * - * @param $depArray array + * @param array $depArray * @return DependencyInfo */ public function buildDependencyInfo($depArray) @@ -46,7 +46,7 @@ class PackageDependencyParser * { type="php|os|sapi|ext|pkg" rel="has|not|eq|ge|gt|le|lt" optional="yes" * channel="channelName" name="extName|packageName" } * - * @param $depArray array Dependency data in package.xml 1.0 format + * @param array $depArray Dependency data in package.xml 1.0 format * @return DependencyConstraint[] */ private function buildDependency10Info($depArray) @@ -115,7 +115,7 @@ class PackageDependencyParser /** * Builds dependency information from package.xml 2.0 format * - * @param $depArray array Dependency data in package.xml 1.0 format + * @param array $depArray Dependency data in package.xml 1.0 format * @return DependencyInfo */ private function buildDependency20Info($depArray) @@ -187,8 +187,8 @@ class PackageDependencyParser /** * Builds dependency constraint of 'extension' type * - * @param $depItem array dependency constraint or array of dependency constraints - * @param $depType string target type of building constraint. + * @param array $depItem dependency constraint or array of dependency constraints + * @param string $depType target type of building constraint. * @return DependencyConstraint[] */ private function buildDepExtensionConstraints($depItem, $depType) @@ -217,8 +217,8 @@ class PackageDependencyParser /** * Builds dependency constraint of 'package' type * - * @param $depItem array dependency constraint or array of dependency constraints - * @param $depType string target type of building constraint. + * @param array $depItem dependency constraint or array of dependency constraints + * @param string $depType target type of building constraint. * @return DependencyConstraint[] */ private function buildDepPackageConstraints($depItem, $depType) @@ -287,7 +287,7 @@ class PackageDependencyParser /** * Softened version parser * - * @param $version + * @param string $version * @return null|string */ private function parseVersion($version) diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php index a3af3b825..ebb7dfbd3 100644 --- a/src/Composer/Util/Filesystem.php +++ b/src/Composer/Util/Filesystem.php @@ -264,8 +264,8 @@ class Filesystem /** * Copies a file or directory from $source to $target. * - * @param $source - * @param $target + * @param string $source + * @param string $target * @return bool */ public function copy($source, $target) diff --git a/src/Composer/Util/NoProxyPattern.php b/src/Composer/Util/NoProxyPattern.php index 5cc6e361b..a6cb112be 100644 --- a/src/Composer/Util/NoProxyPattern.php +++ b/src/Composer/Util/NoProxyPattern.php @@ -35,7 +35,7 @@ class NoProxyPattern * * @param string $url * - * @return true if the URL matches one of the rules. + * @return bool true if the URL matches one of the rules. */ public function test($url) { diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index d7c6816cc..b064feec4 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -515,7 +515,7 @@ class Perforce } /** - * @param $reference + * @param string $reference * @return mixed|null */ protected function getChangeList($reference) @@ -537,8 +537,8 @@ class Perforce } /** - * @param $fromReference - * @param $toReference + * @param string $fromReference + * @param string $toReference * @return mixed|null */ public function getCommitLogs($fromReference, $toReference) diff --git a/src/Composer/Util/StreamContextFactory.php b/src/Composer/Util/StreamContextFactory.php index f5f12d315..4e9b7f480 100644 --- a/src/Composer/Util/StreamContextFactory.php +++ b/src/Composer/Util/StreamContextFactory.php @@ -160,7 +160,7 @@ final class StreamContextFactory * This method fixes the array by moving the content-type header to the end * * @link https://bugs.php.net/bug.php?id=61548 - * @param $header + * @param string|array $header * @return array */ private static function fixHttpHeaderField($header) diff --git a/src/Composer/Util/TlsHelper.php b/src/Composer/Util/TlsHelper.php index e04c7157e..34336d06c 100644 --- a/src/Composer/Util/TlsHelper.php +++ b/src/Composer/Util/TlsHelper.php @@ -164,7 +164,7 @@ final class TlsHelper * * @param string $certName CN/SAN * - * @return callable|null + * @return callable|void */ private static function certNameMatcher($certName) { diff --git a/tests/Composer/Test/AllFunctionalTest.php b/tests/Composer/Test/AllFunctionalTest.php index 1fc552daf..7a3ef3ee0 100644 --- a/tests/Composer/Test/AllFunctionalTest.php +++ b/tests/Composer/Test/AllFunctionalTest.php @@ -12,7 +12,7 @@ namespace Composer\Test; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Symfony\Component\Finder\Finder; use Symfony\Component\Process\Process; diff --git a/tests/Composer/Test/ApplicationTest.php b/tests/Composer/Test/ApplicationTest.php index 37d434fa8..5f491440b 100644 --- a/tests/Composer/Test/ApplicationTest.php +++ b/tests/Composer/Test/ApplicationTest.php @@ -13,7 +13,7 @@ namespace Composer\Test; use Composer\Console\Application; -use Composer\TestCase; +use Composer\Test\TestCase; use Symfony\Component\Console\Output\OutputInterface; class ApplicationTest extends TestCase diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php index b8eec2f43..4d672084e 100644 --- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php +++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php @@ -17,7 +17,7 @@ use Composer\Package\Link; use Composer\Util\Filesystem; use Composer\Package\AliasPackage; use Composer\Package\Package; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Script\ScriptEvents; use Composer\Repository\InstalledRepositoryInterface; use Composer\Installer\InstallationManager; diff --git a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php index 05f0d0530..ae7b597b7 100644 --- a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php +++ b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php @@ -19,7 +19,7 @@ namespace Composer\Test\Autoload; use Composer\Autoload\ClassMapGenerator; -use Composer\TestCase; +use Composer\Test\TestCase; use Symfony\Component\Finder\Finder; use Composer\Util\Filesystem; diff --git a/tests/Composer/Test/CacheTest.php b/tests/Composer/Test/CacheTest.php index 9830fd7de..50c767752 100644 --- a/tests/Composer/Test/CacheTest.php +++ b/tests/Composer/Test/CacheTest.php @@ -12,7 +12,7 @@ namespace Composer\Test; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class CacheTest extends TestCase diff --git a/tests/Composer/Test/Command/InitCommandTest.php b/tests/Composer/Test/Command/InitCommandTest.php index d355b6cd1..06d8a004b 100644 --- a/tests/Composer/Test/Command/InitCommandTest.php +++ b/tests/Composer/Test/Command/InitCommandTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Command; use Composer\Command\InitCommand; -use Composer\TestCase; +use Composer\Test\TestCase; class InitCommandTest extends TestCase { diff --git a/tests/Composer/Test/Command/RunScriptCommandTest.php b/tests/Composer/Test/Command/RunScriptCommandTest.php index 53478b323..97acc6d26 100644 --- a/tests/Composer/Test/Command/RunScriptCommandTest.php +++ b/tests/Composer/Test/Command/RunScriptCommandTest.php @@ -15,7 +15,7 @@ namespace Composer\Test\Command; use Composer\Composer; use Composer\Config; use Composer\Script\Event as ScriptEvent; -use Composer\TestCase; +use Composer\Test\TestCase; class RunScriptCommandTest extends TestCase { diff --git a/tests/Composer/Test/ComposerTest.php b/tests/Composer/Test/ComposerTest.php index aabe1deab..c2c425e76 100644 --- a/tests/Composer/Test/ComposerTest.php +++ b/tests/Composer/Test/ComposerTest.php @@ -13,7 +13,7 @@ namespace Composer\Test; use Composer\Composer; -use Composer\TestCase; +use Composer\Test\TestCase; class ComposerTest extends TestCase { diff --git a/tests/Composer/Test/Config/JsonConfigSourceTest.php b/tests/Composer/Test/Config/JsonConfigSourceTest.php index e558932c2..8c5d641de 100644 --- a/tests/Composer/Test/Config/JsonConfigSourceTest.php +++ b/tests/Composer/Test/Config/JsonConfigSourceTest.php @@ -10,11 +10,11 @@ * file that was distributed with this source code. */ -namespace Composer\Test\Json; +namespace Composer\Test\Config; use Composer\Config\JsonConfigSource; use Composer\Json\JsonFile; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class JsonConfigSourceTest extends TestCase diff --git a/tests/Composer/Test/ConfigTest.php b/tests/Composer/Test/ConfigTest.php index f84d5d35f..57c368988 100644 --- a/tests/Composer/Test/ConfigTest.php +++ b/tests/Composer/Test/ConfigTest.php @@ -13,7 +13,7 @@ namespace Composer\Test; use Composer\Config; -use PHPUnit\Framework\TestCase; +use Composer\Test\TestCase; class ConfigTest extends TestCase { diff --git a/tests/Composer/Test/DefaultConfigTest.php b/tests/Composer/Test/DefaultConfigTest.php index 23de8741f..04298e5a1 100644 --- a/tests/Composer/Test/DefaultConfigTest.php +++ b/tests/Composer/Test/DefaultConfigTest.php @@ -13,7 +13,7 @@ namespace Composer\Test; use Composer\Config; -use PHPUnit\Framework\TestCase; +use Composer\Test\TestCase; class DefaultConfigTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php b/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php index a73139d54..2611d772f 100644 --- a/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php +++ b/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php @@ -19,7 +19,7 @@ use Composer\DependencyResolver\Pool; use Composer\Package\Link; use Composer\Package\AliasPackage; use Composer\Semver\Constraint\Constraint; -use Composer\TestCase; +use Composer\Test\TestCase; class DefaultPolicyTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/PoolTest.php b/tests/Composer/Test/DependencyResolver/PoolTest.php index 14b24fc9f..aa38fa31d 100644 --- a/tests/Composer/Test/DependencyResolver/PoolTest.php +++ b/tests/Composer/Test/DependencyResolver/PoolTest.php @@ -15,7 +15,7 @@ namespace Composer\Test\DependencyResolver; use Composer\DependencyResolver\Pool; use Composer\Repository\ArrayRepository; use Composer\Package\BasePackage; -use Composer\TestCase; +use Composer\Test\TestCase; class PoolTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/RequestTest.php b/tests/Composer/Test/DependencyResolver/RequestTest.php index 08e0cae96..dfa411ed9 100644 --- a/tests/Composer/Test/DependencyResolver/RequestTest.php +++ b/tests/Composer/Test/DependencyResolver/RequestTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\DependencyResolver; use Composer\DependencyResolver\Request; use Composer\Repository\ArrayRepository; -use Composer\TestCase; +use Composer\Test\TestCase; class RequestTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/RuleSetTest.php b/tests/Composer/Test/DependencyResolver/RuleSetTest.php index cecae613d..bd6efbc1b 100644 --- a/tests/Composer/Test/DependencyResolver/RuleSetTest.php +++ b/tests/Composer/Test/DependencyResolver/RuleSetTest.php @@ -17,7 +17,7 @@ use Composer\DependencyResolver\Rule; use Composer\DependencyResolver\RuleSet; use Composer\DependencyResolver\Pool; use Composer\Repository\ArrayRepository; -use Composer\TestCase; +use Composer\Test\TestCase; class RuleSetTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/RuleTest.php b/tests/Composer/Test/DependencyResolver/RuleTest.php index a0339f27a..19f5fddea 100644 --- a/tests/Composer/Test/DependencyResolver/RuleTest.php +++ b/tests/Composer/Test/DependencyResolver/RuleTest.php @@ -17,7 +17,7 @@ use Composer\DependencyResolver\Rule; use Composer\DependencyResolver\RuleSet; use Composer\DependencyResolver\Pool; use Composer\Repository\ArrayRepository; -use Composer\TestCase; +use Composer\Test\TestCase; class RuleTest extends TestCase { diff --git a/tests/Composer/Test/DependencyResolver/SolverTest.php b/tests/Composer/Test/DependencyResolver/SolverTest.php index 28c439b9e..24147e6ad 100644 --- a/tests/Composer/Test/DependencyResolver/SolverTest.php +++ b/tests/Composer/Test/DependencyResolver/SolverTest.php @@ -20,7 +20,7 @@ use Composer\DependencyResolver\Request; use Composer\DependencyResolver\Solver; use Composer\DependencyResolver\SolverProblemsException; use Composer\Package\Link; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Semver\Constraint\MultiConstraint; class SolverTest extends TestCase @@ -30,6 +30,7 @@ class SolverTest extends TestCase protected $repoInstalled; protected $request; protected $policy; + protected $solver; public function setUp() { @@ -37,7 +38,7 @@ class SolverTest extends TestCase $this->repo = new ArrayRepository; $this->repoInstalled = new ArrayRepository; - $this->request = new Request($this->pool); + $this->request = new Request(); $this->policy = new DefaultPolicy; $this->solver = new Solver($this->policy, $this->pool, $this->repoInstalled, new NullIO()); } diff --git a/tests/Composer/Test/Downloader/FileDownloaderTest.php b/tests/Composer/Test/Downloader/FileDownloaderTest.php index d4f6b7ad7..476b9a8f7 100644 --- a/tests/Composer/Test/Downloader/FileDownloaderTest.php +++ b/tests/Composer/Test/Downloader/FileDownloaderTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\FileDownloader; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class FileDownloaderTest extends TestCase diff --git a/tests/Composer/Test/Downloader/FossilDownloaderTest.php b/tests/Composer/Test/Downloader/FossilDownloaderTest.php index ca941fe20..623f7dec2 100644 --- a/tests/Composer/Test/Downloader/FossilDownloaderTest.php +++ b/tests/Composer/Test/Downloader/FossilDownloaderTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\FossilDownloader; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; diff --git a/tests/Composer/Test/Downloader/GitDownloaderTest.php b/tests/Composer/Test/Downloader/GitDownloaderTest.php index ff1c5c201..c3cd31a4a 100644 --- a/tests/Composer/Test/Downloader/GitDownloaderTest.php +++ b/tests/Composer/Test/Downloader/GitDownloaderTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\GitDownloader; use Composer\Config; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; diff --git a/tests/Composer/Test/Downloader/HgDownloaderTest.php b/tests/Composer/Test/Downloader/HgDownloaderTest.php index 714388f2c..c71d463cb 100644 --- a/tests/Composer/Test/Downloader/HgDownloaderTest.php +++ b/tests/Composer/Test/Downloader/HgDownloaderTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\HgDownloader; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; diff --git a/tests/Composer/Test/Downloader/PearPackageExtractorTest.php b/tests/Composer/Test/Downloader/PearPackageExtractorTest.php index 92004d0f1..23334f303 100644 --- a/tests/Composer/Test/Downloader/PearPackageExtractorTest.php +++ b/tests/Composer/Test/Downloader/PearPackageExtractorTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\PearPackageExtractor; -use Composer\TestCase; +use Composer\Test\TestCase; class PearPackageExtractorTest extends TestCase { diff --git a/tests/Composer/Test/Downloader/PerforceDownloaderTest.php b/tests/Composer/Test/Downloader/PerforceDownloaderTest.php index 3fae0f7af..ebb1f0456 100644 --- a/tests/Composer/Test/Downloader/PerforceDownloaderTest.php +++ b/tests/Composer/Test/Downloader/PerforceDownloaderTest.php @@ -16,7 +16,7 @@ use Composer\Downloader\PerforceDownloader; use Composer\Config; use Composer\Repository\VcsRepository; use Composer\IO\IOInterface; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; /** diff --git a/tests/Composer/Test/Downloader/XzDownloaderTest.php b/tests/Composer/Test/Downloader/XzDownloaderTest.php index fc33adcf4..6df782ddb 100644 --- a/tests/Composer/Test/Downloader/XzDownloaderTest.php +++ b/tests/Composer/Test/Downloader/XzDownloaderTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\XzDownloader; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; use Composer\Util\RemoteFilesystem; diff --git a/tests/Composer/Test/Downloader/ZipDownloaderTest.php b/tests/Composer/Test/Downloader/ZipDownloaderTest.php index 3d4ebac7b..466fd35c7 100644 --- a/tests/Composer/Test/Downloader/ZipDownloaderTest.php +++ b/tests/Composer/Test/Downloader/ZipDownloaderTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Downloader; use Composer\Downloader\ZipDownloader; use Composer\Package\PackageInterface; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class ZipDownloaderTest extends TestCase @@ -24,6 +24,8 @@ class ZipDownloaderTest extends TestCase */ private $testDir; private $prophet; + private $io; + private $config; public function setUp() { @@ -46,9 +48,9 @@ class ZipDownloaderTest extends TestCase $reflectedProperty = $reflectionClass->getProperty($name); $reflectedProperty->setAccessible(true); if ($obj === null) { - $reflectedProperty = $reflectedProperty->setValue($value); + $reflectedProperty->setValue($value); } else { - $reflectedProperty = $reflectedProperty->setValue($obj, $value); + $reflectedProperty->setValue($obj, $value); } } diff --git a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php index 7f0327d9c..689462bbd 100644 --- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php +++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php @@ -17,7 +17,7 @@ use Composer\EventDispatcher\EventDispatcher; use Composer\Installer\InstallerEvents; use Composer\Config; use Composer\Composer; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\IO\BufferIO; use Composer\Script\ScriptEvents; use Composer\Script\CommandEvent; diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php index 57809769c..ef5096300 100644 --- a/tests/Composer/Test/IO/ConsoleIOTest.php +++ b/tests/Composer/Test/IO/ConsoleIOTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\IO; use Composer\IO\ConsoleIO; -use Composer\TestCase; +use Composer\Test\TestCase; use Symfony\Component\Console\Output\OutputInterface; class ConsoleIOTest extends TestCase diff --git a/tests/Composer/Test/IO/NullIOTest.php b/tests/Composer/Test/IO/NullIOTest.php index 6902f08bd..d37fb2a4f 100644 --- a/tests/Composer/Test/IO/NullIOTest.php +++ b/tests/Composer/Test/IO/NullIOTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\IO; use Composer\IO\NullIO; -use Composer\TestCase; +use Composer\Test\TestCase; class NullIOTest extends TestCase { diff --git a/tests/Composer/Test/Installer/LibraryInstallerTest.php b/tests/Composer/Test/Installer/LibraryInstallerTest.php index 41581f712..772bb05c8 100644 --- a/tests/Composer/Test/Installer/LibraryInstallerTest.php +++ b/tests/Composer/Test/Installer/LibraryInstallerTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Installer; use Composer\Installer\LibraryInstaller; use Composer\Util\Filesystem; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Composer; use Composer\Config; diff --git a/tests/Composer/Test/InstallerTest.php b/tests/Composer/Test/InstallerTest.php index 8614495ee..c3b957afb 100644 --- a/tests/Composer/Test/InstallerTest.php +++ b/tests/Composer/Test/InstallerTest.php @@ -29,7 +29,7 @@ use Symfony\Component\Console\Input\StringInput; use Symfony\Component\Console\Output\StreamOutput; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Formatter\OutputFormatter; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\IO\BufferIO; class InstallerTest extends TestCase diff --git a/tests/Composer/Test/Mock/FactoryMock.php b/tests/Composer/Test/Mock/FactoryMock.php index a6f88b9cb..47683afcd 100644 --- a/tests/Composer/Test/Mock/FactoryMock.php +++ b/tests/Composer/Test/Mock/FactoryMock.php @@ -19,7 +19,7 @@ use Composer\Repository\RepositoryManager; use Composer\Repository\WritableRepositoryInterface; use Composer\Installer; use Composer\IO\IOInterface; -use Composer\TestCase; +use Composer\Test\TestCase; class FactoryMock extends Factory { diff --git a/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php b/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php index 5856efbf5..f6afe10f1 100644 --- a/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php +++ b/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Package\Archiver; use Composer\Package\Archiver\ArchivableFilesFinder; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Symfony\Component\Process\Process; diff --git a/tests/Composer/Test/Package/Archiver/ArchiverTest.php b/tests/Composer/Test/Package/Archiver/ArchiverTest.php index 1d08e8873..8926d760b 100644 --- a/tests/Composer/Test/Package/Archiver/ArchiverTest.php +++ b/tests/Composer/Test/Package/Archiver/ArchiverTest.php @@ -12,7 +12,7 @@ namespace Composer\Test\Package\Archiver; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\ProcessExecutor; use Composer\Package\Package; diff --git a/tests/Composer/Test/Package/CompletePackageTest.php b/tests/Composer/Test/Package/CompletePackageTest.php index aa3127071..fe1a783e8 100644 --- a/tests/Composer/Test/Package/CompletePackageTest.php +++ b/tests/Composer/Test/Package/CompletePackageTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Package; use Composer\Package\Package; use Composer\Semver\VersionParser; -use Composer\TestCase; +use Composer\Test\TestCase; class CompletePackageTest extends TestCase { diff --git a/tests/Composer/Test/Package/RootAliasPackageTest.php b/tests/Composer/Test/Package/RootAliasPackageTest.php index 8124ca865..a5fe9172d 100644 --- a/tests/Composer/Test/Package/RootAliasPackageTest.php +++ b/tests/Composer/Test/Package/RootAliasPackageTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Package; use Composer\Package\Link; use Composer\Package\RootAliasPackage; -use Composer\TestCase; +use Composer\Test\TestCase; use Prophecy\Argument; class RootAliasPackageTest extends TestCase diff --git a/tests/Composer/Test/Plugin/PluginInstallerTest.php b/tests/Composer/Test/Plugin/PluginInstallerTest.php index 26fc63efa..aa1f9ddbb 100644 --- a/tests/Composer/Test/Plugin/PluginInstallerTest.php +++ b/tests/Composer/Test/Plugin/PluginInstallerTest.php @@ -10,7 +10,7 @@ * file that was distributed with this source code. */ -namespace Composer\Test\Installer; +namespace Composer\Test\Plugin; use Composer\Composer; use Composer\Config; @@ -20,7 +20,7 @@ use Composer\Package\Loader\JsonLoader; use Composer\Package\Loader\ArrayLoader; use Composer\Plugin\PluginManager; use Composer\Autoload\AutoloadGenerator; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class PluginInstallerTest extends TestCase diff --git a/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php b/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php index a69d1aeef..1f0dad72b 100644 --- a/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php +++ b/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php @@ -10,7 +10,7 @@ * file that was distributed with this source code. */ -namespace Composer\Question\Test; +namespace Composer\Test\Question; use Composer\Question\StrictConfirmationQuestion; use PHPUnit\Framework\TestCase; diff --git a/tests/Composer/Test/Repository/ArrayRepositoryTest.php b/tests/Composer/Test/Repository/ArrayRepositoryTest.php index bd19b979c..1c7972c96 100644 --- a/tests/Composer/Test/Repository/ArrayRepositoryTest.php +++ b/tests/Composer/Test/Repository/ArrayRepositoryTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository; use Composer\Repository\ArrayRepository; use Composer\Repository\RepositoryInterface; -use Composer\TestCase; +use Composer\Test\TestCase; class ArrayRepositoryTest extends TestCase { diff --git a/tests/Composer/Test/Repository/ArtifactRepositoryTest.php b/tests/Composer/Test/Repository/ArtifactRepositoryTest.php index d919d180b..506a033c4 100644 --- a/tests/Composer/Test/Repository/ArtifactRepositoryTest.php +++ b/tests/Composer/Test/Repository/ArtifactRepositoryTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository; use Composer\Repository\ArtifactRepository; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\IO\NullIO; use Composer\Config; use Composer\Package\BasePackage; @@ -42,7 +42,7 @@ class ArtifactRepositoryTest extends TestCase ); $coordinates = array('type' => 'artifact', 'url' => __DIR__ . '/Fixtures/artifacts'); - $repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); + $repo = new ArtifactRepository($coordinates, new NullIO()); $foundPackages = array_map(function (BasePackage $package) { return "{$package->getPrettyName()}-{$package->getPrettyVersion()}"; @@ -58,7 +58,7 @@ class ArtifactRepositoryTest extends TestCase { $absolutePath = __DIR__ . '/Fixtures/artifacts'; $coordinates = array('type' => 'artifact', 'url' => $absolutePath); - $repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); + $repo = new ArtifactRepository($coordinates, new NullIO()); foreach ($repo->getPackages() as $package) { $this->assertSame(strpos($package->getDistUrl(), strtr($absolutePath, '\\', '/')), 0); @@ -69,7 +69,7 @@ class ArtifactRepositoryTest extends TestCase { $relativePath = 'tests/Composer/Test/Repository/Fixtures/artifacts'; $coordinates = array('type' => 'artifact', 'url' => $relativePath); - $repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); + $repo = new ArtifactRepository($coordinates, new NullIO()); foreach ($repo->getPackages() as $package) { $this->assertSame(strpos($package->getDistUrl(), $relativePath), 0); diff --git a/tests/Composer/Test/Repository/ComposerRepositoryTest.php b/tests/Composer/Test/Repository/ComposerRepositoryTest.php index 38b459730..3e29e8023 100644 --- a/tests/Composer/Test/Repository/ComposerRepositoryTest.php +++ b/tests/Composer/Test/Repository/ComposerRepositoryTest.php @@ -16,7 +16,7 @@ use Composer\IO\NullIO; use Composer\Repository\ComposerRepository; use Composer\Repository\RepositoryInterface; use Composer\Test\Mock\FactoryMock; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Package\Loader\ArrayLoader; use Composer\Semver\VersionParser; diff --git a/tests/Composer/Test/Repository/CompositeRepositoryTest.php b/tests/Composer/Test/Repository/CompositeRepositoryTest.php index d9f8b70e3..978587133 100644 --- a/tests/Composer/Test/Repository/CompositeRepositoryTest.php +++ b/tests/Composer/Test/Repository/CompositeRepositoryTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository; use Composer\Repository\CompositeRepository; use Composer\Repository\ArrayRepository; -use Composer\TestCase; +use Composer\Test\TestCase; class CompositeRepositoryTest extends TestCase { diff --git a/tests/Composer/Test/Repository/FilesystemRepositoryTest.php b/tests/Composer/Test/Repository/FilesystemRepositoryTest.php index 841a54d7b..be8b0d0a9 100644 --- a/tests/Composer/Test/Repository/FilesystemRepositoryTest.php +++ b/tests/Composer/Test/Repository/FilesystemRepositoryTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository; use Composer\Repository\FilesystemRepository; -use Composer\TestCase; +use Composer\Test\TestCase; class FilesystemRepositoryTest extends TestCase { diff --git a/tests/Composer/Test/Repository/PathRepositoryTest.php b/tests/Composer/Test/Repository/PathRepositoryTest.php index 7f1532a00..a9594257c 100644 --- a/tests/Composer/Test/Repository/PathRepositoryTest.php +++ b/tests/Composer/Test/Repository/PathRepositoryTest.php @@ -15,7 +15,7 @@ namespace Composer\Test\Repository; use Composer\Package\Loader\ArrayLoader; use Composer\Repository\PathRepository; use Composer\Semver\VersionParser; -use Composer\TestCase; +use Composer\Test\TestCase; class PathRepositoryTest extends TestCase { @@ -25,11 +25,10 @@ class PathRepositoryTest extends TestCase ->getMock(); $config = new \Composer\Config(); - $loader = new ArrayLoader(new VersionParser()); $versionGuesser = null; $repositoryUrl = implode(DIRECTORY_SEPARATOR, array(__DIR__, 'Fixtures', 'path', 'with-version')); - $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config, $loader); + $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config); $repository->getPackages(); $this->assertEquals(1, $repository->count()); @@ -42,11 +41,10 @@ class PathRepositoryTest extends TestCase ->getMock(); $config = new \Composer\Config(); - $loader = new ArrayLoader(new VersionParser()); $versionGuesser = null; $repositoryUrl = implode(DIRECTORY_SEPARATOR, array(__DIR__, 'Fixtures', 'path', 'without-version')); - $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config, $loader); + $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config); $packages = $repository->getPackages(); $this->assertEquals(1, $repository->count()); @@ -64,11 +62,10 @@ class PathRepositoryTest extends TestCase ->getMock(); $config = new \Composer\Config(); - $loader = new ArrayLoader(new VersionParser()); $versionGuesser = null; $repositoryUrl = implode(DIRECTORY_SEPARATOR, array(__DIR__, 'Fixtures', 'path', '*')); - $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config, $loader); + $repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config); $packages = $repository->getPackages(); $names = array(); @@ -93,7 +90,6 @@ class PathRepositoryTest extends TestCase ->getMock(); $config = new \Composer\Config(); - $loader = new ArrayLoader(new VersionParser()); $versionGuesser = null; // realpath() does not fully expand the paths @@ -103,7 +99,7 @@ class PathRepositoryTest extends TestCase // PHP Bug https://bugs.php.net/bug.php?id=73797 $relativeUrl = ltrim(substr($repositoryUrl, strlen(realpath(realpath(getcwd())))), DIRECTORY_SEPARATOR); - $repository = new PathRepository(array('url' => $relativeUrl), $ioInterface, $config, $loader); + $repository = new PathRepository(array('url' => $relativeUrl), $ioInterface, $config); $packages = $repository->getPackages(); $this->assertEquals(1, $repository->count()); diff --git a/tests/Composer/Test/Repository/Pear/ChannelReaderTest.php b/tests/Composer/Test/Repository/Pear/ChannelReaderTest.php index 27b7af2a3..e766065a7 100644 --- a/tests/Composer/Test/Repository/Pear/ChannelReaderTest.php +++ b/tests/Composer/Test/Repository/Pear/ChannelReaderTest.php @@ -17,7 +17,7 @@ use Composer\Repository\Pear\DependencyConstraint; use Composer\Repository\Pear\DependencyInfo; use Composer\Repository\Pear\PackageInfo; use Composer\Repository\Pear\ReleaseInfo; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Semver\VersionParser; use Composer\Semver\Constraint\Constraint; use Composer\Package\Link; diff --git a/tests/Composer/Test/Repository/Pear/ChannelRest10ReaderTest.php b/tests/Composer/Test/Repository/Pear/ChannelRest10ReaderTest.php index 263a80420..4aa7bbba2 100644 --- a/tests/Composer/Test/Repository/Pear/ChannelRest10ReaderTest.php +++ b/tests/Composer/Test/Repository/Pear/ChannelRest10ReaderTest.php @@ -12,7 +12,7 @@ namespace Composer\Test\Repository\Pear; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Test\Mock\RemoteFilesystemMock; class ChannelRest10ReaderTest extends TestCase @@ -31,7 +31,7 @@ class ChannelRest10ReaderTest extends TestCase $reader = new \Composer\Repository\Pear\ChannelRest10Reader($rfs); - /** @var $packages \Composer\Package\PackageInterface[] */ + /** @var \Composer\Package\PackageInterface[] $packages */ $packages = $reader->read('http://test.loc/rest10'); $this->assertCount(2, $packages); diff --git a/tests/Composer/Test/Repository/Pear/ChannelRest11ReaderTest.php b/tests/Composer/Test/Repository/Pear/ChannelRest11ReaderTest.php index 562e000c8..04e48426e 100644 --- a/tests/Composer/Test/Repository/Pear/ChannelRest11ReaderTest.php +++ b/tests/Composer/Test/Repository/Pear/ChannelRest11ReaderTest.php @@ -12,7 +12,7 @@ namespace Composer\Test\Repository\Pear; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Test\Mock\RemoteFilesystemMock; class ChannelRest11ReaderTest extends TestCase @@ -27,7 +27,7 @@ class ChannelRest11ReaderTest extends TestCase $reader = new \Composer\Repository\Pear\ChannelRest11Reader($rfs); - /** @var $packages \Composer\Package\PackageInterface[] */ + /** @var \Composer\Package\PackageInterface[] $packages */ $packages = $reader->read('http://test.loc/rest11'); $this->assertCount(3, $packages); diff --git a/tests/Composer/Test/Repository/Pear/PackageDependencyParserTest.php b/tests/Composer/Test/Repository/Pear/PackageDependencyParserTest.php index dd566055a..0ca9259d9 100644 --- a/tests/Composer/Test/Repository/Pear/PackageDependencyParserTest.php +++ b/tests/Composer/Test/Repository/Pear/PackageDependencyParserTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Pear; use Composer\Repository\Pear\DependencyConstraint; use Composer\Repository\Pear\PackageDependencyParser; -use Composer\TestCase; +use Composer\Test\TestCase; class PackageDependencyParserTest extends TestCase { diff --git a/tests/Composer/Test/Repository/PearRepositoryTest.php b/tests/Composer/Test/Repository/PearRepositoryTest.php index c484820b6..b1a3c0b5e 100644 --- a/tests/Composer/Test/Repository/PearRepositoryTest.php +++ b/tests/Composer/Test/Repository/PearRepositoryTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository; use Composer\Repository\PearRepository; -use Composer\TestCase; +use Composer\Test\TestCase; /** * @group legacy diff --git a/tests/Composer/Test/Repository/RepositoryFactoryTest.php b/tests/Composer/Test/Repository/RepositoryFactoryTest.php index e6d811fe9..e54624415 100644 --- a/tests/Composer/Test/Repository/RepositoryFactoryTest.php +++ b/tests/Composer/Test/Repository/RepositoryFactoryTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository; use Composer\Repository\RepositoryFactory; -use Composer\TestCase; +use Composer\Test\TestCase; class RepositoryFactoryTest extends TestCase { diff --git a/tests/Composer/Test/Repository/RepositoryManagerTest.php b/tests/Composer/Test/Repository/RepositoryManagerTest.php index a5739f32d..3774dd268 100644 --- a/tests/Composer/Test/Repository/RepositoryManagerTest.php +++ b/tests/Composer/Test/Repository/RepositoryManagerTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository; use Composer\Repository\RepositoryManager; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; class RepositoryManagerTest extends TestCase diff --git a/tests/Composer/Test/Repository/Vcs/FossilDriverTest.php b/tests/Composer/Test/Repository/Vcs/FossilDriverTest.php index f9e73b5eb..cbb4342e9 100644 --- a/tests/Composer/Test/Repository/Vcs/FossilDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/FossilDriverTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Repository\Vcs\FossilDriver; use Composer\Config; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; diff --git a/tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php index 7547855bf..8d711e8f0 100644 --- a/tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Config; use Composer\Repository\Vcs\GitBitbucketDriver; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; /** diff --git a/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php index 35e2f64c8..ba9c6d4f7 100644 --- a/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Downloader\TransportException; use Composer\Repository\Vcs\GitHubDriver; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Config; diff --git a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php index ced826672..a5eb799f2 100644 --- a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Repository\Vcs\GitLabDriver; use Composer\Config; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Prophecy\Argument; @@ -251,7 +251,7 @@ JSON; public function testGetSource_GivenPublicProject() { - $driver = $this->testInitializePublicProject('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject', true); + $driver = $this->testInitializePublicProject('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject'); $reference = 'c3ebdbf9cceddb82cd2089aaef8c7b992e536363'; $expected = array( diff --git a/tests/Composer/Test/Repository/Vcs/HgDriverTest.php b/tests/Composer/Test/Repository/Vcs/HgDriverTest.php index 441ce19c2..11143b476 100644 --- a/tests/Composer/Test/Repository/Vcs/HgDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/HgDriverTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Repository\Vcs\HgDriver; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Config; diff --git a/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php b/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php index 02a6e89e5..a5e5d4b4c 100644 --- a/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Repository\Vcs\PerforceDriver; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Config; use Composer\Util\Perforce; diff --git a/tests/Composer/Test/Repository/Vcs/SvnDriverTest.php b/tests/Composer/Test/Repository/Vcs/SvnDriverTest.php index 1106c9df4..029d20160 100644 --- a/tests/Composer/Test/Repository/Vcs/SvnDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/SvnDriverTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Repository\Vcs; use Composer\Repository\Vcs\SvnDriver; use Composer\Config; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\Util\Filesystem; use Composer\Util\Platform; diff --git a/tests/Composer/Test/Repository/VcsRepositoryTest.php b/tests/Composer/Test/Repository/VcsRepositoryTest.php index 61e29be37..0cab2f8bb 100644 --- a/tests/Composer/Test/Repository/VcsRepositoryTest.php +++ b/tests/Composer/Test/Repository/VcsRepositoryTest.php @@ -12,7 +12,7 @@ namespace Composer\Test\Repository; -use Composer\TestCase; +use Composer\Test\TestCase; use Symfony\Component\Process\ExecutableFinder; use Composer\Package\Dumper\ArrayDumper; use Composer\Repository\VcsRepository; diff --git a/tests/Composer/TestCase.php b/tests/Composer/Test/TestCase.php similarity index 99% rename from tests/Composer/TestCase.php rename to tests/Composer/Test/TestCase.php index 656bf061b..656a477e6 100644 --- a/tests/Composer/TestCase.php +++ b/tests/Composer/Test/TestCase.php @@ -10,7 +10,7 @@ * file that was distributed with this source code. */ -namespace Composer; +namespace Composer\Test; use Composer\Semver\VersionParser; use Composer\Package\AliasPackage; diff --git a/tests/Composer/Test/Util/ConfigValidatorTest.php b/tests/Composer/Test/Util/ConfigValidatorTest.php index 157eba92e..8b6ac5132 100644 --- a/tests/Composer/Test/Util/ConfigValidatorTest.php +++ b/tests/Composer/Test/Util/ConfigValidatorTest.php @@ -14,7 +14,7 @@ namespace Composer\Test\Util; use Composer\IO\NullIO; use Composer\Util\ConfigValidator; -use Composer\TestCase; +use Composer\Test\TestCase; /** * ConfigValidator test case diff --git a/tests/Composer/Test/Util/ErrorHandlerTest.php b/tests/Composer/Test/Util/ErrorHandlerTest.php index cb16a1e13..52de96af4 100644 --- a/tests/Composer/Test/Util/ErrorHandlerTest.php +++ b/tests/Composer/Test/Util/ErrorHandlerTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Util; use Composer\Util\ErrorHandler; -use Composer\TestCase; +use Composer\Test\TestCase; /** * ErrorHandler test case diff --git a/tests/Composer/Test/Util/FilesystemTest.php b/tests/Composer/Test/Util/FilesystemTest.php index ef3ab5bbe..9f684dbfb 100644 --- a/tests/Composer/Test/Util/FilesystemTest.php +++ b/tests/Composer/Test/Util/FilesystemTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Util; use Composer\Util\Filesystem; -use Composer\TestCase; +use Composer\Test\TestCase; class FilesystemTest extends TestCase { diff --git a/tests/Composer/Test/Util/ProcessExecutorTest.php b/tests/Composer/Test/Util/ProcessExecutorTest.php index 4a18c24e7..e98898417 100644 --- a/tests/Composer/Test/Util/ProcessExecutorTest.php +++ b/tests/Composer/Test/Util/ProcessExecutorTest.php @@ -13,7 +13,7 @@ namespace Composer\Test\Util; use Composer\Util\ProcessExecutor; -use Composer\TestCase; +use Composer\Test\TestCase; use Composer\IO\BufferIO; use Symfony\Component\Console\Output\StreamOutput; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 908861cf5..aaf431f0f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -17,4 +17,4 @@ if (function_exists('date_default_timezone_set') && function_exists('date_defaul } require __DIR__.'/../src/bootstrap.php'; -require __DIR__.'/Composer/TestCase.php'; +require __DIR__.'/Composer/Test/TestCase.php';