* ArrayDumper doesn't extend BaseDumper anymore (hence no conflict o…

…n the interface) * move keys from BaseDumper back to ArrayDumper * interface now declares dump() to always return void
composer · Jun 26, 2012 · a1d287c · a1d287c
1 parent d244f87
commit a1d287c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/src/Composer/Package/Dumper/ArrayDumper.php b/src/Composer/Package/Dumper/ArrayDumper.php
@@ -12,17 +12,38 @@
 
 namespace Composer\Package\Dumper;
 
-use Composer\Package\Dumper\BaseDumper;
-use Composer\Package\Dumper\DumperInterface;
 use Composer\Package\BasePackage;
 use Composer\Package\PackageInterface;
 
 /**
  * @author Konstantin Kudryashiv <ever.zet@gmail.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
-class ArrayDumper extends BaseDumper
+class ArrayDumper
 {
+	/**
+     * @var array
+     */
+    protected static $keys = array(
+        'binaries' => 'bin',
+        'scripts',
+        'type',
+        'extra',
+        'installationSource' => 'installation-source',
+        'license',
+        'authors',
+        'description',
+        'homepage',
+        'keywords',
+        'autoload',
+        'repositories',
+        'includePaths' => 'include-path',
+        'support',
+    );
+
+	/**
+	 * @return array
+	 */
     public function dump(PackageInterface $package)
     {
         $data = array();

diff --git a/src/Composer/Package/Dumper/BaseDumper.php b/src/Composer/Package/Dumper/BaseDumper.php
@@ -30,26 +30,6 @@ abstract class BaseDumper implements DumperInterface
      */
     protected $format = '';
 
-    /**
-     * @var array
-     */
-    protected static $keys = array(
-        'binaries' => 'bin',
-        'scripts',
-        'type',
-        'extra',
-        'installationSource' => 'installation-source',
-        'license',
-        'authors',
-        'description',
-        'homepage',
-        'keywords',
-        'autoload',
-        'repositories',
-        'includePaths' => 'include-path',
-        'support',
-    );
-
     /**
      * Path to where to dump the export to.
      * @var mixed|null

diff --git a/src/Composer/Package/Dumper/DumperInterface.php b/src/Composer/Package/Dumper/DumperInterface.php
@@ -23,7 +23,7 @@ interface DumperInterface
      *
      * @param PackageInterface $package
      *
-     * @return mixed
+     * @return void
      */
     public function dump(PackageInterface $package);
 }