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

Added cacheCredentials config flag for saved SVN credentials to control the --no-auth-cache flag 

Example config:

{
    "http-basic": {
        "svn.example.com": {
            "username": "user",
            "password": "password",
            "cacheCredentials": false
        }
    }
}
pull/3272/head
Bastian Hofmann 2014-09-11 11:48:24 +02:00
parent d79f2b0fd3
commit b132e4eae0
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Util/Svn.php
View File

@ -295,6 +295,10 @@ class Svn
$this->credentials['username'] = $authConfig[$host]['username'];
$this->credentials['password'] = $authConfig[$host]['password'];
if (array_key_exists('cacheCredentials', $authConfig[$host])) {
$this->cacheCredentials = (bool) $authConfig[$host]['cacheCredentials'];
}
return $this->hasAuth = true;
}

42
tests/Composer/Test/Util/SvnTest.php
View File

@ -72,6 +72,48 @@ class SvnTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->getCmd(" --username 'foo' --password 'bar' "), $reflMethod->invoke($svn));
}
public function testCredentialsFromConfigWithCacheCredentialsTrue() {
$url = 'http://svn.apache.org';
$config = new Config();
$config->merge(
array(
'config' => array(
'http-basic' => array(
'svn.apache.org' => array('username' => 'foo', 'password' => 'bar', 'cacheCredentials' => true)
)
)
)
);
$svn = new Svn($url, new NullIO, $config);
$reflMethod = new \ReflectionMethod('Composer\\Util\\Svn', 'getCredentialString');
$reflMethod->setAccessible(true);
$this->assertEquals($this->getCmd(" --username 'foo' --password 'bar' "), $reflMethod->invoke($svn));
}
public function testCredentialsFromConfigWithCacheCredentialsFalse() {
$url = 'http://svn.apache.org';
$config = new Config();
$config->merge(
array(
'config' => array(
'http-basic' => array(
'svn.apache.org' => array('username' => 'foo', 'password' => 'bar', 'cacheCredentials' => false)
)
)
)
);
$svn = new Svn($url, new NullIO, $config);
$reflMethod = new \ReflectionMethod('Composer\\Util\\Svn', 'getCredentialString');
$reflMethod->setAccessible(true);
$this->assertEquals($this->getCmd(" --no-auth-cache --username 'foo' --password 'bar' "), $reflMethod->invoke($svn));
}
private function getCmd($cmd)
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {