Use --uri from commandline over uri in an alias (#3966)

Author: greg-1-anderson

src/Preflight/PreflightArgs.php

@@ -276,6 +276,11 @@ public function uri($default = false)
         return $this->get(self::URI, $default);
     }
 
+    public function hasUri()
+    {
+        return $this->has(self::URI);
+    }
+
     /**
      * Set the uri option
      */

src/Preflight/PreflightSiteLocator.php

@@ -37,7 +37,15 @@ public function __construct(SiteAliasManager $siteAliasManager)
     public function findSite(PreflightArgsInterface $preflightArgs, Environment $environment, $root)
     {
         $aliasName = $preflightArgs->alias();
-        return $this->determineSelf($preflightArgs, $environment, $root);
+        $self = $this->determineSelf($preflightArgs, $environment, $root);
+
+        // If the user provided a uri on the commandline, inject it
+        // into the alias that we found.
+        if ($preflightArgs->hasUri()) {
+            $self->setUri($preflightArgs->uri());
+        }
+
+        return $self;
     }
 
     /**

tests/functional/ConfigPullTest.php

@@ -26,25 +26,27 @@ public function testConfigPull()
             $this->markTestSkipped('rsync paths may not contain colons on Windows.');
         }
 
+        $options = ['yes' => null, 'uri' => 'OMIT'];
+
         $aliases = $this->getAliases();
         $source = $aliases['stage'];
         $destination = $aliases['dev'];
         // Make UUID match.
-        $this->drush('config:get', ['system.site', 'uuid'], ['yes' => null], $source);
+        $this->drush('config:get', ['system.site', 'uuid'], $options, $source);
         list($name, $uuid) = explode(' ', $this->getOutput());
-        $this->drush('config-set', ['system.site', 'uuid', $uuid], ['yes' => null], $destination);
+        $this->drush('config-set', ['system.site', 'uuid', $uuid], $options, $destination);
 
-        $this->drush('config:set', ['system.site', 'name', 'testConfigPull'], ['yes' => null], $source);
-        $this->drush('config:pull', [$source, $destination]);
-        $this->drush('config:import', [], ['yes' => null], $destination);
-        $this->drush('config:get', ['system.site', 'name'], [], $source);
+        $this->drush('config:set', ['system.site', 'name', 'testConfigPull'], $options, $source);
+        $this->drush('config:pull', [$source, $destination], $options);
+        $this->drush('config:import', [], $options, $destination);
+        $this->drush('config:get', ['system.site', 'name'], $options, $source);
         $this->assertEquals("'system.site:name': testConfigPull", $this->getOutput(), 'Config was successfully pulled.');
 
         // Test that custom target dir works
         $target = Path::join($this->getSandbox(), __CLASS__);
         $this->recursiveDelete($target);
         $this->mkdir($target);
-        $this->drush('config:pull', [$source, "$destination:$target"]);
+        $this->drush('config:pull', [$source, "$destination:$target"], $options);
         $this->assertFileExists(Path::join($target, 'system.site.yml'));
     }
 }

tests/functional/RedispatchTest.php

@@ -17,7 +17,7 @@ class RedispatchTest extends CommandUnishTestCase
      */
     public function testDispatchUsingAlias()
     {
-        $options = ['alias-path' => Path::join(__DIR__, 'resources/alias-fixtures'), 'simulate' => null];
+        $options = ['uri' => 'OMIT', 'alias-path' => Path::join(__DIR__, 'resources/alias-fixtures'), 'simulate' => null];
         $this->drush('status', [], $options, '@example.live');
         $this->assertContains("[notice] Simulating: ssh -o PasswordAuthentication=example [email protected] '/example/path/to/drush --no-interaction status --uri=https://example.com --root=/path/on/service-provider'", $this->getSimplifiedErrorOutput());
     }

tests/functional/RsyncTest.php

@@ -29,6 +29,7 @@ public function setUp()
     public function testRsyncSimulated()
     {
         $options = [
+            'uri' => 'OMIT',
             'simulate' => null,
             'alias-path' => __DIR__ . '/resources/alias-fixtures',
         ];

tests/functional/SqlSyncTest.php

@@ -40,6 +40,7 @@ public function testSimulatedSqlSync()
         ];
         $this->setUpSettings($fixtureSites, 'synctest');
         $options = [
+            'uri' => 'OMIT',
             'simulate' => null,
             'alias-path' => __DIR__ . '/resources/alias-fixtures',
         ];
@@ -88,34 +89,39 @@ public function localSqlSync()
     {
 
         $options = [
-            'uri' => 'stage',
             'yes' => null,
+            'uri' => 'OMIT',
         ];
 
+        $stage_options = [
+            'uri' => 'stage',
+        ] + $options;
+
         // Create a user in the staging site
         $name = 'joe.user';
         $mail = "[email protected]";
 
         // Add user fields and a test User.
-        $this->drush('pm-enable', ['field,text,telephone,comment'], $options + ['yes' => null]);
-        $this->drush('php-script', ['user_fields-D8', $name, $mail], $options + ['script-path' => __DIR__ . '/resources',]);
+        $this->drush('pm-enable', ['field,text,telephone,comment'], $stage_options + ['yes' => null]);
+        $this->drush('php-script', ['user_fields-D8', $name, $mail], $stage_options + ['script-path' => __DIR__ . '/resources',]);
 
         // Copy stage to dev, and then sql:sanitize.
         $sync_options = [
             'yes' => null,
+            'uri' => 'OMIT',
             // Test wildcards expansion from within sql-sync. Also avoid D8 persistent entity cache.
             'structure-tables-list' => 'cache,cache*',
         ];
         $this->drush('sql-sync', ['@sut.stage', '@sut.dev'], $sync_options);
-        $this->drush('sql-sanitize', [], ['yes' => null], '@sut.dev');
+        $this->drush('sql-sanitize', [], ['yes' => null, 'uri' => 'dev',], '@sut.dev');
 
         // Confirm that the sample user is unchanged on the staging site
         $this->drush('user-information', [$name], $options + ['format' => 'json'], '@sut.stage');
         $info = $this->getOutputFromJSON(2);
         $this->assertEquals($mail, $info->mail, 'Email address is unchanged on source site.');
         $this->assertEquals($name, $info->name);
         // Get the unchanged pass.
-        $this->drush('user-information', [$name], $options + ['field' => 'pass']);
+        $this->drush('user-information', [$name], $stage_options + ['field' => 'pass']);
         $original_hashed_pass = $this->getOutput();
 
         // Confirm that the sample user's email and password have been sanitized on the dev site
@@ -128,11 +134,12 @@ public function localSqlSync()
         // Copy stage to dev with --sanitize and a fixed sanitized email
         $sync_options = [
             'yes' => null,
+            'uri' => 'OMIT',
             // Test wildcards expansion from within sql-sync. Also avoid D8 persistent entity cache.
             'structure-tables-list' => 'cache,cache*',
         ];
         $this->drush('sql-sync', ['@sut.stage', '@sut.dev'], $sync_options);
-        $this->drush('sql-sanitize', [], ['yes' => null, 'sanitize-email' => '[email protected]'], '@sut.dev');
+        $this->drush('sql-sanitize', [], ['yes' => null, 'sanitize-email' => '[email protected]', 'uri' => 'OMIT',], '@sut.dev');
 
         // Confirm that the sample user's email address has been sanitized on the dev site
         $this->drush('user-information', [$name], $options + ['yes' => null, 'format' => 'json'], '@sut.dev');
@@ -172,7 +179,7 @@ public function assertUserFieldContents($field_name, $value, $should_contain = f
     {
         $table = 'user__' . $field_name;
         $column = $field_name . '_value';
-        $this->drush('sql-query', ["SELECT $column FROM $table LIMIT 1"], [], '@sut.dev');
+        $this->drush('sql-query', ["SELECT $column FROM $table LIMIT 1"], ['uri' => 'OMIT',], '@sut.dev');
         $output = $this->getOutput();
         $this->assertNotEmpty($output);