feature #648 Support more than just "master" as the default branch (nicolas-grekas)

This PR was merged into the 1.8-dev branch.

Discussion
----------

Support more than just "master" as the default branch

Commits
-------

a9bf093 Support more than just "master" as the default branch

Author: nicolas-grekas

src/Command/RecipesCommand.php

@@ -137,6 +137,7 @@ private function displayPackageInformation(Recipe $recipe)
         $lockRef = $recipeLock['recipe']['ref'] ?? null;
         $lockRepo = $recipeLock['recipe']['repo'] ?? null;
         $lockFiles = $recipeLock['files'] ?? null;
+        $lockBranch = $recipeLock['recipe']['branch'] ?? null;
 
         $status = '<comment>up to date</comment>';
         if ($recipe->isAuto()) {
@@ -147,15 +148,14 @@ private function displayPackageInformation(Recipe $recipe)
             $status = '<comment>update available</comment>';
         }
 
-        $branch = $recipeLock['recipe']['branch'] ?? 'master';
         $gitSha = null;
         $commitDate = null;
         if (null !== $lockRef && null !== $lockRepo) {
             try {
                 list($gitSha, $commitDate) = $this->findRecipeCommitDataFromTreeRef(
                     $recipe->getName(),
                     $lockRepo,
-                    $branch,
+                    $lockBranch ?? '',
                     $recipeLock['version'],
                     $lockRef
                 );
@@ -172,7 +172,7 @@ private function displayPackageInformation(Recipe $recipe)
                 'https://%s/tree/%s/%s/%s',
                 $lockRepo,
                 // if something fails, default to the branch as the closest "sha"
-                $gitSha ?? $branch,
+                $gitSha ?? $lockBranch,
                 $recipe->getName(),
                 $recipeLock['version']
             );
@@ -186,7 +186,7 @@ private function displayPackageInformation(Recipe $recipe)
             $historyUrl = sprintf(
                 'https://%s/commits/%s/%s',
                 $lockRepo,
-                $branch,
+                $lockBranch,
                 $recipe->getName()
             );
 

src/Downloader.php

@@ -110,6 +110,15 @@ public function getRecipes(array $operations): array
                 $branchAliases = $package->getExtra()['branch-alias'];
                 if (
                     (isset($branchAliases[$version]) && $alias = $branchAliases[$version]) ||
+                    (isset($branchAliases['dev-main']) && $alias = $branchAliases['dev-main']) ||
+                    (isset($branchAliases['dev-trunk']) && $alias = $branchAliases['dev-trunk']) ||
+                    (isset($branchAliases['dev-develop']) && $alias = $branchAliases['dev-develop']) ||
+                    (isset($branchAliases['dev-default']) && $alias = $branchAliases['dev-default']) ||
+                    (isset($branchAliases['dev-latest']) && $alias = $branchAliases['dev-latest']) ||
+                    (isset($branchAliases['dev-next']) && $alias = $branchAliases['dev-next']) ||
+                    (isset($branchAliases['dev-current']) && $alias = $branchAliases['dev-current']) ||
+                    (isset($branchAliases['dev-support']) && $alias = $branchAliases['dev-support']) ||
+                    (isset($branchAliases['dev-tip']) && $alias = $branchAliases['dev-tip']) ||
                     (isset($branchAliases['dev-master']) && $alias = $branchAliases['dev-master'])
                 ) {
                     $version = $alias;

src/Flex.php

@@ -879,7 +879,7 @@ private function getFlexId()
 
     private function formatOrigin(string $origin): string
     {
-        // symfony/translation:[email protected]/symfony/recipes:master
+        // symfony/translation:[email protected]/symfony/recipes:branch
         if (!preg_match('/^([^:]++):([^@]++)@(.+)$/', $origin, $matches)) {
             return $origin;
         }

src/Recipe.php

@@ -73,7 +73,7 @@ public function getURL(): string
             return '';
         }
 
-        // symfony/translation:[email protected]/symfony/recipes:master
+        // symfony/translation:[email protected]/symfony/recipes:branch
         if (!preg_match('/^([^:]++):([^@]++)@([^:]++):(.+)$/', $this->data['origin'], $matches)) {
             // that excludes auto-generated recipes, which is what we want
             return '';