From a812c6aa7672141033e3ebc77e59c0b3c3aad3b5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 16 Aug 2022 01:01:10 -0700
Subject: [PATCH] (REF) Convert AssetBuilder, Format, SqlTriggers, Themes to
 AutoService

---
 Civi/Core/AssetBuilder.php |  3 ++-
 Civi/Core/Container.php    | 20 --------------------
 Civi/Core/Format.php       |  3 ++-
 Civi/Core/SqlTriggers.php  |  3 ++-
 Civi/Core/Themes.php       |  3 ++-
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/Civi/Core/AssetBuilder.php b/Civi/Core/AssetBuilder.php
index a67569364d..3d1a4d9a9c 100644
--- a/Civi/Core/AssetBuilder.php
+++ b/Civi/Core/AssetBuilder.php
@@ -7,6 +7,7 @@ use Civi\Core\Exception\UnknownAssetException;
 /**
  * Class AssetBuilder
  * @package Civi\Core
+ * @service asset_builder
  *
  * The AssetBuilder is used to manage semi-dynamic assets.
  * In normal production use, these assets are built on first
@@ -70,7 +71,7 @@ use Civi\Core\Exception\UnknownAssetException;
  * secure it (e.g. alternative digest() calculations), but the
  * current implementation is KISS.
  */
-class AssetBuilder {
+class AssetBuilder extends \Civi\Core\Service\AutoService {
 
   /**
    * @return array
diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 8d1bb07865..2590876664 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -226,26 +226,6 @@ class Container {
       ]
     ))->setFactory('CRM_Utils_Cache::create')->setPublic(TRUE);
 
-    $container->setDefinition('sql_triggers', new Definition(
-      'Civi\Core\SqlTriggers',
-      []
-    ))->setPublic(TRUE);
-
-    $container->setDefinition('asset_builder', new Definition(
-      'Civi\Core\AssetBuilder',
-      []
-    ))->setPublic(TRUE);
-
-    $container->setDefinition('themes', new Definition(
-      'Civi\Core\Themes',
-      []
-    ))->setPublic(TRUE);
-
-    $container->setDefinition('format', new Definition(
-      '\Civi\Core\Format',
-      []
-    ))->setPublic(TRUE);
-
     $container->setDefinition('bundle.bootstrap3', new Definition('CRM_Core_Resources_Bundle', ['bootstrap3']))
       ->setFactory('CRM_Core_Resources_Common::createBootstrap3Bundle')->setPublic(TRUE);
 
diff --git a/Civi/Core/Format.php b/Civi/Core/Format.php
index 2f127ee332..bc7970c24f 100644
--- a/Civi/Core/Format.php
+++ b/Civi/Core/Format.php
@@ -15,10 +15,11 @@ use Brick\Money\Context\AutoContext;
 /**
  * Class Paths
  * @package Civi\Core
+ * @service format
  *
  * This class provides standardised formatting
  */
-class Format {
+class Format extends \Civi\Core\Service\AutoService {
 
   /**
    * Get formatted money
diff --git a/Civi/Core/SqlTriggers.php b/Civi/Core/SqlTriggers.php
index 91b5cb9438..8d624c5609 100644
--- a/Civi/Core/SqlTriggers.php
+++ b/Civi/Core/SqlTriggers.php
@@ -14,10 +14,11 @@ namespace Civi\Core;
 /**
  * Class SqlTriggers
  * @package Civi\Core
+ * @service sql_triggers
  *
  * This class manages creation and destruction of SQL triggers.
  */
-class SqlTriggers {
+class SqlTriggers extends \Civi\Core\Service\AutoService {
 
   /**
    * The name of the output file.
diff --git a/Civi/Core/Themes.php b/Civi/Core/Themes.php
index dee905485f..baf07c7c75 100644
--- a/Civi/Core/Themes.php
+++ b/Civi/Core/Themes.php
@@ -17,8 +17,9 @@ use Civi;
  *
  * @package CiviCRM_Hook
  * @copyright CiviCRM LLC https://civicrm.org/licensing
+ * @service themes
  */
-class Themes {
+class Themes extends \Civi\Core\Service\AutoService {
 
   /**
    * The "default" theme adapts based on the latest recommendation from civicrm.org
-- 
2.25.1