Added base name of file as accepted file pattern (#4)

consolidation · Sep 19, 2018 · c869c4d · c869c4d
1 parent 704e908
commit c869c4d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/SiteAliasFileDiscovery.php b/src/SiteAliasFileDiscovery.php
@@ -136,7 +136,8 @@ public function findAllLegacyAliasFiles()
     {
         return array_merge(
             $this->searchForAliasFiles('*.alias.drushrc.php'),
-            $this->searchForAliasFiles('*.aliases.drushrc.php')
+            $this->searchForAliasFiles('*.aliases.drushrc.php'),
+            $this->searchForAliasFiles('aliases.drushrc.php')
         );
     }
 

diff --git a/tests/SiteAliasFileDiscoveryTest.php b/tests/SiteAliasFileDiscoveryTest.php
@@ -36,7 +36,7 @@ public function testFindAllLegacyAliasFiles()
 
         $result = $this->sut->findAllLegacyAliasFiles();
         $paths = $this->simplifyToBasenamesWithLocation($result);
-        $this->assertEquals('legacy/cc.aliases.drushrc.php,legacy/one.alias.drushrc.php,legacy/pantheon.aliases.drushrc.php,legacy/server.aliases.drushrc.php', implode(',', $paths));
+        $this->assertEquals('legacy/aliases.drushrc.php,legacy/cc.aliases.drushrc.php,legacy/one.alias.drushrc.php,legacy/pantheon.aliases.drushrc.php,legacy/server.aliases.drushrc.php', implode(',', $paths));
     }
 
     protected function assertLocation($expected, $path)

diff --git a/tests/fixtures/sitealiases/legacy/aliases.drushrc.php b/tests/fixtures/sitealiases/legacy/aliases.drushrc.php
@@ -0,0 +1,11 @@
+<?php
+
+$aliases['production'] = [
+    'uri' => 'example.com',
+    'root' => '/path/to/drupal',
+];
+
+$aliases['staging'] = [
+    'uri' => 'staging.example.com',
+    'root' => '/path/to/drupal',
+];
diff --git a/tests/fixtures/sitealiases/legacy/do-not-find-me.php b/tests/fixtures/sitealiases/legacy/do-not-find-me.php
@@ -0,0 +1,3 @@
+<?php
+
+// The search scripts shouldn't find me as I do not match the patterns.