mirror of
https://github.com/composer/composer
synced 2025-05-09 00:22:53 +00:00
Composer support string (#11386)
* GitHubDriver: fix support is set to string * GitLabDriver: fix support is set to string * BitbucketDriver: fix support is set to string * Fix PHPStan
This commit is contained in:
Stephan
GitHub
parent
5d2d513f97
commit
685a2e6be2
6 changed files with 116 additions and 39 deletions
|
|
@ -14,6 +14,8 @@ namespace Composer\Test\Repository\Vcs;
|
|||
|
||||
use Composer\Config;
|
||||
use Composer\Repository\Vcs\GitBitbucketDriver;
|
||||
use Composer\Repository\Vcs\GitHubDriver;
|
||||
use Composer\Test\Mock\HttpDownloaderMock;
|
||||
use Composer\Test\TestCase;
|
||||
use Composer\Util\Filesystem;
|
||||
use Composer\Util\ProcessExecutor;
|
||||
|
|
@ -28,7 +30,7 @@ class GitBitbucketDriverTest extends TestCase
|
|||
private $io;
|
||||
/** @var Config */
|
||||
private $config;
|
||||
/** @var \Composer\Util\HttpDownloader&\PHPUnit\Framework\MockObject\MockObject */
|
||||
/** @var HttpDownloaderMock */
|
||||
private $httpDownloader;
|
||||
/** @var string */
|
||||
private $home;
|
||||
|
|
@ -46,9 +48,7 @@ class GitBitbucketDriverTest extends TestCase
|
|||
],
|
||||
]);
|
||||
|
||||
$this->httpDownloader = $this->getMockBuilder('Composer\Util\HttpDownloader')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->httpDownloader = $this->getHttpDownloaderMock($this->io, $this->config);;
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
|
|
@ -83,15 +83,9 @@ class GitBitbucketDriverTest extends TestCase
|
|||
self::expectException('RuntimeException');
|
||||
self::expectExceptionMessage('https://bitbucket.org/user/repo.git does not appear to be a git repository, use https://bitbucket.org/user/repo but remember that Bitbucket no longer supports the mercurial repositories. https://bitbucket.org/blog/sunsetting-mercurial-support-in-bitbucket');
|
||||
|
||||
$this->httpDownloader->expects($this->once())
|
||||
->method('get')
|
||||
->with(
|
||||
$url = 'https://api.bitbucket.org/2.0/repositories/user/repo?fields=-project%2C-owner',
|
||||
[]
|
||||
)
|
||||
->willReturn(
|
||||
new Response(['url' => $url], 200, [], '{"scm":"hg","website":"","has_wiki":false,"name":"repo","links":{"branches":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/branches"},"tags":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/tags"},"clone":[{"href":"https:\/\/user@bitbucket.org\/user\/repo","name":"https"},{"href":"ssh:\/\/hg@bitbucket.org\/user\/repo","name":"ssh"}],"html":{"href":"https:\/\/bitbucket.org\/user\/repo"}},"language":"php","created_on":"2015-02-18T16:22:24.688+00:00","updated_on":"2016-05-17T13:20:21.993+00:00","is_private":true,"has_issues":false}')
|
||||
);
|
||||
$this->httpDownloader->expects([
|
||||
['url' => 'https://api.bitbucket.org/2.0/repositories/user/repo?fields=-project%2C-owner', 'body' => '{"scm":"hg","website":"","has_wiki":false,"name":"repo","links":{"branches":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/branches"},"tags":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/tags"},"clone":[{"href":"https:\/\/user@bitbucket.org\/user\/repo","name":"https"},{"href":"ssh:\/\/hg@bitbucket.org\/user\/repo","name":"ssh"}],"html":{"href":"https:\/\/bitbucket.org\/user\/repo"}},"language":"php","created_on":"2015-02-18T16:22:24.688+00:00","updated_on":"2016-05-17T13:20:21.993+00:00","is_private":true,"has_issues":false}']
|
||||
], true);
|
||||
|
||||
$driver = $this->getDriver(['url' => 'https://bitbucket.org/user/repo.git']);
|
||||
|
||||
|
|
@ -109,32 +103,13 @@ class GitBitbucketDriverTest extends TestCase
|
|||
'https://api.bitbucket.org/2.0/repositories/user/repo/src/main/composer.json',
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo/commit/main?fields=date',
|
||||
];
|
||||
$this->httpDownloader->expects($this->any())
|
||||
->method('get')
|
||||
->withConsecutive(
|
||||
[
|
||||
$urls[0], [],
|
||||
],
|
||||
[
|
||||
$urls[1], [],
|
||||
],
|
||||
[
|
||||
$urls[2], [],
|
||||
],
|
||||
[
|
||||
$urls[3], [],
|
||||
],
|
||||
[
|
||||
$urls[4], [],
|
||||
]
|
||||
)
|
||||
->willReturnOnConsecutiveCalls(
|
||||
new Response(['url' => $urls[0]], 200, [], '{"mainbranch": {"name": "main"}, "scm":"git","website":"","has_wiki":false,"name":"repo","links":{"branches":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/branches"},"tags":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/tags"},"clone":[{"href":"https:\/\/user@bitbucket.org\/user\/repo.git","name":"https"},{"href":"ssh:\/\/git@bitbucket.org\/user\/repo.git","name":"ssh"}],"html":{"href":"https:\/\/bitbucket.org\/user\/repo"}},"language":"php","created_on":"2015-02-18T16:22:24.688+00:00","updated_on":"2016-05-17T13:20:21.993+00:00","is_private":true,"has_issues":false}'),
|
||||
new Response(['url' => $urls[1]], 200, [], '{"values":[{"name":"1.0.1","target":{"hash":"9b78a3932143497c519e49b8241083838c8ff8a1"}},{"name":"1.0.0","target":{"hash":"d3393d514318a9267d2f8ebbf463a9aaa389f8eb"}}]}'),
|
||||
new Response(['url' => $urls[2]], 200, [], '{"values":[{"name":"main","target":{"hash":"937992d19d72b5116c3e8c4a04f960e5fa270b22"}}]}'),
|
||||
new Response(['url' => $urls[3]], 200, [], '{"name": "user/repo","description": "test repo","license": "GPL","authors": [{"name": "Name","email": "local@domain.tld"}],"require": {"creator/package": "^1.0"},"require-dev": {"phpunit/phpunit": "~4.8"}}'),
|
||||
new Response(['url' => $urls[4]], 200, [], '{"date": "2016-05-17T13:19:52+00:00"}')
|
||||
);
|
||||
$this->httpDownloader->expects([
|
||||
['url' => $urls[0], 'body' => '{"mainbranch": {"name": "main"}, "scm":"git","website":"","has_wiki":false,"name":"repo","links":{"branches":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/branches"},"tags":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/tags"},"clone":[{"href":"https:\/\/user@bitbucket.org\/user\/repo.git","name":"https"},{"href":"ssh:\/\/git@bitbucket.org\/user\/repo.git","name":"ssh"}],"html":{"href":"https:\/\/bitbucket.org\/user\/repo"}},"language":"php","created_on":"2015-02-18T16:22:24.688+00:00","updated_on":"2016-05-17T13:20:21.993+00:00","is_private":true,"has_issues":false}'],
|
||||
['url' => $urls[1], 'body' => '{"values":[{"name":"1.0.1","target":{"hash":"9b78a3932143497c519e49b8241083838c8ff8a1"}},{"name":"1.0.0","target":{"hash":"d3393d514318a9267d2f8ebbf463a9aaa389f8eb"}}]}'],
|
||||
['url' => $urls[2], 'body' => '{"values":[{"name":"main","target":{"hash":"937992d19d72b5116c3e8c4a04f960e5fa270b22"}}]}'],
|
||||
['url' => $urls[3], 'body' => '{"name": "user/repo","description": "test repo","license": "GPL","authors": [{"name": "Name","email": "local@domain.tld"}],"require": {"creator/package": "^1.0"},"require-dev": {"phpunit/phpunit": "~4.8"}}'],
|
||||
['url' => $urls[4], 'body' => '{"date": "2016-05-17T13:19:52+00:00"}'],
|
||||
], true);
|
||||
|
||||
$this->assertEquals(
|
||||
'main',
|
||||
|
|
@ -218,6 +193,34 @@ class GitBitbucketDriverTest extends TestCase
|
|||
$driver->initialize();
|
||||
}
|
||||
|
||||
public function testInvalidSupportData(): void
|
||||
{
|
||||
$repoUrl = 'https://bitbucket.org/user/repo.git';
|
||||
|
||||
$driver = $this->getDriver(['url' => $repoUrl]);
|
||||
|
||||
$urls = [
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo?fields=-project%2C-owner',
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo/src/main/composer.json',
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo/commit/main?fields=date',
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo/refs/tags?pagelen=100&fields=values.name%2Cvalues.target.hash%2Cnext&sort=-target.date',
|
||||
'https://api.bitbucket.org/2.0/repositories/user/repo/refs/branches?pagelen=100&fields=values.name%2Cvalues.target.hash%2Cvalues.heads%2Cnext&sort=-target.date',
|
||||
];
|
||||
$this->httpDownloader->expects([
|
||||
['url' => $urls[0], 'body' => '{"mainbranch": {"name": "main"}, "scm":"git","website":"","has_wiki":false,"name":"repo","links":{"branches":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/branches"},"tags":{"href":"https:\/\/api.bitbucket.org\/2.0\/repositories\/user\/repo\/refs\/tags"},"clone":[{"href":"https:\/\/user@bitbucket.org\/user\/repo.git","name":"https"},{"href":"ssh:\/\/git@bitbucket.org\/user\/repo.git","name":"ssh"}],"html":{"href":"https:\/\/bitbucket.org\/user\/repo"}},"language":"php","created_on":"2015-02-18T16:22:24.688+00:00","updated_on":"2016-05-17T13:20:21.993+00:00","is_private":true,"has_issues":false}'],
|
||||
['url' => $urls[1], 'body' => '{"support": "' . $repoUrl . '"}'],
|
||||
['url' => $urls[2], 'body' => '{"date": "2016-05-17T13:19:52+00:00"}'],
|
||||
['url' => $urls[3], 'body' => '{"values":[{"name":"1.0.1","target":{"hash":"9b78a3932143497c519e49b8241083838c8ff8a1"}},{"name":"1.0.0","target":{"hash":"d3393d514318a9267d2f8ebbf463a9aaa389f8eb"}}]}'],
|
||||
['url' => $urls[4], 'body' => '{"values":[{"name":"main","target":{"hash":"937992d19d72b5116c3e8c4a04f960e5fa270b22"}}]}'],
|
||||
], true);
|
||||
|
||||
$driver->getRootIdentifier();
|
||||
$data = $driver->getComposerInformation('main');
|
||||
|
||||
$this->assertIsArray($data);
|
||||
$this->assertSame('https://bitbucket.org/user/repo/src/937992d19d72b5116c3e8c4a04f960e5fa270b22/?at=main', $data['support']['source']);
|
||||
}
|
||||
|
||||
public function testSupports(): void
|
||||
{
|
||||
$this->assertTrue(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue