Эх сурвалжийг харах

Fix issues introduced by #7191, fixes #7263

Jordi Boggiano 7 жил өмнө
parent
commit
0f373e3249

+ 6 - 6
src/Composer/Command/StatusCommand.php

@@ -101,7 +101,9 @@ EOT
                 if ($changes = $downloader->getLocalChanges($package, $targetDir)) {
                     $errors[$targetDir] = $changes;
                 }
-            } elseif ($downloader instanceof VcsCapableDownloaderInterface) {
+            }
+
+            if ($downloader instanceof VcsCapableDownloaderInterface) {
                 if ($currentRef = $downloader->getVcsReference($package, $targetDir)) {
                     switch ($package->getInstallationSource()) {
                         case 'source':
@@ -129,14 +131,12 @@ EOT
                         );
                     }
                 }
-            } elseif ($downloader instanceof DvcsDownloaderInterface) {
+            }
+
+            if ($downloader instanceof DvcsDownloaderInterface) {
                 if ($unpushed = $downloader->getUnpushedChanges($package, $targetDir)) {
                     $unpushedChanges[$targetDir] = $unpushed;
                 }
-            } elseif ($downloader instanceof DownloaderInterface) {
-                if ($changes = $downloader->getLocalChanges($package, $targetDir)) {
-                    $errors[$targetDir] = $changes;
-                }
             }
         }
 

+ 0 - 9
src/Composer/Downloader/DownloaderInterface.php

@@ -61,13 +61,4 @@ interface DownloaderInterface
      * @return DownloaderInterface
      */
     public function setOutputProgress($outputProgress);
-
-    /**
-     * Checks for changes to the local copy
-     *
-     * @param  PackageInterface $package package instance
-     * @param  string           $path    package directory
-     * @return string|null      changes or null
-     */
-    public function getLocalChanges(PackageInterface $package, $path);
 }

+ 1 - 1
src/Composer/Downloader/FileDownloader.php

@@ -35,7 +35,7 @@ use Composer\Util\Url as UrlUtil;
  * @author François Pluchino <francois.pluchino@opendisplay.com>
  * @author Nils Adermann <naderman@naderman.de>
  */
-class FileDownloader implements DownloaderInterface
+class FileDownloader implements DownloaderInterface, ChangeReportInterface
 {
     protected $io;
     protected $config;