diff --git a/.gitignore b/.gitignore.local similarity index 100% rename from .gitignore rename to .gitignore.local diff --git a/.gitlab/issue_templates/rctest.md b/.gitlab/issue_templates/rctest.md deleted file mode 100644 index e5fb19d6ae087e5f4502d4072541f1c64c2db9cd..0000000000000000000000000000000000000000 --- a/.gitlab/issue_templates/rctest.md +++ /dev/null @@ -1,65 +0,0 @@ -# Contacts - -* [ ] Create a Contact -* [ ] Edit a Contact -* [ ] Create an Organization -* [ ] Assign a Contact to an Organization -* [ ] Add an Activity -* [ ] Create and Send Email to a Contact -* [ ] Create a Group and Assign a Contact to Group -* [ ] Create Tags, Tag Sets -* [ ] Find and Merge Duplicate Contacts - -# Contributions - -* [ ] Add a new Contribution -* [ ] Add a Contribution via a Page -* [ ] Add a new Contribution Page (Title tab) -* [ ] Add a new Contribution Page (Amounts tab) -* [ ] Add a new Contribution Page (Memberships tab) -* [ ] Add a new Contribution Page (Receipts and Tell a Friend tabs) -* [ ] Add a new Contribution Page (Profiles tab) -* [ ] Add a new Contribution Page (Premiums tab) -* [ ] Add a New Contribution Page (Personal Campaigns tab) -* [ ] Add a new Pledge -* [ ] Add a Premium - -# Membership - -* [ ] Add a Membership Price Set -* [ ] Add a new membership Contribution Page -- All Tabs -* [ ] Add a Price set with both Public and Admin visibility on line items -* [ ] Add a Premium -* [ ] Complete Membership - test with attention to public and private line items -* [ ] Renew Membership Admin -* [ ] Renew Membership Front End -* [ ] Edit Membership back end -* [ ] Review Bookkeeping Report - -# Events - -* [ ] Event Creation -* [ ] Add a Price set with line items of both Public and Admin visibility -* [ ] Event Registration - test with attention to Public/Admin visibility -* [ ] Event Confirmation - -# Price Sets - -* [ ] Add a new Price Set (Memberships) -* [ ] Add a new Price Set (Contributions) -* [ ] Add a new Price Set (Events) - -# Search - -* [ ] Find Contacts -* [ ] Find Activities -* [ ] Find Contributions -* [ ] Find Memberships -* [ ] Find Participants -* [ ] Export above search Results - -# Mail - -* [ ] Create and Send CiviMail -* [ ] Track Open -* [ ] Track Links \ No newline at end of file diff --git a/civicrm.php b/civicrm.php index 5e9b06cad1cc0b8a0dff82a794af6cac5205e1cb..f5f48ab79cca0bee4b0205140e9ec816064fd69f 100644 --- a/civicrm.php +++ b/civicrm.php @@ -2,11 +2,10 @@ /* Plugin Name: CiviCRM Description: CiviCRM - Growing and Sustaining Relationships -Version: 5.10.0 +Version: 5.10.1 Author: CiviCRM LLC Author URI: https://civicrm.org/ Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress -GitHub Plugin URI: https://github.com/tadpolecc/civicrm.git License: AGPL3 Text Domain: civicrm Domain Path: /languages diff --git a/civicrm/.github/CONTRIBUTING.md b/civicrm/.github/CONTRIBUTING.md deleted file mode 100644 index 0e1ed32e174fbef77830b0a0efeff7bc1be1bfe6..0000000000000000000000000000000000000000 --- a/civicrm/.github/CONTRIBUTING.md +++ /dev/null @@ -1,20 +0,0 @@ -CiviCRM is a community-driven open-source project. It has a small, full-time -[core team](https://civicrm.org/core-team) -which facilitates development and works on critical issues. -Additionally, a large community of active contributors and -[partner organizations](https://civicrm.org/partners-contributors) -drive much of the development work. - -For developers, CiviCRM maintains a comprehensive -[Developer Guide](https://docs.civicrm.org/dev/en/latest). -Topics of particular importance while submitting pull requests include: - -* [Contributing to CiviCRM core](https://docs.civicrm.org/dev/en/latest/core/contributing/) -* [Pull requests](https://docs.civicrm.org/dev/en/latest/tools/git/#pr) -* [Git workflow overview](https://docs.civicrm.org/dev/en/latest/tools/git/#contributing) -* [Writing automated tests](https://docs.civicrm.org/dev/en/latest/testing/setup/) -* [Jenkins continuous integration](https://docs.civicrm.org/dev/en/latest/tools/jenkins/) -* [Release Process](https://docs.civicrm.org/dev/en/latest/core/release-process/) -* [Developer Community](https://docs.civicrm.org/dev/en/latest/basics/community/) - -CiviCRM thanks you for your contributions and invites you to [log your time spent](https://civicrm.org/contributor-log) so that you (or your organization) may receive public recognition and promotion for your efforts. diff --git a/civicrm/.github/PULL_REQUEST_TEMPLATE.md b/civicrm/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 85e7f8f59d2d9d1434aa723b4f22a59f1c7a562f..0000000000000000000000000000000000000000 --- a/civicrm/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,19 +0,0 @@ -Overview ----------------------------------------- -_A brief description of the pull request. Try to keep it non-technical._ - -Before ----------------------------------------- -_The current status. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._ - -After ----------------------------------------- -_What has been changed. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._ - -Technical Details ----------------------------------------- -_If the PR introduces noteworthy technical changes, please describe them here. Provide code snippets if necessary_ - -Comments ----------------------------------------- -_Anything else you would like the reviewer to note_ diff --git a/civicrm/.gitignore.core b/civicrm/.gitignore.core deleted file mode 100644 index 95f9b09cd8245b1ddc829a62ada311ff91e004b9..0000000000000000000000000000000000000000 --- a/civicrm/.gitignore.core +++ /dev/null @@ -1,45 +0,0 @@ -*~ -*.bak -.use-civicrm-setup -/ext/ -backdrop/ -bower_components -CRM/Case/xml/configuration -CRM/Core/DAO/.listAll.php -CRM/Core/DAO/listAll.php -bin/setup.conf -civicrm-version.txt -civicrm.config.php -node_modules -settings_location.php -sql/case_sample.mysql -sql/civicrm.mysql -sql/civicrm_acl.??_??.mysql -sql/civicrm_acl.mysql -sql/civicrm_data.??_??.mysql -sql/civicrm_data.mysql -sql/civicrm_drop.mysql -sql/civicrm_navigation.mysql -sql/civicrm_sample.mysql -tests/phpunit/CiviTest/CiviSeleniumSettings.php -tests/phpunit/CiviTest/civicrm.settings.php -tools/stats/config.php -authors.txt -drupal/ -WordPress -joomla -packages/ -tests/output -tests/phpunit/CiviTest/civicrm.settings.local.php -tests/phpunit/CiviTest/truncate.xml -tools/scripts/releaser/releaser.conf -tools/tests/reports/logfile.tap -tools/tests/reports/testdox.html -tools/tests/reports/testdox.txt -l10n -vendor -civicrm.settings.php -sql/dummy_processor.mysql -distmaker/distmaker.conf -distmaker/out -/tmp diff --git a/civicrm/CRM/Contribute/Form/Contribution.php b/civicrm/CRM/Contribute/Form/Contribution.php index e9c86d36de57f88e404a23425492d70b7662d0a1..ef49a71c9ef9d1800095a1562ffa2cc539ae89f2 100644 --- a/civicrm/CRM/Contribute/Form/Contribution.php +++ b/civicrm/CRM/Contribute/Form/Contribution.php @@ -699,7 +699,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP } // add various dates - $this->addField('receive_date', array('entity' => 'contribution'), TRUE, FALSE); + $this->addField('receive_date', array('entity' => 'contribution'), !$this->_mode, FALSE); $this->addField('receipt_date', array('entity' => 'contribution'), FALSE, FALSE); $this->addField('cancel_date', array('entity' => 'contribution', 'label' => ts('Cancelled / Refunded Date')), FALSE, FALSE); diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php index d6e4758d4b7efea07f5f9f3650e31ce783d1e426..865f91b5a1ef7e513daac8a74cd2c69b6fb737c4 100644 --- a/civicrm/CRM/Contribute/Form/Task/Invoice.php +++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php @@ -298,7 +298,13 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task { $invoiceDate = date("F j, Y"); $dueDate = date('F j, Y', strtotime($contributionReceiveDate . "+" . $prefixValue['due_date'] . "" . $prefixValue['due_date_period'])); - $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID); + if ($input['component'] == 'contribute') { + $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID); + } + else { + $eid = $contribution->_relatedObjects['participant']->id; + $lineItem = CRM_Price_BAO_LineItem::getLineItems($eid, 'participant', NULL, TRUE, FALSE, TRUE); + } $resultPayments = civicrm_api3('Payment', 'get', array( 'sequential' => 1, diff --git a/civicrm/CRM/Core/Payment/AuthorizeNet.php b/civicrm/CRM/Core/Payment/AuthorizeNet.php index 3a6479cf4495883f120487f230b261c37a24e616..1b1ddde77488973b693707e98d2abf3100e879d5 100644 --- a/civicrm/CRM/Core/Payment/AuthorizeNet.php +++ b/civicrm/CRM/Core/Payment/AuthorizeNet.php @@ -171,6 +171,12 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { // fetch available contribution statuses $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); + // check gateway MD5 response + if (!$this->checkMD5($response_fields[37], $response_fields[6], $response_fields[9])) { + $params['payment_status_id'] = array_search('Failed', $contributionStatus); + return self::error(9003, 'MD5 Verification failed'); + } + // check for application errors // TODO: // AVS, CVV2, CAVV, and other verification results @@ -431,6 +437,39 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { } } + /** + * Check the gateway MD5 response to make sure that this is a proper + * gateway response + * + * @param string $responseMD5 + * MD5 hash generated by the gateway. + * @param string $transaction_id + * Transaction id generated by the gateway. + * @param string $amount + * Purchase amount. + * + * @param bool $ipn + * + * @return bool + */ + public function checkMD5($responseMD5, $transaction_id, $amount, $ipn = FALSE) { + // cannot check if no MD5 hash + $md5Hash = $this->_getParam('md5Hash'); + if (empty($md5Hash)) { + return TRUE; + } + $loginid = $this->_getParam('apiLogin'); + $hashString = $ipn ? ($md5Hash . $transaction_id . $amount) : ($md5Hash . $loginid . $transaction_id . $amount); + $result = strtoupper(md5($hashString)); + + if ($result == $responseMD5) { + return TRUE; + } + else { + return FALSE; + } + } + /** * Calculate and return the transaction fingerprint. * diff --git a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php index 8455449c8da01d64cc597d5561db8f09e607692e..9f33ad14dbdbbce9833729240b1688e29462ee12 100644 --- a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php +++ b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php @@ -164,6 +164,8 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN { $objects['contribution']->total_amount = $input['amount']; $objects['contribution']->trxn_id = $input['trxn_id']; + $this->checkMD5($paymentProcessorObject, $input); + $isFirstOrLastRecurringPayment = FALSE; if ($input['response_code'] == 1) { // Approved @@ -357,4 +359,25 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr return $value; } + /** + * Check and validate gateway MD5 response if present. + * + * @param CRM_Core_Payment_AuthorizeNet $paymentObject + * @param array $input + * + * @throws CRM_Core_Exception + */ + public function checkMD5($paymentObject, $input) { + if (empty($input['trxn_id'])) { + // For decline we have nothing to check against. + return; + } + if (!$paymentObject->checkMD5($input['MD5_Hash'], $input['trxn_id'], $input['amount'], TRUE)) { + $message = "Failure: Security verification failed"; + $log = new CRM_Utils_SystemLogger(); + $log->error('payment_notification', array('message' => $message, 'input' => $input)); + throw new CRM_Core_Exception($message); + } + } + } diff --git a/civicrm/CRM/Price/BAO/LineItem.php b/civicrm/CRM/Price/BAO/LineItem.php index 61a8f0b0883c943ea86fca7b57870c4353f8d10c..c00e3fda01808a41788d61a0da02c200c238007c 100644 --- a/civicrm/CRM/Price/BAO/LineItem.php +++ b/civicrm/CRM/Price/BAO/LineItem.php @@ -769,10 +769,7 @@ WHERE li.contribution_id = %1"; )); unset($updateFinancialItemInfoValues['financialTrxn']); } - elseif ($newFinancialItem->amount != 0 && (// bug in EntityFinancialTrxn.create API which doesn't recognize 0 amount - !empty($updateFinancialItemInfoValues['link-financial-trxn']) || - in_array($contributionStatus, ['Pending refund', 'Partially paid']) - )) { + elseif (!empty($updateFinancialItemInfoValues['link-financial-trxn']) && $newFinancialItem->amount != 0) { civicrm_api3('EntityFinancialTrxn', 'create', array( 'entity_id' => $newFinancialItem->id, 'entity_table' => 'civicrm_financial_item', diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.10.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.10.1.mysql.tpl new file mode 100644 index 0000000000000000000000000000000000000000..5a0b049bff2dcfc0b11ed4a52f2c71ab99c32bb1 --- /dev/null +++ b/civicrm/CRM/Upgrade/Incremental/sql/5.10.1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.10.1 during upgrade *} diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php index bb0fa46b3de0137d243d3631d8b807343729db61..7dd040872e2ea92afec149003e37f2efde01f522 100644 --- a/civicrm/CRM/Utils/System/WordPress.php +++ b/civicrm/CRM/Utils/System/WordPress.php @@ -815,13 +815,11 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { $contactCreated = 0; $contactMatching = 0; - // previously used $wpdb - which means WordPress *must* be bootstrapped - $wpUsers = get_users(array( - 'blog_id' => get_current_blog_id(), - 'number' => -1, - )); + global $wpdb; + $wpUserIds = $wpdb->get_col("SELECT $wpdb->users.ID FROM $wpdb->users"); - foreach ($wpUsers as $wpUserData) { + foreach ($wpUserIds as $wpUserId) { + $wpUserData = get_userdata($wpUserId); $contactCount++; if ($match = CRM_Core_BAO_UFMatch::synchronizeUFMatch($wpUserData, $wpUserData->$id, diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php index 68ba97760b8d14b05d1df298816adb0d0b49c69b..2238c921ddaebdfb5dbee016886dff92baf6436d 100644 --- a/civicrm/civicrm-version.php +++ b/civicrm/civicrm-version.php @@ -1,7 +1,7 @@ <?php /** @deprecated */ function civicrmVersion( ) { - return array( 'version' => '5.10.0', + return array( 'version' => '5.10.1', 'cms' => 'Wordpress', 'revision' => '' ); } diff --git a/civicrm/release-notes/5.10.1.md b/civicrm/release-notes/5.10.1.md new file mode 100644 index 0000000000000000000000000000000000000000..450f5539d9c1a674f641af84efca1cba348c3b52 --- /dev/null +++ b/civicrm/release-notes/5.10.1.md @@ -0,0 +1,43 @@ +# CiviCRM 5.10.1 + +Released February 12, 2019 + +- **[Synopsis](#synopsis)** +- **[Bugs resolved](#bugs)** +- **[Credits](#credits)** +- **[Feedback](#feedback)** + +## <a name="synopsis"></a>Synopsis + +| *Does this version...?* | | +|:--------------------------------------------------------------- |:-------:| +| Fix security vulnerabilities? | no | +| Change the database schema? | no | +| Alter the API? | no | +| Require attention to configuration options? | no | +| Fix problems installing or upgrading to a previous version? | no | +| Introduce features? | no | +| **Fix bugs?** | **yes** | + +## <a name="bugs"></a>Bugs resolved + +- **[13570](https://github.com/civicrm/civicrm-core/pull/13570) Fix Regression + where recieve date field being required broke backend credit card contribution + form** + + To fix another problem the receive date field was made a required field, this + subsequently broke the back office credit card form as the receive date isn't + exposed on that form. + +## <a name="credits"></a>Credits + +This release was developed by the following authors and reviewers: + +Wikimedia Foundation - Eileen McNaughton; CiviCRM - Tim +Otten; Australian Greens - Seamus Lee + +## <a name="feedback"></a>Feedback + +These release notes are edited by Tim Otten and Andrew 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 dc177fa1e6d25e3e608f783395be52b043cc6e55..ce25029d7d2367e5e9b532d93975d582988d10dc 100644 --- a/civicrm/sql/civicrm_data.mysql +++ b/civicrm/sql/civicrm_data.mysql @@ -24043,4 +24043,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.10.0'; +UPDATE civicrm_domain SET version = '5.10.1'; diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql index 36b3eebed63913a1aaf806398881bea1237d7e46..e05544ba28fab5e057652d3d8c703eebcf044d4b 100644 --- a/civicrm/sql/civicrm_generated.mysql +++ b/civicrm/sql/civicrm_generated.mysql @@ -399,7 +399,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.10.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.10.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/civicrm/tools/extensions/.gitignore b/civicrm/tools/extensions/.gitignore deleted file mode 100644 index 05d4332dde0f7f616e95e001d891cac187da3284..0000000000000000000000000000000000000000 --- a/civicrm/tools/extensions/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -cividiscount -civisualize -civivolunteer -org.civicoop.civirules -org.civicrm.angularprofiles diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php index 5848befd4033233794c204bf99222d72def9eaad..0db3742f4343b77cfe8eb3cc576353fdce18351a 100644 --- a/civicrm/vendor/autoload.php +++ b/civicrm/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c::getLoader(); +return ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4::getLoader(); diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php index b9b31e8db7d388d596b7a660239ab2dc1721ae78..437ed36c28287a513d9e89e75116fb87e5b61b16 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 ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c +class ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4475206d531e7b9a0504d26f121dc3c4', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); @@ -31,7 +31,7 @@ class ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit74db121d2bef062e09584e1afca7e69c::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -52,19 +52,19 @@ class ComposerAutoloaderInit74db121d2bef062e09584e1afca7e69c $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit74db121d2bef062e09584e1afca7e69c::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire74db121d2bef062e09584e1afca7e69c($fileIdentifier, $file); + composerRequire4475206d531e7b9a0504d26f121dc3c4($fileIdentifier, $file); } return $loader; } } -function composerRequire74db121d2bef062e09584e1afca7e69c($fileIdentifier, $file) +function composerRequire4475206d531e7b9a0504d26f121dc3c4($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php index c3ce5e3d47188bc349fc31a0f3c11c027ab83d0d..7d03378b4a05b9f861f396c319161500e3dd1a97 100644 --- a/civicrm/vendor/composer/autoload_static.php +++ b/civicrm/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit74db121d2bef062e09584e1afca7e69c +class ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4 { public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', @@ -397,10 +397,10 @@ class ComposerStaticInit74db121d2bef062e09584e1afca7e69c public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit74db121d2bef062e09584e1afca7e69c::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit74db121d2bef062e09584e1afca7e69c::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit74db121d2bef062e09584e1afca7e69c::$prefixesPsr0; - $loader->classMap = ComposerStaticInit74db121d2bef062e09584e1afca7e69c::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$prefixesPsr0; + $loader->classMap = ComposerStaticInit4475206d531e7b9a0504d26f121dc3c4::$classMap; }, null, ClassLoader::class); } diff --git a/civicrm/vendor/symfony/config/Symfony/Component/Config/.gitignore b/civicrm/vendor/symfony/config/Symfony/Component/Config/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/config/Symfony/Component/Config/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore b/civicrm/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore b/civicrm/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore b/civicrm/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/vendor/symfony/finder/Symfony/Component/Finder/.gitignore b/civicrm/vendor/symfony/finder/Symfony/Component/Finder/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/finder/Symfony/Component/Finder/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/vendor/symfony/process/Symfony/Component/Process/.gitignore b/civicrm/vendor/symfony/process/Symfony/Component/Process/.gitignore deleted file mode 100644 index c49a5d8df5c6548379f00c77fe572a7217bce218..0000000000000000000000000000000000000000 --- a/civicrm/vendor/symfony/process/Symfony/Component/Process/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml index a3ac2a5972ef1f71143a7e74039e18387cf49e43..d962bee6e64698d4f04bb9c49ee1d72984c62bee 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.10.0</version_no> + <version_no>5.10.1</version_no> </version>