Fix regex for GitLab URL's (#45)

michielkalle · moay · commit a761e538649b · 2019-10-16T10:09:08.000+02:00
diff --git a/src/Service/RecipePublicUrlResolver.php b/src/Service/RecipePublicUrlResolver.php
@@ -73,7 +73,7 @@ private function resolveHttpUrl(string $repoUrl, string $packageName)
      */
     private function resolveSshUrl(string $repoUrl, string $packageName)
     {
-        if (preg_match('/^(?:ssh(?::\/\/)?)?(?:git)?@?([a-zA-Z0-9-_\.]+\.[a-z]+)(:[0-9])?(?:[:\/]([a-zA-Z0-9-_\.]*))?\/([a-zA-Z0-9-_\.]+)\/([a-zA-Z0-9-_]+)(?:.git)?$/', $repoUrl, $urlParts)) {
+        if (preg_match('/^(?:ssh(?::\/\/)?)?(?:git)?@?([a-zA-Z0-9-_\.]+\.[a-z]+)(:[0-9])?(?:[:\/]([a-zA-Z0-9-_\.]*))?(\/|:)([a-zA-Z0-9-_\.]+)\/([a-zA-Z0-9-_]+)(?:.git)?$/', $repoUrl, $urlParts)) {
             $host = $urlParts[1];
             $port = empty($urlParts[2]) ? null : $urlParts[2];
             $prefix = empty($urlParts[3]) ? null : $urlParts[3];

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private function resolveHttpUrl(string $repoUrl, string $packageName)`
`73`	`73`	`*/`
`74`	`74`	`private function resolveSshUrl(string $repoUrl, string $packageName)`
`75`	`75`	`{`
`76`		`- if (preg_match('/^(?:ssh(?::\/\/)?)?(?:git)?@?([a-zA-Z0-9-_\.]+\.[a-z]+)(:[0-9])?(?:[:\/]([a-zA-Z0-9-_\.]*))?\/([a-zA-Z0-9-_\.]+)\/([a-zA-Z0-9-_]+)(?:.git)?$/', $repoUrl, $urlParts)) {`
	`76`	`+ if (preg_match('/^(?:ssh(?::\/\/)?)?(?:git)?@?([a-zA-Z0-9-_\.]+\.[a-z]+)(:[0-9])?(?:[:\/]([a-zA-Z0-9-_\.]*))?(\/\|:)([a-zA-Z0-9-_\.]+)\/([a-zA-Z0-9-_]+)(?:.git)?$/', $repoUrl, $urlParts)) {`
`77`	`77`	`$host = $urlParts[1];`
`78`	`78`	`$port = empty($urlParts[2]) ? null : $urlParts[2];`
`79`	`79`	`$prefix = empty($urlParts[3]) ? null : $urlParts[3];`