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

Improved argument order

pull/1177/head
Sander Marechal 2012-10-03 18:51:42 +02:00
parent 748c4764ba
commit 11b5b5944d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Composer/Test/Util/RemoteFilesystemTest.php
View File

@ -25,7 +25,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(false)) ->will($this->returnValue(false))
; ;
$res = $this->callGetOptionsForUrl($io, array(), array('http://example.org')); $res = $this->callGetOptionsForUrl($io, array('http://example.org'));
$this->assertTrue(isset($res['http']['header']) && false !== strpos($res['http']['header'], 'User-Agent'), 'getOptions must return an array with a header containing a User-Agent'); $this->assertTrue(isset($res['http']['header']) && false !== strpos($res['http']['header'], 'User-Agent'), 'getOptions must return an array with a header containing a User-Agent');
} }
@ -43,7 +43,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array('username' => 'login', 'password' => 'password'))) ->will($this->returnValue(array('username' => 'login', 'password' => 'password')))
; ;
$options = $this->callGetOptionsForUrl($io, array(), array('http://example.org')); $options = $this->callGetOptionsForUrl($io, array('http://example.org'));
$this->assertContains('Authorization: Basic', $options['http']['header']); $this->assertContains('Authorization: Basic', $options['http']['header']);
} }
@ -60,7 +60,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
'allow_self_signed' => true, 'allow_self_signed' => true,
)); ));
$res = $this->callGetOptionsForUrl($io, $streamOptions, array('https://example.org')); $res = $this->callGetOptionsForUrl($io, array('https://example.org'), $streamOptions);
$this->assertTrue(isset($res['ssl']) && isset($res['ssl']['allow_self_signed']) && true === $res['ssl']['allow_self_signed'], 'getOptions must return an array with a allow_self_signed set to true'); $this->assertTrue(isset($res['ssl']) && isset($res['ssl']['allow_self_signed']) && true === $res['ssl']['allow_self_signed'], 'getOptions must return an array with a allow_self_signed set to true');
} }
@ -119,7 +119,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
unlink($file); unlink($file);
} }
protected function callGetOptionsForUrl($io, array $options = array(), array $args = array()) protected function callGetOptionsForUrl($io, array $args = array(), array $options = array())
{ {
$fs = new RemoteFilesystem($io, $options); $fs = new RemoteFilesystem($io, $options);
$ref = new \ReflectionMethod($fs, 'getOptionsForUrl'); $ref = new \ReflectionMethod($fs, 'getOptionsForUrl');