1
0
Fork 0

Added BitbucketTest class. Added is_array and is_object check to http content before calling http_build_query.

pull/5055/head
Paul.Wenke 2016-03-13 21:33:13 -04:00
parent 9ddf8c4d55
commit b4d9d0fd0d
3 changed files with 139 additions and 1 deletions

View File

@ -18,6 +18,7 @@ use Composer\Config;
use Composer\Downloader\TransportException; use Composer\Downloader\TransportException;
/** /**
* I used GitHub.php as a template.
* @author Paul Wenke <wenke.paul@gmail.com> * @author Paul Wenke <wenke.paul@gmail.com>
*/ */
class Bitbucket class Bitbucket

View File

@ -129,7 +129,7 @@ final class StreamContextFactory
$options['http']['header'] = self::fixHttpHeaderField($options['http']['header']); $options['http']['header'] = self::fixHttpHeaderField($options['http']['header']);
} }
if (isset($options['http']['content'])) { if (isset($options['http']['content']) && (is_array($options['http']['content']) || is_object($options['http']['content']))) {
$options['http']['content'] = http_build_query($options['http']['content']); $options['http']['content'] = http_build_query($options['http']['content']);
} }

View File

@ -0,0 +1,137 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Util;
use Composer\Util\Bitbucket;
/**
* I used GitHubTest.php as a template.
* @author Paul Wenke <wenke.paul@gmail.com>
*/
class BitbucketTest extends \PHPUnit_Framework_TestCase
{
private $username = 'username';
private $password = 'password';
private $authcode = 'authcode';
private $message = 'mymessage';
private $origin = 'bitbucket.org';
private $token = 'bitbuckettoken';
public function testUsernamePasswordAuthenticationFlow()
{
$io = $this->getIOMock();
$io
->expects($this->at(0))
->method('writeError')
->with($this->message)
;
$io->expects($this->exactly(2))
->method('askAndHideAnswer')
->withConsecutive(
array('Consumer Key (hidden): '),
array('Consumer Secret (hidden): ')
)
->willReturnOnConsecutiveCalls($this->username, $this->password);
$rfs = $this->getRemoteFilesystemMock();
$rfs
->expects($this->once())
->method('getContents')
->with(
$this->equalTo($this->origin),
$this->equalTo(sprintf('https://%s/site/oauth2/access_token', $this->origin)),
$this->isFalse(),
$this->anything()
)
->willReturn(sprintf('{}', $this->token))
;
$config = $this->getConfigMock();
$config
->expects($this->exactly(2))
->method('getAuthConfigSource')
->willReturn($this->getAuthJsonMock())
;
$config
->expects($this->once())
->method('getConfigSource')
->willReturn($this->getConfJsonMock())
;
$bitbucket = new Bitbucket($io, $config, null, $rfs);
$this->assertTrue($bitbucket->authorizeOAuthInteractively($this->origin, $this->message));
}
private function getIOMock()
{
$io = $this
->getMockBuilder('Composer\IO\ConsoleIO')
->disableOriginalConstructor()
->getMock()
;
return $io;
}
private function getConfigMock()
{
$config = $this->getMock('Composer\Config');
return $config;
}
private function getRemoteFilesystemMock()
{
$rfs = $this
->getMockBuilder('Composer\Util\RemoteFilesystem')
->disableOriginalConstructor()
->getMock()
;
return $rfs;
}
private function getAuthJsonMock()
{
$authjson = $this
->getMockBuilder('Composer\Config\JsonConfigSource')
->disableOriginalConstructor()
->getMock()
;
$authjson
->expects($this->atLeastOnce())
->method('getName')
->willReturn('auth.json')
;
return $authjson;
}
private function getConfJsonMock()
{
$confjson = $this
->getMockBuilder('Composer\Config\JsonConfigSource')
->disableOriginalConstructor()
->getMock()
;
$confjson
->expects($this->atLeastOnce())
->method('removeConfigSetting')
->with('bitbucket-oauth.'.$this->origin)
;
return $confjson;
}
}