Fixes #3510: Fix up regular expressions for remote site specifications. (#3583)

* Fixes #3510: Fix up regular expressions for remote site specifications.

* Fixes #3263: Also allow dots in the username part of site specifications.

Author: greg-1-anderson

isolation/tests/SiteSpecParserTest.php

@@ -64,8 +64,11 @@ public static function validSiteSpecs()
         return [
             [ '/path/to/drupal#uri' ],
             [ 'user@server/path/to/drupal#uri' ],
+            [ '[email protected]/path/to/drupal#uri' ],
             [ 'user@server/path/to/drupal' ],
+            [ '[email protected]/path/to/drupal' ],
             [ 'user@server#uri' ],
+            [ '[email protected]#uri' ],
             [ '#uri' ],
         ];
     }
@@ -97,6 +100,16 @@ public static function parserTestValues()
                 ],
             ],
 
+            [
+                '[email protected]/path#somemultisite',
+                [
+                    'user' => 'user.name',
+                    'host' => 'example.com',
+                    'root' => '/path',
+                    'uri' => 'somemultisite',
+                ],
+            ],
+
             [
                 'user@server/path',
                 [
@@ -107,6 +120,16 @@ public static function parserTestValues()
                 ],
             ],
 
+            [
+                '[email protected]/path',
+                [
+                    'user' => 'user.name',
+                    'host' => 'example.com',
+                    'root' => '/path',
+                    'uri' => 'default',
+                ],
+            ],
+
             [
                 '/fixtures#mymultisite',
                 [

src/Preflight/ArgsPreprocessor.php

@@ -64,7 +64,7 @@ public function parse($argv, PreflightArgsInterface $storage)
                 return $storage->passArgs($argv);
             }
 
-            if ($this->isAliasOrSiteSpec($opt) && !$storage->hasAlias() && !$sawArg) {
+            if (!$sawArg && !$storage->hasAlias() && $this->isAliasOrSiteSpec($opt)) {
                 $storage->setAlias($opt);
                 continue;
             }

src/SiteAlias/SiteSpecParser.php

@@ -77,34 +77,39 @@ public function isAliasName($aliasName)
      */
     protected function patterns()
     {
+        $PATH = '(/[^#]*)';
+        $USER = '([a-zA-Z0-9\._-]+)';
+        $SERVER = '([a-zA-Z0-9\._-]+)';
+        $URI = '([a-zA-Z0-9_-]+)';
+
         return [
             // /path/to/drupal#uri
-            '%^(/[^#]*)#([a-zA-Z0-9_-]+)$%' => [
+            "%^{$PATH}#{$URI}\$%" => [
                 'root' => 1,
                 'uri' => 2,
             ],
             // user@server/path/to/drupal#uri
-            '%^([a-zA-Z0-9_-]+)@([a-zA-Z0-9_-]+)(/[^#]*)#([a-zA-Z0-9_-]+)$%' => [
+            "%^{$USER}@{$SERVER}{$PATH}#{$URI}\$%" => [
                 'user' => 1,
                 'host' => 2,
                 'root' => 3,
                 'uri' => 4,
             ],
             // user@server/path/to/drupal
-            '%^([a-zA-Z0-9_-]+)@([a-zA-Z0-9_-]+)(/[^#]*)$%' => [
+            "%^{$USER}@{$SERVER}{$PATH}\$%" => [
                 'user' => 1,
                 'host' => 2,
                 'root' => 3,
                 'uri' => 'default', // Or '2' if uri should be 'host'
             ],
             // user@server#uri
-            '%^([a-zA-Z0-9_-]+)@([a-zA-Z0-9_-]+)#([a-zA-Z0-9_-]+)$%' => [
+            "%^{$USER}@{$SERVER}#{$URI}\$%" => [
                 'user' => 1,
                 'host' => 2,
                 'uri' => 3,
             ],
             // #uri
-            '%^#([a-zA-Z0-9_-]+)$%' => [
+            "%^#{$URI}\$%" => [
                 'uri' => 1,
             ],
         ];