Moved archive Dumpers into its own Archiver package

src/Composer/Package/Archiver/ArchiverInterface.php

@@ -8,18 +8,18 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Composer\Package\Dumper;
+namespace Composer\Package\Archiver;
 
 use Composer\Package\PackageInterface;
 
 /**
  * @author Till Klampaeckel <till@php.net>
  */
-interface DumperInterface
+interface ArchiverInterface
 {
     /**
      * Return value depends on implementation - e.g. generating a tar or zip the
-     * method currently returns void, the ArrayDumper returns an array.
+     * method currently returns void, the ArrayArchiver returns an array.
      *
      * @param PackageInterface $package
      *

src/Composer/Package/Archiver/BaseArchiver.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Package\Dumper;
+namespace Composer\Package\Archiver;
 
 use Composer\Package\PackageInterface;
 use Composer\Util\ProcessExecutor;
@@ -22,7 +22,7 @@ use Composer\Factory;
 /**
  * @author Till Klampaeckel <till@php.net>
  */
-abstract class BaseDumper implements DumperInterface
+abstract class BaseArchiver implements ArchiverInterface
 {
     /**
      * Format: zip or tar.

src/Composer/Package/Archiver/TarArchiver.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Package\Dumper;
+namespace Composer\Package\Archiver;
 
-use Composer\Package\Dumper\BaseDumper;
-use Composer\Package\Dumper\DumperInterface;
+use Composer\Package\Archiver\BaseArchiver;
+use Composer\Package\Archiver\ArchiverInterface;
 use Composer\Package\PackageInterface;
 use Composer\Util\ProcessExecutor;
 
 /**
  * @author Ulf Härnhammar <ulfharn@gmail.com>
  */
-class TarDumper extends BaseDumper
+class TarArchiver extends BaseArchiver
 {
     protected $format = 'tar';
 

src/Composer/Package/Archiver/ZipArchiver.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Package\Dumper;
+namespace Composer\Package\Archiver;
 
-use Composer\Package\Dumper\BaseDumper;
-use Composer\Package\Dumper\DumperInterface;
+use Composer\Package\Archiver\BaseArchiver;
+use Composer\Package\Archiver\ArchiverInterface;
 use Composer\Package\PackageInterface;
 use Composer\Util\ProcessExecutor;
 
 /**
  * @author Till Klampaeckel <till@php.net>
  */
-class ZipDumper extends BaseDumper
+class ZipArchiver extends BaseArchiver
 {
     protected $format = 'zip';
 

tests/Composer/Test/Package/Archiver/ArchiverTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Test\Package\Dumper;
+namespace Composer\Test\Package\Archiver;
 
 use Composer\Package\MemoryPackage;
 use Composer\Util\Filesystem;
 use Composer\Util\ProcessExecutor;
 
-abstract class DumperTest extends \PHPUnit_Framework_TestCase
+abstract class ArchiverTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Composer\Util\Filesystem
@@ -36,7 +36,7 @@ abstract class DumperTest extends \PHPUnit_Framework_TestCase
     {
         $this->fs      = new Filesystem;
         $this->process = new ProcessExecutor;
-        $this->testdir = sys_get_temp_dir() . '/composer_dumpertest_git_repository' . mt_rand();
+        $this->testdir = sys_get_temp_dir() . '/composer_archivertest_git_repository' . mt_rand();
     }
 
     protected function getTestDir()
@@ -83,7 +83,7 @@ abstract class DumperTest extends \PHPUnit_Framework_TestCase
     protected function setupPackage()
     {
         $td = $this->getTestDir();
-        $package = new MemoryPackage('dumpertest/dumpertest', 'master', 'master');
+        $package = new MemoryPackage('archivertest/archivertest', 'master', 'master');
         $package->setSourceUrl("file://$td");
         $package->setSourceReference('master');
         $package->setSourceType('git');

tests/Composer/Test/Package/Archiver/TarArchiverTest.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Test\Package\Dumper;
+namespace Composer\Test\Package\Archiver;
 
-use Composer\Package\Dumper\TarDumper;
+use Composer\Package\Archiver\TarArchiver;
 
-class TarDumperTest extends DumperTest
+class TarArchiverTest extends ArchiverTest
 {
     public function testThis()
     {
@@ -22,7 +22,7 @@ class TarDumperTest extends DumperTest
         $name = $this->getPackageFileName($package);
 
         $temp = sys_get_temp_dir();
-        $tar = new TarDumper($temp);
+        $tar = new TarArchiver($temp);
         $tar->dump($package);
 
         $dist = sprintf('%s/%s.tar',
@@ -38,6 +38,6 @@ class TarDumperTest extends DumperTest
      */
     public function testException()
     {
-        new TarDumper("/totally-random-" . time());
+        new TarArchiver("/totally-random-" . time());
     }
 }

tests/Composer/Test/Package/Archiver/ZipArchiverTest.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\Test\Package\Dumper;
+namespace Composer\Test\Package\Archiver;
 
-use Composer\Package\Dumper\ZipDumper;
+use Composer\Package\Archiver\ZipArchiver;
 
-class ZipDumperTest extends DumperTest
+class ZipArchiverTest extends ArchiverTest
 {
     public function testThis()
     {
@@ -22,7 +22,7 @@ class ZipDumperTest extends DumperTest
         $name = $this->getPackageFileName($package);
 
         $temp = sys_get_temp_dir();
-        $zip = new ZipDumper($temp);
+        $zip = new ZipArchiver($temp);
         $zip->dump($package);
 
         $dist = sprintf('%s/%s.zip',
@@ -38,6 +38,6 @@ class ZipDumperTest extends DumperTest
      */
     public function testException()
     {
-        new ZipDumper("/totally-random-" . time());
+        new ZipArchiver("/totally-random-" . time());
     }
 }