Fixed the Git SSH syntax in an error message

EasyCorp · Apr 21, 2018 · 3a39d4e · 3a39d4e
1 parent bbd0c87
commit 3a39d4e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/Configuration/DefaultConfiguration.php b/src/Configuration/DefaultConfiguration.php
@@ -103,8 +103,8 @@ public function repositoryUrl(string $url): self
         //   https://github.com/<user>/<repo>
         //   https://bitbucket.org/<user>/<repo>
         //   https://gitlab.com/<user>/<repo>.git
-        if (Str::startsWith($url, 'https://')) {
-            $sshUrl = str_replace('https://', 'git@', $url);
+        if (Str::startsWith($url, 'http://') || Str::startsWith($url, 'https://')) {
+            $sshUrl = preg_replace('/https?:\/\/(?<server>.*)\/(?<vendor>.*)\/(?<repository>.*)/', 'git@$1:$2/$3', $url);
             if (!Str::endsWith($sshUrl, '.git')) {
                 $sshUrl .= '.git';
             }

diff --git a/tests/Configuration/DefaultConfigurationTest.php b/tests/Configuration/DefaultConfigurationTest.php
@@ -17,13 +17,14 @@
 class DefaultConfigurationTest extends TestCase
 {
     /**
+     * @dataProvider provideHttpRepositoryUrls
      * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessageRegExp  /The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https:\/\/.*" by "git@.*"/
+     * @expectedExceptionMessageRegExp /The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https?:\/\/.*\/symfony\/symfony-demo.git" by "git@.*:symfony\/symfony-demo.git"/
      */
-    public function test_repository_url_protocol()
+    public function test_repository_url_protocol(string $url)
     {
         (new DefaultConfiguration(__DIR__))
-            ->repositoryUrl('https://github.com/symfony/symfony-demo.git')
+            ->repositoryUrl($url)
         ;
     }
 
@@ -37,4 +38,14 @@ public function test_reset_opcache_for()
             ->resetOpCacheFor('symfony.com')
         ;
     }
+
+    public function provideHttpRepositoryUrls()
+    {
+        yield ['http://github.com/symfony/symfony-demo.git'];
+        yield ['https://github.com/symfony/symfony-demo.git'];
+        yield ['http://bitbucket.org/symfony/symfony-demo.git'];
+        yield ['https://bitbucket.org/symfony/symfony-demo.git'];
+        yield ['http://gitlab.com/symfony/symfony-demo.git'];
+        yield ['https://gitlab.com/symfony/symfony-demo.git'];
+    }
 }