Merge pull request #14948 from civicrm/5.16

[civicrm-core.git] / CRM / Core / CodeGen / Main.php

diff --git a/CRM/Core/CodeGen/Main.php b/CRM/Core/CodeGen/Main.php
index 978f3e9cae2732018a1004de77ae4a7737e3d5db..4ea9ba89342b1794ba1ed83d3775db9184a33a02 100644 (file)
--- a/CRM/Core/CodeGen/Main.php
+++ b/CRM/Core/CodeGen/Main.php
@@ -4,15 +4,23 @@
  * Class CRM_Core_CodeGen_Main
  */
 class CRM_Core_CodeGen_Main {
-  var $buildVersion;
-  var $db_version;
-  var $cms; // drupal, joomla, wordpress
+  public $buildVersion;
+  public $db_version;
+  /**
+   * drupal, joomla, wordpress
+   * @var string
+   */
+  public $cms;
 
-  var $CoreDAOCodePath;
-  var $sqlCodePath;
-  var $phpCodePath;
-  var $tplCodePath;
-  var $schemaPath; // ex: schema/Schema.xml
+  public $CoreDAOCodePath;
+  public $sqlCodePath;
+  public $phpCodePath;
+  public $tplCodePath;
+  /**
+   * ex: schema/Schema.xml
+   * @var string
+   */
+  public $schemaPath;
 
   /**
    * Definitions of all tables.
@@ -20,24 +28,29 @@ class CRM_Core_CodeGen_Main {
    * @var array
    *   Ex: $tables['civicrm_address_format']['className'] = 'CRM_Core_DAO_AddressFormat';
    */
-  var $tables;
+  public $tables;
 
   /**
    * @var array
    *   Ex: $database['tableAttributes_modern'] = "ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci";
    */
-  var $database;
+  public $database;
 
   /**
-   * @var string|NULL path in which to store a marker that indicates the last execution of
-   * GenCode. If a matching marker already exists, GenCode doesn't run.
+   * Path in which to store a marker that indicates the last execution of GenCode.
+   *
+   * If a matching marker already exists, GenCode doesn't run.
+   *
+   * @var string|null
    */
-  var $digestPath;
+  public $digestPath;
 
   /**
-   * @var string|NULL a digest of the inputs to the code-generator (eg the properties and source files)
+   * Digest of the inputs to the code-generator (eg the properties and source files).
+   *
+   * @var string|null
    */
-  var $sourceDigest;
+  public $sourceDigest;
 
   /**
    * @param $CoreDAOCodePath
@@ -142,7 +155,6 @@ Alternatively you can get a version of CiviCRM that matches your PHP version
     if (!$this->database || !$this->tables) {
       $specification = new CRM_Core_CodeGen_Specification();
       $specification->parse($this->schemaPath, $this->buildVersion);
-      # cheese:
       $this->database = $specification->database;
       $this->tables = $specification->tables;
     }