A

.editorconfig

@@ -13,9 +13,6 @@ indent_size = 4
 [{*.{sql,scss,css,twig,yml},package.json}]
 indent_size = 2
 
-[*.twig]
-insert_final_newline = false
-
 [*.svg]
 insert_final_newline = false
 

.eslintignore

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

.gitattributes

@@ -10,7 +10,6 @@
 .eslintignore export-ignore
 .weblate export-ignore
 codecov.yml export-ignore
-build.xml export-ignore
 infection.json5.dist export-ignore
 phpcs.xml.dist export-ignore
 phpstan.neon.dist export-ignore

.github/workflows/daily-snapshots.yml

@@ -25,7 +25,7 @@ jobs:
           - { version: '6.0', branch: 'master', php-version: '8.1', node-version: '14', python-version: '3.7' }
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
 
@@ -52,8 +52,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Install Yarn modules
         run: yarn install --non-interactive

.github/workflows/frontend-tests.yml

@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     paths:
-      - 'js/**'
+      - 'resources/js/**'
       - '**.s?css'
       - 'test/javascript/**'
       - '.browserslistrc'
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node
         uses: actions/setup-node@v3
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node
         uses: actions/setup-node@v3
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node
         uses: actions/setup-node@v3

.github/workflows/lint-and-analyse-php.yml

@@ -19,7 +19,7 @@ jobs:
         php-version: ["8.1"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
@@ -34,7 +34,6 @@ jobs:
         if: always()
         uses: ramsey/composer-install@v2
         with:
-          dependency-versions: highest
           # Ignore zip for php-webdriver/webdriver
           composer-options: "--ignore-platform-req=ext-zip"
 
@@ -68,7 +67,7 @@ jobs:
         php-version: ["8.1"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
@@ -78,8 +77,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Analyse files with PHPStan
         run: composer phpstan -- --memory-limit 2G

.github/workflows/lint-docs.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint phpdoc blocks
         uses: sudo-bot/action-doctum@v5

.github/workflows/mutation-tests.yml

@@ -7,12 +7,14 @@ on:
     branches:
       - master
     paths:
-      - '*/classes/**.php'
+      - 'src/**.php'
+      - 'test/classes/**.php'
   pull_request:
     branches:
       - master
     paths:
-      - '*/classes/**.php'
+      - 'src/**.php'
+      - 'test/classes/**.php'
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
@@ -32,13 +34,13 @@ jobs:
           - ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
       - name: Checkout base ref code
         if: github.event_name == 'pull_request'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
 
@@ -57,8 +59,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Run Infection for changed files only
         if: github.event_name == 'push' || github.event_name == 'pull_request'

.github/workflows/other-tools.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -36,7 +36,7 @@ jobs:
         php-version: ["8.1"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install gettext
         run: sudo apt-get install -y gettext
@@ -50,8 +50,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Set up Node
         uses: actions/setup-node@v3

.github/workflows/shellcheck.yml

@@ -0,0 +1,27 @@
+name: ShellCheck
+
+on:
+  push:
+    paths:
+      - 'scripts/**'
+  pull_request:
+    paths:
+      - 'scripts/**'
+
+permissions:
+  contents: read
+
+jobs:
+  shellcheck:
+    name: ShellCheck
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run ShellCheck
+        uses: reviewdog/action-shellcheck@v1
+        with:
+          path: scripts
+          check_all_files_with_shebangs: true
+          fail_on_error: true

.github/workflows/test-selenium.yml

@@ -82,7 +82,7 @@ jobs:
           - "Xss"
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Refresh apt cache
         run: sudo apt-get update
@@ -102,8 +102,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Set up Node
         uses: actions/setup-node@v3

.github/workflows/tests.yml

@@ -28,7 +28,7 @@ jobs:
           - { php-version: '81', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Write script
         # tcpdf allowed memory exhausted needs the memory_limit workaround
@@ -45,8 +45,8 @@ jobs:
           php\$V-dom php\$V-json php\$V-bz2 php\$V-curl php\$V-gd php\$V-zip \
           musl-locales musl-locales-lang \
           gettext composer git && \
-          composer config version "$(php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::VERSION;")" && \
-          composer update && \
+          composer config version "$(php -r "define('VERSION_SUFFIX', ''); require_once('src/Version.php'); echo \PhpMyAdmin\Version::VERSION;")" && \
+          composer install && \
           ./scripts/generate-mo && \
           php\$V -d memory_limit=512M ./vendor/bin/phpunit --no-logging --no-coverage --testsuite unit --exclude-group=%s" \
           "${{ matrix.php-version }}" "${{ matrix.exclude-phpunit-groups }}" > ./do-tests.sh
@@ -61,24 +61,24 @@ jobs:
         run: docker run -v $PWD:/app --workdir /app --rm ${{ matrix.arch }}/alpine:3.17 sh /app/do-tests.sh
 
   test-php:
-    name: Test on PHP ${{ matrix.php-version }} and ${{ matrix.os }}
+    name: Test on PHP ${{ matrix.php-version }}, ${{ matrix.composer-dependency }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
+    continue-on-error: ${{ matrix.php-version == '8.4' }}
     strategy:
       matrix:
-        php-version: ["8.1", "8.2"]
-        experimental: [false]
+        php-version: ['8.1', '8.2', '8.3']
         os: [ubuntu-latest]
+        composer-dependency: [locked, highest]
         php-extensions: ['mbstring, iconv, mysqli, zip, gd, bz2']
         include:
-          - php-version: 'nightly'
-            experimental: true
+          - php-version: '8.4'
             os: ubuntu-latest
+            composer-dependency: locked
             composer-options: '--ignore-platform-req=php+'
             php-extensions: 'mbstring, iconv, mysqli, zip, bz2'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch some commits for Scrutinizer coverage upload
           fetch-depth: 15
@@ -99,7 +99,7 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
-          dependency-versions: highest
+          dependency-versions: ${{ matrix.composer-dependency }}
           composer-options: ${{ matrix.composer-options }}
 
       - name: Run PHP tests
@@ -138,7 +138,7 @@ jobs:
         extension: ["dbase"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch some commits for Scrutinizer coverage upload
           fetch-depth: 15
@@ -158,8 +158,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Run PHP tests
         run: composer run phpunit -- --testsuite unit
@@ -168,7 +166,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           flags: ${{ matrix.extension }}-extension
-          name: php-7.2-${{ matrix.extension }}-enabled
+          name: php-${{ matrix.php-version }}-${{ matrix.extension }}-enabled
 
       - name: Send coverage to Scrutinizer
         uses: sudo-bot/action-scrutinizer@latest

.github/workflows/update-po.yml

@@ -21,7 +21,7 @@ jobs:
         php-version: ["8.1"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Gettext
         run: |
@@ -35,8 +35,6 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
 
       - name: Set up git config
         run: |

.gitignore

@@ -54,14 +54,13 @@ phpunit.xml
 # Ant cache
 cache.properties
 # Composer
-composer.lock
 /vendor/
 # NPM
 /node_modules/
 phpstan.neon
 # Infection
 infection.json5
 /public/build/
-/js/dist/
+/js/
 /setup/
 /themes/

.scrutinizer.yml

@@ -5,9 +5,8 @@ imports:
 filter:
   excluded_paths:
     - build/
-    - js/vendor/
-    - js/dist/
     - node_modules/
+    - public/js/
     - tmp/
     - vendor/
     - test/doctum-config.php

ChangeLog

@@ -65,6 +65,10 @@ phpMyAdmin - ChangeLog
 - issue #18325 Allow hex representations for integers in the search box validation
 - issue #14411 Fixed double tap to edit on mobile devices
 - issue        Update documentation to reflect that Node >= 12 is required to compile the JS and CSS files
+- issue #18578 Fixed PDF export NULL values gives a type error
+- issue #18650 Fixed double escaping on foreign key relation link title
+- issue #18533 Fixed wrong count for simulated queries
+- issue #18611 Fixed an error when searching a table without conditions
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid

libraries/constants.php → app/constants.php

@@ -6,7 +6,7 @@
     exit;
 }
 
-$vendorConfig = require_once ROOT_PATH . 'libraries/vendor_config.php';
+$vendorConfig = require_once ROOT_PATH . 'app/vendor_config.php';
 if (
     ! is_array($vendorConfig) || ! isset(
         $vendorConfig['autoloadFile'],