From d62e6c8d9bcbc06271a8da9180dc9906c8699d3b Mon Sep 17 00:00:00 2001
From: William Allen <16820599+williamjallen@users.noreply.github.com>
Date: Wed, 29 May 2024 20:52:52 -0400
Subject: [PATCH] Remove Config class and associated test

---
 app/cdash/config/di.php                     |   2 +-
 app/cdash/include/CDash/Config.php          |  33 ------
 app/cdash/tests/CMakeLists.txt              |   5 +-
 app/cdash/tests/case/CDash/ConfigTest.php   |  28 -----
 app/cdash/tests/case/CDash/DatabaseTest.php |   2 -
 phpstan-baseline.neon                       | 111 --------------------
 6 files changed, 2 insertions(+), 179 deletions(-)
 delete mode 100644 app/cdash/include/CDash/Config.php
 delete mode 100644 app/cdash/tests/case/CDash/ConfigTest.php

diff --git a/app/cdash/config/di.php b/app/cdash/config/di.php
index 53fb54edec..4cd73498af 100644
--- a/app/cdash/config/di.php
+++ b/app/cdash/config/di.php
@@ -2,5 +2,5 @@
 
 return [
     'CDash\Controller\Auth\Session' => \DI\create()
-        ->constructor(\DI\get('CDash\System'), \CDash\Config::getInstance()),
+        ->constructor(\DI\get('CDash\System')),
 ];
diff --git a/app/cdash/include/CDash/Config.php b/app/cdash/include/CDash/Config.php
deleted file mode 100644
index 97426966c9..0000000000
--- a/app/cdash/include/CDash/Config.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace CDash;
-
-/**
- * @deprecated 05/29/2024  Use config() instead.
- */
-class Config extends Singleton
-{
-    private array $_config;
-
-    protected function __construct()
-    {
-        $this->_config = get_defined_vars();
-    }
-
-    /**
-     * @deprecated 09/04/2023  Use config() instead.
-     */
-    public function get($name)
-    {
-        if (isset($this->_config[$name])) {
-            return $this->_config[$name];
-        }
-    }
-
-    /**
-     * @deprecated 09/04/2023  Use config() instead.
-     */
-    public function set($name, $value)
-    {
-        $this->_config[$name] = $value;
-    }
-}
diff --git a/app/cdash/tests/CMakeLists.txt b/app/cdash/tests/CMakeLists.txt
index 4712c503ad..209b318ba2 100644
--- a/app/cdash/tests/CMakeLists.txt
+++ b/app/cdash/tests/CMakeLists.txt
@@ -84,11 +84,8 @@ set_tests_properties(/CDash/Api/GitHubWebhook PROPERTIES DEPENDS /PHPUnitTest)
 add_unit_test(/CDash/BuildUseCase)
 set_tests_properties(/CDash/BuildUseCase PROPERTIES DEPENDS /CDash/Api/GitHubWebhook)
 
-add_unit_test(/CDash/Config)
-set_tests_properties(/CDash/Config PROPERTIES DEPENDS /CDash/BuildUseCase)
-
 add_unit_test(/CDash/ConfigUseCase)
-set_tests_properties(/CDash/ConfigUseCase PROPERTIES DEPENDS /CDash/Config)
+set_tests_properties(/CDash/ConfigUseCase PROPERTIES DEPENDS /CDash/BuildUseCase)
 
 add_unit_test(/CDash/Database)
 set_tests_properties(/CDash/Database PROPERTIES DEPENDS /CDash/ConfigUseCase)
diff --git a/app/cdash/tests/case/CDash/ConfigTest.php b/app/cdash/tests/case/CDash/ConfigTest.php
deleted file mode 100644
index ada73ba5a6..0000000000
--- a/app/cdash/tests/case/CDash/ConfigTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-use CDash\Config;
-use CDash\Test\CDashTestCase;
-
-class ConfigTest extends CDashTestCase
-{
-    public function testGetInstance()
-    {
-        $config = Config::getInstance();
-        $this->assertInstanceOf(Config::class, $config);
-
-        $reflection = new ReflectionClass(\CDash\Singleton::class);
-        $property = $reflection->getProperty('_instances');
-        $property->setAccessible(true);
-        $instances = $property->getValue();
-
-        $this->assertSame($instances[Config::class], $config);
-    }
-
-    public function testGetSet()
-    {
-        $config = Config::getInstance();
-        $config->set('THIS_IS_NOT_A_THING', 'ABCDEFGH');
-        $this->assertEquals('ABCDEFGH', $config->get('THIS_IS_NOT_A_THING'));
-        $config->set('THIS_IS_NOT_A_THING', null);
-    }
-}
diff --git a/app/cdash/tests/case/CDash/DatabaseTest.php b/app/cdash/tests/case/CDash/DatabaseTest.php
index 8806cc50c1..6d6690fd00 100644
--- a/app/cdash/tests/case/CDash/DatabaseTest.php
+++ b/app/cdash/tests/case/CDash/DatabaseTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use CDash\Database;
-use CDash\Config;
 use CDash\Test\CDashTestCase;
 
 class DatabaseTest extends CDashTestCase
@@ -12,7 +11,6 @@ public static function setUpBeforeClass() : void
 
     public static function tearDownAfterClass() : void
     {
-        Config::setInstance(Config::class, null);
         Database::setInstance(Database::class, null);
         parent::tearDownAfterClass();
     }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a3a4a8bc98..103835ca7d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -10622,44 +10622,6 @@ parameters:
 			count: 1
 			path: app/cdash/bootstrap/cdash_autoload.php
 
-		-
-			message: """
-				#^Call to method getInstance\\(\\) of deprecated class CDash\\\\Singleton\\:
-				05/29/2024  Use config\\(\\) instead\\.$#
-			"""
-			count: 1
-			path: app/cdash/config/di.php
-
-		-
-			message: "#^Method CDash\\\\Config\\:\\:get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
-		-
-			message: "#^Method CDash\\\\Config\\:\\:get\\(\\) has parameter \\$name with no type specified\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
-		-
-			message: "#^Method CDash\\\\Config\\:\\:set\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
-		-
-			message: "#^Method CDash\\\\Config\\:\\:set\\(\\) has parameter \\$name with no type specified\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
-		-
-			message: "#^Method CDash\\\\Config\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
-		-
-			message: "#^Property CDash\\\\Config\\:\\:\\$_config type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: app/cdash/include/CDash/Config.php
-
 		-
 			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
@@ -15723,63 +15685,6 @@ parameters:
 			count: 1
 			path: app/cdash/tests/case/CDash/BuildUseCaseTest.php
 
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class CDash\\\\Config\\:
-				09/04/2023  Use config\\(\\) instead\\.$#
-			"""
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: """
-				#^Call to deprecated method set\\(\\) of class CDash\\\\Config\\:
-				09/04/2023  Use config\\(\\) instead\\.$#
-			"""
-			count: 2
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: """
-				#^Call to method getInstance\\(\\) of deprecated class CDash\\\\Singleton\\:
-				05/29/2024  Use config\\(\\) instead\\.$#
-			"""
-			count: 2
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\)\\.$#"
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\)\\.$#"
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: """
-				#^Fetching class constant class of deprecated class CDash\\\\Config\\:
-				05/29/2024  Use config\\(\\) instead\\.$#
-			"""
-			count: 2
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: "#^Method ConfigTest\\:\\:testGetInstance\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
-		-
-			message: "#^Method ConfigTest\\:\\:testGetSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: app/cdash/tests/case/CDash/ConfigTest.php
-
 		-
 			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\)\\.$#"
 			count: 1
@@ -15861,14 +15766,6 @@ parameters:
 			count: 1
 			path: app/cdash/tests/case/CDash/DatabaseTest.php
 
-		-
-			message: """
-				#^Call to method setInstance\\(\\) of deprecated class CDash\\\\Singleton\\:
-				05/29/2024  Use config\\(\\) instead\\.$#
-			"""
-			count: 1
-			path: app/cdash/tests/case/CDash/DatabaseTest.php
-
 		-
 			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\)\\.$#"
 			count: 3
@@ -15894,14 +15791,6 @@ parameters:
 			count: 1
 			path: app/cdash/tests/case/CDash/DatabaseTest.php
 
-		-
-			message: """
-				#^Fetching class constant class of deprecated class CDash\\\\Config\\:
-				05/29/2024  Use config\\(\\) instead\\.$#
-			"""
-			count: 1
-			path: app/cdash/tests/case/CDash/DatabaseTest.php
-
 		-
 			message: "#^Method DatabaseTest\\:\\:testExecute\\(\\) has no return type specified\\.$#"
 			count: 1