From efdb77727e7968146e096af3656a43932525f383 Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Thu, 8 Oct 2026 10:26:43 -0300
Subject: [PATCH 1/4] fix: describe vRetCSLL as CSLL only

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 src/Dto/DpsData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dto/DpsData.php b/src/Dto/DpsData.php
index ea4ab4b..a2b21e9 100644
--- a/src/Dto/DpsData.php
+++ b/src/Dto/DpsData.php
@@ -176,7 +176,7 @@ public function __construct(
         /** Valor do IRRF. */
         public string $federalValorIrrf = '',
 
-        /** Valor das contribuições sociais retidas (CSLL). */
+        /** Valor da CSLL retida. */
         public string $federalValorCsll = '',
 
         /** Valor da contribuição previdenciária retida. */

From 7bde405e4fb359d324030d9fcf030fea42fa88ad Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Thu, 8 Oct 2026 10:26:54 -0300
Subject: [PATCH 2/4] fix: map vRetCSLL explicitly as CSLL

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 src/Danfse/DanfseTemplate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Danfse/DanfseTemplate.php b/src/Danfse/DanfseTemplate.php
index eaf033d..aac8690 100644
--- a/src/Danfse/DanfseTemplate.php
+++ b/src/Danfse/DanfseTemplate.php
@@ -169,7 +169,7 @@ public function buildData(array $nfse): array
             'tributacao_federal' => [
                 'irrf'   => $this->currencyOrDash($this->val($tribFed, 'vRetIRRF')),
                 'cp'     => $this->currencyOrDash($this->val($tribFed, 'vRetCP')),
-                'contribuicoes_sociais' => $this->currencyOrDash($this->val($tribFed, 'vRetCSLL')),
+                'csll'   => $this->currencyOrDash($this->val($tribFed, 'vRetCSLL')),
                 'pis'    => $this->currencyOrDash($this->val($tribFed, 'piscofins', 'vPis')),
                 'cofins' => $this->currencyOrDash($this->val($tribFed, 'piscofins', 'vCofins')),
                 'descricao_retencao' => $this->pisCofinsRetentionLabel(

From 5cba420ff3c4609bdb8dd8bd22744874d746bcd1 Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Thu, 8 Oct 2026 10:27:06 -0300
Subject: [PATCH 3/4] fix: label vRetCSLL correctly in DANFSe

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 src/Danfse/HTMLTemplate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Danfse/HTMLTemplate.php b/src/Danfse/HTMLTemplate.php
index 35e531f..b0cf30e 100644
--- a/src/Danfse/HTMLTemplate.php
+++ b/src/Danfse/HTMLTemplate.php
@@ -483,8 +483,8 @@
                     <span class="value"><?= $data['tributacao_federal']['cp'] ?? '-' ?></span>
                 </td>
                 <td style="width: 25%;">
-                    <span class="label">Contribuições Sociais - Retidas</span>
-                    <span class="value"><?= $data['tributacao_federal']['contribuicoes_sociais'] ?? '-' ?></span>
+                    <span class="label">CSLL - Retida</span>
+                    <span class="value"><?= $data['tributacao_federal']['csll'] ?? '-' ?></span>
                 </td>
                 <td style="width: 25%;"></td>
             </tr>
@@ -498,7 +498,7 @@
                     <span class="value"><?= $data['tributacao_federal']['cofins'] ?? '-' ?></span>
                 </td>
                 <td colspan="2">
-                    <span class="label">Descrição Contrib. Sociais - Retidas</span>
+                    <span class="label">Tipo de retenção PIS/COFINS/CSLL</span>
                     <span class="value"><?= $data['tributacao_federal']['descricao_retencao'] ?? '-' ?></span>
                 </td>
             </tr>

From d552383c7a858754d0433fb32b6a7fa5fdd1b75d Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Thu, 8 Oct 2026 10:27:19 -0300
Subject: [PATCH 4/4] test: keep CSLL separate from PIS and COFINS

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 tests/Unit/Danfse/DanfseGoldenReferenceTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Unit/Danfse/DanfseGoldenReferenceTest.php b/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
index 4cccbf0..6cb7b5c 100644
--- a/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
+++ b/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
@@ -120,23 +120,23 @@ public function testAuthorizedXmlWithoutIbsCbsStillRendersRequiredV2Section(): v
         self::assertStringContainsString('DANFSe v2.0', $html);
     }
 
-    public function testFederalRetentionUsesOfficialV2Semantics(): void
+    public function testFederalRetentionKeepsCsllSeparateFromPisAndCofins(): void
     {
         $nfse = $this->fixtureData();
         $nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['piscofins']['tpRetPisCofins'] = '4';
-        $nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['vRetCSLL'] = '1149.75';
+        unset($nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['vRetCSLL']);
 
         $template = new DanfseTemplate();
         $data = $template->buildData($nfse);
         $html = $template->render($nfse, new DanfseConfig());
 
-        self::assertSame('R$ 1.149,75', $data['tributacao_federal']['contribuicoes_sociais']);
+        self::assertSame('-', $data['tributacao_federal']['csll']);
         self::assertSame(
             '4 - PIS/COFINS Retidos, CSLL Não Retido',
             $data['tributacao_federal']['descricao_retencao'],
         );
-        self::assertStringContainsString('Contribuições Sociais - Retidas', $html);
-        self::assertStringContainsString('Descrição Contrib. Sociais - Retidas', $html);
+        self::assertStringContainsString('CSLL - Retida', $html);
+        self::assertStringContainsString('Tipo de retenção PIS/COFINS/CSLL', $html);
     }
 
     public function testHomologationReferenceCarriesVisibleMarker(): void