From 83b2d634af0aa5675cd1e981c3fed2b7ffd3b40a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 14 Dec 2022 20:11:13 -0800
Subject: [PATCH] (REF) CiviEnvBuilder - Simplify `$name` calculation

Tweaking the `$name` is theoretically useful if you have entirely
independent data-sets that happen to live in the same DB.  In practice, we
only use CiviEnvBuilder to manage Civi-related data-sets.
---
 Civi/Test.php                | 4 ++--
 Civi/Test/CiviEnvBuilder.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Civi/Test.php b/Civi/Test.php
index dfa4d31c30..cd01116417 100644
--- a/Civi/Test.php
+++ b/Civi/Test.php
@@ -110,7 +110,7 @@ class Test {
    */
   public static function headless() {
     $civiRoot = dirname(__DIR__);
-    $builder = new \Civi\Test\CiviEnvBuilder('CiviEnvBuilder');
+    $builder = new \Civi\Test\CiviEnvBuilder();
     $builder
       ->callback(function ($ctx) {
         if (CIVICRM_UF !== 'UnitTests') {
@@ -139,7 +139,7 @@ class Test {
    * @return \Civi\Test\CiviEnvBuilder
    */
   public static function e2e() {
-    $builder = new \Civi\Test\CiviEnvBuilder('CiviEnvBuilder');
+    $builder = new \Civi\Test\CiviEnvBuilder();
     $builder
       ->callback(function ($ctx) {
         if (CIVICRM_UF === 'UnitTests') {
diff --git a/Civi/Test/CiviEnvBuilder.php b/Civi/Test/CiviEnvBuilder.php
index 8bce9d1fbf..2da7268bcc 100644
--- a/Civi/Test/CiviEnvBuilder.php
+++ b/Civi/Test/CiviEnvBuilder.php
@@ -28,7 +28,7 @@ class CiviEnvBuilder {
    */
   private $targetSignature = NULL;
 
-  public function __construct($name) {
+  public function __construct(string $name = 'CiviEnvBuilder') {
     $this->name = $name;
   }
 
-- 
2.25.1