4.1 -> 4.x #10789
Merged
4.1 -> 4.x #10789
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The button that i updated is for saving changes made in the "Edit code" window and should thus say "Save", not "Edit".
…mautic#10697) * Fixes issue mautic#10453 * Adding functional test covering the bug mautic#10453 Co-authored-by: Rolando <rpayanm@gmail.com>
* Deleted unused IPs in batches and some improvements. * Added return type declaration to command methods and some improvements. * Removed dump() * Created separate methods for get and delete unused ips. * Consumed repo methods in model. * Updated command to use model methods. * Added test case. * Fix static analysis
Co-authored-by: John Linhart <admin@escope.cz>
…autic#10663) Fix error when using PHP 8: {"exception":"[object] (Symfony\\Component\\Debug\\Exception\\FatalThrowableError(code: 0): array_merge() does not accept unknown named parameters} Not sure if this is the most elegant way to address the issue but this bug has broken the site functionality.
* Allow user to update role via API * Update user's role using API: test cases * Update user's role using API: added more test cases * Fix test cases and add more test case * Added AbstractMauticTestCase::loginUser() method that allows login user in non-restricted areas * Fix failing tests Co-authored-by: fedys <miroslav.fedeles@gmail.com> Co-authored-by: John Linhart <admin@escope.cz>
* Fix send unpublished SMS * Fix send unpublished SMS for broadcast command * Add CampaignSendSubscriberTest * Add testSendSmsNotPublished test * Minor change to tests * Fixing types * Automatic cs fix Co-authored-by: John Linhart <admin@escope.cz>
* Fix group by If you use count columns * Add unit tests * Fix unit tests * Remove define from tests * Fix unit tests * Fix unit tests * Fix unit tests Co-authored-by: John Linhart <admin@escope.cz>
Removing the background color f0f0f0 from gjs-field-radio class to improve the color constrast between radio's background and radio's options and returning the class parameters to the default of the original editor. Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com>
Apply Stalebot only to issues and not PRs Co-authored-by: John Linhart <admin@escope.cz>
Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> Co-authored-by: Joey Keller <jos0405@gmail.com>
…ar (mautic#10778) * Change field definition for column_value to longtext instead of varchar 255 * Update app/migrations/Version20200729170800.php Co-authored-by: John Linhart <admin@escope.cz> * I suggested bad namespace path during code review. Fixing it here Co-authored-by: Don Gilbert <don@dongilbert.net>
…orms have identical names (mautic#10717) * Correct name form Campaign Contact Source * Refactoring and add test * Finishing up the test * Fixing the bug discovered by the test * CS fix Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com>
* Fix empty value in contact boolean fields
* Fix configuration page save
* Fix controller functional tests
* Always retype the isEnabled param to int. Even for PATCH
* Fixing phpstan issue
Line app/bundles/ChannelBundle/Controller/Api/MessageApiController.php
------ -------------------------------------------------------------------
32 Property
Mautic\ChannelBundle\Controller\Api\MessageApiController::$model
(Mautic\ChannelBundle\Model\MessageModel) does not accept
Mautic\CoreBundle\Model\AbstractCommonModel.
* Fixing PHP Notice - Undefined index: email
"file":"\/var\/www\/html\/mautic\/app\/bundles\/ChannelBundle\/Controller\/Api\/MessageApiController.php","line":54
I cannot figure out why the condition for PATCH was there in the first place. It's causing only troubles.
* Adding functional API tests covering the problematic endpoint and method, fixing the controller
* Fix csfixer issue
* Adding missing description to payloads for assertion
Co-authored-by: John Linhart <admin@escope.cz>
Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com>
* Add missing information * Missing commas 😊
* Fix for mautic#10517 Some integrations such as Hubspot have an `'encode_parameters' => 'json'` setting, which triggers the parameters being sent in `POST` / `PUT` / `PATCH` requests to be `json_encode`-d: https://github.com/mautic/mautic/blob/5975231722cfde8bdad783b373c70ad20333db37/app/bundles/PluginBundle/Integration/AbstractIntegration.php#L760 That causes a problem when the result is passed to Guzzle's `request` method under key `\GuzzleHttp\RequestOptions::FORM_PARAMS`, because the payload is expected to be an array: https://github.com/mautic/mautic/blob/5975231722cfde8bdad783b373c70ad20333db37/app/bundles/PluginBundle/Integration/AbstractIntegration.php#L829 as per the documentation: https://docs.guzzlephp.org/en/stable/request-options.html#form-params The above RP addresses this by passing the payload under `\GuzzleHttp\RequestOptions::BODY` instead, **if** the payload is a string, rather than an array. Tested and working with HubSpot. * Adding test to the payload key fix * Creating Client in another method so it could be mocked Plus some code style improvements * CS Fixer * STAN fixes * Removing whitespace Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com>
cla-bot
bot
added
the
cla-signed
Codecov Report
@@ Coverage Diff @@
## 4.x #10789 +/- ##
============================================
+ Coverage 44.60% 45.30% +0.70%
- Complexity 34879 34890 +11
============================================
Files 2089 2089
Lines 116938 116987 +49
============================================
+ Hits 52157 53005 +848
+ Misses 64781 63982 -799
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
This PR merges the changes from 4.1.2 into the 4.x branch.
Steps to test this PR: