Merge pull request #505 from laravel/fix-valet-links-non-dev

Fix valet links non dev

Author: adamwathan

cli/Valet/Site.php

@@ -64,7 +64,8 @@ function link($target, $link)
      *
      * @return \Illuminate\Support\Collection
      */
-    function links() {
+    function links()
+    {
         $certsPath = VALET_HOME_PATH.'/Certificates';
 
         $this->files->ensureDirExists($certsPath, user());
@@ -82,7 +83,7 @@ function links() {
      */
     function getCertificates($path)
     {
-        return collect($this->files->scanDir($path))->filter(function ($value, $key) {
+        return collect($this->files->scandir($path))->filter(function ($value, $key) {
             return ends_with($value, '.crt');
         })->map(function ($cert) {
             return substr($cert, 0, strripos($cert, '.', -5));
@@ -100,7 +101,7 @@ function getLinks($path, $certs)
     {
         $config = $this->config->read();
 
-        return collect($this->files->scanDir($path))->mapWithKeys(function ($site) use ($path) {
+        return collect($this->files->scandir($path))->mapWithKeys(function ($site) use ($path) {
             return [$site => $this->files->readLink($path.'/'.$site)];
         })->map(function ($path, $site) use ($certs, $config) {
             $secured = $certs->has($site);

tests/SiteTest.php

@@ -64,6 +64,24 @@ public function test_prune_links_removes_broken_symlinks_in_sites_path()
         $site->pruneLinks();
         $this->assertFileNotExists(__DIR__.'/output/link');
     }
+
+
+    public function test_certificates_trim_tld_for_custom_tlds()
+    {
+        $files = Mockery::mock(Filesystem::class);
+        $files->shouldReceive('scandir')->once()->andReturn([
+            'threeletters.dev.crt',
+            'fiveletters.local.crt',
+        ]);
+
+        swap(Filesystem::class, $files);
+
+        $site = resolve(Site::class);
+        $certs = $site->getCertificates('fake-cert-path')->flip();
+
+        $this->assertEquals('threeletters', $certs->first());
+        $this->assertEquals('fiveletters', $certs->last());
+    }
 }