PR Review

- reverted comma removal
- made getReplacementPackage consistent
- removed abandoned flag if false

src/Composer/Package/CompletePackage.php

@@ -194,8 +194,6 @@ class CompletePackage extends Package implements CompletePackageInterface
      */
     public function getReplacementPackage()
     {
-        return $this->abandoned ?: null;
+        return is_string($this->abandoned)? $this->abandoned : null;
     }
-
-
 }

src/Composer/Package/Dumper/ArrayDumper.php

@@ -97,7 +97,7 @@ class ArrayDumper
                 'homepage',
                 'keywords',
                 'repositories',
-                'support'
+                'support',
             );
 
             $data = $this->dumpValues($package, $keys, $data);
@@ -106,7 +106,9 @@ class ArrayDumper
                 sort($data['keywords']);
             }
 
-            $data['abandoned'] = $package->getReplacementPackage() ?: false;
+            if ($package->isAbandoned()) {
+                $data['abandoned'] = $package->getReplacementPackage() ?: true;
+            }
         }
 
         if ($package instanceof RootPackageInterface) {

tests/Composer/Test/Fixtures/installer/install-dev-using-dist.test

@@ -38,8 +38,7 @@ install --prefer-dist
                 "reference": "459720ff3b74ee0c0d159277c6f2f5df89d8a4f6",
                 "shasum": null
             },
-            "type": "library",
+            "type": "library"
-            "abandoned": false
         }
     ],
     "packages-dev": [],

tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test

@@ -50,9 +50,9 @@ update c/uptodate
 --EXPECT-LOCK--
 {
     "packages": [
-        { "name": "a/old", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "a/old", "version": "1.0.0", "type": "library" },
-        { "name": "b/unstable", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "b/unstable", "version": "1.0.0", "type": "library" },
-        { "name": "c/uptodate", "version": "2.0.0", "type": "library", "abandoned": false }
+        { "name": "c/uptodate", "version": "2.0.0", "type": "library" }
     ],
     "packages-dev": [],
     "aliases": [],

tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test

@@ -50,9 +50,9 @@ update b/unstable
 --EXPECT-LOCK--
 {
     "packages": [
-        { "name": "a/old", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "a/old", "version": "1.0.0", "type": "library" },
-        { "name": "b/unstable", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "b/unstable", "version": "1.0.0", "type": "library" },
-        { "name": "c/uptodate", "version": "1.0.0", "type": "library", "abandoned": false }
+        { "name": "c/uptodate", "version": "1.0.0", "type": "library" }
     ],
     "packages-dev": [],
     "aliases": [],

tests/Composer/Test/Fixtures/installer/partial-update-without-lock.test

@@ -33,10 +33,10 @@ update b/unstable
 --EXPECT-LOCK--
 {
     "packages": [
-        { "name": "a/old", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "a/old", "version": "1.0.0", "type": "library" },
-        { "name": "b/unstable", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "b/unstable", "version": "1.0.0", "type": "library" },
-        { "name": "c/uptodate", "version": "1.0.0", "type": "library", "abandoned": false },
+        { "name": "c/uptodate", "version": "1.0.0", "type": "library" },
-        { "name": "d/removed", "version": "1.0.0", "type": "library", "abandoned": false }
+        { "name": "d/removed", "version": "1.0.0", "type": "library" }
     ],
     "packages-dev": [],
     "aliases": [],

tests/Composer/Test/Fixtures/installer/update-alias-lock.test

@@ -58,8 +58,7 @@ update
             "name": "a/a", "version": "dev-master",
             "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } },
             "source": { "reference": "master", "type": "git", "url": "" },
-            "type": "library",
+            "type": "library"
-            "abandoned": false
         }
     ],
     "packages-dev": [],

tests/Composer/Test/Fixtures/installer/updating-dev-updates-url-and-reference.test

@@ -51,8 +51,7 @@ update
             "name": "a/a", "version": "dev-master",
             "type": "library",
             "source": { "reference": "newref", "url": "newurl", "type": "git" },
-            "dist": { "reference": "newref", "url": "newurl", "type": "zip", "shasum": "" },
+            "dist": { "reference": "newref", "url": "newurl", "type": "zip", "shasum": "" }
-            "abandoned": false
         }
     ],
     "packages-dev": [],

tests/Composer/Test/Package/Dumper/ArrayDumperTest.php

@@ -45,8 +45,7 @@ class ArrayDumperTest extends \PHPUnit_Framework_TestCase
             array(
                 'name' => 'foo',
                 'version' => '1.0',
-                'version_normalized' => '1.0.0.0',
+                'version_normalized' => '1.0.0.0'
-                'abandoned' => false
             ),
             $config
         );
@@ -65,6 +64,7 @@ class ArrayDumperTest extends \PHPUnit_Framework_TestCase
 
     public function testDumpAbandoned()
     {
+        $this->packageExpects('isAbandoned', true);
         $this->packageExpects('getReplacementPackage', true);
 
         $config = $this->dumper->dump($this->package);
@@ -74,6 +74,7 @@ class ArrayDumperTest extends \PHPUnit_Framework_TestCase
 
     public function testDumpAbandonedReplacement()
     {
+        $this->packageExpects('isAbandoned', true);
         $this->packageExpects('getReplacementPackage', 'foo/bar');
 
         $config = $this->dumper->dump($this->package);