Refactor where legacy drivers are pulled in

cli/includes/require-drivers.php

@@ -8,3 +8,10 @@
         require_once './cli/Valet/Drivers/'.$file;
     }
 }
+
+// Require legacy drivers; can be deprecated in v4
+foreach (scandir('./cli/includes/legacy') as $file) {
+    if (substr($file, 0, 1) !== '.') {
+        require_once './cli/includes/legacy/'.$file;
+    }
+}

cli/includes/require-legacy-files.php

@@ -1,7 +0,0 @@
-<?php
-
-foreach (scandir('./cli/includes/legacy') as $file) {
-    if (substr($file, 0, 1) !== '.') {
-        require_once './cli/includes/legacy/'.$file;
-    }
-}

composer.json

@@ -21,8 +21,7 @@
         "files": [
             "cli/includes/compatibility.php",
             "cli/includes/facades.php",
-            "cli/includes/helpers.php",
+            "cli/includes/helpers.php"
-            "cli/includes/require-legacy-files.php"
         ],
         "psr-4": {
             "Valet\\": "cli/Valet/"

server.php

@@ -1,7 +1,6 @@
 <?php
 
 require_once './cli/includes/require-drivers.php';
-require_once './cli/includes/require-legacy-files.php';
 
 use Valet\Drivers\ValetDriver;
 

tests/Drivers/ValetDriverTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Valet\Drivers\BedrockValetDriver;
 use Valet\Drivers\ValetDriver;
 
 class ValetDriverTest extends BaseDriverTestCase
@@ -17,10 +18,6 @@ public function test_it_assigns_drivers_to_given_project()
     {
         $assignedDriver = ValetDriver::assign($this->projectDir('bedrock'), 'my-site', '/');
 
-        // For v4:
+        $this->assertEquals(BedrockValetDriver::class, get_class($assignedDriver));
-        // $this->assertEquals('Valet\Drivers\BedrockValetDriver', get_class($assignedDriver));
-
-        // For now, because legacy:
-        $this->assertEquals('BedrockValetDriver', get_class($assignedDriver));
     }
 }