Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

.github/workflows/tests.yml

@@ -34,6 +34,7 @@ jobs:
         # musl-locales and musl-locales-lang are needed to run some locale specific tests
         # gettext is needed to run generate-mo
         # git is needed to work around a version detection issue with composer, see: https://github.com/Roave/SecurityAdvisories/issues/76
+        # ctype for psalm
         run: |
           printf "set -exu && \
           export V='%s' && \
@@ -64,16 +65,16 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-version: ["7.2", "7.3", "7.4", "8.0"]
+        php-version: ["7.2", "7.3", "7.4", "8.0", "8.1"]
         experimental: [false]
         os: [ubuntu-latest]
         phpunit-options: ['--testsuite unit']
         include:
-          - php-version: '8.1'
+          - php-version: 'nightly'
             experimental: true
             os: ubuntu-latest
             phpunit-options: '--configuration test/phpunit-php-nightly.xml'
-            composer-options: '--ignore-platform-req=php'
+            composer-options: '--ignore-platform-req=php+'
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

ChangeLog

@@ -142,6 +142,8 @@ phpMyAdmin - ChangeLog
 - issue #16005 Performance improvement on the Import and Export pages
 - issue #17247 Fix triple HTML encoding
 - issue #17259 Fix broken link in the Simulate DML query modal
+- issue #16746 Update tcpdf dependency to ^6.4.4 for PHP 8.1 compatibility
+- issue #16746 Update twig dependency to "^2.14.9 || ^3" for PHP 8.1 compatibility
 
 5.1.1 (2021-06-04)
 - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa

composer.json

@@ -91,7 +91,7 @@
         "php-webdriver/webdriver": "^1.11",
         "phpmyadmin/coding-standard": "^3.0.0",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.2",
+        "phpstan/phpstan": "^1.3",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
@@ -101,7 +101,7 @@
         "code-lts/u2f-php-server": "^1.2",
         "symfony/console": "^5.2.3",
         "tecnickcom/tcpdf": "^6.4.4",
-        "vimeo/psalm": "^4.15.0"
+        "vimeo/psalm": "^4.17"
     },
     "extra": {
         "branch-alias": {

test/classes/PdfTest.php

@@ -53,7 +53,7 @@ class PdfTest extends AbstractTestCase
         $pdf = new Pdf();
         $pdf->SetTitle('Title');
         $pdf->Open();
-        $pdf->setAutoPageBreak(false);
+        $pdf->setAutoPageBreak(true);
         $pdf->Addpage();
         $pdf->SetFont(Pdf::PMA_PDF_FONT, 'B', 14);
         $pdf->Cell(0, 6, 'Cell', 'B', 1, 'C');