build: fixed build on PHP 8.4

thorsten · Nov 17, 2024 · 0a9322d · 0a9322d
1 parent b8f52da
commit 0a9322d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -68,7 +68,7 @@ ENV PMF_TIMEZONE="Europe/Berlin" \
     PMF_MEMORY_LIMIT=2048M \
     PMF_DISABLE_HTACCESS="" \
     PHP_LOG_ERRORS=On \
-    PHP_ERROR_REPORTING=E_ALL|E_STRICT \
+    PHP_ERROR_REPORTING=E_ALL \
     PHP_POST_MAX_SIZE=64M \
     PHP_UPLOAD_MAX_FILESIZE=64M
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       - PMF_ENABLE_UPLOADS="On"
       - PMF_MEMORY_LIMIT="2048M" # only for development
       - PHP_LOG_ERRORS="On"
-      - PHP_ERROR_REPORTING="E_ALL & E_DEPRECATED & E_STRICT" # Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+      - PHP_ERROR_REPORTING="E_ALL & E_DEPRECATED" # Production Value: E_ALL & ~E_DEPRECATED
     links:
       - mariadb:db
       - postgres

diff --git a/phpmyfaq/setup/index.php b/phpmyfaq/setup/index.php
@@ -52,7 +52,7 @@
 if (DEBUG) {
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
-    error_reporting(E_ALL | E_STRICT);
+    error_reporting(E_ALL);
 }
 
 session_name('phpmyfaq-setup');

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -25,7 +25,7 @@
 
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 //
 // The root directory

diff --git a/tests/phpMyFAQ/Administration/HttpStreamerTest.php b/tests/phpMyFAQ/Administration/HttpStreamerTest.php
@@ -25,7 +25,7 @@ public function testSend(): void
 
         $headers = xdebug_get_headers();
 
-        //$this->assertContains('Content-Type: application/pdf', $headers); // @todo test with PHP 8.4 final
+        $this->assertContains('Content-Type: application/pdf', $headers);
         $this->assertContains('Content-Description: phpMyFAQ PDF export file', $headers);
         $this->assertContains('Content-Transfer-Encoding: binary', $headers);
         $this->assertContains('Accept-Ranges: none', $headers);