Merge pull request #315 from gersonfs/atualizacao-php

robmachado · web-flow · commit 1c6b03dd06b3 · 2025-07-02T09:34:43.000-03:00
Adicionando suporte a PHP 8.3 e 8.4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Setup PHP
@@ -55,6 +55,16 @@ jobs:
         run: |
             composer stan82
 
+      - name: Análises estáticas PHP 8.3
+        if: matrix.php-version == '8.3'
+        run: |
+            composer stan83
+
+      - name: Análises estáticas PHP 8.4
+        if: matrix.php-version == '8.4'
+        run: |
+            composer stan84
+
       - name: Rodando PHPUnit
         run: |
           composer test
diff --git a/composer.json b/composer.json
@@ -70,6 +70,8 @@
         "stan": "phpstan analyse src/",
         "stan80": "phpstan analyse src/ -c phpstan80.neon",
         "stan81": "phpstan analyse src/ -c phpstan81.neon",
-        "stan82": "phpstan analyse src/ -c phpstan82.neon"
+        "stan82": "phpstan analyse src/ -c phpstan82.neon",
+        "stan83": "phpstan analyse src/ -c phpstan83.neon",
+        "stan84": "phpstan analyse src/ -c phpstan84.neon"
     }
 }
diff --git a/phpstan-baseline83.neon b/phpstan-baseline83.neon
@@ -0,0 +1,126 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Certificate.php
+
+		-
+			message: "#^Binary operation \"\\*\" between 40 and string results in an error\\.$#"
+			count: 1
+			path: src/Certificate/Asn1.php
+
+		-
+			message: "#^Parameter \\#2 \\$qIn of static method NFePHP\\\\Common\\\\Certificate\\\\Asn1\\:\\:xBase128\\(\\) expects int, float given\\.$#"
+			count: 1
+			path: src/Certificate/Asn1.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Certificate/PublicKey.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 5
+			path: src/Exception/CertificateException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 4
+			path: src/Exception/SignerException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 2
+			path: src/Exception/SoapException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 2
+			path: src/Exception/ValidatorException.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Files\\:\\:listContents\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:randomName\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:uid\\(\\) should return string but returns int\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:uid\\(\\) should return string but returns int\\|false\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapInterface\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Property NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:\\$filesystem \\(NFePHP\\\\Common\\\\Files\\) in empty\\(\\) is not falsy\\.$#"
+			count: 2
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Parameter \\#5 \\$oneWay \\(int\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapClientExtended\\:\\:__doRequest\\(\\) should be compatible with parameter \\$oneWay \\(bool\\) of method SoapClient\\:\\:__doRequest\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapClientExtended.php
+
+		-
+			message: "#^Parameter \\#5 \\$oneWay of method SoapClient\\:\\:__doRequest\\(\\) expects bool, int given\\.$#"
+			count: 1
+			path: src/Soap/SoapClientExtended.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapCurl\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapCurl.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapFake\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapInterface\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapFake.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapNative\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapNative.php
+
+		-
+			message: "#^Static method NFePHP\\\\Common\\\\Exception\\\\SoapException\\:\\:soapFault\\(\\) invoked with 1 parameter, 2 required\\.$#"
+			count: 4
+			path: src/Soap/SoapNative.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$emit\\.$#"
+			count: 1
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$ide\\.$#"
+			count: 9
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$infnfe\\.$#"
+			count: 2
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:createProperty\\(\\) expects NFePHP\\\\Common\\\\Tags\\\\TagInterface, array given\\.$#"
+			count: 1
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Undefined variable\\: \\$infId$#"
+			count: 1
+			path: src/Tags/MakeBase.php
diff --git a/phpstan-baseline84.neon b/phpstan-baseline84.neon
@@ -0,0 +1,126 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Certificate.php
+
+		-
+			message: "#^Binary operation \"\\*\" between 40 and string results in an error\\.$#"
+			count: 1
+			path: src/Certificate/Asn1.php
+
+		-
+			message: "#^Parameter \\#2 \\$qIn of static method NFePHP\\\\Common\\\\Certificate\\\\Asn1\\:\\:xBase128\\(\\) expects int, float given\\.$#"
+			count: 1
+			path: src/Certificate/Asn1.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Certificate/PublicKey.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 5
+			path: src/Exception/CertificateException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 4
+			path: src/Exception/SignerException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 2
+			path: src/Exception/SoapException.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 2
+			path: src/Exception/ValidatorException.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Files\\:\\:listContents\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:randomName\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:uid\\(\\) should return string but returns int\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:uid\\(\\) should return string but returns int\\|false\\.$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapInterface\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Property NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:\\$filesystem \\(NFePHP\\\\Common\\\\Files\\) in empty\\(\\) is not falsy\\.$#"
+			count: 2
+			path: src/Soap/SoapBase.php
+
+		-
+			message: "#^Parameter \\#5 \\$oneWay \\(int\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapClientExtended\\:\\:__doRequest\\(\\) should be compatible with parameter \\$oneWay \\(bool\\) of method SoapClient\\:\\:__doRequest\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapClientExtended.php
+
+		-
+			message: "#^Parameter \\#5 \\$oneWay of method SoapClient\\:\\:__doRequest\\(\\) expects bool, int given\\.$#"
+			count: 1
+			path: src/Soap/SoapClientExtended.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapCurl\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapCurl.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapFake\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapInterface\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapFake.php
+
+		-
+			message: "#^Parameter \\#8 \\$soapheader \\(SoapHeader\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapNative\\:\\:send\\(\\) should be compatible with parameter \\$soapheader \\(null\\) of method NFePHP\\\\Common\\\\Soap\\\\SoapBase\\:\\:send\\(\\)$#"
+			count: 1
+			path: src/Soap/SoapNative.php
+
+		-
+			message: "#^Static method NFePHP\\\\Common\\\\Exception\\\\SoapException\\:\\:soapFault\\(\\) invoked with 1 parameter, 2 required\\.$#"
+			count: 4
+			path: src/Soap/SoapNative.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$emit\\.$#"
+			count: 1
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$ide\\.$#"
+			count: 9
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Access to an undefined property NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:\\$infnfe\\.$#"
+			count: 2
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method NFePHP\\\\Common\\\\Tags\\\\MakeBase\\:\\:createProperty\\(\\) expects NFePHP\\\\Common\\\\Tags\\\\TagInterface, array given\\.$#"
+			count: 1
+			path: src/Tags/MakeBase.php
+
+		-
+			message: "#^Undefined variable\\: \\$infId$#"
+			count: 1
+			path: src/Tags/MakeBase.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,6 +3,4 @@ includes:
 
 parameters:
     level: 5
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
diff --git a/phpstan80.neon b/phpstan80.neon
@@ -3,6 +3,4 @@ includes:
 
 parameters:
     level: 5
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
diff --git a/phpstan81.neon b/phpstan81.neon
@@ -3,6 +3,4 @@ includes:
 
 parameters:
     level: 5
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
diff --git a/phpstan82.neon b/phpstan82.neon
@@ -3,6 +3,4 @@ includes:
 
 parameters:
     level: 5
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
diff --git a/phpstan83.neon b/phpstan83.neon
@@ -0,0 +1,6 @@
+includes:
+    - phpstan-baseline83.neon
+
+parameters:
+    level: 5
+    treatPhpDocTypesAsCertain: false
diff --git a/phpstan84.neon b/phpstan84.neon
@@ -0,0 +1,6 @@
+includes:
+    - phpstan-baseline84.neon
+
+parameters:
+    level: 5
+    treatPhpDocTypesAsCertain: false
diff --git a/src/DOMImproved.php b/src/DOMImproved.php
@@ -197,7 +197,7 @@ public function addChild(
      * @param string $msg
      * @return void
      */
-    public function appChild(DOMElement &$parent, DOMElement $child = null, $msg = '')
+    public function appChild(DOMElement &$parent, ?DOMElement $child = null, $msg = '')
     {
         if (empty($child)) {
             //$this->errors[] = $msg;
@@ -249,7 +249,7 @@ public function appExternalChildBefore(
      * @param string $msg
      * @return void
      */
-    public function appChildBefore(DOMElement &$parent, DOMElement $child = null, $before = '', $msg = '')
+    public function appChildBefore(DOMElement &$parent, ?DOMElement $child = null, $before = '', $msg = '')
     {
         if (
             empty($child) ||
@@ -289,7 +289,7 @@ public function addArrayChild(?DOMElement &$parent, $arr)
      * @return void
      * @throws \DOMException
      */
-    public function addAttribute(\DOMElement &$node, string $name, string $value = null)
+    public function addAttribute(\DOMElement &$node, string $name, ?string $value = null)
     {
         if (is_null($value)) {
             return;
diff --git a/src/Exception/ExceptionCollection.php b/src/Exception/ExceptionCollection.php
@@ -23,7 +23,7 @@ class ExceptionCollection extends \Exception implements ExceptionInterface, Iter
      * @param int $code
      * @param \Exception $previous
      */
-    public function __construct($message = '', $code = 0, \Exception $previous = null)
+    public function __construct($message = '', $code = 0, ?\Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
         // $this->shortMessage = $message;
diff --git a/src/Soap/SoapBase.php b/src/Soap/SoapBase.php
@@ -152,7 +152,7 @@ abstract class SoapBase implements SoapInterface
      * @param Certificate|null $certificate
      */
     public function __construct(
-        Certificate $certificate = null
+        ?Certificate $certificate = null
     ) {
         $this->loadCertificate($certificate);
     }
@@ -163,7 +163,7 @@ public function __construct(
      * @return void
      * @throws Certificate\Exception\Expired
      */
-    private function isCertificateExpired(Certificate $certificate = null)
+    private function isCertificateExpired(?Certificate $certificate = null)
     {
         if (!$this->disableCertValidation) {
             if (null !== $certificate && $certificate->isExpired()) {
@@ -338,7 +338,7 @@ public function setDebugMode($value = false)
      * @param Certificate $certificate
      * @return void
      */
-    public function loadCertificate(Certificate $certificate = null)
+    public function loadCertificate(?Certificate $certificate = null)
     {
         $this->isCertificateExpired($certificate);
         if (null !== $certificate) {
diff --git a/src/Soap/SoapClientExtended.php b/src/Soap/SoapClientExtended.php
diff --git a/src/Soap/SoapCurl.php b/src/Soap/SoapCurl.php
diff --git a/src/Soap/SoapFake.php b/src/Soap/SoapFake.php
diff --git a/src/Soap/SoapNative.php b/src/Soap/SoapNative.php

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@`
`70`	`70`	`"stan": "phpstan analyse src/",`
`71`	`71`	`"stan80": "phpstan analyse src/ -c phpstan80.neon",`
`72`	`72`	`"stan81": "phpstan analyse src/ -c phpstan81.neon",`
`73`		`- "stan82": "phpstan analyse src/ -c phpstan82.neon"`
	`73`	`+ "stan82": "phpstan analyse src/ -c phpstan82.neon",`
	`74`	`+ "stan83": "phpstan analyse src/ -c phpstan83.neon",`
	`75`	`+ "stan84": "phpstan analyse src/ -c phpstan84.neon"`
`74`	`76`	`}`
`75`	`77`	`}`