[REF] Patch electrolinux/phpquery and also core files to fix using {} when doing...

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index ea28427be49aa08b8e155493a3b02773a270a65a..79465208aa377dbb3649c3cb229696c1954cbe71 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -354,7 +354,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
                 $fy = $config->fiscalYearStart;
                 $fiscal = self::fiscalYearOffset($field['dbAlias']);
 
-                $select[] = "DATE_ADD(MAKEDATE({$fiscal}, 1), INTERVAL ({$fy{'M'}})-1 MONTH) AS {$tableName}_{$fieldName}_start";
+                $select[] = "DATE_ADD(MAKEDATE({$fiscal}, 1), INTERVAL ({$fy['M']})-1 MONTH) AS {$tableName}_{$fieldName}_start";
                 $select[] = "{$fiscal} AS {$tableName}_{$fieldName}_subtotal";
                 $select[] = "{$fiscal} AS {$tableName}_{$fieldName}_interval";
                 $field['title'] = ts('Fiscal Year Beginning');

diff --git a/Civi/Angular/ChangeSet.php b/Civi/Angular/ChangeSet.php
index 27c92a5867b16395213863d24e732d7a197cd4d3..fc5d9b08c965a56a3ca6069f59b2b5b0241e698e 100644 (file)
--- a/Civi/Angular/ChangeSet.php
+++ b/Civi/Angular/ChangeSet.php
@@ -150,7 +150,7 @@ class ChangeSet implements ChangeSetInterface {
    */
   public function alterHtml($file, $callback) {
     $this->htmlFilters[] = [
-      'regex' => ($file{0} === ';') ? $file : $this->createRegex($file),
+      'regex' => ($file[0] === ';') ? $file : $this->createRegex($file),
       'callback' => $callback,
     ];
     return $this;

diff --git a/composer.json b/composer.json
index e2fc32f8fd7ddf5bb2e5c30a60fd6042e68a810b..fc89c367c7166789bdd4e44be129750e3ce838a4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -242,6 +242,9 @@
         "Support PHPUnit 6+": "https://github.com/php-cache/integration-tests/commit/1ec7362962185df91d3d749bc3fa7e7b99cb9fc7.patch",
         "Add tests for binary data round trip": "https://github.com/php-cache/integration-tests/commit/89cd7068e83aa776774bfc44f6bcba858c085616.patch"
       },
+      "electrolinux/phpquery": {
+        "PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch"
+      },
       "pear/mail": {
         "Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch"
       },

diff --git a/composer.lock b/composer.lock
index bfcbff172d0d55f8fce81b1d5aed0c7fa9e413ef..a2264757026af635bcf7450730fa2dcc70d453fe 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3c6d377d0dfd5ce11b0a96af56344181",
+    "content-hash": "96209031150a0c16ca42aeb4422abe56",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -431,6 +431,11 @@
                 "shasum": ""
             },
             "type": "library",
+            "extra": {
+                "patches_applied": {
+                    "PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "phpQuery/"
@@ -3061,5 +3066,6 @@
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.1"
-    }
+    },
+    "plugin-api-version": "1.1.0"
 }