From 7566d17daae5be69a37b413030b988d970e9b123 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:01:16 -0600 Subject: [PATCH 1/8] Replace function_typehint_space with type_declaration_spaces --- .php-cs-fixer.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index f2846e5..49c33cc 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -22,7 +22,7 @@ 'whitespace_after_comma_in_array' => true, 'no_empty_statement' => true, 'no_extra_blank_lines' => true, - 'function_typehint_space' => true, + 'type_declaration_spaces' => true, 'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays']], 'no_blank_lines_after_phpdoc' => true, 'object_operator_without_whitespace' => true, From e69877c5964c6b5758d05b387131da7a719ec5d9 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:02:07 -0600 Subject: [PATCH 2/8] Use GitHub actions version 4 --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/sat-ns-registry-update.yml | 4 ++-- .github/workflows/sonarcloud.yml | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a36fdc5..75cb994 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -39,7 +39,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -54,7 +54,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -65,7 +65,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -80,7 +80,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -91,7 +91,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -109,7 +109,7 @@ jobs: php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -122,7 +122,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -137,7 +137,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -148,7 +148,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} diff --git a/.github/workflows/sat-ns-registry-update.yml b/.github/workflows/sat-ns-registry-update.yml index 16fc524..2499789 100644 --- a/.github/workflows/sat-ns-registry-update.yml +++ b/.github/workflows/sat-ns-registry-update.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -29,7 +29,7 @@ jobs: run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Composer cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index e03211d..ab34c28 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -15,7 +15,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -28,7 +28,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -38,7 +38,7 @@ jobs: - name: Create code coverage run: vendor/bin/phpunit --testdox --verbose --coverage-xml=build/coverage --coverage-clover=build/coverage/clover.xml --log-junit=build/coverage/junit.xml - name: Store code coverage - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: code-coverage path: build/coverage @@ -73,7 +73,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone to provide blame information run: git fetch --unshallow - name: Setup PHP @@ -86,7 +86,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -94,7 +94,7 @@ jobs: - name: Install project dependencies run: composer upgrade --no-interaction --no-progress --prefer-dist - name: Obtain code coverage - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: code-coverage path: build/coverage From 8c6cf47048e93c234ea39353fbfc76b01494f1d5 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:02:38 -0600 Subject: [PATCH 3/8] Add PHP 8.3 to build matrix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75cb994..84b4945 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2'] + php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout uses: actions/checkout@v4 From c4f77e5fe375156698dddadb029b819959296f97 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:04:20 -0600 Subject: [PATCH 4/8] Run jobs using PHP 8.3 --- .github/workflows/build.yml | 10 +++++----- .github/workflows/sonarcloud.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84b4945..8bb7a27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: phpcs, cs2pr - name: phpcs @@ -43,7 +43,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: php-cs-fixer, cs2pr - name: php-cs-fixer @@ -58,7 +58,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2, phpstan - name: Get composer cache directory @@ -84,7 +84,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 - name: Get composer cache directory @@ -141,7 +141,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: xdebug tools: composer:v2, infection - name: Get composer cache directory diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index ab34c28..5c792e6 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -19,7 +19,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: xdebug tools: composer:v2 env: @@ -79,7 +79,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' coverage: none tools: composer:v2 - name: Get composer cache directory From 8c05fa73ab082f221b1042213cad223d7d3b6f28 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:04:41 -0600 Subject: [PATCH 5/8] Use matix variable php-version (singular) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bb7a27..6c3a556 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,18 +102,18 @@ jobs: run: bash bin/check-current-max-occurs-paths.bash tests: - name: Tests on PHP ${{ matrix.php-versions }} (phpunit) + name: Tests on PHP ${{ matrix.php-version }} (phpunit) runs-on: "ubuntu-latest" strategy: matrix: - php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] + php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ matrix.php-version }} coverage: none tools: composer:v2 env: From b759a407e5da88b0e01bedbf27d1fc5bd7cffbab Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:05:05 -0600 Subject: [PATCH 6/8] Update license year to 2024 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ed6db39..0d96a4a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 - 2023 PhpCfdi https://www.phpcfdi.com/ +Copyright (c) 2021 - 2024 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 From ec3a69d428d8e007cf74b3007662958a25e60976 Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:16:01 -0600 Subject: [PATCH 7/8] Update development tools --- .phive/phars.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.phive/phars.xml b/.phive/phars.xml index dcbf06b..c534f9b 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,8 +1,8 @@ - - - - - + + + + + From e415973d7df0485632f8818f883f6790c081e17d Mon Sep 17 00:00:00 2001 From: Carlos C Soto Date: Thu, 11 Jul 2024 22:16:55 -0600 Subject: [PATCH 8/8] Document version 0.3.5 --- docs/CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e2223a6..210f6e1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -11,6 +11,19 @@ versión aunque sí su incorporación en la rama principal de trabajo, generalme ## Listado de cambios +### Versión 0.3.5 2024-07-11 + +- Se actualiza el archivo `UnboundedOccursPaths.json` porque se incluyó el nuevo complemento *Carta Porte 3.1*. + +Los siguientes cambios no modifican el código fuente. + +- Se actualiza el archivo de licencia. +- En los flujos de trabajo de GitHub: + - Se agrega PHP 8.3 a la matriz de pruebas. + - Se ejecutan los trabajos en PHP 8.3. + - Se utilizan las acciones de GitHub versión 4. +- Se actualizan las herramientas de desarrollo. + ### Versión 0.3.4 2023-10-22 - Se actualiza el archivo `UnboundedOccursPaths.json` porque se incluyó el nuevo complemento *Carta Porte 3.0*.