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

Create ArchiveManager with the Factory

pull/1567/head
Matthieu Moquet 2012-08-28 23:55:26 +02:00 committed by Nils Adermann
parent d1d77dd13d
commit 60b1cc7d24
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Composer/Factory.php
View File

@ -15,6 +15,7 @@ namespace Composer;
use Composer\Config\JsonConfigSource; use Composer\Config\JsonConfigSource;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Package\Archiver;
use Composer\Repository\ComposerRepository; use Composer\Repository\ComposerRepository;
use Composer\Repository\RepositoryManager; use Composer\Repository\RepositoryManager;
use Composer\Util\ProcessExecutor; use Composer\Util\ProcessExecutor;
@ -317,6 +318,30 @@ class Factory
return $dm; return $dm;
} }
/**
* @param string $workDir Directory used to download sources
* @param Downloader\DownloadManager $dm Manager use to download sources
*
* @return Archiver\ArchiveManager
*/
public function createArchiveManager($workDir = null, DownloadManager $dm = null)
{
if (null === $dm) {
$dm = $this->createDownloadManager(new IO\NullIO());
}
if (null === $workDir) {
$workDir = sys_get_temp_dir();
}
$am = new Archiver\ArchiveManager($workDir, $dm);
$am->addArchiver(new Archiver\GitArchiver);
$am->addArchiver(new Archiver\MercurialArchiver);
$am->addArchiver(new Archiver\PharArchiver);
return $am;
}
/** /**
* @return Installer\InstallationManager * @return Installer\InstallationManager
*/ */

8
src/Composer/Package/Archiver/ArchiveManager.php
View File

@ -34,16 +34,10 @@ class ArchiveManager
* @param string $buildDir The directory used to build the archive * @param string $buildDir The directory used to build the archive
* @param DownloadManager $downloadManager A manager used to download package sources * @param DownloadManager $downloadManager A manager used to download package sources
*/ */
public function __construct($buildDir, DownloadManager $downloadManager = null) public function __construct($buildDir, DownloadManager $downloadManager)
{ {
$this->buildDir = $buildDir; $this->buildDir = $buildDir;
if (null !== $downloadManager) {
$this->downloadManager = $downloadManager; $this->downloadManager = $downloadManager;
} else {
$factory = new Factory();
$this->downloadManager = $factory->createDownloadManager(new NullIO());
}
} }
/** /**

10
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -12,6 +12,8 @@
namespace Composer\Test\Package\Archiver; namespace Composer\Test\Package\Archiver;
use Composer\Factory;
use Composer\IO\NullIO;
use Composer\Package\Archiver; use Composer\Package\Archiver;
use Composer\Package\Archiver\ArchiveManager; use Composer\Package\Archiver\ArchiveManager;
use Composer\Package\PackageInterface; use Composer\Package\PackageInterface;
@ -30,12 +32,10 @@ class ArchiveManagerTest extends ArchiverTest
{ {
parent::setUp(); parent::setUp();
$this->workDir = sys_get_temp_dir(); $factory = new Factory();
$this->manager = new ArchiveManager($this->workDir); $this->workDir = sys_get_temp_dir();
$this->manager->addArchiver(new Archiver\GitArchiver); $this->manager = $factory->createArchiveManager($this->workDir);
$this->manager->addArchiver(new Archiver\MercurialArchiver);
$this->manager->addArchiver(new Archiver\PharArchiver);
} }
public function testUnknownFormat() public function testUnknownFormat()