Load root packages as aliases if they are aliased so that they replac…

…e everything
juzna · Apr 29, 2012 · a4c2337 · a4c2337
1 parent f3df477
commit a4c2337
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php
@@ -15,6 +15,7 @@
 use Composer\Package\Version\VersionParser;
 use Composer\Repository\RepositoryManager;
 use Composer\Util\ProcessExecutor;
+use Composer\Package\AliasPackage;
 
 /**
  * ArrayLoader built for the sole purpose of loading the root package
@@ -48,13 +49,6 @@ public function load($config)
                 foreach ($this->process->splitLines($output) as $branch) {
                     if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+) *[a-f0-9]+ .*$}', $branch, $match)) {
                         $version = 'dev-'.$match[1];
-                        if (isset($config['extra']['branch-alias'][$version])
-                            && substr($config['extra']['branch-alias'][$version], -4) === '-dev'
-                        ) {
-                            $targetBranch = $config['extra']['branch-alias'][$version];
-                            $normalized = $this->versionParser->normalizeBranch(substr($targetBranch, 0, -4));
-                            $version = preg_replace('{(\.9{7})+}', '.x', $normalized);
-                        }
                     }
                 }
             }
@@ -97,6 +91,16 @@ public function load($config)
             $package->setRepositories($config['repositories']);
         }
 
+        if (isset($config['extra']['branch-alias'][$version])
+            && substr($config['extra']['branch-alias'][$version], -4) === '-dev'
+        ) {
+            $targetBranch = $config['extra']['branch-alias'][$version];
+            $normalized = $this->versionParser->normalizeBranch(substr($targetBranch, 0, -4));
+            $version = preg_replace('{(\.9{7})+}', '.x', $normalized);
+
+            return new AliasPackage($package, $normalized, $version);
+        }
+
         return $package;
     }
 }