Merge branch 'new' into 5.2.x

natanfelles · natanfelles · commit 0fcf14e9b77c · 2023-12-26T18:28:41.000-03:00
# Conflicts:
#	composer.json
#	docker-compose.yml
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{md, rst}]
+[*.{md,rst}]
 trim_trailing_whitespace = false
 
 [*.yml]
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
           vendor/bin/phpstan analyse --xdebug -vvv
 
       - name: PHPUnit
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Upload coverage results to Coveralls
         env:
@@ -66,7 +66,7 @@ jobs:
     strategy:
       fail-fast: true
 
-    name: PHP 8.2 - Last
+    name: PHP Latest
 
     steps:
       - name: Checkout
@@ -75,7 +75,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: latest
           tools: composer
           coverage: xdebug
 
@@ -84,4 +84,4 @@ jobs:
           composer update
 
       - name: PHPUnit
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build/
 raw-tests/
 vendor/
 .php-cs-fixer.cache
+.phpunit.cache
 .phpunit.result.cache
 composer.lock
 composer.phar
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,8 +30,8 @@ test:php:
       - build/docs/
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
-test:php-last:
-  image: registry.gitlab.com/aplus-framework/images/base:3
+test:php-latest:
+  image: registry.gitlab.com/aplus-framework/images/base:latest
   stage: test
   timeout: 10 minutes
   cache:
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     volumes:
       - .:/package
     tty: true
-  package-last:
-    image: registry.gitlab.com/aplus-framework/images/package:3
-    container_name: package-http-last
+  package-latest:
+    image: registry.gitlab.com/aplus-framework/images/package:latest
+    container_name: package-http-latest
     working_dir: /package
     volumes:
       - .:/package
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
-         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false"
-         stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
+         bootstrap="vendor/autoload.php" colors="true" stopOnError="false" stopOnFailure="false"
+         stopOnIncomplete="false" stopOnSkipped="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+    <coverage>
         <report>
             <clover outputFile="build/coverage/clover.xml"/>
             <html outputDirectory="build/coverage"/>
@@ -22,4 +19,9 @@
         <const name="TESTING" value="true"/>
         <env name="XDEBUG_MODE" value="coverage"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Response.php b/src/Response.php
@@ -31,6 +31,7 @@ class Response extends Message implements ResponseInterface
 
     protected int $cacheSeconds = 0;
     protected bool $isSent = false;
+    protected bool $headersSent = false;
     protected Request $request;
     /**
      * HTTP Response Status Code.
@@ -377,7 +378,7 @@ protected function sendCookies() : void
      */
     protected function sendHeaders() : void
     {
-        if (\headers_sent()) {
+        if ($this->headersSent || \headers_sent()) {
             throw new LogicException('Headers are already sent');
         }
         if ($this->getHeader(Header::DATE) === null) {
@@ -393,6 +394,7 @@ protected function sendHeaders() : void
         foreach ($this->getHeaderLines() as $line) {
             \header($line);
         }
+        $this->headersSent = true;
     }
 
     /**
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -293,9 +293,16 @@ public function testHeader() : void
 
     public function testHeadersAreAlreadySent() : void
     {
+        $response = new class(new RequestMock(['domain.tld'])) extends Response {
+            public function sendHeaders() : void
+            {
+                parent::sendHeaders();
+            }
+        };
+        $response->sendHeaders();
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Headers are already sent');
-        $this->response->send();
+        $response->sendHeaders();
     }
 
     public function testInvalidStatusCode() : void
@@ -548,27 +555,10 @@ public function testContentTypeAutoSetIfBodyIsNotEmpty() : void
     }
 
     /**
-     * @dataProvider
-     *
-     * @return array<array<string>>
-     */
-    public function serverSoftwareProvider() : array
-    {
-        return [
-            ['Apache/2.4.52'],
-            ['lighttpd/1.4.63'],
-            ['nginx/1.18.0'],
-        ];
-    }
-
-    /**
-     * @dataProvider serverSoftwareProvider
-     *
      * @runInSeparateProcess
      */
-    public function testContentTypeEmptyOnServer(string $software) : void
+    public function testContentTypeEmptyOnServer() : void
     {
-        $_SERVER['SERVER_SOFTWARE'] = $software;
         $this->response->setBody('');
         \ob_start();
         $this->response->send();

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class Response extends Message implements ResponseInterface`
`31`	`31`
`32`	`32`	`protected int $cacheSeconds = 0;`
`33`	`33`	`protected bool $isSent = false;`
	`34`	`+ protected bool $headersSent = false;`
`34`	`35`	`protected Request $request;`
`35`	`36`	`/**`
`36`	`37`	`* HTTP Response Status Code.`
`@@ -377,7 +378,7 @@ protected function sendCookies() : void`
`377`	`378`	`*/`
`378`	`379`	`protected function sendHeaders() : void`
`379`	`380`	`{`
`380`		`- if (\headers_sent()) {`
	`381`	`+ if ($this->headersSent \|\| \headers_sent()) {`
`381`	`382`	`throw new LogicException('Headers are already sent');`
`382`	`383`	`}`
`383`	`384`	`if ($this->getHeader(Header::DATE) === null) {`
`@@ -393,6 +394,7 @@ protected function sendHeaders() : void`
`393`	`394`	`foreach ($this->getHeaderLines() as $line) {`
`394`	`395`	`\header($line);`
`395`	`396`	`}`
	`397`	`+ $this->headersSent = true;`
`396`	`398`	`}`
`397`	`399`
`398`	`400`	`/**`