mirror of
https://github.com/composer/composer
synced 2025-05-09 00:22:53 +00:00
Merge branch 'master' into 2.0
This commit is contained in:
commit
4517c00d40
20 changed files with 196 additions and 64 deletions
|
@ -223,7 +223,7 @@ class FileDownloaderTest extends TestCase
|
|||
{
|
||||
$oldPackage = $this->getMock('Composer\Package\PackageInterface');
|
||||
$oldPackage->expects($this->once())
|
||||
->method('getPrettyVersion')
|
||||
->method('getFullPrettyVersion')
|
||||
->will($this->returnValue('1.2.0'));
|
||||
$oldPackage->expects($this->once())
|
||||
->method('getVersion')
|
||||
|
@ -231,7 +231,7 @@ class FileDownloaderTest extends TestCase
|
|||
|
||||
$newPackage = $this->getMock('Composer\Package\PackageInterface');
|
||||
$newPackage->expects($this->once())
|
||||
->method('getPrettyVersion')
|
||||
->method('getFullPrettyVersion')
|
||||
->will($this->returnValue('1.0.0'));
|
||||
$newPackage->expects($this->once())
|
||||
->method('getVersion')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue