From afd98b74f13b9def1b2447f16fd0bfd4d96dff94 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 31 Aug 2015 10:58:25 +0100 Subject: [PATCH] Fix handling of www.github.com in GitHubDriver, fixes composer/packagist#572 --- src/Composer/Repository/Vcs/GitHubDriver.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php index fd2e71545..517012751 100644 --- a/src/Composer/Repository/Vcs/GitHubDriver.php +++ b/src/Composer/Repository/Vcs/GitHubDriver.php @@ -50,6 +50,9 @@ class GitHubDriver extends VcsDriver $this->owner = $match[3]; $this->repository = $match[4]; $this->originUrl = !empty($match[1]) ? $match[1] : $match[2]; + if ($this->originUrl === 'www.github.com') { + $this->originUrl = 'github.com'; + } $this->cache = new Cache($this->io, $this->config->get('cache-repo-dir').'/'.$this->originUrl.'/'.$this->owner.'/'.$this->repository); if (isset($this->repoConfig['no-api']) && $this->repoConfig['no-api']) { @@ -260,7 +263,7 @@ class GitHubDriver extends VcsDriver } $originUrl = !empty($matches[2]) ? $matches[2] : $matches[3]; - if (!in_array($originUrl, $config->get('github-domains'))) { + if (!in_array(preg_replace('{^www\.}i', '', $originUrl), $config->get('github-domains'))) { return false; }