mirror of
https://github.com/composer/composer
synced 2025-05-09 08:32:56 +00:00
Merge pull request #4086 from legoktm/format-version
Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
This commit is contained in:
commit
2438105e11
11 changed files with 95 additions and 74 deletions
|
@ -12,6 +12,8 @@
|
|||
|
||||
namespace Composer\Test\Package;
|
||||
|
||||
use Composer\Package\BasePackage;
|
||||
|
||||
class BasePackageTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
public function testSetSameRepository()
|
||||
|
@ -37,4 +39,51 @@ class BasePackageTest extends \PHPUnit_Framework_TestCase
|
|||
$package->setRepository($this->getMock('Composer\Repository\RepositoryInterface'));
|
||||
$package->setRepository($this->getMock('Composer\Repository\RepositoryInterface'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider formattedVersions
|
||||
*/
|
||||
public function testFormatVersionForDevPackage(BasePackage $package, $truncate, $expected)
|
||||
{
|
||||
$this->assertSame($expected, $package->getFullPrettyVersion($truncate));
|
||||
}
|
||||
|
||||
public function formattedVersions()
|
||||
{
|
||||
$data = array(
|
||||
array(
|
||||
'sourceReference' => 'v2.1.0-RC2',
|
||||
'truncate' => true,
|
||||
'expected' => 'PrettyVersion v2.1.0-RC2'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'bbf527a27356414bfa9bf520f018c5cb7af67c77',
|
||||
'truncate' => true,
|
||||
'expected' => 'PrettyVersion bbf527a'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'v1.0.0',
|
||||
'truncate' => false,
|
||||
'expected' => 'PrettyVersion v1.0.0'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'bbf527a27356414bfa9bf520f018c5cb7af67c77',
|
||||
'truncate' => false,
|
||||
'expected' => 'PrettyVersion bbf527a27356414bfa9bf520f018c5cb7af67c77'
|
||||
),
|
||||
);
|
||||
|
||||
$self = $this;
|
||||
$createPackage = function ($arr) use ($self) {
|
||||
$package = $self->getMockForAbstractClass('\Composer\Package\BasePackage', array(), '', false);
|
||||
$package->expects($self->once())->method('isDev')->will($self->returnValue(true));
|
||||
$package->expects($self->once())->method('getSourceType')->will($self->returnValue('git'));
|
||||
$package->expects($self->once())->method('getPrettyVersion')->will($self->returnValue('PrettyVersion'));
|
||||
$package->expects($self->any())->method('getSourceReference')->will($self->returnValue($arr['sourceReference']));
|
||||
|
||||
return array($package, $arr['truncate'], $arr['expected']);
|
||||
};
|
||||
|
||||
return array_map($createPackage, $data);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,52 +21,6 @@ use Composer\Package\PackageInterface;
|
|||
|
||||
class VersionParserTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* @dataProvider formattedVersions
|
||||
*/
|
||||
public function testFormatVersionForDevPackage(PackageInterface $package, $truncate, $expected)
|
||||
{
|
||||
$this->assertSame($expected, VersionParser::formatVersion($package, $truncate));
|
||||
}
|
||||
|
||||
public function formattedVersions()
|
||||
{
|
||||
$data = array(
|
||||
array(
|
||||
'sourceReference' => 'v2.1.0-RC2',
|
||||
'truncate' => true,
|
||||
'expected' => 'PrettyVersion v2.1.0-RC2'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'bbf527a27356414bfa9bf520f018c5cb7af67c77',
|
||||
'truncate' => true,
|
||||
'expected' => 'PrettyVersion bbf527a'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'v1.0.0',
|
||||
'truncate' => false,
|
||||
'expected' => 'PrettyVersion v1.0.0'
|
||||
),
|
||||
array(
|
||||
'sourceReference' => 'bbf527a27356414bfa9bf520f018c5cb7af67c77',
|
||||
'truncate' => false,
|
||||
'expected' => 'PrettyVersion bbf527a27356414bfa9bf520f018c5cb7af67c77'
|
||||
),
|
||||
);
|
||||
|
||||
$self = $this;
|
||||
$createPackage = function ($arr) use ($self) {
|
||||
$package = $self->getMock('\Composer\Package\PackageInterface');
|
||||
$package->expects($self->once())->method('isDev')->will($self->returnValue(true));
|
||||
$package->expects($self->once())->method('getSourceType')->will($self->returnValue('git'));
|
||||
$package->expects($self->once())->method('getPrettyVersion')->will($self->returnValue('PrettyVersion'));
|
||||
$package->expects($self->any())->method('getSourceReference')->will($self->returnValue($arr['sourceReference']));
|
||||
|
||||
return array($package, $arr['truncate'], $arr['expected']);
|
||||
};
|
||||
|
||||
return array_map($createPackage, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider numericAliasVersions
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue