[pull] master from phpmyadmin:master

.browserslistrc

@@ -5,11 +5,7 @@ last 2 major versions
 not dead
 Chrome >= 60
 Firefox >= 60
-# needed since Legacy Edge still has usage; 79 was the first Chromium Edge version
-# should be removed in the future when its usage drops or when it's moved to dead browsers
-not Edge < 79
 Firefox ESR
-iOS >= 10
-Safari >= 10
-Android >= 6
+iOS >= 12
+Safari >= 12
 not Explorer <= 11

.editorconfig

@@ -13,8 +13,8 @@ indent_size = 4
 [{*.{sql,scss,css,twig,yml},package.json}]
 indent_size = 2
 
-[*.twig]
+[*.svg]
 insert_final_newline = false
 
-[test/test_data/*]
+[tests/test_data/*]
 insert_final_newline = false

.eslintignore

@@ -1,4 +1,6 @@
 js/vendor/
 js/dist/
+public/js/
 tmp/
 vendor/
+webpack.config.cjs

.eslintrc.json

@@ -1,48 +1,36 @@
 {
     "extends": [
         "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended",
         "plugin:no-jquery/deprecated",
         "plugin:compat/recommended"
     ],
-    "plugins": ["no-jquery"],
+    "parser": "@typescript-eslint/parser",
+    "plugins": [ "@typescript-eslint", "no-jquery" ],
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
     "env": {
         "browser": true,
-        "es6": true,
-        "jquery": true
-    },
-    "globals": {
-        "AJAX": "readonly",
-        "bootstrap": "readonly",
-        "CodeMirror": "readonly",
-        "CommonActions": "readonly",
-        "CommonParams": "readonly",
-        "Cookies": "readonly",
-        "Functions": "readonly",
-        "Messages": "readonly",
-        "Navigation": "readonly",
-        "OpenLayers": "readonly",
-        "Sql": "readonly"
+        "es6": true
     },
     "rules": {
-        "valid-jsdoc": ["error", {
-            "prefer": {
-                "returns": "return"
-            },
-            "requireReturn": false,
-            "requireParamType": false,
-            "requireReturnDescription": false,
-            "requireParamDescription": false
-        }],
         "array-bracket-spacing": "error",
+        "array-bracket-newline": ["error", { "multiline": true }],
+        "array-element-newline": ["error", "consistent"],
         "brace-style": "error",
         "camelcase": "error",
+        "comma-dangle": ["error", "only-multiline"],
         "comma-style": ["error", "last"],
         "curly": "error",
         "dot-notation": "error",
         "eol-last": "error",
         "eqeqeq": "error",
         "indent": ["error", 4],
         "keyword-spacing": "error",
+        "lines-between-class-members": "error",
         "new-cap": "error",
         "no-array-constructor": "error",
         "no-eval": "error",
@@ -56,16 +44,31 @@
         "no-trailing-spaces": "error",
         "no-underscore-dangle": "error",
         "no-unneeded-ternary": "error",
+        "no-var": "off",
         "object-curly-spacing": ["error", "always"],
         "one-var": ["error", "never"],
         "padded-blocks": ["error", "never"],
+        "padding-line-between-statements": [
+            "error",
+            { "blankLine": "always", "prev": "block-like", "next": "*" },
+            { "blankLine": "always", "prev": "multiline-expression", "next": "*" },
+            { "blankLine": "always", "prev": "*", "next": "return" }
+        ],
+        "prefer-const": "off",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
         "quotes": ["error", "single"],
         "semi": "error",
         "space-before-blocks": "error",
         "space-before-function-paren": "error",
         "space-in-parens": "error",
         "space-infix-ops": "error",
         "spaced-comment": ["error", "always"],
-        "wrap-iife": "error"
+        "wrap-iife": "error",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/no-empty-function": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-this-alias": "off"
     }
 }

.gitattributes

@@ -1,3 +1,5 @@
+*.php  text diff=php
+
 .gitattributes export-ignore
 .gitignore export-ignore
 .github export-ignore
@@ -8,25 +10,24 @@
 .eslintignore export-ignore
 .weblate export-ignore
 codecov.yml export-ignore
-build.xml export-ignore
-infection.json.dist export-ignore
+infection.json5.dist export-ignore
 phpcs.xml.dist export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 psalm.xml export-ignore
 psalm-baseline.xml export-ignore
 DCO export-ignore
 .editorconfig export-ignore
-# Exclude only the following files and not all files in test/
+# Exclude only the following files and not all files in tests/
 # This is because some packaging teams need our test files but not the CI related files
-test/doctum-config.php export-ignore
-test/bootstrap-static.php export-ignore
-test/config.e2e.inc.php export-ignore
-test/phpstan-constants.php export-ignore
-test/*-local-server export-ignore
-test/*.conf export-ignore
-test/*.ini export-ignore
-test/ci-phplint export-ignore
+tests/doctum-config.php export-ignore
+tests/bootstrap-static.php export-ignore
+tests/config.e2e.inc.php export-ignore
+tests/phpstan-constants.php export-ignore
+tests/*-local-server export-ignore
+tests/*.conf export-ignore
+tests/*.ini export-ignore
+tests/ci-phplint export-ignore
 .browserslistrc export-ignore
 CODE_OF_CONDUCT.md export-ignore
 CONTRIBUTING.md export-ignore

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve phpMyAdmin
 
 ---
 
@@ -22,7 +22,7 @@ A clear and concise description of what you expected to happen.
 
 ### Screenshots
 
-If applicable, add screenshots to help explain your problem.
+If applicable, add screenshots to help explain the bug.
 
 ### Server configuration
 
@@ -39,4 +39,4 @@ If applicable, add screenshots to help explain your problem.
 
 ### Additional context
 
-Add any other context about the problem here.
+Add any other context about the bug here.

.github/workflows/daily-snapshots.yml

@@ -0,0 +1,85 @@
+name: Daily snapshots
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/daily-snapshots.yml'
+      - 'bin/**'
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  generate-snapshots:
+    name: Generate ${{ matrix.version }} snapshots
+    runs-on: ubuntu-latest
+    if: (github.event_name == 'schedule' && github.repository == 'phpmyadmin/phpmyadmin') || (github.event_name != 'schedule')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { version: '5.2', branch: 'QA_5_2', php-version: '7.2', node-version: '12', python-version: '3.7' }
+          - { version: '6.0', branch: 'master', php-version: '8.1', node-version: '16', python-version: '3.7' }
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.branch }}
+
+      - name: Install Gettext
+        run: sudo apt-get install -y gettext
+
+      - name: Set up PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, iconv, mysqli, zip, gd
+          coverage: none
+
+      - name: Set up Node ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: Install Yarn modules
+        run: yarn install --non-interactive
+
+      - name: Install Sphinx for the documentation build
+        run: pip install 'Sphinx'
+
+      - name: Build the release
+        if: matrix.branch == 'master'
+        run: ./bin/internal/create-release.sh --daily ${{ matrix.version }}+snapshot ${{ matrix.branch }}
+
+      - name: Build the release
+        if: matrix.branch != 'master'
+        run: ./scripts/create-release.sh --daily ${{ matrix.version }}+snapshot ${{ matrix.branch }}
+
+      - name: Check release excludes
+        if: matrix.branch == 'master'
+        run: ./bin/internal/check-release-excludes.sh release/phpMyAdmin-${{ matrix.version }}+snapshot-all-languages.tar.gz
+        continue-on-error: true
+
+      - name: Check release excludes
+        if: matrix.branch != 'master'
+        run: ./scripts/check-release-excludes.sh release/phpMyAdmin-${{ matrix.version }}+snapshot-all-languages.tar.gz
+        continue-on-error: true
+
+      - name: Upload snapshots
+        uses: actions/upload-artifact@v4
+        with:
+          name: phpMyAdmin-${{ matrix.version }}-snapshots
+          path: release/*
+          retention-days: 1

.github/workflows/frontend-tests.yml

@@ -0,0 +1,76 @@
+name: Frontend analysis and tests
+
+on:
+  push:
+  pull_request:
+    paths:
+      - 'resources/js/**'
+      - '**.s?css'
+      - 'tests/javascript/**'
+      - '.browserslistrc'
+      - '.eslint*'
+      - '*.cjs'
+      - 'package.json'
+      - 'tsconfig.json'
+      - 'yarn.lock'
+
+permissions:
+  contents: read
+
+jobs:
+  javascript-test:
+    name: Test JavaScript files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'yarn'
+
+      - name: Install modules
+        run: yarn install --non-interactive
+
+      - name: Run tests
+        run: yarn test
+
+  javascript-lint:
+    name: Lint JavaScript files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'yarn'
+
+      - name: Install modules
+        run: yarn install --non-interactive
+
+      - name: Lint JavaScript files
+        run: yarn run js-lint --quiet
+
+  css-lint:
+    name: Lint CSS files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'yarn'
+
+      - name: Install modules
+        run: yarn install --non-interactive
+
+      - name: Lint CSS files
+        run: yarn run css-lint