Upgrade to CiviCRM 5.31.0

Includes new features, bug fixes, and changes to the database schema. Requires database updates. Notes:

* https://github.com/civicrm/civicrm-core/blob/master/release-notes/5.30.0.md
* https://github.com/civicrm/civicrm-core/blob/master/release-notes/5.30.1.md
* https://github.com/civicrm/civicrm-core/blob/master/release-notes/5.31.0.md

Backup your site using Pantheon's backup tool first. Then either go to
http://<your_drupal_home>/civicrm/upgrade?reset=1 or use terminus drush site.env civicrm-upgrade-db.

Fully test on a dev environment before upgrading on live.

If you have questions contact https://civicrmstarterkit.org/contact. We provide
some basic general support for the public. If you require help with your
specific website there will likely be a cost.

Author: herbdool

profiles/civicrm_starterkit/civicrm_starterkit.make

@@ -8,12 +8,12 @@ core = 7.51
 api = 2
 
 ; Drupal Core
-projects[drupal][version] = "7.61"
+projects[drupal][version] = "7.73"
 
 ; ====== CIVICRM RELATED =========
 
 libraries[civicrm][download][type] = get
-libraries[civicrm][download][url] = "https://download.civicrm.org/civicrm-5.29.1-drupal.tar.gz"
+libraries[civicrm][download][url] = "https://download.civicrm.org/civicrm-5.31.0-drupal.tar.gz"
 libraries[civicrm][destination] = modules
 libraries[civicrm][directory_name] = civicrm
 

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/BAO/ACL.php

@@ -204,36 +204,29 @@ protected static function getGroupACLs($contact_id, $aclRoles = FALSE) {
   protected static function getGroupACLRoles($contact_id) {
     $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
 
-    $rule = new CRM_ACL_BAO_ACL();
-
-    $aclRole = 'civicrm_acl_role';
-
-    $aclER = CRM_ACL_DAO_EntityRole::getTableName();
-    $c2g = CRM_Contact_BAO_GroupContact::getTableName();
-
     $query = "   SELECT          acl.*
                         FROM            civicrm_acl acl
                         INNER JOIN      civicrm_option_group og
                                 ON      og.name = 'acl_role'
                         INNER JOIN      civicrm_option_value ov
-                                ON      acl.entity_table   = '$aclRole'
+                                ON      acl.entity_table   = 'civicrm_acl_role'
                                 AND     ov.option_group_id  = og.id
                                 AND     acl.entity_id      = ov.value
                                 AND     ov.is_active        = 1
-                        INNER JOIN      $aclER
-                                ON      $aclER.acl_role_id = acl.entity_id
-                                AND     $aclER.is_active    = 1
-                        INNER JOIN  $c2g
-                                ON      $aclER.entity_id      = $c2g.group_id
-                                AND     $aclER.entity_table   = 'civicrm_group'
-                        WHERE       acl.entity_table       = '$aclRole'
+                        INNER JOIN      civicrm_acl_entity_role acl_entity_role
+                                ON      acl_entity_role.acl_role_id = acl.entity_id
+                                AND     acl_entity_role.is_active    = 1
+                        INNER JOIN  civicrm_group_contact group_contact
+                                ON      acl_entity_role.entity_id      = group_contact.group_id
+                                AND     acl_entity_role.entity_table   = 'civicrm_group'
+                        WHERE       acl.entity_table       = 'civicrm_acl_role'
                             AND     acl.is_active          = 1
-                            AND     $c2g.contact_id         = $contact_id
-                            AND     $c2g.status             = 'Added'";
+                            AND     group_contact.contact_id         = $contact_id
+                            AND     group_contact.status             = 'Added'";
 
     $results = [];
 
-    $rule->query($query);
+    $rule = CRM_Core_DAO::executeQuery($query);
 
     while ($rule->fetch()) {
       $results[$rule->id] = $rule->toArray();
@@ -254,7 +247,7 @@ protected static function getGroupACLRoles($contact_id) {
    AND acl.entity_table   = 'civicrm_acl_role'
 ";
 
-    $rule->query($query);
+    $rule = CRM_Core_DAO::executeQuery($query);
     while ($rule->fetch()) {
       $results[$rule->id] = $rule->toArray();
     }
@@ -484,10 +477,10 @@ public static function group(
       $aclKeys = array_keys($acls);
       $aclKeys = implode(',', $aclKeys);
 
-      $cacheKey = CRM_Utils_Cache::cleanKey("$tableName-$aclKeys");
+      $cacheKey = CRM_Utils_Cache::cleanKey("$type-$tableName-$aclKeys");
       $cache = CRM_Utils_Cache::singleton();
       $ids = $cache->get($cacheKey);
-      if (!$ids) {
+      if (!is_array($ids)) {
         $ids = [];
         $query = "
 SELECT   a.operation, a.object_id

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/DAO/ACL.php

@@ -6,13 +6,15 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d91adfb9ffb0a514d42f6828f1b95033)
+ * (GenCodeChecksum:54e8c75c28c9dd74192f60bbcf1605f6)
  */
 
 /**
  * Database access object for the ACL entity.
  */
 class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
+  const EXT = 'civicrm';
+  const TABLE_ADDED = '1.6';
 
   /**
    * Static instance to hold the table name.
@@ -115,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('ACLs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('ACLs') : ts('ACL');
   }
 
   /**

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/DAO/ACLCache.php

@@ -6,13 +6,15 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0427e4f02009f7a66cf34ae18ef397aa)
+ * (GenCodeChecksum:7faa5879056a56b463304bd81829afda)
  */
 
 /**
  * Database access object for the ACLCache entity.
  */
 class CRM_ACL_DAO_ACLCache extends CRM_Core_DAO {
+  const EXT = 'civicrm';
+  const TABLE_ADDED = '1.6';
 
   /**
    * Static instance to hold the table name.
@@ -66,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('ACLCaches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('ACLCaches') : ts('ACLCache');
   }
 
   /**
@@ -80,7 +85,6 @@ public static function getEntityTitle() {
   public static function getReferenceColumns() {
     if (!isset(Civi::$statics[__CLASS__]['links'])) {
       Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
-      Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id');
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'acl_id', 'civicrm_acl', 'id');
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
     }
@@ -118,7 +122,6 @@ public static function &fields() {
           'entity' => 'ACLCache',
           'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
-          'FKClassName' => 'CRM_Contact_DAO_Contact',
           'html' => [
             'type' => 'EntityRef',
           ],
@@ -226,6 +229,14 @@ public static function &export($prefix = FALSE) {
    */
   public static function indices($localize = TRUE) {
     $indices = [
+      'index_contact_id' => [
+        'name' => 'index_contact_id',
+        'field' => [
+          0 => 'contact_id',
+        ],
+        'localizable' => FALSE,
+        'sig' => 'civicrm_acl_cache::0::contact_id',
+      ],
       'index_acl_id' => [
         'name' => 'index_acl_id',
         'field' => [

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/DAO/EntityRole.php

@@ -6,13 +6,15 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2e8133b4c385feaa934b2d14ea40f971)
+ * (GenCodeChecksum:c1087517beb5b266d4a1a0a1a342ced0)
  */
 
 /**
  * Database access object for the EntityRole entity.
  */
 class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO {
+  const EXT = 'civicrm';
+  const TABLE_ADDED = '1.6';
 
   /**
    * Static instance to hold the table name.
@@ -73,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Roles');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Roles') : ts('Entity Role');
   }
 
   /**

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/Form/ACL.php

@@ -96,11 +96,12 @@ public function buildQuickForm() {
 
     $this->add('text', 'name', ts('Description'), CRM_Core_DAO::getAttribute('CRM_ACL_DAO_ACL', 'name'), TRUE);
 
-    $operations = ['' => ts('- select -')] + CRM_ACL_BAO_ACL::operation();
     $this->add('select',
       'operation',
       ts('Operation'),
-      $operations, TRUE
+      CRM_ACL_BAO_ACL::operation(),
+      TRUE,
+      ['placeholder' => TRUE]
     );
 
     $objTypes = [
@@ -129,22 +130,22 @@ public function buildQuickForm() {
     $this->add('select', 'entity_id', $label, $role, TRUE);
 
     $group = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select group -'),
       '0' => ts('All Groups'),
     ] + CRM_Core_PseudoConstant::group();
 
     $customGroup = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select set of custom fields -'),
       '0' => ts('All Custom Groups'),
     ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
 
     $ufGroup = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select profile -'),
       '0' => ts('All Profiles'),
     ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
 
     $event = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select event -'),
       '0' => ts('All Events'),
     ] + CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template IS NULL OR is_template != 1 )");
 

profiles/civicrm_starterkit/modules/civicrm/CRM/ACL/Form/EntityRole.php

@@ -26,9 +26,8 @@ public function buildQuickForm() {
       return;
     }
 
-    $aclRoles = ['' => ts('- select -')] + CRM_Core_OptionGroup::values('acl_role');
     $this->add('select', 'acl_role_id', ts('ACL Role'),
-      $aclRoles, TRUE
+      CRM_Core_OptionGroup::values('acl_role'), TRUE, ['placeholder' => TRUE]
     );
 
     $label = ts('Assigned to');

profiles/civicrm_starterkit/modules/civicrm/CRM/Activity/ActionMapping.php

@@ -118,4 +118,12 @@ public function createQuery($schedule, $phase, $defaultParams) {
     return $query;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }