PSR-12 conversion

.appveyor.yml

@@ -44,7 +44,7 @@ install:
     - choco install composer
     - cd C:\projects\joomla-cms
     - refreshenv
-    - composer install --no-progress --profile
+    - composer install --no-progress --profile --ignore-platform-req=ext-sodium
 before_test:
 #  Database setup for MySQL via PowerShell tools
   - >

.github/workflows/create-translation-pull-request-v4.yml

@@ -10,8 +10,13 @@ on:
     # Run daily at 7:26
     - cron:  '26 7 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      contents: write  # for Git to git push
     runs-on: ubuntu-latest
     # Only run this action the translation-bot repository in the translation branch
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation' }}

administrator/components/com_cpanel/src/Controller/DisplayController.php

@@ -11,7 +11,6 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Router\Route;
 
@@ -78,8 +77,8 @@ public function addModule()
 			$position = 'cpanel';
 		}
 
-		Factory::getApplication()->setUserState('com_modules.modules.filter.position', $position);
-		Factory::getApplication()->setUserState('com_modules.modules.client_id', '1');
+		$this->app->setUserState('com_modules.modules.filter.position', $position);
+		$this->app->setUserState('com_modules.modules.client_id', '1');
 
 		$this->setRedirect(Route::_('index.php?option=com_modules&view=select&tmpl=component&layout=modal' . $appendLink, false));
 	}

administrator/components/com_finder/src/Controller/IndexController.php

@@ -11,7 +11,6 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Plugin\PluginHelper;

administrator/components/com_finder/src/Controller/IndexerController.php

@@ -178,10 +178,10 @@ public function batch()
 		try
 		{
 			// Trigger the onBeforeIndex event.
-			Factory::getApplication()->triggerEvent('onBeforeIndex');
+			$this->app->triggerEvent('onBeforeIndex');
 
 			// Trigger the onBuildIndex event.
-			Factory::getApplication()->triggerEvent('onBuildIndex');
+			$this->app->triggerEvent('onBuildIndex');
 
 			// Get the indexer state.
 			$state = Indexer::getState();

administrator/components/com_languages/src/Controller/InstalledController.php

@@ -46,7 +46,7 @@ public function setDefault()
 				$language = Factory::getLanguage();
 				$newLang = Language::getInstance($cid);
 				Factory::$language = $newLang;
-				Factory::getApplication()->loadLanguage($language = $newLang);
+				$this->app->loadLanguage($language = $newLang);
 				$newLang->load('com_languages', JPATH_ADMINISTRATOR);
 			}
 
@@ -101,7 +101,7 @@ public function switchAdminLanguage()
 			$language = Factory::getLanguage();
 			$newLang = Language::getInstance($cid);
 			Factory::$language = $newLang;
-			Factory::getApplication()->loadLanguage($language = $newLang);
+			$this->app->loadLanguage($language = $newLang);
 			$newLang->load('com_languages', JPATH_ADMINISTRATOR);
 
 			$msg = Text::sprintf('COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS', $languageName);

administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue

@@ -3,15 +3,18 @@
     class="media-browser-select"
     :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')"
     :title="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')"
+    tabindex="0"
+    @focusin="focused(true)"
+    @focusout="focused(false)"
   />
   <div
     class="media-browser-actions"
     :class="{ active: showActions }"
   >
     <media-browser-action-item-toggle
       ref="actionToggle"
-      :on-focused="focused"
       :main-action="openActions"
+      @on-focused="focused"
       @keyup.up="openLastActions()"
       @keyup.down="openActions()"
     />
@@ -29,6 +32,7 @@
             :closing-action="hideActions"
             @keyup.up="$refs.actionDelete.$el.focus()"
             @keyup.down="$refs.actionDelete.$el.previousElementSibling.focus()"
+            @keyup.esc="hideActions"
           />
         </li>
         <li>
@@ -40,6 +44,7 @@
             :closing-action="hideActions"
             @keyup.up="$refs.actionPreview.$el.focus()"
             @keyup.down="$refs.actionPreview.$el.previousElementSibling.focus()"
+            @keyup.esc="hideActions"
           />
         </li>
         <li>
@@ -61,6 +66,7 @@
                   ? $refs.actionShare.$el.focus()
                   : $refs.actionShare.$el.previousElementSibling.focus()
             "
+            @keyup.esc="hideActions"
           />
         </li>
         <li>
@@ -72,6 +78,7 @@
             :closing-action="hideActions"
             @keyup.up="$refs.actionRename.$el.focus()"
             @keyup.down="$refs.actionRename.$el.previousElementSibling.focus()"
+            @keyup.esc="hideActions"
           />
         </li>
         <li>
@@ -87,6 +94,7 @@
                 : $refs.actionEdit.$el.previousElementSibling.focus()
             "
             @keyup.down="$refs.actionDelete.$el.focus()"
+            @keyup.esc="hideActions"
           />
         </li>
         <li>
@@ -106,6 +114,7 @@
                 ? $refs.actionPreview.$el.focus()
                 : $refs.actionPreview.$el.previousElementSibling.focus()
             "
+            @keyup.esc="hideActions"
           />
         </li>
       </ul>
@@ -121,12 +130,12 @@ export default {
   name: 'MediaBrowserActionItemsContainer',
   props: {
     item: { type: Object, default: () => {} },
-    onFocused: { type: Function, default: () => {} },
     edit: { type: Function, default: () => {} },
     previewable: { type: Boolean, default: false },
     downloadable: { type: Boolean, default: false },
     shareable: { type: Boolean, default: false },
   },
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: false,
@@ -207,6 +216,9 @@ export default {
     editItem() {
       this.edit();
     },
+    focused(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>

administrator/components/com_media/resources/scripts/components/browser/actionItems/toggle.vue

@@ -2,6 +2,7 @@
   <button
     type="button"
     class="action-toggle"
+    tabindex="0"
     :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')"
     :title="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')"
     @keyup.enter="openActions()"
@@ -22,14 +23,14 @@ export default {
   name: 'MediaBrowserActionItemToggle',
   props: {
     mainAction: { type: Function, default: () => {} },
-    onFocused: { type: Function, default: () => {} },
   },
+  emits: ['on-focused'],
   methods: {
     openActions() {
       this.mainAction();
     },
     focused(bool) {
-      this.onFocused(bool);
+      this.$emit('on-focused', bool);
     },
   },
 };

administrator/components/com_media/resources/scripts/components/browser/items/audio.vue

@@ -1,8 +1,10 @@
 <template>
   <div
     class="media-browser-audio"
+    tabindex="0"
     @dblclick="openPreview()"
     @mouseleave="hideActions()"
+    @keyup.enter="openPreview()"
   >
     <div class="media-browser-item-preview">
       <div class="file-background">
@@ -16,11 +18,11 @@
     </div>
     <media-browser-action-items-container
       ref="container"
-      :focused="focused"
       :item="item"
       :previewable="true"
       :downloadable="true"
       :shareable="true"
+      @toggle-settings="toggleSettings"
     />
   </div>
 </template>
@@ -30,6 +32,7 @@ export default {
   name: 'MediaBrowserItemAudio',
   // eslint-disable-next-line vue/require-prop-types
   props: ['item', 'focused'],
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: false,
@@ -44,6 +47,9 @@ export default {
     openPreview() {
       this.$refs.container.openPreview();
     },
+    toggleSettings(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>

administrator/components/com_media/resources/scripts/components/browser/items/directory.vue

@@ -5,7 +5,9 @@
   >
     <div
       class="media-browser-item-preview"
+      tabindex="0"
       @dblclick.stop.prevent="onPreviewDblClick()"
+      @keyup.enter="onPreviewDblClick()"
     >
       <div class="file-background">
         <div class="folder-icon">
@@ -18,8 +20,8 @@
     </div>
     <media-browser-action-items-container
       ref="container"
-      :focused="focused"
       :item="item"
+      @toggle-settings="toggleSettings"
     />
   </div>
 </template>
@@ -30,7 +32,8 @@ export default {
   name: 'MediaBrowserItemDirectory',
   mixins: [navigable],
   // eslint-disable-next-line vue/require-prop-types
-  props: ['item', 'focused'],
+  props: ['item'],
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: false,
@@ -45,6 +48,9 @@ export default {
     hideActions() {
       this.$refs.container.hideActions();
     },
+    toggleSettings(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>

administrator/components/com_media/resources/scripts/components/browser/items/document.vue

@@ -21,11 +21,11 @@
     />
     <media-browser-action-items-container
       ref="container"
-      :focused="focused"
       :item="item"
       :previewable="true"
       :downloadable="true"
       :shareable="true"
+      @toggle-settings="toggleSettings"
     />
   </div>
 </template>
@@ -35,6 +35,7 @@ export default {
   name: 'MediaBrowserItemDocument',
   // eslint-disable-next-line vue/require-prop-types
   props: ['item', 'focused'],
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: false,
@@ -49,6 +50,9 @@ export default {
     openPreview() {
       this.$refs.container.openPreview();
     },
+    toggleSettings(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>

administrator/components/com_media/resources/scripts/components/browser/items/file.vue

@@ -20,11 +20,11 @@
     />
     <media-browser-action-items-container
       ref="container"
-      :focused="focused"
       :item="item"
       :previewable="true"
       :downloadable="true"
       :shareable="true"
+      @toggle-settings="toggleSettings"
     />
   </div>
 </template>
@@ -34,6 +34,7 @@ export default {
   name: 'MediaBrowserItemFile',
   // eslint-disable-next-line vue/require-prop-types
   props: ['item', 'focused'],
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: false,
@@ -48,6 +49,9 @@ export default {
     openPreview() {
       this.$refs.container.openPreview();
     },
+    toggleSettings(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>

administrator/components/com_media/resources/scripts/components/browser/items/image.vue

@@ -1,8 +1,10 @@
 <template>
   <div
     class="media-browser-image"
+    tabindex="0"
     @dblclick="openPreview()"
     @mouseleave="hideActions()"
+    @keyup.enter="openPreview()"
   >
     <div
       class="media-browser-item-preview"
@@ -34,12 +36,12 @@
     />
     <media-browser-action-items-container
       ref="container"
-      :focused="focused"
       :item="item"
       :edit="editItem"
       :previewable="true"
       :downloadable="true"
       :shareable="true"
+      @toggle-settings="toggleSettings"
     />
   </div>
 </template>
@@ -53,6 +55,7 @@ export default {
     item: { type: Object, required: true },
     focused: { type: Boolean, required: true, default: false },
   },
+  emits: ['toggle-settings'],
   data() {
     return {
       showActions: { type: Boolean, default: false },
@@ -98,6 +101,9 @@ export default {
 
       window.location.href = fileBaseUrl + this.item.path;
     },
+    toggleSettings(bool) {
+      this.$emit('toggle-settings', bool);
+    },
   },
 };
 </script>