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

Merge remote-tracking branch 'webfactory/issue-2698' 

Conflicts:
	src/Composer/Repository/ArtifactRepository.php
pull/3137/head
Jordi Boggiano 2014-07-19 21:35:51 +02:00
parent 32a9eebcd6 beff1f5cc1
commit 7b4fcd93d3
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Repository/ArtifactRepository.php
View File

@ -139,7 +139,7 @@ class ArtifactRepository extends ArrayRepository
$package = JsonFile::parseJson($json, $composerFile); $package = JsonFile::parseJson($json, $composerFile);
$package['dist'] = array( $package['dist'] = array(
'type' => 'zip', 'type' => 'zip',
'url' => $file->getRealPath(), 'url' => $file->getPathname(),
'shasum' => sha1_file($file->getRealPath()) 'shasum' => sha1_file($file->getRealPath())
); );

24
tests/Composer/Test/Repository/ArtifactRepositoryTest.php
View File

@ -16,6 +16,7 @@ use Composer\TestCase;
use Composer\IO\NullIO; use Composer\IO\NullIO;
use Composer\Config; use Composer\Config;
use Composer\Package\BasePackage; use Composer\Package\BasePackage;
use Composer\Util\Filesystem;
class ArtifactRepositoryTest extends TestCase class ArtifactRepositoryTest extends TestCase
{ {
@ -44,6 +45,29 @@ class ArtifactRepositoryTest extends TestCase
$this->assertSame($expectedPackages, $foundPackages); $this->assertSame($expectedPackages, $foundPackages);
} }
public function testAbsoluteRepoUrlCreatesAbsoluteUrlPackages()
{
$absolutePath = __DIR__ . '/Fixtures/artifacts';
$coordinates = array('type' => 'artifact', 'url' => $absolutePath);
$repo = new ArtifactRepository($coordinates, new NullIO(), new Config());
foreach ($repo->getPackages() as $package) {
$this->assertTrue(strpos($package->getDistUrl(), $absolutePath) === 0);
}
}
public function testRelativeRepoUrlCreatesRelativeUrlPackages()
{
$relativePath = 'tests/Composer/Test/Repository/Fixtures/artifacts';
$coordinates = array('type' => 'artifact', 'url' => $relativePath);
$repo = new ArtifactRepository($coordinates, new NullIO(), new Config());
foreach ($repo->getPackages() as $package) {
$this->assertTrue(strpos($package->getDistUrl(), $relativePath) === 0);
}
}
} }
//Files jsonInFirstLevel.zip, jsonInRoot.zip and jsonInSecondLevel.zip were generated with: //Files jsonInFirstLevel.zip, jsonInRoot.zip and jsonInSecondLevel.zip were generated with: