Merge pull request #88 from eclipxe13/version-5.0.0

Cambios en compatibilidad de PHP 8.2 - 8.4 (Versión 5.0.0)

Author: eclipxe13

.github/workflows/build.yml

@@ -13,56 +13,56 @@ on:
 
 jobs:
 
-  phpcs:
-    name: Code style (phpcs)
+  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.3'
+          php-version: '8.4'
           coverage: none
-          tools: cs2pr, phpcs
+          tools: composer-normalize
         env:
           fail-fast: true
-      - name: Code style (phpcs)
-        run: phpcs -q --report=checkstyle | cs2pr
+      - name: Composer normalize
+        run: composer-normalize
 
-  php-cs-fixer:
-    name: Code style (php-cs-fixer)
+  phpcs:
+    name: Code style (phpcs)
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
-          tools: cs2pr, php-cs-fixer
+          tools: cs2pr, phpcs
         env:
           fail-fast: true
-      - name: Code style (php-cs-fixer)
-        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
+      - name: Code style (phpcs)
+        run: phpcs -q --report=checkstyle | cs2pr
 
-  composer-normalize:
-    name: Composer normalization
+  php-cs-fixer:
+    name: Code style (php-cs-fixer)
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
-          tools: composer-normalize
+          tools: cs2pr, php-cs-fixer
         env:
           fail-fast: true
-      - name: Composer normalize
-        run: composer-normalize
+      - name: Code style (php-cs-fixer)
+        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
 
   phpstan:
     name: Code analysis (phpstan)
@@ -73,7 +73,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
           tools: composer:v2, phpstan
         env:
@@ -97,7 +97,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3', '8.4']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -118,10 +118,7 @@ jobs:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
           restore-keys: ${{ runner.os }}-composer-
-      - name: Remove phpcfdi/image-captcha-resolver-boxfactura-ai for PHP < 8.1
-        if: ${{ matrix.php-version < '8.1' }}
-        run: composer remove phpcfdi/image-captcha-resolver-boxfactura-ai --dev --no-interaction --no-progress --no-update
       - name: Install project dependencies
         run: composer upgrade --no-interaction --no-progress --prefer-dist
       - name: Tests (phpunit)
-        run: vendor/bin/phpunit --testdox --verbose
+        run: vendor/bin/phpunit --testdox

.github/workflows/coverage.yml

@@ -0,0 +1,53 @@
+name: "SonarQube Cloud"
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+# Actions
+# shivammathur/setup-php@v2 https://github.com/marketplace/actions/setup-php-action
+# SonarSource/sonarqube-scan-action@v5 https://github.com/marketplace/actions/official-sonarqube-scan
+
+jobs:
+
+  sonarqube-cloud:
+    name: SonarCloud Scan and Report
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Check SONAR_TOKEN secret
+        run: |
+          if [ -z "${{ secrets.SONAR_TOKEN }}" ]; then
+            echo "::warning ::SONAR_TOKEN non set"
+            exit 1
+          fi
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Unshallow clone to provide blame information
+        run: git fetch --unshallow
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          coverage: xdebug
+          tools: composer:v2
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install project dependencies
+        run: composer upgrade --no-interaction --no-progress --prefer-dist
+      - name: Create code coverage
+        run: vendor/bin/phpunit --testdox --coverage-xml=build/coverage --coverage-clover=build/coverage/clover.xml --log-junit=build/coverage/junit.xml
+      - name: Prepare SonarCloud Code Coverage Files
+        run: |
+          sed 's#'$GITHUB_WORKSPACE'#/github/workspace#g' build/coverage/junit.xml > build/sonar-junit.xml
+          sed 's#'$GITHUB_WORKSPACE'#/github/workspace#g' build/coverage/clover.xml > build/sonar-coverage.xml
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarqube-scan-action@v5
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sonarqube-cloud.yml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.75.0" installed="3.75.0" location="./tools/php-cs-fixer" copy="false"/>
-  <phar name="phpcs" version="^3.13.0" installed="3.13.0" location="./tools/phpcs" copy="false"/>
-  <phar name="phpcbf" version="^3.13.0" installed="3.13.0" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpstan" version="^2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
-  <phar name="composer-normalize" version="^2.47.0" installed="2.47.0" location="./tools/composer-normalize" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.87.2" installed="3.87.2" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="phpcs" version="^3.13.4" installed="3.13.4" location="./tools/phpcs" copy="false"/>
+  <phar name="phpcbf" version="^3.13.4" installed="3.13.4" location="./tools/phpcbf" copy="false"/>
+  <phar name="phpstan" version="^2.1.25" installed="2.1.25" location="./tools/phpstan" copy="false"/>
+  <phar name="composer-normalize" version="^2.48.2" installed="2.48.2" location="./tools/composer-normalize" copy="false"/>
 </phive>

.phive/phars.xml

@@ -15,15 +15,15 @@
     ->setRules([
         '@PSR12' => true,
         '@PSR12:risky' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHP73Migration' => true,
+        '@PHP82Migration:risky' => true,
+        '@PHP82Migration' => true,
         // symfony
         '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', 'arguments']],
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays', 'match', 'arguments', 'parameters']],
         'no_blank_lines_after_phpdoc' => true,
         'object_operator_without_whitespace' => true,
         'binary_operator_spaces' => true,
@@ -36,6 +36,7 @@
         'standardize_not_equals' => true,
         'concat_space' => ['spacing' => 'one'],
         'linebreak_after_opening_tag' => true,
+        'fully_qualified_strict_types' => true,
         // symfony:risky
         'no_alias_functions' => true,
         'self_accessor' => true,

.php-cs-fixer.dist.php

@@ -579,6 +579,7 @@ Consulta las guías de actualización:
 
 - [Actualización de la versión `2.x` a la versión `3.x`](docs/UPGRADE-2-3.md).
 - [Actualización de la versión `3.x` a la versión `4.x`](docs/UPGRADE-3-4.md).
+- [Actualización de la versión `4.x` a la versión `5.x`](docs/UPGRADE-4-5.md).
 
 ## Contribuciones
 
@@ -620,6 +621,6 @@ and licensed for use under the MIT License (MIT). Please see [LICENSE][] for mor
 [badge-build]: https://img.shields.io/github/actions/workflow/status/phpcfdi/cfdi-sat-scraper/build.yml?branch=main&logo=github-actions
 [badge-reliability]: https://sonarcloud.io/api/project_badges/measure?project=phpcfdi_cfdi-sat-scraper&metric=reliability_rating
 [badge-maintainability]: https://sonarcloud.io/api/project_badges/measure?project=phpcfdi_cfdi-sat-scraper&metric=sqale_rating
-[badge-coverage]: https://img.shields.io/sonar/coverage/phpcfdi_cfdi-sat-scraper/main?logo=sonarcloud&server=https%3A%2F%2Fsonarcloud.io
-[badge-violations]: https://img.shields.io/sonar/violations/phpcfdi_cfdi-sat-scraper/main?format=long&logo=sonarcloud&server=https%3A%2F%2Fsonarcloud.io
+[badge-coverage]: https://img.shields.io/sonar/coverage/phpcfdi_cfdi-sat-scraper/main?logo=sonarqubecloud&server=https%3A%2F%2Fsonarcloud.io
+[badge-violations]: https://img.shields.io/sonar/violations/phpcfdi_cfdi-sat-scraper/main?format=long&logo=sonarqubecloud&server=https%3A%2F%2Fsonarcloud.io
 [badge-downloads]: https://img.shields.io/packagist/dt/phpcfdi/cfdi-sat-scraper?logo=packagist

README.md

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
+        "php": ">=8.2",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -32,16 +32,16 @@
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/promises": "^2.0",
         "phpcfdi/credentials": "^1.1",
-        "phpcfdi/image-captcha-resolver": "^0.2.4",
+        "phpcfdi/image-captcha-resolver": "^0.3.0",
         "psr/http-message": "^1.1 || ^2.0",
         "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
         "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ext-iconv": "*",
         "fakerphp/faker": "^1.13",
-        "phpcfdi/image-captcha-resolver-boxfactura-ai": "^0.1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpcfdi/image-captcha-resolver-boxfactura-ai": "^0.2.0",
+        "phpunit/phpunit": "^11.5",
         "symfony/dotenv": "^5.4 || ^6.0 || ^7.0"
     },
     "autoload": {
@@ -72,17 +72,17 @@
         ],
         "dev:check-style": [
             "@php tools/composer-normalize normalize --dry-run",
-            "@php -r 'exit(intval(PHP_VERSION_ID >= 74000));' || $PHP_BINARY tools/php-cs-fixer fix --dry-run --verbose",
+            "@php tools/php-cs-fixer fix --dry-run --verbose",
             "@php tools/phpcs --colors -sp"
         ],
         "dev:fix-style": [
             "@php tools/composer-normalize normalize",
-            "@php -r 'exit(intval(PHP_VERSION_ID >= 74000));' || $PHP_BINARY tools/php-cs-fixer fix --verbose",
+            "@php tools/php-cs-fixer fix --verbose",
             "@php tools/phpcbf --colors -sp"
         ],
         "dev:tests": [
             "@dev:check-style",
-            "@php vendor/bin/phpunit --testdox --verbose",
+            "@php vendor/bin/phpunit --testdox",
             "@php tools/phpstan analyze --no-progress --verbose"
         ]
     },