mirror of
https://github.com/composer/composer
synced 2025-05-10 00:53:06 +00:00
Merge branch 'master' into 2.0
This commit is contained in:
commit
45ecbae8f5
64 changed files with 377 additions and 612 deletions
|
@ -13,7 +13,7 @@
|
|||
namespace Composer\Test\Package\Archiver;
|
||||
|
||||
use Composer\Package\Archiver\GitExcludeFilter;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class GitExcludeFilterTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
namespace Composer\Test\Package\Archiver;
|
||||
|
||||
use Composer\Package\Archiver\HgExcludeFilter;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class HgExcludeFilterTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -13,10 +13,13 @@
|
|||
namespace Composer\Test\Package;
|
||||
|
||||
use Composer\Package\BasePackage;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class BasePackageTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @doesNotPerformAssertions
|
||||
*/
|
||||
public function testSetSameRepository()
|
||||
{
|
||||
$package = $this->getMockForAbstractClass('Composer\Package\BasePackage', array('foo'));
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace Composer\Test\Package\Dumper;
|
|||
use Composer\Package\Dumper\ArrayDumper;
|
||||
use Composer\Package\Link;
|
||||
use Composer\Semver\Constraint\Constraint;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class ArrayDumperTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace Composer\Test\Package\Loader;
|
|||
|
||||
use Composer\Package\Loader\ArrayLoader;
|
||||
use Composer\Package\Dumper\ArrayDumper;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class ArrayLoaderTest extends TestCase
|
||||
{
|
||||
|
@ -83,7 +83,7 @@ class ArrayLoaderTest extends TestCase
|
|||
$this->assertEquals('1.2.3.4', $package->getVersion());
|
||||
}
|
||||
|
||||
public function testParseDumpProvider()
|
||||
public function parseDumpProvider()
|
||||
{
|
||||
$validConfig = array(
|
||||
'name' => 'A/B',
|
||||
|
@ -142,7 +142,7 @@ class ArrayLoaderTest extends TestCase
|
|||
* The default parser should default to loading the config as this
|
||||
* allows require-dev libraries to have transport options included.
|
||||
*
|
||||
* @dataProvider testParseDumpProvider
|
||||
* @dataProvider parseDumpProvider
|
||||
*/
|
||||
public function testParseDumpDefaultLoadConfig($config)
|
||||
{
|
||||
|
@ -153,7 +153,7 @@ class ArrayLoaderTest extends TestCase
|
|||
}
|
||||
|
||||
/**
|
||||
* @dataProvider testParseDumpProvider
|
||||
* @dataProvider parseDumpProvider
|
||||
*/
|
||||
public function testParseDumpTrueLoadConfig($config)
|
||||
{
|
||||
|
@ -165,7 +165,7 @@ class ArrayLoaderTest extends TestCase
|
|||
}
|
||||
|
||||
/**
|
||||
* @dataProvider testParseDumpProvider
|
||||
* @dataProvider parseDumpProvider
|
||||
*/
|
||||
public function testParseDumpFalseLoadConfig($config)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@ use Composer\Package\Loader\RootPackageLoader;
|
|||
use Composer\Package\BasePackage;
|
||||
use Composer\Package\Version\VersionGuesser;
|
||||
use Composer\Semver\VersionParser;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
use Prophecy\Argument;
|
||||
|
||||
class RootPackageLoaderTest extends TestCase
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace Composer\Test\Package\Loader;
|
|||
|
||||
use Composer\Package\Loader\ValidatingArrayLoader;
|
||||
use Composer\Package\Loader\InvalidPackageException;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class ValidatingArrayLoaderTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace Composer\Test\Package;
|
|||
|
||||
use Composer\Package\Locker;
|
||||
use Composer\IO\NullIO;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class LockerTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace Composer\Test\Package\Version;
|
|||
use Composer\Config;
|
||||
use Composer\Package\Version\VersionGuesser;
|
||||
use Composer\Semver\VersionParser;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class VersionGuesserTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
namespace Composer\Test\Package\Version;
|
||||
|
||||
use Composer\Package\Version\VersionParser;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class VersionParserTest extends TestCase
|
||||
{
|
||||
|
|
|
@ -16,7 +16,7 @@ use Composer\Package\Version\VersionSelector;
|
|||
use Composer\Package\Package;
|
||||
use Composer\Package\Link;
|
||||
use Composer\Semver\VersionParser;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Composer\Test\TestCase;
|
||||
|
||||
class VersionSelectorTest extends TestCase
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue