X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=civicrm-version.php;h=2209ab9240620074ca6515873a4f6de829899a8b;hb=72b84deda54a9a04a0d62483cd87ed08faec200c;hp=fccb2033eed91be9987030b8b0cea128737cf313;hpb=fce0c43e767b0da72794e0dffb0fd02241e84946;p=civicrm-core.git

diff --git a/civicrm-version.php b/civicrm-version.php
old mode 100755
new mode 100644
index fccb2033ee..2209ab9240
--- a/civicrm-version.php
+++ b/civicrm-version.php
@@ -1,112 +1,132 @@
 <?php
 
-namespace Civi;
+namespace _CiviVersion_ {
 
-class Version {
+  class Util {
 
-  /**
-   * Get the CiviCRM version
-   */
-  public static function findVersion() {
-    $verFile = implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), 'xml', 'version.xml']);
-    if (file_exists($verFile)) {
-      $str = file_get_contents($verFile);
-      $xmlObj = simplexml_load_string($str);
-      return (string) $xmlObj->version_no;
-    }
-
-    trigger_error("Unknown version", E_USER_ERROR);
-    exit();
-  }
+    /**
+     * Get the CiviCRM version
+     */
+    public static function findVersion() {
+      $verFile = implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), 'xml', 'version.xml']);
+      if (file_exists($verFile)) {
+        $str = file_get_contents($verFile);
+        $xmlObj = simplexml_load_string($str);
+        return (string) $xmlObj->version_no;
+      }
 
-  /**
-   * Get the CMS name
-   */
-  public static function findCMS() {
-    if (defined('CIVICRM_UF')) {
-      return CIVICRM_UF;
-    }
-    elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '6.0', '>=') && version_compare(VERSION, '7.0', '<')) {
-      return 'Drupal6';
+      trigger_error("Unknown version", E_USER_ERROR);
+      exit();
     }
-    elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '7.0', '>=') && version_compare(VERSION, '8.0', '<')) {
-      return 'Drupal';
-    }
-    else {
-      // guess CMS name from the current path
-      list($cmsType,) = self::findCMSRootPath();
 
-      if (!empty($cmsType)) {
-        return $cmsType;
+    /**
+     * Get the CMS name
+     */
+    public static function findCMS() {
+      if (defined('CIVICRM_UF')) {
+        return CIVICRM_UF;
+      }
+      elseif (defined('BACKDROP_VERSION')) {
+        return 'Backdrop';
+      }
+      elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '6.0', '>=') && version_compare(VERSION, '7.0', '<')) {
+        return 'Drupal6';
+      }
+      elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '7.0', '>=') && version_compare(VERSION, '8.0', '<')) {
+        return 'Drupal';
+      }
+      elseif (defined('ABSPATH') && function_exists('get_bloginfo')) {
+        return 'WordPress';
+      }
+      elseif (defined('DRUPAL_ROOT') && class_exists('Drupal') && version_compare(\Drupal::VERSION, '8.0', '>=') && version_compare(\Drupal::VERSION, '9.0', '<')) {
+        return 'Drupal8';
+      }
+      else {
+        // guess CMS name from the current path
+        list($cmsType,) = self::findCMSRootPath();
+
+        if (!empty($cmsType)) {
+          return $cmsType;
+        }
       }
     }
-  }
 
-  /**
-   * Get the CMS root path and CMS name
-   */
-  public static function findCMSRootPath() {
-    $cmsPatterns = array(
-      'Wordpress' => array(
-        'wp-includes/version.php',
-        // Future? 'vendor/civicrm/wordpress/civicrm.php' => 'wp',
-      ),
-      'Joomla' => array(
-        'administrator/components/com_civicrm/civicrm/civicrm-version.php',
-      ),
-      'Drupal' => array(
-        'modules/system/system.module', // D7
-      ),
-      'Drupal8' => array(
-        'core/core.services.yml', // D8
-      ),
-      'Backdrop' => array(
-        'core/modules/layout/layout.module',
-      ),
-    );
+    /**
+     * Get the CMS root path and CMS name
+     */
+    public static function findCMSRootPath() {
+      $cmsPatterns = array(
+        'Wordpress' => array(
+          'wp-includes/version.php',
+          // Future? 'vendor/civicrm/wordpress/civicrm.php' => 'wp',
+        ),
+        'Joomla' => array(
+          'administrator/components/com_civicrm/civicrm/civicrm-version.php',
+        ),
+        'Drupal' => array(
+          // D7
+          'modules/system/system.module',
+        ),
+        'Drupal8' => array(
+          // D8
+          'core/core.services.yml',
+        ),
+        'Backdrop' => array(
+          'core/modules/layout/layout.module',
+        ),
+      );
 
-    $parts = explode('/', str_replace('\\', '/', self::getSearchDir()));
-    while (!empty($parts)) {
-      $basePath = implode('/', $parts);
+      $parts = explode('/', str_replace('\\', '/', self::getSearchDir()));
+      while (!empty($parts)) {
+        $basePath = implode('/', $parts);
 
-      foreach ($cmsPatterns as $cmsType => $relPaths) {
-        foreach ($relPaths as $relPath) {
-          $matches = glob("$basePath/$relPath");
-          if (!empty($matches)) {
-            return [$cmsType, $basePath];
+        foreach ($cmsPatterns as $cmsType => $relPaths) {
+          foreach ($relPaths as $relPath) {
+            $matches = glob("$basePath/$relPath");
+            if (!empty($matches)) {
+              return [$cmsType, $basePath];
+            }
           }
         }
+
+        array_pop($parts);
       }
+    }
 
-      array_pop($parts);
+    /**
+     * Get the current path
+     */
+    public static function getSearchDir() {
+      if ($_SERVER['SCRIPT_FILENAME']) {
+        return dirname($_SERVER['SCRIPT_FILENAME']);
+      }
+      // getenv('PWD') works better with symlinked source trees, but it's
+      // not portable to Windows.
+      if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+        return getcwd();
+      }
+      else {
+        return getenv('PWD');
+      }
     }
+
   }
+}
+
+namespace {
 
   /**
-   * Get the current path
+   * Get the CiviCRM version.
+   * TODO : For now this function is not included in \Civi\Version class so not to break any code
+   *   which directly call civicrmVersion(). So those call need to replaced with \Civi\Version::civicrmVersion()
+   *   when included in the class
+   * @deprecated
    */
-  public static function getSearchDir() {
-    // getenv('PWD') works better with symlinked source trees, but it's
-    // not portable to Windows.
-    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-      return getcwd();
-    }
-    else {
-      return getenv('PWD');
-    }
+  function civicrmVersion() {
+    return [
+      'version' => \_CiviVersion_\Util::findVersion(),
+      'cms' => \_CiviVersion_\Util::findCMS(),
+    ];
   }
 
 }
-
-/**
- * Get the CiviCRM version.
- * TODO : For now this function is not included in \Civi\Version class so not to break any code
- *   which directly call civicrmVersion(). So those call need to replaced with \Civi\Version::civicrmVersion()
- *   when included in the class
- */
-function civicrmVersion() {
-  return [
-    'version' => \Civi\Version::findVersion(),
-    'cms' => \Civi\Version::findCMS(),
-  ];
-}