Merge branch '1.8'

src/Composer/Downloader/PathDownloader.php

@@ -180,24 +180,21 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
     }
 
     /**
-     * Returns true if junctions can be safely used on Windows
+     * Returns true if junctions can be created and safely used on Windows
      *
      * A PHP bug makes junction detection fragile, leading to possible data loss
      * when removing a package. See https://bugs.php.net/bug.php?id=77552
      *
      * For safety we require a minimum version of Windows 7, so we can call the
-     * system rmdir which can detect junctions and not delete target content.
+     * system rmdir which will preserve target content if given a junction.
+     *
+     * The PHP bug was fixed in 7.2.16 and 7.3.3 (requires at least Windows 7).
      *
      * @return bool
      */
     private function safeJunctions()
     {
-        // Bug fixed in 7.3.3 and 7.2.16
+        // We need to call mklink, and rmdir on Windows 7 (version 6.1)
-        if (PHP_VERSION_ID >= 70303 || (PHP_VERSION_ID >= 70216 && PHP_VERSION_ID < 70300)) {
-            return true;
-        }
-
-        // Windows 7 is version 6.1
         return function_exists('proc_open') &&
             (PHP_WINDOWS_VERSION_MAJOR > 6 ||
             (PHP_WINDOWS_VERSION_MAJOR === 6 && PHP_WINDOWS_VERSION_MINOR >= 1));

src/Composer/Repository/Vcs/BitbucketDriver.php

@@ -124,50 +124,52 @@ abstract class BitbucketDriver extends VcsDriver
 
             $composer = $this->getBaseComposerInformation($identifier);
 
-            // specials for bitbucket
+            if ($composer) {
-            if (!isset($composer['support']['source'])) {
+                // specials for bitbucket
-                $label = array_search(
+                if (!isset($composer['support']['source'])) {
-                    $identifier,
+                    $label = array_search(
-                    $this->getTags()
+                        $identifier,
-                ) ?: array_search(
+                        $this->getTags()
-                    $identifier,
+                    ) ?: array_search(
-                    $this->getBranches()
+                        $identifier,
-                ) ?: $identifier;
+                        $this->getBranches()
-
+                    ) ?: $identifier;
-                if (array_key_exists($label, $tags = $this->getTags())) {
+
-                    $hash = $tags[$label];
+                    if (array_key_exists($label, $tags = $this->getTags())) {
-                } elseif (array_key_exists($label, $branches = $this->getBranches())) {
+                        $hash = $tags[$label];
-                    $hash = $branches[$label];
+                    } elseif (array_key_exists($label, $branches = $this->getBranches())) {
-                }
+                        $hash = $branches[$label];
+                    }
 
-                if (! isset($hash)) {
+                    if (! isset($hash)) {
-                    $composer['support']['source'] = sprintf(
+                        $composer['support']['source'] = sprintf(
-                        'https://%s/%s/%s/src',
+                            'https://%s/%s/%s/src',
+                            $this->originUrl,
+                            $this->owner,
+                            $this->repository
+                        );
+                    } else {
+                        $composer['support']['source'] = sprintf(
+                            'https://%s/%s/%s/src/%s/?at=%s',
+                            $this->originUrl,
+                            $this->owner,
+                            $this->repository,
+                            $hash,
+                            $label
+                        );
+                    }
+                }
+                if (!isset($composer['support']['issues']) && $this->hasIssues) {
+                    $composer['support']['issues'] = sprintf(
+                        'https://%s/%s/%s/issues',
                         $this->originUrl,
                         $this->owner,
                         $this->repository
                     );
-                } else {
-                    $composer['support']['source'] = sprintf(
-                        'https://%s/%s/%s/src/%s/?at=%s',
-                        $this->originUrl,
-                        $this->owner,
-                        $this->repository,
-                        $hash,
-                        $label
-                    );
                 }
-            }
+                if (!isset($composer['homepage'])) {
-            if (!isset($composer['support']['issues']) && $this->hasIssues) {
+                    $composer['homepage'] = empty($this->website) ? $this->homeUrl : $this->website;
-                $composer['support']['issues'] = sprintf(
+                }
-                    'https://%s/%s/%s/issues',
-                    $this->originUrl,
-                    $this->owner,
-                    $this->repository
-                );
-            }
-            if (!isset($composer['homepage'])) {
-                $composer['homepage'] = empty($this->website) ? $this->homeUrl : $this->website;
             }
 
             $this->infoCache[$identifier] = $composer;

src/Composer/Repository/Vcs/GitHubDriver.php

@@ -152,8 +152,8 @@ class GitHubDriver extends VcsDriver
             }
 
             $composer = $this->getBaseComposerInformation($identifier);
-            if ($composer) {
 
+            if ($composer) {
                 // specials for github
                 if (!isset($composer['support']['source'])) {
                     $label = array_search($identifier, $this->getTags()) ?: array_search($identifier, $this->getBranches()) ?: $identifier;