From 3dbcd89da1e91f5ac5955b1bb413cbd1ba8506d9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 15 Aug 2015 04:53:59 -0700
Subject: [PATCH] CRM-16373 - CRM_*_Config - Remove unused component config
 stuff

This code seems to generate default value for domain.config_backend.
However, the only one which defined any defaults was CiviMail, and that's
now moved over to `settings/`.
---
 CRM/Campaign/Config.php       | 37 --------------------
 CRM/Case/Config.php           | 38 ---------------------
 CRM/Contribute/Config.php     | 38 ---------------------
 CRM/Core/Component.php        | 16 ---------
 CRM/Core/Component/Config.php | 64 -----------------------------------
 CRM/Core/Component/Info.php   | 16 ---------
 CRM/Core/Config.php           |  3 --
 CRM/Core/Config/Defaults.php  | 10 ------
 CRM/Core/Config/Variables.php |  2 ++
 CRM/Event/Config.php          | 39 ---------------------
 CRM/Grant/Config.php          | 36 --------------------
 CRM/Mailing/Config.php        |  2 +-
 CRM/Member/Config.php         | 36 --------------------
 CRM/Pledge/Config.php         | 39 ---------------------
 CRM/Report/Config.php         | 40 ----------------------
 15 files changed, 3 insertions(+), 413 deletions(-)
 delete mode 100644 CRM/Campaign/Config.php
 delete mode 100644 CRM/Case/Config.php
 delete mode 100644 CRM/Contribute/Config.php
 delete mode 100644 CRM/Core/Component/Config.php
 delete mode 100644 CRM/Event/Config.php
 delete mode 100644 CRM/Grant/Config.php
 delete mode 100644 CRM/Member/Config.php
 delete mode 100644 CRM/Pledge/Config.php
 delete mode 100644 CRM/Report/Config.php

diff --git a/CRM/Campaign/Config.php b/CRM/Campaign/Config.php
deleted file mode 100644
index eee02200ac..0000000000
--- a/CRM/Campaign/Config.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                  |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- */
-class CRM_Campaign_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Case/Config.php b/CRM/Case/Config.php
deleted file mode 100644
index c01f995e49..0000000000
--- a/CRM/Case/Config.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- */
-class CRM_Case_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Contribute/Config.php b/CRM/Contribute/Config.php
deleted file mode 100644
index aaecca8ccc..0000000000
--- a/CRM/Contribute/Config.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- */
-class CRM_Contribute_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php
index c7f08fa9a0..3254f0047a 100644
--- a/CRM/Core/Component.php
+++ b/CRM/Core/Component.php
@@ -236,22 +236,6 @@ class CRM_Core_Component {
     return $items;
   }
 
-  /**
-   * @param $config
-   * @param bool $oldMode
-   *
-   * @return null
-   */
-  public static function addConfig(&$config, $oldMode = FALSE) {
-    $info = self::_info();
-
-    foreach ($info as $name => $comp) {
-      $cfg = $comp->getConfigObject();
-      $cfg->add($config, $oldMode);
-    }
-    return NULL;
-  }
-
   /**
    * @param string $componentName
    *
diff --git a/CRM/Core/Component/Config.php b/CRM/Core/Component/Config.php
deleted file mode 100644
index 8fd866aa94..0000000000
--- a/CRM/Core/Component/Config.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- * This abstract class provides the framework for component configuration
- * and provides aggregation methods for injecting it into system config.
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-abstract class CRM_Core_Component_Config {
-
-  /**
-   * Gets the list of class variables from specific component's
-   * configuration file and injects them into system wide
-   * configuration object.
-   *
-   * @param CRM_Core_Config $config
-   * @param $oldMode
-   */
-  public function add($config, $oldMode) {
-    foreach (get_class_vars(get_class($this)) as $key => $value) {
-      $config->$key = $value;
-    }
-  }
-
-  /**
-   * @param array $defaults
-   */
-  public function setDefaults(&$defaults) {
-    foreach (get_class_vars(get_class($this)) as $key => $value) {
-      if (!isset($defaults[$key])) {
-        $defaults[$key] = $value;
-      }
-    }
-  }
-
-}
diff --git a/CRM/Core/Component/Info.php b/CRM/Core/Component/Info.php
index 887af332a9..f2b600c720 100644
--- a/CRM/Core/Component/Info.php
+++ b/CRM/Core/Component/Info.php
@@ -42,12 +42,6 @@ abstract class CRM_Core_Component_Info {
    */
   const COMPONENT_INVOKE_CLASS = 'Invoke';
 
-  /**
-   * Name of the class (minus component namespace path)
-   * of the component configuration class'es name.
-   */
-  const COMPONENT_CONFIG_CLASS = 'Config';
-
   /**
    * Name of the class (minus component namespace path)
    * of the component BAO Query class'es name.
@@ -240,16 +234,6 @@ abstract class CRM_Core_Component_Info {
     return FALSE;
   }
 
-  /**
-   * Provides component's configuration object.
-   *
-   * @return mixed
-   *   component's configuration object
-   */
-  public function getConfigObject() {
-    return $this->_instantiate(self::COMPONENT_CONFIG_CLASS);
-  }
-
   /**
    * Provides component's menu definition object.
    *
diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 74be9981bc..0d6e5f80c7 100644
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -440,9 +440,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
       // retrieve directory and url preferences also
       CRM_Core_BAO_Setting::retrieveDirectoryAndURLPreferences($variables);
 
-      // add component specific settings
-      $this->componentRegistry->addConfig($this);
-
       // serialise settings
       $settings = $variables;
       CRM_Core_BAO_ConfigSetting::add($settings);
diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php
index 26d652a709..b21a1f7bf0 100644
--- a/CRM/Core/Config/Defaults.php
+++ b/CRM/Core/Config/Defaults.php
@@ -187,16 +187,6 @@ class CRM_Core_Config_Defaults {
     if (isset($_GET[$config->userFrameworkURLVar])) {
       $args = explode('/', $_GET[$config->userFrameworkURLVar]);
     }
-
-    if (isset($defaults['enableComponents'])) {
-      foreach ($defaults['enableComponents'] as $key => $name) {
-        $comp = $config->componentRegistry->get($name);
-        if ($comp) {
-          $co = $comp->getConfigObject();
-          $co->setDefaults($defaults);
-        }
-      }
-    }
   }
 
 }
diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php
index 07d34def92..baf6c6f4db 100644
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -411,6 +411,8 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   public $wpBasePage = NULL;
 
+  public $verpSeparator = '.', $mailThrottleTime = 0, $mailerJobsMax = 0, $mailerJobSize = 0, $mailerBatchLimit = 0;
+
   /**
    * Provide addressSequence.
    *
diff --git a/CRM/Event/Config.php b/CRM/Event/Config.php
deleted file mode 100644
index 5febd35fa0..0000000000
--- a/CRM/Event/Config.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                  |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-class CRM_Event_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Grant/Config.php b/CRM/Grant/Config.php
deleted file mode 100644
index bc59740988..0000000000
--- a/CRM/Grant/Config.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-class CRM_Grant_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Mailing/Config.php b/CRM/Mailing/Config.php
index 30808a4bbd..19c9a7dbe5 100644
--- a/CRM/Mailing/Config.php
+++ b/CRM/Mailing/Config.php
@@ -32,7 +32,7 @@
  * $Id$
  *
  */
-class CRM_Mailing_Config extends CRM_Core_Component_Config {
+class CRM_Mailing_Config {
 
   const OUTBOUND_OPTION_SMTP = 0;
   const OUTBOUND_OPTION_SENDMAIL = 1;
diff --git a/CRM/Member/Config.php b/CRM/Member/Config.php
deleted file mode 100644
index 47537184e9..0000000000
--- a/CRM/Member/Config.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-class CRM_Member_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Pledge/Config.php b/CRM/Pledge/Config.php
deleted file mode 100644
index 2957ceaf94..0000000000
--- a/CRM/Pledge/Config.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                  |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-class CRM_Pledge_Config extends CRM_Core_Component_Config {
-}
diff --git a/CRM/Report/Config.php b/CRM/Report/Config.php
deleted file mode 100644
index 5636307ccc..0000000000
--- a/CRM/Report/Config.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * Config handles all the run time configuration changes that the system needs to deal with.
- * Typically we'll have different values for a user's sandbox, a qa sandbox and a production area.
- * The default values in general, should reflect production values (minimizes chances of screwing up)
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-class CRM_Report_Config extends CRM_Core_Component_Config {
-}
-- 
2.25.1