Merge pull request #24 from eclipxe13/version-3.3.0

Eliminar soporte para PHP 7.3, PHP 7.4 y PHP 8.0 (versión 3.3.0)

Author: eclipxe13

.github/workflows/build.yml

@@ -12,6 +12,24 @@ on:
 # shivammathur/setup-php@v2 https://github.com/marketplace/actions/setup-php-action
 
 jobs:
+
+  composer-normalize:
+    name: Composer normalization
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          coverage: none
+          tools: composer-normalize
+        env:
+          fail-fast: true
+      - name: Composer normalize
+        run: composer-normalize
+
   phpcs:
     name: Code Style (phpcs)
     runs-on: "ubuntu-latest"
@@ -99,7 +117,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.phive/phars.xml

@@ -6,4 +6,5 @@
   <phar name="phpstan" version="^2.1.11" installed="2.1.11" location="./tools/phpstan" copy="false"/>
   <phar name="psalm" version="^6.10.0" installed="6.10.0" location="./tools/psalm" copy="false"/>
   <phar name="infection" version="^0.29.14" installed="0.29.14" location="./tools/infection" copy="false"/>
+  <phar name="composer-normalize" version="^2.46.0" installed="2.46.0" location="./tools/composer-normalize" copy="false"/>
 </phive>

.php-cs-fixer.dist.php

@@ -15,15 +15,16 @@
     ->setRules([
         '@PSR12' => true,
         '@PSR12:risky' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHP73Migration' => true,
+        '@PHP81Migration' => true,
+        '@PHP80Migration:risky' => true,
         // symfony
+        'array_indentation' => true,
         'class_attributes_separation' => true,
         'whitespace_after_comma_in_array' => true,
         'no_empty_statement' => true,
         'no_extra_blank_lines' => true,
         'type_declaration_spaces' => true,
-        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays']],
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match', 'parameters']],
         'no_blank_lines_after_phpdoc' => true,
         'object_operator_without_whitespace' => true,
         'binary_operator_spaces' => true,
@@ -36,6 +37,8 @@
         'standardize_not_equals' => true,
         '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,

composer.json

@@ -1,36 +1,34 @@
 {
     "name": "phpcfdi/cfdi-expresiones",
     "description": "Genera expresiones de CFDI 4.0, CFDI 3.3, CFDI 3.2, RET 1.0 y RET 2.0",
-    "keywords": ["phpcfdi", "sat", "cfdi"],
-    "homepage": "https://github.com/phpcfdi/cfdi-expresiones",
     "license": "MIT",
+    "keywords": [
+        "phpcfdi",
+        "sat",
+        "cfdi"
+    ],
     "authors": [
         {
             "name": "Carlos C Soto",
             "email": "eclipxe13@gmail.com",
             "homepage": "https://eclipxe.com.mx/"
         }
     ],
+    "homepage": "https://github.com/phpcfdi/cfdi-expresiones",
     "support": {
-        "source": "https://github.com/phpcfdi/cfdi-expresiones",
-        "issues": "https://github.com/phpcfdi/cfdi-expresiones/issues"
-    },
-    "prefer-stable": true,
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": {
-            "*": "dist"
-        }
+        "issues": "https://github.com/phpcfdi/cfdi-expresiones/issues",
+        "source": "https://github.com/phpcfdi/cfdi-expresiones"
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=8.1",
         "ext-dom": "*",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "ext-json": "*"
+        "ext-json": "*",
+        "phpunit/phpunit": "^10.5.45"
     },
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "PhpCfdi\\CfdiExpresiones\\": "src/"
@@ -41,13 +39,27 @@
             "PhpCfdi\\CfdiExpresiones\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": {
+            "*": "dist"
+        }
+    },
     "scripts": {
-        "dev:build": ["@dev:fix-style", "@dev:test"],
+        "dev:build": [
+            "@dev:fix-style",
+            "@dev:test"
+        ],
         "dev:check-style": [
+            "@php tools/composer-normalize normalize --dry-run",
             "@php tools/php-cs-fixer fix --dry-run --verbose",
             "@php tools/phpcs --colors -sp"
         ],
+        "dev:coverage": [
+            "@php -dzend_extension=xdebug.so -dxdebug.mode=coverage vendor/bin/phpunit --coverage-html build/coverage/html/"
+        ],
         "dev:fix-style": [
+            "@php tools/composer-normalize normalize",
             "@php tools/php-cs-fixer fix --verbose",
             "@php tools/phpcbf --colors -sp"
         ],
@@ -57,16 +69,13 @@
             "@php tools/phpstan analyse --no-progress",
             "@php tools/psalm --no-progress",
             "@php tools/infection --no-progress --no-interaction --show-mutations"
-        ],
-        "dev:coverage": [
-            "@php -dzend_extension=xdebug.so -dxdebug.mode=coverage vendor/bin/phpunit --coverage-html build/coverage/html/"
         ]
     },
     "scripts-descriptions": {
         "dev:build": "DEV: run dev:fix-style and dev:tests, run before pull request",
-        "dev:check-style": "DEV: search for code style errors using php-cs-fixer and phpcs",
-        "dev:fix-style": "DEV: fix code style errors using php-cs-fixer and phpcbf",
-        "dev:test": "DEV: run dev:check-style, phpunit, phpstan, psalm and infection",
-        "dev:coverage": "DEV: run phpunit with xdebug and storage coverage in build/coverage/html/"
+        "dev:check-style": "DEV: search for code style errors using composer-normalize, php-cs-fixer and phpcs",
+        "dev:coverage": "DEV: run phpunit with xdebug and storage coverage in build/coverage/html/",
+        "dev:fix-style": "DEV: fix code style errors using composer-normalize, php-cs-fixer and phpcbf",
+        "dev:test": "DEV: run dev:check-style, phpunit, phpstan, psalm and infection"
     }
 }

docs/CHANGELOG.md

@@ -11,6 +11,17 @@ versión, aunque sí su incorporación en la rama principal de trabajo, generalm
 
 ## Listado de cambios
 
+### Version 3.3.0 2025-04-13
+
+Se elimina el soporte para PHP 7.3, PHP 7.4 y PHP 8.0.  La versión mínima es ahora PHP 8.1.
+Esto incluye cambios al código relacionados con tipos, calidad de código y eliminación de código muerto.
+
+Los siguientes cambios aplican al entorno de desarrollo.
+
+- Se actualizan las pruebas a PHPUnit 10.
+- Se agrega la herramienta `composer-normalize` al proceso de construcción.
+- Se actualiza el estándar de código para `phpcs` y `php-cs-fixer`.
+
 ### Version 3.2.1 2025-04-13
 
 - Se comprueba que el proyecto es compatible con PHP 8.4.

phpcs.xml.dist

@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="EngineWorks">
-    <description>The EngineWorks (PSR-2 based) coding standard.</description>
+    <description>The EngineWorks (PSR-12 based) coding standard.</description>
 
     <file>src</file>
     <file>tests</file>

phpunit.xml.dist

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    cacheResultFile="build/phpunit.result.cache"
-    bootstrap="tests/bootstrap.php"
-    colors="true"
-    >
-    <testsuites>
-        <testsuite name="default">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src/</directory>
-        </include>
-    </coverage>
+  xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+  cacheResultFile="build/phpunit.result.cache"
+  bootstrap="tests/bootstrap.php"
+  colors="true"
+  >
+  <testsuites>
+    <testsuite name="default">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

src/DiscoverExtractor.php

@@ -15,7 +15,7 @@
 class DiscoverExtractor implements ExpressionExtractorInterface
 {
     /** @var ExpressionExtractorInterface[] */
-    private $extractors;
+    private readonly array $extractors;
 
     public function __construct(ExpressionExtractorInterface ...$extractors)
     {

src/ExpressionExtractorInterface.php

@@ -10,40 +10,30 @@ interface ExpressionExtractorInterface
 {
     /**
      * Extractor (implementor) unique name
-     *
-     * @return string
      */
     public function uniqueName(): string;
 
     /**
      * Check that the XML document matches with the extractor
-     *
-     * @param DOMDocument $document
-     * @return bool
      */
     public function matches(DOMDocument $document): bool;
 
     /**
      * Obtain the relevant values from the given XML Document
      *
-     * @param DOMDocument $document
      * @return array<string, string>
      */
     public function obtain(DOMDocument $document): array;
 
     /**
      * Format an expression based on given XML document
-     *
-     * @param DOMDocument $document
-     * @return string
      */
     public function extract(DOMDocument $document): string;
 
     /**
      * Format an expression based on given values
      *
      * @param array<string, string> $values
-     * @return string
      */
     public function format(array $values): string;
 }

src/Extractors/Comprobante32.php

@@ -15,8 +15,7 @@ class Comprobante32 implements ExpressionExtractorInterface
     use Standards\FormatRfcXml;
     use Standards\FormatTotal10x6;
 
-    /** @var MatchDetector */
-    private $matchDetector;
+    private MatchDetector $matchDetector;
 
     public function __construct()
     {