Merge pull request #7 from tecnospeed/hotfix/rps

fix: data de correção RPS
tecnospeed · Mar 21, 2019 · 26cac94 · 26cac94
2 parents 376b02e + 781c922
commit 26cac94
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 Alterações na biblioteca
 
+## [1.4.2] - 21/03/2019
+### Corrigido
+
+Data de emissão no RPS
+
 ## [1.4.1] - 20/03/2019
 ### Corrigido
 

diff --git a/examples/nfse.array.php b/examples/nfse.array.php
@@ -40,8 +40,8 @@
 ];
 
 $rps = [
-    'dataEmissao' => \DateTime(),
-    'competencia' => \DateTime()
+    'dataEmissao' => new \DateTime(),
+    'competencia' => new \DateTime()
 ];
 
 $servico = [

diff --git a/src/Nfse/Rps.php b/src/Nfse/Rps.php
@@ -17,7 +17,7 @@ public function setDataEmissao(\DateTimeInterface $dataEmissao)
 
     public function getDataEmissao()
     {
-        return $this->competencia;
+        return $this->dataEmissao;
     }
 
     public function setCompetencia(\DateTimeInterface $competencia)

diff --git a/tests/Nfse/RpsTest.php b/tests/Nfse/RpsTest.php
@@ -36,12 +36,14 @@ public function testWithInvalidDataEmissao()
      */
     public function testWithValidRpsData()
     {
-        $dateCompare = new \DateTime('now');
+        $dateBase = new \DateTime('now');
+        $competencia = $dateBase->format('Y-m-d');
+        $dataEmissao = $dateBase->format('Y-m-d\TH:i:s');
         $rps = new Rps();
-        $rps->setDataEmissao($dateCompare);
-        $rps->setCompetencia($dateCompare);
+        $rps->setDataEmissao($dateBase);
+        $rps->setCompetencia($dateBase);
 
-        $this->assertSame($rps->getDataEmissao(), $dateCompare->format('Y-m-d'));
-        $this->assertSame($rps->getCompetencia(), $dateCompare->format('Y-m-d'));
+        $this->assertSame($rps->getDataEmissao(), $dataEmissao);
+        $this->assertSame($rps->getCompetencia(), $competencia);
     }
 }
diff --git a/tests/NfseTest.php b/tests/NfseTest.php
@@ -196,7 +196,7 @@ public function testWithValidData()
         $this->assertSame($nfse->getIdIntegracao(), 1234);
         $this->assertSame($nfse->getImpressao()->getCamposCustomizados()['teste'], 'testeImpressao');
         $this->assertSame($nfse->getPrestador()->getCertificado(), '5b855b0926ddb251e0f0ef42');
-        $this->assertSame($nfse->getRps()->getDataEmissao(), $dateCompare->format('Y-m-d'));
+        $this->assertSame($nfse->getRps()->getDataEmissao(), $dateCompare->format('Y-m-d\TH:i:s'));
         $this->assertSame($nfse->getServico()->getIdIntegracao(), 'A001XT');
         $this->assertSame($nfse->getSubstituicao(), false);
         $this->assertSame($nfse->getTomador()->getCpfCnpj(), '00000000000191');