Merge remote-tracking branch 'Unister/master'

src/Composer/Command/ShowCommand.php

@@ -258,13 +258,19 @@ EOT
         }
 
         uasort($versions, 'version_compare');
-        $versions = implode(', ', array_keys(array_reverse($versions)));
+        $versions = array_keys(array_reverse($versions));
 
         // highlight installed version
         if ($installedRepo->hasPackage($package)) {
-            $versions = str_replace($package->getPrettyVersion(), '<info>* ' . $package->getPrettyVersion() . '</info>', $versions);
+            $installedVersion = $package->getPrettyVersion();
+            $key = array_search($installedVersion, $versions);
+            if (FALSE !== $key) {
+                $versions[$key] = '<info>* ' . $installedVersion . '</info>';
+            }
         }
 
+        $versions = implode(', ', $versions);
+
         $output->writeln('<info>versions</info> : ' . $versions);
     }