Merge branch '3.x' into development

Author: natanfelles

.github/workflows/tests.yml

@@ -11,19 +11,16 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
 
-    strategy:
-      fail-fast: true
-
-    name: PHP 8.1
+    name: PHP 8.3
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
           tools: composer
           coverage: xdebug
 
@@ -63,14 +60,11 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
 
-    strategy:
-      fail-fast: true
-
     name: PHP Latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 ---
-image: registry.gitlab.com/aplus-framework/images/base:2
+image: registry.gitlab.com/aplus-framework/images/base:4
 
 include:
   - template: Security/SAST.gitlab-ci.yml

.phpstorm.meta.php

@@ -100,22 +100,6 @@
 );
 registerArgumentsSet(
     'response_headers',
-    \Framework\HTTP\Header::CACHE_CONTROL,
-    \Framework\HTTP\Header::CONNECTION,
-    \Framework\HTTP\Header::CONTENT_DISPOSITION,
-    \Framework\HTTP\Header::CONTENT_ENCODING,
-    \Framework\HTTP\Header::CONTENT_LANGUAGE,
-    \Framework\HTTP\Header::CONTENT_LENGTH,
-    \Framework\HTTP\Header::CONTENT_LOCATION,
-    \Framework\HTTP\Header::CONTENT_RANGE,
-    \Framework\HTTP\Header::CONTENT_TYPE,
-    \Framework\HTTP\Header::DATE,
-    \Framework\HTTP\Header::KEEP_ALIVE,
-    \Framework\HTTP\Header::TRAILER,
-    \Framework\HTTP\Header::TRANSFER_ENCODING,
-    \Framework\HTTP\Header::VIA,
-    \Framework\HTTP\Header::WARNING,
-    \Framework\HTTP\Header::X_REQUEST_ID,
     \Framework\HTTP\ResponseHeader::ACCEPT_RANGES,
     \Framework\HTTP\ResponseHeader::ACCESS_CONTROL_ALLOW_CREDENTIALS,
     \Framework\HTTP\ResponseHeader::ACCESS_CONTROL_ALLOW_HEADERS,
@@ -125,13 +109,24 @@
     \Framework\HTTP\ResponseHeader::ACCESS_CONTROL_MAX_AGE,
     \Framework\HTTP\ResponseHeader::AGE,
     \Framework\HTTP\ResponseHeader::ALLOW,
+    \Framework\HTTP\ResponseHeader::CACHE_CONTROL,
     \Framework\HTTP\ResponseHeader::CLEAR_SITE_DATA,
+    \Framework\HTTP\ResponseHeader::CONNECTION,
+    \Framework\HTTP\ResponseHeader::CONTENT_DISPOSITION,
+    \Framework\HTTP\ResponseHeader::CONTENT_ENCODING,
+    \Framework\HTTP\ResponseHeader::CONTENT_LANGUAGE,
+    \Framework\HTTP\ResponseHeader::CONTENT_LENGTH,
+    \Framework\HTTP\ResponseHeader::CONTENT_LOCATION,
+    \Framework\HTTP\ResponseHeader::CONTENT_RANGE,
     \Framework\HTTP\ResponseHeader::CONTENT_SECURITY_POLICY,
     \Framework\HTTP\ResponseHeader::CONTENT_SECURITY_POLICY_REPORT_ONLY,
+    \Framework\HTTP\ResponseHeader::CONTENT_TYPE,
+    \Framework\HTTP\ResponseHeader::DATE,
     \Framework\HTTP\ResponseHeader::ETAG,
     \Framework\HTTP\ResponseHeader::EXPECT_CT,
     \Framework\HTTP\ResponseHeader::EXPIRES,
     \Framework\HTTP\ResponseHeader::FEATURE_POLICY,
+    \Framework\HTTP\ResponseHeader::KEEP_ALIVE,
     \Framework\HTTP\ResponseHeader::LAST_MODIFIED,
     \Framework\HTTP\ResponseHeader::LOCATION,
     \Framework\HTTP\ResponseHeader::PROXY_AUTHENTICATE,
@@ -145,12 +140,17 @@
     \Framework\HTTP\ResponseHeader::STRICT_TRANSPORT_SECURITY,
     \Framework\HTTP\ResponseHeader::TIMING_ALLOW_ORIGIN,
     \Framework\HTTP\ResponseHeader::TK,
+    \Framework\HTTP\ResponseHeader::TRAILER,
+    \Framework\HTTP\ResponseHeader::TRANSFER_ENCODING,
     \Framework\HTTP\ResponseHeader::VARY,
+    \Framework\HTTP\ResponseHeader::VIA,
+    \Framework\HTTP\ResponseHeader::WARNING,
     \Framework\HTTP\ResponseHeader::WWW_AUTHENTICATE,
     \Framework\HTTP\ResponseHeader::X_CONTENT_TYPE_OPTIONS,
     \Framework\HTTP\ResponseHeader::X_DNS_PREFETCH_CONTROL,
     \Framework\HTTP\ResponseHeader::X_FRAME_OPTIONS,
     \Framework\HTTP\ResponseHeader::X_POWERED_BY,
+    \Framework\HTTP\ResponseHeader::X_REQUEST_ID,
     \Framework\HTTP\ResponseHeader::X_XSS_PROTECTION,
     'Accept-Ranges',
     'Access-Control-Allow-Credentials',

composer.json

@@ -33,9 +33,9 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "aplus/mvc": "^3.0",
-        "phpunit/phpunit": "^10.5"
+        "php": ">=8.3",
+        "aplus/mvc": "^4.0",
+        "phpunit/phpunit": "~11.3.6"
     },
     "require-dev": {
         "ext-xdebug": "*",

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   package:
-    image: registry.gitlab.com/aplus-framework/images/package:2
+    image: registry.gitlab.com/aplus-framework/images/package:4
     container_name: package-testing
     working_dir: /package
     volumes:

phpunit.xml.dist

@@ -2,7 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
          bootstrap="vendor/autoload.php" colors="true" stopOnError="false" stopOnFailure="false"
          stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
          cacheDirectory=".phpunit.cache">
     <coverage>
         <report>

src/AppTesting.php

@@ -41,7 +41,7 @@ public function runCliWithExec(string $command) : void
         };
         // We need to restore the error handler to avoid conflict with PHPUnit.
         // See: https://github.com/sebastianbergmann/phpunit/issues/5403
-        \restore_error_handler();
+        //\restore_error_handler();
     }
 
     /**