Merge pull request #46228 from HLeithner/6.1/maint/upmerge-251004

[6.1] Upmerge 2025-10-04

Author: tecpromotion

.devcontainer/Dockerfile

@@ -50,7 +50,21 @@ RUN sed -i 's|/var/www/html|/workspaces/joomla-cms|g' /etc/apache2/sites-availab
 RUN a2enmod rewrite \
     && echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
-# Create a custom PHP configuration file to enable file uploads
-RUN echo "upload_tmp_dir = /tmp" > /usr/local/etc/php/conf.d/custom-php.ini && \
+RUN apt-get update && apt-get install -y ssl-cert && \
+    a2enmod ssl && \
+    a2ensite 000-default && \
+    a2ensite default-ssl && \
+    sed -i 's|/var/www/html|/workspaces/joomla-cms|g' /etc/apache2/sites-available/default-ssl.conf && \
+    echo '<Directory /workspaces/joomla-cms>\n    Options Indexes FollowSymLinks\n    AllowOverride All\n    Require all granted\n</Directory>' >> /etc/apache2/sites-available/default-ssl.conf
+
+# Create a custom PHP configuration file to enable file uploads and a log directory
+RUN mkdir -p /var/log/ && \
+    touch /var/log/php_errors.log && \
+    chown -R www-data:www-data /var/log/ && \
+    chmod 766 /var/log/php_errors.log && \
+    echo "upload_tmp_dir = /tmp" > /usr/local/etc/php/conf.d/custom-php.ini && \
     echo "post_max_size = 64M" >> /usr/local/etc/php/conf.d/custom-php.ini && \
-    echo "upload_max_filesize = 64M" >> /usr/local/etc/php/conf.d/custom-php.ini
+    echo "upload_max_filesize = 64M" >> /usr/local/etc/php/conf.d/custom-php.ini && \
+    echo "log_errors = On" >> /usr/local/etc/php/conf.d/custom-php.ini && \
+    echo "error_log = /var/log/php_errors.log" >> /usr/local/etc/php/conf.d/custom-php.ini && \
+    echo "error_reporting = E_ALL" >> /usr/local/etc/php/conf.d/custom-php.ini

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
         "ghcr.io/devcontainers/features/desktop-lite:1": {}
     },
     "portsAttributes": {
-        "80" : {
+        "443" : {
             "label": "Web Server (Joomla & phpmyadmin)",
             "onAutoForward": "silent"
         },

.devcontainer/docker-compose.yml

@@ -8,6 +8,7 @@ services:
       - ./xdebug.ini:/usr/local/etc/php/conf.d/99-xdebug.ini
     ports:
       - "80:80"
+      - "443:443"
       - "3306:3306"
       - "6080:6080"
     command: sleep infinity

.devcontainer/post-create.sh

@@ -33,6 +33,7 @@ echo "✅ Dependencies installed."
 
 # --- 3. Install Joomla from Repository Source ---
 echo "--> Installing Joomla using the local repository source..."
+rm -f configuration.php
 php installation/joomla.php install \
     --site-name="Joomla CMS Test" \
     --admin-user="$ADMIN_REAL_NAME" \
@@ -72,7 +73,7 @@ echo "--> Applying Codespaces URL fix..."
 cat > "${JOOMLA_ROOT}/fix.php" << 'EOF'
 <?php
 // Fix for incorrect host when running behind the Codespaces reverse proxy.
-if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] === 'localhost:80') {
+if (isset($_SERVER['HTTP_HOST']) && str_contains($_SERVER['HTTP_HOST'], 'localhost')) {
     if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
         $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
         $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
@@ -81,7 +82,6 @@ if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] === 'localhost:80') {
 EOF
 
 # Include fix in both entry points
-cp $JOOMLA_ROOT/fix.php $JOOMLA_ROOT/administrator/fix.php
 sed -i '2i require_once __DIR__ . "/fix.php";' $JOOMLA_ROOT/index.php
 sed -i '2i require_once __DIR__ . "/../fix.php";' $JOOMLA_ROOT/administrator/index.php
 
@@ -96,7 +96,6 @@ git update-index --assume-unchanged "tests/System/support/commands/config.mjs"
 # For NEW UNTRACKED files, add them to the local exclude file
 echo "cypress.config.js" >> ".git/info/exclude"
 echo "fix.php" >> ".git/info/exclude"
-echo "administrator/fix.php" >> ".git/info/exclude"
 echo "phpmyadmin" >> ".git/info/exclude"
 echo "codespace-details.txt" >> ".git/info/exclude"
 
@@ -113,7 +112,7 @@ sed -i "s/return cy.task('writeRelativeFile', { path: 'configuration.php', conte
 chmod +x ./node_modules/.bin/cypress
 cp cypress.config.dist.mjs cypress.config.js
 npx cypress install
-sed -i -e "s|baseUrl:.*|baseUrl: 'http://localhost:80',|" -e "s/db_host: 'localhost'/db_host: 'mysql'/g" -e "s/db_user: 'root'/db_user: 'joomla_ut'/g" -e "s/db_password: ''/db_password: 'joomla_ut'/g" cypress.config.js
+sed -i -e "s|baseUrl:.*|baseUrl: 'https://localhost',|" -e "s/db_host: 'localhost'/db_host: 'mysql'/g" -e "s/db_user: 'root'/db_user: 'joomla_ut'/g" -e "s/db_password: ''/db_password: 'joomla_ut'/g" cypress.config.js
 
 # Restart Apache to apply all changes
 echo '<Directory /workspaces/joomla-cms>
@@ -140,7 +139,7 @@ DETAILS_FILE="${JOOMLA_ROOT}/codespace-details.txt"
     echo "This information has been saved to codespace-details.txt"
     echo ""
     echo "Joomla Admin Login:"
-    echo "  URL: Open the 'Ports' tab, find the 'Web Server' (80), and click the Globe icon. Then add /administrator"
+    echo "  URL: Open the 'Ports' tab, find the 'Web Server' (443), and click the Globe icon. Then add /administrator"
     echo "  Username: $ADMIN_USER"
     echo "  Password: $ADMIN_PASS"
     echo ""
@@ -156,4 +155,4 @@ DETAILS_FILE="${JOOMLA_ROOT}/codespace-details.txt"
     echo "Xdebug for PHP Debugging:"
     echo "  Xdebug is pre-configured on port 9003. Use the 'Run and Debug' panel in VS Code and select 'Listen for Xdebug'."
     echo "---"
-} | tee "$DETAILS_FILE"
+} | tee "$DETAILS_FILE"

.devcontainer/xdebug.ini

@@ -1,6 +1,7 @@
 [xdebug]
 zend_extension=xdebug
 xdebug.mode=debug
+xdebug.log_level = 0
 xdebug.start_with_request=yes
 xdebug.client_port=9003
 xdebug.client_host=localhost

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

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
   schedule:
-    # Run daily at 7:26
+    # Run daily at 7:27
     - cron:  '27 7 * * *'
 
 permissions:

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

@@ -12,7 +12,7 @@ on:
 
 env:
   JOOMLA_MAJOR_VERSION: 5
-  JOOMLA_MINOR_VERSION: 5.3
+  JOOMLA_MINOR_VERSION: 5.4
 
 permissions:
   contents: read
@@ -22,18 +22,18 @@ jobs:
     permissions:
       contents: write  # for Git to git push
     runs-on: ubuntu-latest
-    # Only run this action the translation-bot repository in the translation branch
+    # Only run this action the translation-bot repository in the relevant translation branch
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation5' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         # We need the full depth to create / update the pull request against the main repo
         with:
           ref: translation5
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Fetch latest cms changes
         run: |

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

@@ -0,0 +1,80 @@
+name: Create translation pull request J6
+
+on:
+  push:
+    branches: [ translation6 ]
+
+  workflow_dispatch:
+
+  schedule:
+    # Run daily at 7:37
+    - cron:  '37 7 * * *'
+
+env:
+  JOOMLA_MAJOR_VERSION: 6
+  JOOMLA_MINOR_VERSION: '6.0'
+
+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 relevant translation branch
+    if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation6' }}
+
+    steps:
+      - uses: actions/checkout@v5
+        # We need the full depth to create / update the pull request against the main repo
+        with:
+          ref: translation6
+          fetch-depth: 0
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 24
+
+      - name: Fetch latest cms changes
+        run: |
+          git config user.name Translation Bot
+          git config user.email [email protected]
+          git remote add upstream https://github.com/joomla/joomla-cms.git
+          git fetch upstream
+          git checkout --progress --force -B translation6 refs/remotes/origin/translation6
+          git merge upstream/${{ env.JOOMLA_MINOR_VERSION }}-dev
+
+      - name: Fetch and extract translations
+        run: |
+          cd ..
+          wget -nv "https://github.com/joomla/core-translations/archive/refs/heads/main.zip"
+          unzip main.zip
+
+      - name: Syncing directories
+        # We use a simple copy paste syntax here if needed customization for different directories
+        run: |
+          cd ..
+          SYNC_PATH="installation/language/"
+          echo ${SYNC_PATH}
+          rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_v${{ env.JOOMLA_MAJOR_VERSION }}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
+
+      - name: Update static error pages
+        run: |
+          npm ci --ignore-scripts && node build/build.mjs --build-pages
+
+      - name: Create commit
+        continue-on-error: true
+        run: |
+          git config user.name Translation Bot
+          git config user.email [email protected]
+          git add .
+          git commit -m "Language update"
+          git push --force
+
+      - name: Create pull request
+        if: ${{ success() }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
+        run: |
+          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "[${{ env.JOOMLA_MINOR_VERSION }}] Translation Update" --base ${{ env.JOOMLA_MINOR_VERSION }}-dev | grep -v "No pull" || \
+            gh pr create --title "[${{ env.JOOMLA_MINOR_VERSION }}] Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base ${{ env.JOOMLA_MINOR_VERSION }}-dev

.gitignore

@@ -8,6 +8,9 @@
 .docker
 /docker-compose.yml
 /nbproject
+/.devcontainer
+/.github
+/.vscode
 
 # Local System Files (i.e. cache, logs, etc.)
 /administrator/cache

administrator/components/com_actionlogs/src/Field/ExtensionField.php

@@ -44,7 +44,7 @@ class ExtensionField extends ListField
     public function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__action_logs'))
             ->order($db->quoteName('extension'));