Merge branch '7.x' into fix-ckeditor-modal-issue

Author: andersonjeccel

.all-contributorsrc

@@ -1580,6 +1580,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "OlgaMarchuk",
+      "name": "OlgaMarchuk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/219189660?v=4",
+      "profile": "https://github.com/OlgaMarchuk",
+      "contributions": [
+        "userTesting"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -24,6 +24,7 @@ body:
       label: Mautic Series
       description: What series of Mautic you are using? Please test to reproduce your bug with the [latest stable version of Mautic](https://www.mautic.org/mautic-releases) which might contain new fixes.  If you are able, please also check the latest development release.
       options:
+        - 7.0.x series
         - 6.0.x series
         - 5.2.x series
         - 5.1.x series (not supported)

README.md

@@ -346,6 +346,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ElPollero"><img src="https://avatars.githubusercontent.com/u/130322184?v=4?s=100" width="100px;" alt="ElPollero"/><br /><sub><b>ElPollero</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=ElPollero" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://pelbox.com"><img src="https://avatars.githubusercontent.com/u/6670191?v=4?s=100" width="100px;" alt="Gagandeep Singh"/><br /><sub><b>Gagandeep Singh</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=pelbox" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/PedroLoureiro1"><img src="https://avatars.githubusercontent.com/u/116733776?v=4?s=100" width="100px;" alt="PedroLoureiro1"/><br /><sub><b>PedroLoureiro1</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=PedroLoureiro1" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/OlgaMarchuk"><img src="https://avatars.githubusercontent.com/u/219189660?v=4?s=100" width="100px;" alt="OlgaMarchuk"/><br /><sub><b>OlgaMarchuk</b></sub></a><br /><a href="#userTesting-OlgaMarchuk" title="User Testing">📓</a></td>
     </tr>
   </tbody>
 </table>

UPGRADE-7.0.md

@@ -9,6 +9,10 @@
 - The ability to update Mautic in the browser (via user interface) has been removed. To update Mautic, use the **command line** instead.
 - The API Limiter was removed temporarily. Shoud be added back before the M7-stable is released. https://github.com/mautic/mautic/pull/14876
 
+## Removed code
+
+- Deprecated class `Mautic\MessengerBundle\MessageHandler\TestHandler` removed with no replacement.
+
 ## Removed Composer dependencies
 - `symfony/yaml` see https://github.com/mautic/mautic/pull/14850
 - `symfony/security-acl` see https://github.com/mautic/mautic/pull/14850
@@ -21,7 +25,8 @@
 ## BC breaks in the code
 
 ### PHP
-- Removed `\Mautic\DashboardBundle\Dashboard\Widget::FORMAT_MYSQL` constant. Use `DateTimeHelper::FORMAT_DB_DATE_ONLY` instead.
+- Removed `Mautic\DashboardBundle\Dashboard\Widget::FORMAT_MYSQL` constant. Use `DateTimeHelper::FORMAT_DB_DATE_ONLY` instead.
+- Removed `Mautic\ApiBundle\Security\OAuth2\Firewall::OAuthListener` class as it was empty. Use `FOS\OAuthServerBundle\Security\Firewall\OAuthListener` instead.
 
 ### Javascript
 - Removed `Mautic.insertTextInEditor` function. Use `Mautic.insertHtmlInEditor` instead.

app/assets/scaffold/files/package-lock.json

@@ -86,7 +86,6 @@
                     ],
                 ],
             ],
-            'fos_oauth_server.security.authentication.listener.class' => Mautic\ApiBundle\Security\OAuth2\Firewall\OAuthListener::class,
             'mautic.validator.oauthcallback'                          => [
                 'class' => Mautic\ApiBundle\Form\Validator\Constraints\OAuthCallbackValidator::class,
                 'tag'   => 'validator.constraint_validator',

app/bundles/ApiBundle/Config/config.php

@@ -7,8 +7,8 @@
 use Mautic\CoreBundle\Tests\CommonMocks;
 use Mautic\CoreBundle\Translation\Translator;
 use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
@@ -43,7 +43,7 @@ protected function setUp(): void
         $this->coreParametersHelper = $this->createMock(CoreParametersHelper::class);
         $this->translator           = $this->createMock(Translator::class);
         $this->request              = $this->createMock(Request::class);
-        $this->request->headers     = new ParameterBag();
+        $this->request->headers     = new HeaderBag();
         $this->event                = $this->createMock(RequestEvent::class);
         $this->subscriber           = new ApiSubscriber(
             $this->coreParametersHelper,

app/bundles/ApiBundle/Security/OAuth2/Firewall/OAuthListener.php

@@ -5,13 +5,18 @@
 namespace Mautic\CacheBundle\Command;
 
 use Mautic\CacheBundle\Cache\CacheProviderInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * CLI Command to clear the application cache.
  */
+#[AsCommand(
+    name: 'mautic:cache:clear',
+    description: "Clears Mautic's cache"
+)]
 class ClearCacheCommand extends Command
 {
     public function __construct(
@@ -20,15 +25,8 @@ public function __construct(
         parent::__construct();
     }
 
-    protected function configure(): void
-    {
-        $this->setName('mautic:cache:clear');
-    }
-
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         return (int) !$this->cacheProvider->clear();
     }
-
-    protected static $defaultDescription = 'Clears Mautic\'s cache';
 }

app/bundles/ApiBundle/Tests/EventListener/ApiSubscriberTest.php

@@ -136,34 +136,6 @@ Mautic.campaignOnLoad = function (container, response) {
             Mautic.processBuilderErrors(response);
         }
 
-        const campaignEmailStats = mQuery(container).find('[data-load="campaign-email-stats"]').first();
-        if(campaignEmailStats.length) {
-            mQuery(campaignEmailStats).on('click', () => {
-                const $campaignWeekdaysContainer = mQuery('[data-campaign-email-stats-weekdays]');
-                const $campaignHoursContainer = mQuery('[data-campaign-email-stats-hours]');
-
-                if ($campaignWeekdaysContainer.find('canvas').length === 0) {
-                    mQuery.ajax({
-                        url: $campaignWeekdaysContainer.data('campaign-email-stats-weekdays'),
-                        success: function (response) {
-                            $campaignWeekdaysContainer.html(response);
-                            Mautic.renderCharts($campaignWeekdaysContainer);
-                        }
-                    });
-                }
-
-                if ($campaignHoursContainer.find('canvas').length === 0) {
-                    mQuery.ajax({
-                        url: $campaignHoursContainer.data('campaign-email-stats-hours'),
-                        success: function (response) {
-                            $campaignHoursContainer.html(response);
-                            Mautic.renderCharts($campaignHoursContainer);
-                        }
-                    });
-                }
-            });
-        }
-
         // update the cloned event info when storage is updated from different tab
         window.addEventListener('storage', function(event) {
             if (event.key === 'mautic_campaign_event_clone') {
@@ -180,6 +152,34 @@ Mautic.campaignOnLoad = function (container, response) {
         });
     }
 
+    const campaignEmailStats = mQuery(container).find('[data-load="campaign-email-stats"]').first();
+    if(campaignEmailStats.length) {
+        mQuery(campaignEmailStats).on('click', () => {
+            const $campaignWeekdaysContainer = mQuery('[data-campaign-email-stats-weekdays]');
+            const $campaignHoursContainer = mQuery('[data-campaign-email-stats-hours]');
+
+            if ($campaignWeekdaysContainer.find('canvas').length === 0) {
+                mQuery.ajax({
+                    url: $campaignWeekdaysContainer.data('campaign-email-stats-weekdays'),
+                    success: function (response) {
+                        $campaignWeekdaysContainer.html(response);
+                        Mautic.renderCharts($campaignWeekdaysContainer);
+                    }
+                });
+            }
+
+            if ($campaignHoursContainer.find('canvas').length === 0) {
+                mQuery.ajax({
+                    url: $campaignHoursContainer.data('campaign-email-stats-hours'),
+                    success: function (response) {
+                        $campaignHoursContainer.html(response);
+                        Mautic.renderCharts($campaignHoursContainer);
+                    }
+                });
+            }
+        });
+    }
+
     Mautic.campaignAuditlogOnLoad(container, response);
 };
 
@@ -2286,11 +2286,19 @@ Mautic.highlightJumpTarget = function(event, el) {
     if (highlightedAlready) {
         parentEventElement.data('highlighted', false);
         overlay.hide();
+        overlay.off('click.closejump');
         parentEventElement.css("z-index", 1010);
         jumpTarget.css("z-index", 1010);
     } else {
+        if (mQuery('[data-highlighted="true"]').length) {
+            mQuery('[data-highlighted="true"]').find('.highlight-jump-target').click();
+        }
+
         parentEventElement.data('highlighted', true);
         overlay.show();
+        overlay.on('click.closejump', function() {
+            element.click();
+        });
         parentEventElement.css("z-index", 2010);
         jumpTarget.css("z-index", 2010);
     }
@@ -2465,4 +2473,4 @@ Mautic.campaignAuditlogOnLoad = function (container, response) {
             }
         });
     });
-};
+};