diff --git a/civicrm.php b/civicrm.php
index ec56baedf68c2f0d199b7fade0075263ab9bae87..31a0b6910b2fed372cd0fb9fd7d6fd88e1abb618 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.52.0
+ * Version: 5.52.1
* Requires at least: 4.9
* Requires PHP: 7.2
* Author: CiviCRM LLC
@@ -36,7 +36,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: changing it forces Javascript and CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.52.0');
+define('CIVICRM_PLUGIN_VERSION', '5.52.1');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Api4/Page/AJAX.php b/civicrm/CRM/Api4/Page/AJAX.php
index 4816ea9c97d9261c355bf6d2e3e9304ddc2d6d3a..0aa40e94d9cdea315bd901f0dd25d5be63ce5b68 100644
--- a/civicrm/CRM/Api4/Page/AJAX.php
+++ b/civicrm/CRM/Api4/Page/AJAX.php
@@ -58,8 +58,9 @@ class CRM_Api4_Page_AJAX extends CRM_Core_Page {
CRM_Utils_System::civiExit();
}
try {
- // Call multiple
+ // Two call formats. Which one was used? Note: CRM_Api4_Permission::check() and CRM_Api4_Page_AJAX::run() should have matching conditionals.
if (empty($this->urlPath[3])) {
+ // Received multi-call format
$calls = CRM_Utils_Request::retrieve('calls', 'String', CRM_Core_DAO::$_nullObject, TRUE, NULL, 'POST');
$calls = json_decode($calls, TRUE);
$response = [];
@@ -67,8 +68,8 @@ class CRM_Api4_Page_AJAX extends CRM_Core_Page {
$response[$index] = call_user_func_array([$this, 'execute'], $call);
}
}
- // Call single
else {
+ // Received single-call format
$entity = $this->urlPath[3];
$action = $this->urlPath[4];
$params = CRM_Utils_Request::retrieve('params', 'String');
diff --git a/civicrm/CRM/Api4/Permission.php b/civicrm/CRM/Api4/Permission.php
index c179ad57c023ce094545c3806935ba0f93b5df2e..e476627656063aa82f0b3b935cbe8ab2454bdbb2 100644
--- a/civicrm/CRM/Api4/Permission.php
+++ b/civicrm/CRM/Api4/Permission.php
@@ -22,17 +22,32 @@
class CRM_Api4_Permission {
public static function check() {
- $config = CRM_Core_Config::singleton();
- $urlPath = explode('/', $_GET[$config->userFrameworkURLVar]);
- $permissions = [
+ $urlPath = explode('/', CRM_Utils_System::currentPath());
+ $defaultPermissions = [
['access CiviCRM', 'access AJAX API'],
];
+ // Two call formats. Which one was used? Note: CRM_Api4_Permission::check() and CRM_Api4_Page_AJAX::run() should have matching conditionals.
if (!empty($urlPath[3])) {
+ // Received single-call format
$entity = $urlPath[3];
$action = $urlPath[4];
+ $permissions = $defaultPermissions;
CRM_Utils_Hook::alterApiRoutePermissions($permissions, $entity, $action);
+ return CRM_Core_Permission::check($permissions);
+ }
+ else {
+ // Received multi-call format
+ $calls = CRM_Utils_Request::retrieve('calls', 'String', CRM_Core_DAO::$_nullObject, TRUE, NULL, 'POST');
+ $calls = json_decode($calls, TRUE);
+ foreach ($calls as $call) {
+ $permissions = $defaultPermissions;
+ CRM_Utils_Hook::alterApiRoutePermissions($permissions, $call[0], $call[1]);
+ if (!CRM_Core_Permission::check($permissions)) {
+ return FALSE;
+ }
+ }
+ return TRUE;
}
- return CRM_Core_Permission::check($permissions);
}
}
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index e244fe0fc36dee8609fff99dec1dc025929c0939..9c4a4bbd249d23e866c604cdf9fe98eddee8910b 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -417,7 +417,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
$error = $this->checkContactDuplicate($paramValues);
if (CRM_Core_Error::isAPIError($error, CRM_Core_ERROR::DUPLICATE_CONTACT)) {
- $matchedIDs = explode(',', $error['error_message']['params'][0]);
+ $matchedIDs = (array) $error['error_message']['params'];
if (count($matchedIDs) > 1) {
throw new CRM_Core_Exception('Multiple matching contact records detected for this row. The contribution was not imported', CRM_Import_Parser::ERROR);
}
@@ -776,7 +776,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
$error = $this->checkContactDuplicate($params);
if (isset($error['error_message']['params'][0])) {
- $matchedIDs = explode(',', $error['error_message']['params'][0]);
+ $matchedIDs = (array) $error['error_message']['params'];
// check if only one contact is found
if (count($matchedIDs) > 1) {
diff --git a/civicrm/CRM/Event/Import/Parser/Participant.php b/civicrm/CRM/Event/Import/Parser/Participant.php
index 8afe963e82de27ee09de6a99411de77b08bb86fd..de5f53ef520591a129ad4a1246b1514b31abe836 100644
--- a/civicrm/CRM/Event/Import/Parser/Participant.php
+++ b/civicrm/CRM/Event/Import/Parser/Participant.php
@@ -236,7 +236,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
$error = $this->checkContactDuplicate($formatValues);
if (CRM_Core_Error::isAPIError($error, CRM_Core_ERROR::DUPLICATE_CONTACT)) {
- $matchedIDs = explode(',', $error['error_message']['params'][0]);
+ $matchedIDs = (array) $error['error_message']['params'];
if (count($matchedIDs) >= 1) {
foreach ($matchedIDs as $contactId) {
$formatted['contact_id'] = $contactId;
diff --git a/civicrm/CRM/Member/Import/Parser/Membership.php b/civicrm/CRM/Member/Import/Parser/Membership.php
index 45db615fcdf5209b14cf72e8735165636639c2bf..5c6dbc9b22ee484cbdb809afc9ac7c0374929cf6 100644
--- a/civicrm/CRM/Member/Import/Parser/Membership.php
+++ b/civicrm/CRM/Member/Import/Parser/Membership.php
@@ -215,7 +215,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
$error = $this->checkContactDuplicate($formatValues);
if (CRM_Core_Error::isAPIError($error, CRM_Core_ERROR::DUPLICATE_CONTACT)) {
- $matchedIDs = explode(',', $error['error_message']['params'][0]);
+ $matchedIDs = (array) $error['error_message']['params'];
if (count($matchedIDs) > 1) {
throw new CRM_Core_Exception('Multiple matching contact records detected for this row. The membership was not imported', CRM_Import_Parser::ERROR);
}
diff --git a/civicrm/CRM/Utils/DeprecatedUtils.php b/civicrm/CRM/Utils/DeprecatedUtils.php
index 4bfe2c71f435a3dd38be709d637e198234a07d8d..7b9cb3f67da2b381d806f7f4bccab3fba32684b5 100644
--- a/civicrm/CRM/Utils/DeprecatedUtils.php
+++ b/civicrm/CRM/Utils/DeprecatedUtils.php
@@ -48,7 +48,7 @@ function _civicrm_api3_deprecated_duplicate_formatted_contact($params) {
'is_error' => 1,
'error_message' => [
'code' => CRM_Core_Error::DUPLICATE_CONTACT,
- 'params' => $contact->id,
+ 'params' => [$contact->id],
'level' => 'Fatal',
'message' => "Found matching contacts: $contact->id",
],
diff --git a/civicrm/Civi/Api4/Utils/FormattingUtil.php b/civicrm/Civi/Api4/Utils/FormattingUtil.php
index da1129ad4fa606350e9c0c14d836729cc9f607ec..efacccb3de3ee905d0d262f04dced2e3d89a188c 100644
--- a/civicrm/Civi/Api4/Utils/FormattingUtil.php
+++ b/civicrm/Civi/Api4/Utils/FormattingUtil.php
@@ -265,7 +265,7 @@ class FormattingUtil {
}
// Fallback for option lists that exist in the api but not the BAO
if (!isset($options) || $options === FALSE) {
- $options = civicrm_api4($field['entity'], 'getFields', ['action' => $action, 'loadOptions' => ['id', $valueType], 'where' => [['name', '=', $field['name']]]])[0]['options'] ?? NULL;
+ $options = civicrm_api4($field['entity'], 'getFields', ['checkPermissions' => FALSE, 'action' => $action, 'loadOptions' => ['id', $valueType], 'where' => [['name', '=', $field['name']]]])[0]['options'] ?? NULL;
$options = $options ? array_column($options, $valueType, 'id') : $options;
}
if (is_array($options)) {
diff --git a/civicrm/ang/crmUi.js b/civicrm/ang/crmUi.js
index 075e29b0d07382cab65ae380129fa575548a96a2..a8bc9de7ef0754c83cfe9e9944f5eb6d65da40f4 100644
--- a/civicrm/ang/crmUi.js
+++ b/civicrm/ang/crmUi.js
@@ -759,7 +759,7 @@
restrict: 'EA',
scope: {
crmUiTabSet: '@',
- tabSetOptions: '@'
+ tabSetOptions: '<'
},
templateUrl: '~/crmUi/tabset.html',
transclude: true,
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index fa2cc9f250b07e57e12bfd5cfc639f7693072706..3c0003224224fbdce065bc3687db5583c267cf61 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.52.0',
+ return array( 'version' => '5.52.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/composer.json b/civicrm/composer.json
index 72db2434d3ed4d4d2a45887d908b6962f515a566..39132a90416cd651b492c89c0c4ce6ceaad03592 100644
--- a/civicrm/composer.json
+++ b/civicrm/composer.json
@@ -59,6 +59,7 @@
"symfony/filesystem": "~4.4",
"symfony/process": "~4.4",
"symfony/var-dumper": "~3.0 || ~4.4 || ~5.1",
+ "symfony/service-contracts": "~2.2",
"psr/log": "~1.0 || ~2.0 || ~3.0",
"symfony/finder": "~4.4",
"tecnickcom/tcpdf" : "6.4.*",
@@ -94,7 +95,8 @@
"ezyang/htmlpurifier": "^4.13",
"phpoffice/phpspreadsheet": "^1.18",
"symfony/polyfill-php73": "^1.23",
- "html2text/html2text": "^4.3.1"
+ "html2text/html2text": "^4.3.1",
+ "psr/container": "~1.0"
},
"scripts": {
"post-install-cmd": [
diff --git a/civicrm/composer.lock b/civicrm/composer.lock
index e84f413ebebb8145f7434b1c7c84f95d27d25c80..acc1431944bf2c7d1d9b9af0a17ea08596171734 100644
--- a/civicrm/composer.lock
+++ b/civicrm/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": "9808720dbc97471b1d5cc71fdc6b6897",
+ "content-hash": "0fc116de60e32605258ea574d897653b",
"packages": [
{
"name": "adrienrn/php-mimetyper",
@@ -3055,22 +3055,27 @@
},
{
"name": "psr/container",
- "version": "1.1.1",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
"shasum": ""
},
"require": {
- "php": ">=7.2.0"
+ "php": ">=5.3.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
@@ -3083,7 +3088,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
+ "homepage": "http://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -3097,9 +3102,9 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.1"
+ "source": "https://github.com/php-fig/container/tree/master"
},
- "time": "2021-03-05T17:36:06+00:00"
+ "time": "2017-02-14T16:28:37+00:00"
},
{
"name": "psr/http-client",
@@ -3736,73 +3741,6 @@
],
"time": "2022-06-22T15:01:38+00:00"
},
- {
- "name": "symfony/deprecation-contracts",
- "version": "v2.5.2",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- },
- "autoload": {
- "files": [
- "function.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "A generic function and convention to trigger deprecation notices",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-01-02T09:53:40+00:00"
- },
{
"name": "symfony/event-dispatcher",
"version": "v4.4.42",
@@ -4884,25 +4822,21 @@
},
{
"name": "symfony/service-contracts",
- "version": "v2.5.2",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
- "psr/container": "^1.1",
- "symfony/deprecation-contracts": "^2.1|^3"
- },
- "conflict": {
- "ext-psr": "<1.1|>=2"
+ "psr/container": "^1.0"
},
"suggest": {
"symfony/service-implementation": ""
@@ -4910,7 +4844,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4947,7 +4881,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/service-contracts/tree/master"
},
"funding": [
{
@@ -4963,7 +4897,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-30T19:17:29+00:00"
+ "time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/var-dumper",
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index fc4bff2d4f23fdfc25a6ea259ddedbe6f80afc9f..61af0f1510591e83953a9e158ac9d23db8b1a2e6 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 3fcde4e9c4cb9483425fbe02c53d1c83316ade14..870254d1c161c35664f301220719c459012082bc 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -103,7 +103,7 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
$data = ['fields' => $result[$id]];
foreach ($entity['joins'] ?? [] as $joinEntity => $join) {
$data['joins'][$joinEntity] = (array) $api4($joinEntity, 'get', [
- 'where' => self::getJoinWhereClause($entity['type'], $joinEntity, $id),
+ 'where' => self::getJoinWhereClause($this->_formDataModel, $entity['name'], $joinEntity, $id),
'limit' => !empty($join['af-repeat']) ? $join['max'] ?? 0 : 1,
'select' => array_keys($join['fields']),
'orderBy' => self::getEntityField($joinEntity, 'is_primary') ? ['is_primary' => 'DESC'] : [],
@@ -139,22 +139,32 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
abstract protected function processForm();
/**
- * @param $mainEntityName
- * @param $joinEntityName
- * @param $mainEntityId
+ * @param \Civi\Afform\FormDataModel $formDataModel
+ * @param string $mainEntityName
+ * @param string $joinEntityType
+ * @param int|string $mainEntityId
* @return array
* @throws \API_Exception
*/
- protected static function getJoinWhereClause($mainEntityName, $joinEntityName, $mainEntityId) {
+ protected static function getJoinWhereClause(FormDataModel $formDataModel, string $mainEntityName, string $joinEntityType, $mainEntityId) {
+ $entity = $formDataModel->getEntity($mainEntityName);
+ $mainEntityType = $entity['type'];
$params = [];
- if (self::getEntityField($joinEntityName, 'entity_id')) {
+
+ // Add data as clauses e.g. `is_primary: true`
+ foreach ($entity['joins'][$joinEntityType]['data'] ?? [] as $key => $val) {
+ $params[] = [$key, '=', $val];
+ }
+
+ // Figure out the FK field between the join entity and the main entity
+ if (self::getEntityField($joinEntityType, 'entity_id')) {
$params[] = ['entity_id', '=', $mainEntityId];
- if (self::getEntityField($joinEntityName, 'entity_table')) {
- $params[] = ['entity_table', '=', CoreUtil::getTableName($mainEntityName)];
+ if (self::getEntityField($joinEntityType, 'entity_table')) {
+ $params[] = ['entity_table', '=', CoreUtil::getTableName($mainEntityType)];
}
}
else {
- $mainEntityField = \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($mainEntityName) . '_id';
+ $mainEntityField = \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($mainEntityType) . '_id';
$params[] = [$mainEntityField, '=', $mainEntityId];
}
return $params;
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 068fc657dbed652363075e65663ce3b735853a56..e1e3173895060a213bb5a726b7094098fb1a5d6f 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -244,7 +244,7 @@ class Submit extends AbstractProcessor {
$result = civicrm_api4($joinEntityName, 'replace', [
// Disable permission checks because the main entity has already been vetted
'checkPermissions' => FALSE,
- 'where' => self::getJoinWhereClause($event->getEntityType(), $joinEntityName, $entityId),
+ 'where' => self::getJoinWhereClause($event->getFormDataModel(), $event->getEntityName(), $joinEntityName, $entityId),
'records' => $values,
], ['id']);
$indexedResult = array_combine(array_keys($values), (array) $result);
@@ -256,7 +256,7 @@ class Submit extends AbstractProcessor {
civicrm_api4($joinEntityName, 'delete', [
// Disable permission checks because the main entity has already been vetted
'checkPermissions' => FALSE,
- 'where' => self::getJoinWhereClause($event->getEntityType(), $joinEntityName, $entityId),
+ 'where' => self::getJoinWhereClause($event->getFormDataModel(), $event->getEntityName(), $joinEntityName, $entityId),
]);
}
catch (\API_Exception $e) {
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 01077bc24079951b85cd9f81aa0cdfa08ea02a3f..f580049d6af6b62f5506a0c88fc41567327b9496 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index ea554fce85c9524bd0f72cbce334841e4f21c097..2041e36f5c6d1b7ede985b8efe33bb7fab038b6c 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index 4a77e8a8cbcbd61e8e251ad638e142b4d728ed39..20cb81b727566c6f4009bb437057907902c1c071 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -12,7 +12,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index 8b7952847953f4ed594788bdbc47e9157733aed0..a97c6bb3bf39e7a7e1f1f6da096360149bb6d8e3 100644
--- a/civicrm/ext/authx/info.xml
+++ b/civicrm/ext/authx/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-02-11</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/civicrm_admin_ui/info.xml b/civicrm/ext/civicrm_admin_ui/info.xml
index fe92248e3322b3640a84f4a677a2696679051a45..fb073e30c8e94d0648847d22ef23188ffda7fc1e 100644
--- a/civicrm/ext/civicrm_admin_ui/info.xml
+++ b/civicrm/ext/civicrm_admin_ui/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2022-01-02</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/civigrant/info.xml b/civicrm/ext/civigrant/info.xml
index e1d4fb68e2fba708c727de4805d091ee230da635..6db7603b2583db31dbcc7a3291c8c8702337781c 100644
--- a/civicrm/ext/civigrant/info.xml
+++ b/civicrm/ext/civigrant/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-11-11</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index 3c020d9734e83ece74e1cf1afa0811502adc4e16..868f7de0abc3922e1c016e31bce03d2cb9025269 100644
--- a/civicrm/ext/ckeditor4/info.xml
+++ b/civicrm/ext/ckeditor4/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-05-23</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index abb8e4caf2454eb446cbc7cd71feaa0baeff4cd4..eb68d4d50d7380cae4e2f2ad0d55e01959421b7b 100644
--- a/civicrm/ext/contributioncancelactions/info.xml
+++ b/civicrm/ext/contributioncancelactions/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-12</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 97534f767be2b0cdca303714e8d568a2e350a278..5c02b8f2d4b9aaa4755bf3de589821848e977fca 100644
--- a/civicrm/ext/eventcart/info.xml
+++ b/civicrm/ext/eventcart/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-03</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 67a95e8a7fdbed05d6b9dda82360720ef81136f2..dc98ce6de57366f4f1314c4f38bb20af69066d03 100644
--- a/civicrm/ext/ewaysingle/info.xml
+++ b/civicrm/ext/ewaysingle/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-07</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index 8c3a7e5198d3432aeb88b0c1d8abf6f397c12523..d557df0f3f983cb5eabd8927f73854f1513067dc 100644
--- a/civicrm/ext/financialacls/info.xml
+++ b/civicrm/ext/financialacls/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-27</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 15f002475da03fbd2da11db5a6d8acf4085fb04a..a44f5e115c0ce8adbaa625b5d2b5cb136b2d66fd 100644
--- a/civicrm/ext/flexmailer/info.xml
+++ b/civicrm/ext/flexmailer/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-05</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index d147e402a4bcb9143d8df8c2ba31a813e23dfa05..5705bc870a51c1b8dda3f90e675efd4eb41f443e 100644
--- a/civicrm/ext/greenwich/info.xml
+++ b/civicrm/ext/greenwich/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-07-21</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index 005cbdd6447ad95882b794e4d854668b97e50ec1..a35b3a9a48f4d54b62ca8c82dde4121f70cfed7b 100644
--- a/civicrm/ext/legacycustomsearches/info.xml
+++ b/civicrm/ext/legacycustomsearches/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-07-25</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/message_admin/info.xml b/civicrm/ext/message_admin/info.xml
index bee2dfa268c94f72e4c5fe790420e4c4f476826c..955a58b2494ef816e3a0cb41993d81ded792e225 100644
--- a/civicrm/ext/message_admin/info.xml
+++ b/civicrm/ext/message_admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-06-12</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 4588367c2b9603a4b69441cfe4158c8627ecf6ec..c355f77390253e09ac15c2954b5680b1a1243792 100644
--- a/civicrm/ext/oauth-client/info.xml
+++ b/civicrm/ext/oauth-client/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-23</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index 105f400379cf7eaaf309ced5d9f859cb9a85f24e..973c260d6dd75866bfbdf0c5687fa93473e241cf 100644
--- a/civicrm/ext/payflowpro/info.xml
+++ b/civicrm/ext/payflowpro/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-13</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 84434821bc1549eb7b10eb7ab44e98cf8a0e2eb3..405ecb199bdae55fe0c1b4efb0aa892322345a29 100644
--- a/civicrm/ext/recaptcha/info.xml
+++ b/civicrm/ext/recaptcha/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-03</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 5cf4a1034d0b3ebd8649bb1104c9801df81bce41..75237f6dfec31d1fb5c4ca8ea70092283ff22450 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.52</ver>
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 27b70955b1cc19dcde357a425e390347dbcb6a13..18f44ca9b4cff10513784d0c6a6e6a610be9f065 100644
--- a/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/civicrm/ext/sequentialcreditnotes/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-28</releaseDate>
- <version>5.52.0</version>
+ <version>5.52.1</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index c6592c451d8a4a2e4807f4bb1a46c4fbce4f3320..7c6205b4ccab9889b12a4cae0e7c95a616caca1e 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.52.1
+
+Released August 9, 2022
+
+- **[Synopsis](release-notes/5.52.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.52.1.md#bugs)**
+- **[Credits](release-notes/5.52.1.md#credits)**
+- **[Feedback](release-notes/5.52.1.md#feedback)**
+
## CiviCRM 5.51.0
Released August 3, 2022
diff --git a/civicrm/release-notes/5.52.1.md b/civicrm/release-notes/5.52.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..ed5f42f8a14d83ebe9c43349609a2b09186366fb
--- /dev/null
+++ b/civicrm/release-notes/5.52.1.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.52.1
+
+Released August 9, 2022
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Afform_: Update existing email,phone,address correctly. Prevent deletion of others. ([#24172](https://github.com/civicrm/civicrm-core/pull/24172))**
+* **_Compatibility_: Refine Symfony requirements for better compatibility ([#24171](https://github.com/civicrm/civicrm-core/pull/24171))**
+
+ Specifically, this resolves a new conflict with WordPress plugin `better-wp-security`.
+
+* **_Importer_: Incorrect matching on "External ID"/"Contact ID" ([dev/core#3784](https://lab.civicrm.org/dev/core/-/issues/3784), [dev/core#3786](https://lab.civicrm.org/dev/core/-/issues/3786): [#24166](https://github.com/civicrm/civicrm-core/pull/24166/), [#24153](https://github.com/civicrm/civicrm-core/pull/24153))**
+* **_Search Kit_: Fix viewing search display for anonymous user ([#24180](https://github.com/civicrm/civicrm-core/pull/24180))**
+* **_crmUi_: Make it possible to pass `tabSetOptions` again ([#24193](https://github.com/civicrm/civicrm-core/pull/24193))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Megaphone
+Technology Consulting - Jon Goldberg; Lemniscus - Noah Miller; JMA Consulting - Seamus
+Lee; Dave D; CiviCRM - Tim Otten, Coleman Watts; Agileware - Francis Whittle
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index f0c8067b3342a795743b0aaa17a737e552ed528d..3fcc8e9868c7935c3e98823679e96d386c5494ad 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23825,4 +23825,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.52.0';
+UPDATE civicrm_domain SET version = '5.52.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 59fd42b42e74650fb00e41cdf2c57e6f760bdd3a..69ec4158b7a8ed22110a6aa3be503dbd849b05d6 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2922,7 +2922,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES
- (1,'Default Domain Name',NULL,'5.52.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.52.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index dca67026783856bec2f9544b8388d624bbd015ca..2c58766324d1e3b112e6746f07b98fe51f83e4af 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763::getLoader();
+return ComposerAutoloaderInit21ccd47217059ceab40d01e396eb6144::getLoader();
diff --git a/civicrm/vendor/composer/autoload_files.php b/civicrm/vendor/composer/autoload_files.php
index 3ca7438d8ccb75bef8b7b4f73b4240e912ad6da5..c39203df2973f88efd126ce7cbeb41cd95b7ad00 100644
--- a/civicrm/vendor/composer/autoload_files.php
+++ b/civicrm/vendor/composer/autoload_files.php
@@ -17,7 +17,6 @@ return array(
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'7e9bd612cc444b3eed788ebbe46263a0' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/autoload.php',
- '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
'abede361264e2ae69ec1eee813a101af' => $vendorDir . '/markbaker/complex/classes/src/functions/abs.php',
'21a5860fbef5be28db5ddfbc3cca67c4' => $vendorDir . '/markbaker/complex/classes/src/functions/acos.php',
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 6e64499d3e1aacf41ea84757753caf516f58a06e..f86d1d215f4db83290d9a654dbb74c9fe78c4dc0 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763
+class ComposerAutoloaderInit21ccd47217059ceab40d01e396eb6144
{
private static $loader;
@@ -24,22 +24,22 @@ class ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit21ccd47217059ceab40d01e396eb6144', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit21ccd47217059ceab40d01e396eb6144', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
set_include_path(implode(PATH_SEPARATOR, $includePaths));
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitc4b80b14ec4be1e37a02512281713763::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit21ccd47217059ceab40d01e396eb6144::getInitializer($loader));
$loader->register(true);
- $includeFiles = \Composer\Autoload\ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$files;
+ $includeFiles = \Composer\Autoload\ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequirec4b80b14ec4be1e37a02512281713763($fileIdentifier, $file);
+ composerRequire21ccd47217059ceab40d01e396eb6144($fileIdentifier, $file);
}
return $loader;
@@ -51,7 +51,7 @@ class ComposerAutoloaderInitc4b80b14ec4be1e37a02512281713763
* @param string $file
* @return void
*/
-function composerRequirec4b80b14ec4be1e37a02512281713763($fileIdentifier, $file)
+function composerRequire21ccd47217059ceab40d01e396eb6144($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 3f93a44fd3c0a203cbd0378313ff47b897445770..3ab8618041206d72bc8d89336d8bd23eb6128ab4 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitc4b80b14ec4be1e37a02512281713763
+class ComposerStaticInit21ccd47217059ceab40d01e396eb6144
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -18,7 +18,6 @@ class ComposerStaticInitc4b80b14ec4be1e37a02512281713763
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'7e9bd612cc444b3eed788ebbe46263a0' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/autoload.php',
- '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
'2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
'abede361264e2ae69ec1eee813a101af' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/abs.php',
'21a5860fbef5be28db5ddfbc3cca67c4' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acos.php',
@@ -723,11 +722,11 @@ class ComposerStaticInitc4b80b14ec4be1e37a02512281713763
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitc4b80b14ec4be1e37a02512281713763::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit21ccd47217059ceab40d01e396eb6144::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/include_paths.php b/civicrm/vendor/composer/include_paths.php
index 5386e5c83092fb28fb0ad8c81e99f6ce4e93ead5..0b33bdb80b579a979facb2f2c3cd1a2494b6dbd7 100644
--- a/civicrm/vendor/composer/include_paths.php
+++ b/civicrm/vendor/composer/include_paths.php
@@ -12,8 +12,8 @@ return array(
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear-core-minimal/src',
$vendorDir . '/pear/db',
- $vendorDir . '/pear/log',
$vendorDir . '/pear/mail',
+ $vendorDir . '/pear/log',
$vendorDir . '/pear/mail_mime',
$vendorDir . '/pear/net_socket',
$vendorDir . '/pear/net_smtp',
diff --git a/civicrm/vendor/composer/installed.json b/civicrm/vendor/composer/installed.json
index 21de0eefbf2b77b93db5eb29c0fc21841a945a15..97e324666c318b764e7f07dc48588fe29770ebe4 100644
--- a/civicrm/vendor/composer/installed.json
+++ b/civicrm/vendor/composer/installed.json
@@ -3223,24 +3223,29 @@
},
{
"name": "psr/container",
- "version": "1.1.1",
- "version_normalized": "1.1.1.0",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
"shasum": ""
},
"require": {
- "php": ">=7.2.0"
+ "php": ">=5.3.0"
},
- "time": "2021-03-05T17:36:06+00:00",
+ "time": "2017-02-14T16:28:37+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -3254,7 +3259,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
+ "homepage": "http://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -3268,7 +3273,7 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.1"
+ "source": "https://github.com/php-fig/container/tree/master"
},
"install-path": "../psr/container"
},
@@ -3940,76 +3945,6 @@
],
"install-path": "../symfony/dependency-injection"
},
- {
- "name": "symfony/deprecation-contracts",
- "version": "v2.5.2",
- "version_normalized": "2.5.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "time": "2022-01-02T09:53:40+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "files": [
- "function.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "A generic function and convention to trigger deprecation notices",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "install-path": "../symfony/deprecation-contracts"
- },
{
"name": "symfony/event-dispatcher",
"version": "v4.4.42",
@@ -5133,35 +5068,31 @@
},
{
"name": "symfony/service-contracts",
- "version": "v2.5.2",
- "version_normalized": "2.5.2.0",
+ "version": "v2.2.0",
+ "version_normalized": "2.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
- "psr/container": "^1.1",
- "symfony/deprecation-contracts": "^2.1|^3"
- },
- "conflict": {
- "ext-psr": "<1.1|>=2"
+ "psr/container": "^1.0"
},
"suggest": {
"symfony/service-implementation": ""
},
- "time": "2022-05-30T19:17:29+00:00",
+ "time": "2020-09-07T11:33:47+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5199,7 +5130,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/service-contracts/tree/master"
},
"funding": [
{
diff --git a/civicrm/vendor/composer/installed.php b/civicrm/vendor/composer/installed.php
index a1dbfaa7dd72f427c9924fac352945360c30c009..fb1f86b1239ae9f89348ecca80c02b1ddfbe15ef 100644
--- a/civicrm/vendor/composer/installed.php
+++ b/civicrm/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'civicrm/civicrm-core',
'pretty_version' => '5.52.x-dev',
'version' => '5.52.9999999.9999999-dev',
- 'reference' => '04ae5d12ef221deaecffd756d875d70964c993d0',
+ 'reference' => '73ac6c95ee9c3f8c3a1674be703892aef0aa0d99',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -58,7 +58,7 @@
'civicrm/civicrm-core' => array(
'pretty_version' => '5.52.x-dev',
'version' => '5.52.9999999.9999999-dev',
- 'reference' => '04ae5d12ef221deaecffd756d875d70964c993d0',
+ 'reference' => '73ac6c95ee9c3f8c3a1674be703892aef0aa0d99',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -458,9 +458,9 @@
'dev_requirement' => false,
),
'psr/container' => array(
- 'pretty_version' => '1.1.1',
- 'version' => '1.1.1.0',
- 'reference' => '8622567409010282b7aeebe4bb841fe98b58dcaf',
+ 'pretty_version' => '1.0.0',
+ 'version' => '1.0.0.0',
+ 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
'type' => 'library',
'install_path' => __DIR__ . '/../psr/container',
'aliases' => array(),
@@ -589,15 +589,6 @@
'aliases' => array(),
'dev_requirement' => false,
),
- 'symfony/deprecation-contracts' => array(
- 'pretty_version' => 'v2.5.2',
- 'version' => '2.5.2.0',
- 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
- 'type' => 'library',
- 'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
'symfony/event-dispatcher' => array(
'pretty_version' => 'v4.4.42',
'version' => '4.4.42.0',
@@ -731,9 +722,9 @@
'dev_requirement' => false,
),
'symfony/service-contracts' => array(
- 'pretty_version' => 'v2.5.2',
- 'version' => '2.5.2.0',
- 'reference' => '4b426aac47d6427cc1a1d0f7e2ac724627f5966c',
+ 'pretty_version' => 'v2.2.0',
+ 'version' => '2.2.0.0',
+ 'reference' => 'd15da7ba4957ffb8f1747218be9e1a121fd298a1',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/service-contracts',
'aliases' => array(),
diff --git a/civicrm/vendor/psr/container/README.md b/civicrm/vendor/psr/container/README.md
index 1b9d9e5708ad387080dcde0d74585c15647733d6..084f6df51b21868be82bfc59ef361a6d803d7d3d 100644
--- a/civicrm/vendor/psr/container/README.md
+++ b/civicrm/vendor/psr/container/README.md
@@ -1,13 +1,5 @@
-Container interface
-==============
+# PSR Container
-This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url].
-
-Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container.
-
-The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
-
-[psr-url]: https://www.php-fig.org/psr/psr-11/
-[package-url]: https://packagist.org/packages/psr/container
-[implementation-url]: https://packagist.org/providers/psr/container-implementation
+This repository holds all interfaces/classes/traits related to [PSR-11](https://github.com/container-interop/fig-standards/blob/master/proposed/container.md).
+Note that this is not a container implementation of its own. See the specification for more details.
diff --git a/civicrm/vendor/psr/container/composer.json b/civicrm/vendor/psr/container/composer.json
index 3797a25382aa2ce80ea066979a330397e569ac10..b8ee01265dee64bc8b911a6eece972353b7db2f3 100644
--- a/civicrm/vendor/psr/container/composer.json
+++ b/civicrm/vendor/psr/container/composer.json
@@ -8,15 +8,20 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
+ "homepage": "http://www.php-fig.org/"
}
],
"require": {
- "php": ">=7.2.0"
+ "php": ">=5.3.0"
},
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
}
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
}
}
diff --git a/civicrm/vendor/psr/container/src/ContainerExceptionInterface.php b/civicrm/vendor/psr/container/src/ContainerExceptionInterface.php
index cf10b8b4f570efbf6d793e1be65311c1cdb4b068..d35c6b4d864d9870f1517f47c2917b9e7e2b9a35 100644
--- a/civicrm/vendor/psr/container/src/ContainerExceptionInterface.php
+++ b/civicrm/vendor/psr/container/src/ContainerExceptionInterface.php
@@ -1,4 +1,7 @@
<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
namespace Psr\Container;
diff --git a/civicrm/vendor/psr/container/src/ContainerInterface.php b/civicrm/vendor/psr/container/src/ContainerInterface.php
index cf8e7fd330ffcac7259d2c908c26581736dcf4ae..c3a7206fa00b0db45bbaa2cf47fa9698d578d363 100644
--- a/civicrm/vendor/psr/container/src/ContainerInterface.php
+++ b/civicrm/vendor/psr/container/src/ContainerInterface.php
@@ -1,6 +1,7 @@
<?php
-
-declare(strict_types=1);
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
namespace Psr\Container;
@@ -19,7 +20,7 @@ interface ContainerInterface
*
* @return mixed Entry.
*/
- public function get(string $id);
+ public function get($id);
/**
* Returns true if the container can return an entry for the given identifier.
@@ -32,5 +33,5 @@ interface ContainerInterface
*
* @return bool
*/
- public function has(string $id);
+ public function has($id);
}
diff --git a/civicrm/vendor/psr/container/src/NotFoundExceptionInterface.php b/civicrm/vendor/psr/container/src/NotFoundExceptionInterface.php
index 650bf464eb554870d9f983ee5f636e7d3789001b..6566704eda1d0f551641d38d7c944bffd7d530d9 100644
--- a/civicrm/vendor/psr/container/src/NotFoundExceptionInterface.php
+++ b/civicrm/vendor/psr/container/src/NotFoundExceptionInterface.php
@@ -1,4 +1,7 @@
<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
namespace Psr\Container;
diff --git a/civicrm/vendor/symfony/deprecation-contracts/.gitignore b/civicrm/vendor/symfony/deprecation-contracts/.gitignore
deleted file mode 100644
index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/civicrm/vendor/symfony/deprecation-contracts/CHANGELOG.md b/civicrm/vendor/symfony/deprecation-contracts/CHANGELOG.md
deleted file mode 100644
index 7932e26132d319374a768a73230e78c12535987c..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-CHANGELOG
-=========
-
-The changelog is maintained for all Symfony contracts at the following URL:
-https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/civicrm/vendor/symfony/deprecation-contracts/LICENSE b/civicrm/vendor/symfony/deprecation-contracts/LICENSE
deleted file mode 100644
index 406242ff28554c50aa30f065a034902bf2bf340d..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2020-2022 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/civicrm/vendor/symfony/deprecation-contracts/README.md b/civicrm/vendor/symfony/deprecation-contracts/README.md
deleted file mode 100644
index 4957933a6cc50402853ba29e6a7ce00d3e597470..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Symfony Deprecation Contracts
-=============================
-
-A generic function and convention to trigger deprecation notices.
-
-This package provides a single global function named `trigger_deprecation()` that triggers silenced deprecation notices.
-
-By using a custom PHP error handler such as the one provided by the Symfony ErrorHandler component,
-the triggered deprecations can be caught and logged for later discovery, both on dev and prod environments.
-
-The function requires at least 3 arguments:
- - the name of the Composer package that is triggering the deprecation
- - the version of the package that introduced the deprecation
- - the message of the deprecation
- - more arguments can be provided: they will be inserted in the message using `printf()` formatting
-
-Example:
-```php
-trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use "%s" instead.', 'bitcoin', 'fabcoin');
-```
-
-This will generate the following message:
-`Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.`
-
-While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty
-`function trigger_deprecation() {}` in your application.
diff --git a/civicrm/vendor/symfony/deprecation-contracts/composer.json b/civicrm/vendor/symfony/deprecation-contracts/composer.json
deleted file mode 100644
index cc7cc12372f438aa7eab8ae2e1fc326c35f31451..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "symfony/deprecation-contracts",
- "type": "library",
- "description": "A generic function and convention to trigger deprecation notices",
- "homepage": "https://symfony.com",
- "license": "MIT",
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "require": {
- "php": ">=7.1"
- },
- "autoload": {
- "files": [
- "function.php"
- ]
- },
- "minimum-stability": "dev",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- }
-}
diff --git a/civicrm/vendor/symfony/deprecation-contracts/function.php b/civicrm/vendor/symfony/deprecation-contracts/function.php
deleted file mode 100644
index d4371504a03d7b1ff8055ac7d4cdb3670adcff2f..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/deprecation-contracts/function.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (!function_exists('trigger_deprecation')) {
- /**
- * Triggers a silenced deprecation notice.
- *
- * @param string $package The name of the Composer package that is triggering the deprecation
- * @param string $version The version of the package that introduced the deprecation
- * @param string $message The message of the deprecation
- * @param mixed ...$args Values to insert in the message using printf() formatting
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
- function trigger_deprecation(string $package, string $version, string $message, ...$args): void
- {
- @trigger_error(($package || $version ? "Since $package $version: " : '').($args ? vsprintf($message, $args) : $message), \E_USER_DEPRECATED);
- }
-}
diff --git a/civicrm/vendor/symfony/service-contracts/Attribute/Required.php b/civicrm/vendor/symfony/service-contracts/Attribute/Required.php
index 9df851189a43f4f5db7703e189acd1022cca2c1e..8ba6183f6e32b6ead0edce8b37b4785b910bfc12 100644
--- a/civicrm/vendor/symfony/service-contracts/Attribute/Required.php
+++ b/civicrm/vendor/symfony/service-contracts/Attribute/Required.php
@@ -11,6 +11,8 @@
namespace Symfony\Contracts\Service\Attribute;
+use Attribute;
+
/**
* A required dependency.
*
@@ -19,7 +21,7 @@ namespace Symfony\Contracts\Service\Attribute;
*
* @author Alexander M. Turek <me@derrabus.de>
*/
-#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_PROPERTY)]
final class Required
{
}
diff --git a/civicrm/vendor/symfony/service-contracts/Attribute/SubscribedService.php b/civicrm/vendor/symfony/service-contracts/Attribute/SubscribedService.php
deleted file mode 100644
index 10d1bc38e8bf5a8ab9bea1ce21c82f56eb47ad74..0000000000000000000000000000000000000000
--- a/civicrm/vendor/symfony/service-contracts/Attribute/SubscribedService.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service\Attribute;
-
-use Symfony\Contracts\Service\ServiceSubscriberTrait;
-
-/**
- * Use with {@see ServiceSubscriberTrait} to mark a method's return type
- * as a subscribed service.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-#[\Attribute(\Attribute::TARGET_METHOD)]
-final class SubscribedService
-{
- /**
- * @param string|null $key The key to use for the service
- * If null, use "ClassName::methodName"
- */
- public function __construct(
- public ?string $key = null
- ) {
- }
-}
diff --git a/civicrm/vendor/symfony/service-contracts/CHANGELOG.md b/civicrm/vendor/symfony/service-contracts/CHANGELOG.md
index 7932e26132d319374a768a73230e78c12535987c..e9847779ba985366b4bff79d369c09db31d620eb 100644
--- a/civicrm/vendor/symfony/service-contracts/CHANGELOG.md
+++ b/civicrm/vendor/symfony/service-contracts/CHANGELOG.md
@@ -2,4 +2,4 @@ CHANGELOG
=========
The changelog is maintained for all Symfony contracts at the following URL:
-https://github.com/symfony/contracts/blob/main/CHANGELOG.md
+https://github.com/symfony/contracts/blob/master/CHANGELOG.md
diff --git a/civicrm/vendor/symfony/service-contracts/LICENSE b/civicrm/vendor/symfony/service-contracts/LICENSE
index 74cdc2dbf6dbec4aea949b7bd47e3ee1e8c421e7..69d925ba7511e664a16b2af1fabce06b8767455d 100644
--- a/civicrm/vendor/symfony/service-contracts/LICENSE
+++ b/civicrm/vendor/symfony/service-contracts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 Fabien Potencier
+Copyright (c) 2018-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/civicrm/vendor/symfony/service-contracts/README.md b/civicrm/vendor/symfony/service-contracts/README.md
index 41e054a101cf47251bbdf87a618195d29636cb93..d033a439b9a96118d6ee9c90c58ea936bc432fb3 100644
--- a/civicrm/vendor/symfony/service-contracts/README.md
+++ b/civicrm/vendor/symfony/service-contracts/README.md
@@ -6,4 +6,4 @@ A set of abstractions extracted out of the Symfony components.
Can be used to build on semantics that the Symfony components proved useful - and
that already have battle tested implementations.
-See https://github.com/symfony/contracts/blob/main/README.md for more information.
+See https://github.com/symfony/contracts/blob/master/README.md for more information.
diff --git a/civicrm/vendor/symfony/service-contracts/ServiceLocatorTrait.php b/civicrm/vendor/symfony/service-contracts/ServiceLocatorTrait.php
index 74dfa4362e467f9b919ec803a54bdcc0d57150f6..1737f50e997abb1550dd2816612c74750abe5805 100644
--- a/civicrm/vendor/symfony/service-contracts/ServiceLocatorTrait.php
+++ b/civicrm/vendor/symfony/service-contracts/ServiceLocatorTrait.php
@@ -43,17 +43,15 @@ trait ServiceLocatorTrait
*
* @return bool
*/
- public function has(string $id)
+ public function has($id)
{
return isset($this->factories[$id]);
}
/**
* {@inheritdoc}
- *
- * @return mixed
*/
- public function get(string $id)
+ public function get($id)
{
if (!isset($this->factories[$id])) {
throw $this->createNotFoundException($id);
diff --git a/civicrm/vendor/symfony/service-contracts/ServiceSubscriberInterface.php b/civicrm/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
index 098ab908cdfc752f7d6572745a7ecd0e39ae4f8c..8bb320f5b32d8f216a463fd1908df5b517c7993d 100644
--- a/civicrm/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
+++ b/civicrm/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
@@ -47,7 +47,7 @@ interface ServiceSubscriberInterface
* * ['?Psr\Log\LoggerInterface'] is a shortcut for
* * ['Psr\Log\LoggerInterface' => '?Psr\Log\LoggerInterface']
*
- * @return string[] The required service types, optionally keyed by service names
+ * @return array The required service types, optionally keyed by service names
*/
public static function getSubscribedServices();
}
diff --git a/civicrm/vendor/symfony/service-contracts/ServiceSubscriberTrait.php b/civicrm/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
index 16e3eb2c19757dc9593f897bf8ef2198f67a78ab..82fb5ab36155986c00f169c2b2b15e5b1ecbf98f 100644
--- a/civicrm/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
+++ b/civicrm/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
@@ -12,11 +12,10 @@
namespace Symfony\Contracts\Service;
use Psr\Container\ContainerInterface;
-use Symfony\Contracts\Service\Attribute\SubscribedService;
/**
* Implementation of ServiceSubscriberInterface that determines subscribed services from
- * method return types. Service ids are available as "ClassName::methodName".
+ * private method return types. Service ids are available as "ClassName::methodName".
*
* @author Kevin Bond <kevinbond@gmail.com>
*/
@@ -25,66 +24,23 @@ trait ServiceSubscriberTrait
/** @var ContainerInterface */
protected $container;
- /**
- * {@inheritdoc}
- */
public static function getSubscribedServices(): array
{
- $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
- $attributeOptIn = false;
-
- if (\PHP_VERSION_ID >= 80000) {
- foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
- if (self::class !== $method->getDeclaringClass()->name) {
- continue;
- }
-
- if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) {
- continue;
- }
-
- if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
- throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name));
- }
-
- if (!$returnType = $method->getReturnType()) {
- throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
- }
-
- $serviceId = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
+ static $services;
- if ($returnType->allowsNull()) {
- $serviceId = '?'.$serviceId;
- }
-
- $services[$attribute->newInstance()->key ?? self::class.'::'.$method->name] = $serviceId;
- $attributeOptIn = true;
- }
+ if (null !== $services) {
+ return $services;
}
- if (!$attributeOptIn) {
- foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
- if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
- continue;
- }
-
- if (self::class !== $method->getDeclaringClass()->name) {
- continue;
- }
+ $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];
- if (!($returnType = $method->getReturnType()) instanceof \ReflectionNamedType) {
- continue;
- }
-
- if ($returnType->isBuiltin()) {
- continue;
- }
-
- if (\PHP_VERSION_ID >= 80000) {
- trigger_deprecation('symfony/service-contracts', '2.5', 'Using "%s" in "%s" without using the "%s" attribute on any method is deprecated.', ServiceSubscriberTrait::class, self::class, SubscribedService::class);
- }
+ foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
+ if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
+ continue;
+ }
- $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType);
+ if (self::class === $method->getDeclaringClass()->name && ($returnType = $method->getReturnType()) && !$returnType->isBuiltin()) {
+ $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $type);
}
}
@@ -93,14 +49,12 @@ trait ServiceSubscriberTrait
/**
* @required
- *
- * @return ContainerInterface|null
*/
public function setContainer(ContainerInterface $container)
{
$this->container = $container;
- if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
+ if (\is_callable(['parent', __FUNCTION__])) {
return parent::setContainer($container);
}
diff --git a/civicrm/vendor/symfony/service-contracts/composer.json b/civicrm/vendor/symfony/service-contracts/composer.json
index f0586370103670d8c6fed5912026745c0f658c41..47244fbb1034a0e59a1bb2d1888526e69b2e1985 100644
--- a/civicrm/vendor/symfony/service-contracts/composer.json
+++ b/civicrm/vendor/symfony/service-contracts/composer.json
@@ -17,11 +17,7 @@
],
"require": {
"php": ">=7.2.5",
- "psr/container": "^1.1",
- "symfony/deprecation-contracts": "^2.1|^3"
- },
- "conflict": {
- "ext-psr": "<1.1|>=2"
+ "psr/container": "^1.0"
},
"suggest": {
"symfony/service-implementation": ""
@@ -32,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 39f1623281616af223b39abf31b4be3997ecec2a..fd6bab73a7db7dcf1941a372757ffde9c1cf74e6 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.52.0</version_no>
+ <version_no>5.52.1</version_no>
</version>