Merge branch '5.3-dev' into deps

Author: laoneo

administrator/components/com_templates/src/View/Style/JsonView.php

@@ -69,7 +69,7 @@ public function display($tpl = null)
             return false;
         }
 
-        $paramsList = (array) $this->item;
+        $paramsList = get_object_vars($this->item);
 
         unset($paramsList['xml']);
 

administrator/components/com_users/src/Model/UserModel.php

@@ -292,7 +292,7 @@ public function save($data)
         }
 
         // Destroy all active sessions for the user after changing the password or blocking him
-        if ($data['password2'] || $data['block']) {
+        if (!empty($data['password2']) || $data['block']) {
             UserHelper::destroyUserSessions($user->id, true);
         }
 

build/build-modules-js/init/minify-vendor.mjs

@@ -9,7 +9,6 @@ const RootPath = process.cwd();
 const folders = [
   'media/vendor/accessibility/js',
   'media/vendor/chosen/js',
-  'media/vendor/codemirror',
   'media/vendor/debugbar',
   'media/vendor/diff/js',
   'media/vendor/es-module-shims/js',

language/en-GB/com_contact.ini

@@ -29,7 +29,7 @@ COM_CONTACT_EMAIL_FORM="Contact Form"
 COM_CONTACT_EMAIL_LABEL="Email"
 COM_CONTACT_EMAIL_THANKS="Thank you for your email."
 COM_CONTACT_ENQUIRY_SUBJECT="{SITENAME}: {SUBJECT}"
-COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via {URL} from:\n{NAME} <{EMAIL}>\n\n{BODY}\n\n{CUSTOMFIELDS}"
+COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via {URL} from:\n{NAME} {EMAIL}\n\n{BODY}\n\n{CUSTOMFIELDS}"
 COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
 COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact in this category has the same alias."
 COM_CONTACT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Contact in this category has the same alias."

plugins/actionlog/joomla/src/Extension/Joomla.php

@@ -183,13 +183,13 @@ public function onContentAfterSave(Model\AfterSaveEvent $event): void
             $messageLanguageKey = $defaultLanguageKey;
         }
 
-        $id = empty($params->id_holder) ? 0 : $article->get($params->id_holder);
+        $id = empty($params->id_holder) ? 0 : $article->{$params->id_holder};
 
         $message = [
             'action'   => $isNew ? 'add' : 'update',
             'type'     => $params->text_prefix . '_TYPE_' . $params->type_title,
             'id'       => $id,
-            'title'    => $article->get($params->title_holder),
+            'title'    => $article->{$params->title_holder} ?? '',
             'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder, $article),
         ];
 
@@ -231,13 +231,13 @@ public function onContentAfterDelete(Model\AfterDeleteEvent $event): void
             $messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED';
         }
 
-        $id = empty($params->id_holder) ? 0 : $article->get($params->id_holder);
+        $id = empty($params->id_holder) ? 0 : $article->{$params->id_holder};
 
         $message = [
             'action' => 'delete',
             'type'   => $params->text_prefix . '_TYPE_' . $params->type_title,
             'id'     => $id,
-            'title'  => $article->get($params->title_holder),
+            'title'  => $article->{$params->title_holder} ?? '',
         ];
 
         $this->addLog([$message], $messageLanguageKey, $context);

plugins/filesystem/local/src/Adapter/LocalAdapter.php

@@ -531,6 +531,10 @@ private function copyFile(string $sourcePath, string $destinationPath, bool $for
             $destinationPath .= '/' . $this->getFileName($sourcePath);
         }
 
+        if (!MediaHelper::checkFileExtension(pathinfo($destinationPath, PATHINFO_EXTENSION))) {
+            throw new \Exception(Text::_('COM_MEDIA_MOVE_FILE_EXTENSION_INVALID'));
+        }
+
         if (file_exists($destinationPath) && !$force) {
             throw new \Exception(Text::_('COM_MEDIA_COPY_FILE_NOT_POSSIBLE_FILE_ALREADY_EXISTS'));
         }

tests/System/integration/api/com_banners/Categories.cy.js

@@ -17,7 +17,12 @@ describe('Test that banners categories API endpoint', () => {
   });
 
   it('can create a category', () => {
-    cy.api_post('/banners/categories', { title: 'automated test banner category', description: 'automated test banner category description' })
+    cy.api_post('/banners/categories', {
+      title: 'automated test banner category',
+      description: 'automated test banner category description',
+      parent_id: 1,
+      extension: 'com_banners',
+    })
       .then((response) => {
         cy.wrap(response).its('body').its('data').its('attributes')
           .its('title')

tests/System/integration/api/com_contact/Contacts.cy.js

@@ -62,7 +62,7 @@ describe('Test that contacts API endpoint', () => {
       cy.wrap(mails[0].receivers).should('have.property', Cypress.env('email'));
       cy.wrap(mails[0].headers.subject).should('equal', `${Cypress.env('sitename')}: automated test subject`);
       cy.wrap(mails[0].body).should('have.string', 'This is an enquiry email via');
-      cy.wrap(mails[0].body).should('have.string', `${Cypress.env('name')} <${Cypress.env('email')}>`);
+      cy.wrap(mails[0].body).should('have.string', `${Cypress.env('name')} ${Cypress.env('email')}`);
       cy.wrap(mails[0].body).should('have.string', 'automated test message');
     });
   });

tests/System/integration/api/com_content/Categories.cy.js

@@ -17,7 +17,12 @@ describe('Test that content categories API endpoint', () => {
   });
 
   it('can create a category', () => {
-    cy.api_post('/content/categories', { title: 'automated test content category', description: 'automated test content category description' })
+    cy.api_post('/content/categories', {
+      title: 'automated test content category',
+      description: 'automated test content category description',
+      parent_id: 1,
+      extension: 'com_content',
+    })
       .then((response) => {
         cy.wrap(response).its('body').its('data').its('attributes')
           .its('title')
@@ -30,7 +35,10 @@ describe('Test that content categories API endpoint', () => {
 
   it('can update a category', () => {
     cy.db_createCategory({ title: 'automated test content category', extension: 'com_content' })
-      .then((id) => cy.api_patch(`/content/categories/${id}`, { title: 'updated automated test content category', description: 'automated test content category description' }))
+      .then((id) => cy.api_patch(`/content/categories/${id}`, {
+        title: 'updated automated test content category',
+        description: 'automated test content category description',
+      }))
       .then((response) => {
         cy.wrap(response).its('body').its('data').its('attributes')
           .its('title')