CRM-17637 - Remove useless singleton method

diff --git a/CRM/Utils/Check/Env.php b/CRM/Utils/Check/Env.php
index 882e5da066053274a7e9a8488c5d838ed2c37840..7b4a9d9112380959274061efd8a85e25583634c3 100644 (file)
--- a/CRM/Utils/Check/Env.php
+++ b/CRM/Utils/Check/Env.php
@@ -293,7 +293,7 @@ class CRM_Utils_Check_Env {
     $messages = array();
 
     if (Civi::settings()->get('versionCheck')) {
-      $vc = CRM_Utils_VersionCheck::singleton();
+      $vc = new CRM_Utils_VersionCheck();
       $newerVersion = $vc->isNewerVersionAvailable();
 
       if ($newerVersion['version']) {

diff --git a/CRM/Utils/VersionCheck.php b/CRM/Utils/VersionCheck.php
index eff22b55068032209619d3767fa3f28bab1d978b..0b013bf638b6de3969d288c946c2658e0305de68 100644 (file)
--- a/CRM/Utils/VersionCheck.php
+++ b/CRM/Utils/VersionCheck.php
@@ -42,14 +42,6 @@ class CRM_Utils_VersionCheck {
     // cachefile expiry time (in seconds) - one day
     CACHEFILE_EXPIRE = 86400;
 
-  /**
-   * We only need one instance of this object, so we use the
-   * singleton pattern and cache the instance in this variable
-   *
-   * @var object
-   */
-  static private $_singleton = NULL;
-
   /**
    * The version of the current (local) installation
    *
@@ -119,21 +111,6 @@ class CRM_Utils_VersionCheck {
     }
   }
 
-  /**
-   * Static instance provider.
-   *
-   * Method providing static instance of CRM_Utils_VersionCheck,
-   * as in Singleton pattern
-   *
-   * @return CRM_Utils_VersionCheck
-   */
-  public static function &singleton() {
-    if (!isset(self::$_singleton)) {
-      self::$_singleton = new CRM_Utils_VersionCheck();
-    }
-    return self::$_singleton;
-  }
-
   /**
    * Finds the release info for a minor version.
    * @param string $version

diff --git a/tests/phpunit/CRM/Utils/versionCheckTest.php b/tests/phpunit/CRM/Utils/versionCheckTest.php
index f65faffe4e17ed5987b8c8781faee650b9dbd3ea..a85cd2e04f7d43148d151966d8db4c124f4d05d7 100644 (file)
--- a/tests/phpunit/CRM/Utils/versionCheckTest.php
+++ b/tests/phpunit/CRM/Utils/versionCheckTest.php
@@ -108,7 +108,7 @@ class CRM_Utils_versionCheckTest extends CiviUnitTestCase {
    * @param mixed $expectedResult
    */
   public function testNewerVersion($localVersion, $versionInfo, $expectedResult) {
-    $vc = CRM_Utils_VersionCheck::singleton();
+    $vc = new CRM_Utils_VersionCheck();
     // These values are set by the constructor but for testing we override them
     $vc->localVersion = $localVersion;
     $vc->localMajorVersion = $vc->getMajorVersion($localVersion);
@@ -154,7 +154,7 @@ class CRM_Utils_versionCheckTest extends CiviUnitTestCase {
    * @param bool $expectedResult
    */
   public function testSecurityUpdate($localVersion, $versionInfo, $expectedResult) {
-    $vc = CRM_Utils_VersionCheck::singleton();
+    $vc = new CRM_Utils_VersionCheck();
     // These values are set by the constructor but for testing we override them
     $vc->localVersion = $localVersion;
     $vc->localMajorVersion = $vc->getMajorVersion($localVersion);