Merge pull request #50 from eclipxe13/maintenance

Compatibilidad con PHP 8.5, dependencias con CVE y json_validate (version 0.6.1)

Author: eclipxe13

.github/workflows/build.yml

@@ -98,7 +98,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        php-version: ['8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.phive/phars.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpcs" version="^3.13.5" installed="3.13.5" location="./tools/phpcs" copy="false"/>
-  <phar name="phpcbf" version="^3.13.5" installed="3.13.5" location="./tools/phpcbf" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.89.2" installed="3.89.2" location="./tools/php-cs-fixer" copy="false"/>
-  <phar name="phpstan" version="^2.1.31" installed="2.1.31" location="./tools/phpstan" copy="false"/>
+  <phar name="phpcs" version="^4.0.1" installed="4.0.1" location="./tools/phpcs" copy="false"/>
+  <phar name="phpcbf" version="^4.0.1" installed="4.0.1" location="./tools/phpcbf" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.92.5" installed="3.92.5" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="phpstan" version="^2.1.36" installed="2.1.36" location="./tools/phpstan" copy="false"/>
   <phar name="composer-normalize" version="^2.48.2" installed="2.48.2" location="./tools/composer-normalize" copy="false"/>
 </phive>

.php-cs-fixer.dist.php

@@ -24,7 +24,7 @@
         'no_empty_statement' => true,
         'no_extra_blank_lines' => true,
         'type_declaration_spaces' => true,
-        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays', 'match', 'parameters']],
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match', 'arguments', 'parameters']],
         'no_blank_lines_after_phpdoc' => true,
         'object_operator_without_whitespace' => true,
         'binary_operator_spaces' => true,
@@ -38,6 +38,7 @@
         'concat_space' => ['spacing' => 'one'],
         'linebreak_after_opening_tag' => true,
         'fully_qualified_strict_types' => true,
+        'global_namespace_import' => ['import_classes' => true],
         // symfony:risky
         'no_alias_functions' => true,
         'self_accessor' => true,

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 - 2025 PhpCfdi https://www.phpcfdi.com/
+Copyright (c) 2019 - 2026 PhpCfdi https://www.phpcfdi.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -32,13 +32,13 @@
         "phpcfdi/credentials": "^1.3.0",
         "phpcfdi/xml-cancelacion": "^2.0.5",
         "psr/log": "^3.0",
-        "robrichards/xmlseclibs": "^3.1.3"
+        "robrichards/xmlseclibs": "^3.1.4"
     },
     "require-dev": {
         "ext-fileinfo": "*",
         "eclipxe/cfdiutils": "^3.0.1",
         "phpcfdi/rfc": "^1.2",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^10.5.50",
         "rector/rector": "^2.2",
         "symfony/dotenv": "^6.0 || ^7.0"
     },

docs/CHANGELOG.md

@@ -6,9 +6,26 @@ Nos apegamos a [SEMVER](SEMVER.md), revisa la información para entender mejor e
 
 Estos cambios se aplican y se publican, pero aún no son parte de una versión liberada.
 
+## Versión 0.6.1 2026-02-04
+
+- Se comprueba la compatibilidad con PHP 8.5.
+- Se actualizan dependencias para evitar alertas de seguridad (CVE).
+- Se agrega una validación para prevenir el uso de `json_validate` en versiones de PHP donde no se soporta.
+
+Se hacen varios cambios menores:
+
+- Actualización del estándar de código.
+- Actualización del año de licencia a 2026.
+
+Se hacen varios cambios al entorno de desarrollo:
+
+- Se agrega PHP 8.5 a la matriz de pruebas.
+- Se actualizan las herramientas de desarrollo.
+
 ## Versión 0.6.0 2025-11-08
 
 Esta versión tiene cambios importantes dado que:
+
 - Elimina la compatibilidad con PHP 7.3, PHP 7.4 y PHP 8.0.
 - Agrega la compatibilidad con PHP 8.4.
 

src/Finkok.php

@@ -160,7 +160,7 @@ protected function executeService(string $method, object $service, ?object $comm
         $method = static::SERVICES_MAP[$method][2] ?? $method;
         if (! is_callable([$service, $method])) {
             throw new BadMethodCallException(
-                sprintf('The service %s does not have a method %s', $service::class, $method)
+                sprintf('The service %s does not have a method %s', $service::class, $method),
             );
         }
         return $service->{$method}($command);

src/FinkokSettings.php

@@ -75,7 +75,7 @@ public function createCallerForService(
         $wsdlLocation = $this->environment()->endpoint($service);
         $credentials = array_merge(
             ('' !== $usernameKey) ? [$usernameKey => $this->username()] : [],
-            ('' !== $passwordKey) ? [$passwordKey => $this->password()] : []
+            ('' !== $passwordKey) ? [$passwordKey => $this->password()] : [],
         );
         return $this->soapFactory()->createSoapCaller($wsdlLocation, $credentials);
     }

src/Helpers/DocumentSigner.php

@@ -69,7 +69,7 @@ public function signDocumentUsingCredential(DOMDocument $document, Credential $c
             $document,
             XMLSecurityDSig::SHA1,
             ['http://www.w3.org/2000/09/xmldsig#enveloped-signature'],
-            ['force_uri' => true]
+            ['force_uri' => true],
         );
 
         $objKey = new XMLSecurityKey(XMLSecurityKey::RSA_SHA1, ['type' => 'private']);

src/Helpers/JsonDecoderLogger.php

@@ -81,19 +81,17 @@ public function log($level, string|Stringable $message, array $context = []): vo
     private function jsonDecode(string|Stringable $string): string
     {
         $this->lastMessageWasJsonValid = false;
-        $string = strval($string);
 
         // json_validate and json_decode
-        if ($this->useJsonValidateIfAvailable && function_exists('\json_validate')) {
-            if (\json_validate($string)) {
-                $this->lastMessageWasJsonValid = true;
-                return $this->varDump(json_decode($string));
+        if ($this->useJsonValidateIfAvailable) {
+            $string = $this->jsonDecodeWithValidate($string);
+            if ($this->lastMessageWasJsonValid()) {
+                return $string;
             }
-
-            return $string;
         }
 
         // json_decode only
+        $string = (string) $string;
         $decoded = json_decode($string);
         if (JSON_ERROR_NONE === json_last_error()) {
             $this->lastMessageWasJsonValid = true;
@@ -103,6 +101,17 @@ private function jsonDecode(string|Stringable $string): string
         return $string;
     }
 
+    private function jsonDecodeWithValidate(string|Stringable $string): string
+    {
+        $string = (string) $string;
+        if (function_exists('json_validate') && json_validate($string)) {
+            $this->lastMessageWasJsonValid = true;
+            return $this->varDump(json_decode($string));
+        }
+
+        return $string;
+    }
+
     private function varDump(mixed $var): string
     {
         return print_r($var, true);