Lay the groundwork for Herd integration.

cli/Valet/Context/Context.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Valet\Context;
+
+abstract class Context
+{
+    public static function assign()
+    {
+        if (static::isHerd()) {
+            return new Herd();
+        }
+
+        return new Standalone();
+    }
+
+    public static function isHerd()
+    {
+        return true; // @todo implement
+    }
+
+    public static function isStandalone()
+    {
+        return ! static::isHerd();
+    }
+
+    abstract public function name();
+}

cli/Valet/Context/Herd.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Valet\Context;
+
+class Herd extends Context
+{
+    public function name()
+    {
+        return 'Laravel Herd';
+    }
+}

cli/Valet/Context/Standalone.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Valet\Context;
+
+class Standalone extends Context
+{
+    public function name()
+    {
+        return 'Laravel Valet';
+    }
+}

cli/app.php

@@ -9,10 +9,13 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Valet\Context\Context;
 use Valet\Drivers\ValetDriver;
 use function Valet\info;
 use function Valet\output;
+use function Valet\resolve;
 use function Valet\table;
+use function Valet\testing;
 use function Valet\warning;
 use function Valet\writer;
 
@@ -30,11 +33,18 @@
 /**
  * Create the application.
  */
-Container::setInstance(new Container);
+
+if (testing()) {
+    $container = Container::getInstance();
+    $context = resolve(Context::class);
+} else {
+    Container::setInstance($container = new Container);
+    $container->instance(Context::class, $context = Context::assign());
+}
 
 $version = '4.1.3';
 
-$app = new Application('Laravel Valet', $version);
+$app = new Application($context->name(), $version);
 
 $app->setDispatcher($dispatcher = new EventDispatcher());
 

composer.json

@@ -30,6 +30,7 @@
     "autoload-dev": {
         "files": [
             "tests/UsesNullWriter.php",
+            "tests/PrepsContainer.php",
             "tests/BaseApplicationTestCase.php",
             "tests/Drivers/BaseDriverTestCase.php"
         ]

tests/BaseApplicationTestCase.php

@@ -6,6 +6,7 @@
 
 class BaseApplicationTestCase extends TestCase
 {
+    use PrepsContainer;
     use UsesNullWriter;
 
     public function setUp(): void
@@ -25,7 +26,9 @@ public function tearDown(): void
     public function prepTestConfig(): void
     {
         require_once __DIR__.'/../cli/includes/helpers.php';
-        Container::setInstance(new Container); // Reset app container from previous tests
+
+        // Reset app container from previous tests
+        $this->prepContainer();
 
         if (Filesystem::isDir(VALET_HOME_PATH)) {
             Filesystem::rmDirAndContents(VALET_HOME_PATH);

tests/BrewTest.php

@@ -11,13 +11,14 @@
 
 class BrewTest extends Yoast\PHPUnitPolyfills\TestCases\TestCase
 {
+    use PrepsContainer;
     use UsesNullWriter;
 
     public function set_up()
     {
         $_SERVER['SUDO_USER'] = user();
 
-        Container::setInstance(new Container);
+        $this->prepContainer();
         $this->setNullWriter();
     }
 

tests/NginxTest.php

@@ -11,13 +11,14 @@
 
 class NginxTest extends Yoast\PHPUnitPolyfills\TestCases\TestCase
 {
+    use PrepsContainer;
     use UsesNullWriter;
 
     public function set_up()
     {
         $_SERVER['SUDO_USER'] = user();
 
-        Container::setInstance(new Container);
+        $this->prepContainer();
         $this->setNullWriter();
     }
 

tests/PhpFpmTest.php

@@ -14,13 +14,14 @@
 
 class PhpFpmTest extends Yoast\PHPUnitPolyfills\TestCases\TestCase
 {
+    use PrepsContainer;
     use UsesNullWriter;
 
     public function set_up()
     {
         $_SERVER['SUDO_USER'] = user();
 
-        Container::setInstance(new Container);
+        $this->prepContainer();
         $this->setNullWriter();
     }
 

tests/PrepsContainer.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Container\Container;
+use Valet\Context\Context;
+use Valet\Context\Standalone;
+use function Valet\resolve;
+
+trait PrepsContainer
+{
+    public function prepContainer()
+    {
+        Container::setInstance($container = new Container);
+
+        $container->instance(Context::class, resolve(Standalone::class));
+    }
+}

tests/SiteTest.php

@@ -12,13 +12,14 @@
 
 class SiteTest extends Yoast\PHPUnitPolyfills\TestCases\TestCase
 {
+    use PrepsContainer;
     use UsesNullWriter;
 
     public function set_up()
     {
         $_SERVER['SUDO_USER'] = user();
 
-        Container::setInstance(new Container);
+        $this->prepContainer();
         $this->setNullWriter();
     }