From e52db72071e770becb890ac4e561517e5ab5a99f Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 11:15:43 -0400 Subject: [PATCH 1/8] fix: Update `.gitattributes` to exclude additional files from the package. --- .gitattributes | 5 +++++ .github/workflows/build-mysql.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/mutation.yml | 3 ++- composer.json | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 65a6a4e..fdf0ca4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,6 +26,7 @@ /CHANGELOG.md merge=union # Exclude files from the archive +/.editorconfig export-ignore /.gitattributes export-ignore /.github export-ignore /.gitignore export-ignore @@ -33,7 +34,11 @@ /codeception.yml export-ignore /composer-require-checker.json export-ignore /docs export-ignore +/ecs.php export-ignore +/infection.json* export-ignore +/phpstan*.neon* export-ignore /phpunit.xml.dist export-ignore /psalm.xml export-ignore /rector.php export-ignore +/runtime export-ignore /tests export-ignore diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml index 1e830ac..e419a4b 100644 --- a/.github/workflows/build-mysql.yml +++ b/.github/workflows/build-mysql.yml @@ -20,7 +20,7 @@ name: build-mysql jobs: mysql: name: MySQL tests. - uses: php-forge/actions/.github/workflows/phpunit-database.yml@main + uses: php-forge/actions/.github/workflows/phpunit-database.yml@fix-mini-31 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce9b83a..0877d78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ name: build jobs: phpunit: - uses: php-forge/actions/.github/workflows/phpunit.yml@main + uses: php-forge/actions/.github/workflows/phpunit.yml@fix-mini-31 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: @@ -29,7 +29,7 @@ jobs: extensions: pdo, pdo_sqlite phpunit-group: sqlite phpunit-compatibility: - uses: php-forge/actions/.github/workflows/phpunit.yml@main + uses: php-forge/actions/.github/workflows/phpunit.yml@mfix-mini-31 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index aa68e8a..c2e4012 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -19,8 +19,9 @@ name: mutation test jobs: mutation: - uses: php-forge/actions/.github/workflows/infection.yml@main + uses: php-forge/actions/.github/workflows/infection.yml@fix-mini-31 with: + command-coverage-options: --with-uncovered extensions: pdo, pdo_pgsql, pdo_sqlite framework-options: --test-framework-options="--group=sqlite,mutation" hook: | diff --git a/composer.json b/composer.json index 553e5b3..1fbc431 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require-dev": { "ext-dom": "*", "ext-simplexml": "*", - "infection/infection": "^0.27|^0.30", + "infection/infection": "^0.27|^0.31", "maglnet/composer-require-checker": "^4.1", "php-forge/support": "^0.1", "phpstan/extension-installer": "^1.4", From c470fb910224877d25ab97af59e82ab578b56660 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 11:16:55 -0400 Subject: [PATCH 2/8] fix: Correct workflow reference in `build.yml` for phpunit compatibility job. --- .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 0877d78..8c70582 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: extensions: pdo, pdo_sqlite phpunit-group: sqlite phpunit-compatibility: - uses: php-forge/actions/.github/workflows/phpunit.yml@mfix-mini-31 + uses: php-forge/actions/.github/workflows/phpunit.yml@fix-mini-31 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: From 8e1b9d506e638d12d6f147f3c56a6e467851a5ce Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 11:21:15 -0400 Subject: [PATCH 3/8] fix: Reorganize mutation job configuration in `mutation.yml` for clarity and consistency. --- .github/workflows/mutation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index c2e4012..d900ed7 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -21,10 +21,7 @@ jobs: mutation: uses: php-forge/actions/.github/workflows/infection.yml@fix-mini-31 with: - command-coverage-options: --with-uncovered - extensions: pdo, pdo_pgsql, pdo_sqlite - framework-options: --test-framework-options="--group=sqlite,mutation" - hook: | + before-hook: | # Config MySQL with Docker docker run -d \ --name mysql-test \ @@ -75,6 +72,9 @@ jobs: echo "PGSQL_DSN=pgsql:host=localhost;port=5432;dbname=yiitest" >> $GITHUB_ENV echo "PGSQL_USERNAME=root" >> $GITHUB_ENV echo "PGSQL_PASSWORD=root" >> $GITHUB_ENV + command-coverage-options: --with-uncovered + extensions: pdo, pdo_pgsql, pdo_sqlite + framework-options: --test-framework-options="--group=sqlite,mutation" phpstan: true secrets: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} From f1a7a6a87090caa3826413eb6906b20217bdd90b Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 13:15:08 -0400 Subject: [PATCH 4/8] fix: Correct copyright holder name in `LICENSE.md`. --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 13bf79d..749460a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -11,7 +11,7 @@ are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of Yii Software nor the names of its contributors may be +* Neither the name of Terabytesoftw nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. From aa9163a6ac05384bb9e2a547a8cc924030abb9b3 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 13:52:40 -0400 Subject: [PATCH 5/8] fix: Update workflow references to use versioned actions for consistency. --- .github/workflows/build-mssql.yml | 2 +- .github/workflows/build-mysql.yml | 2 +- .github/workflows/build-oracle.yml | 2 +- .github/workflows/build-pgsql.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/dependency-check.yml | 2 +- .github/workflows/ecs.yml | 2 +- .github/workflows/mutation.yml | 2 +- .github/workflows/static.yml | 2 +- LICENSE.md | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-mssql.yml b/.github/workflows/build-mssql.yml index 623c116..3fd7c32 100644 --- a/.github/workflows/build-mssql.yml +++ b/.github/workflows/build-mssql.yml @@ -20,7 +20,7 @@ name: build-mssql jobs: mssql: name: SQL Server tests. - uses: php-forge/actions/.github/workflows/phpunit-database.yml@main + uses: php-forge/actions/.github/workflows/phpunit-database.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml index e419a4b..045d0b9 100644 --- a/.github/workflows/build-mysql.yml +++ b/.github/workflows/build-mysql.yml @@ -20,7 +20,7 @@ name: build-mysql jobs: mysql: name: MySQL tests. - uses: php-forge/actions/.github/workflows/phpunit-database.yml@fix-mini-31 + uses: php-forge/actions/.github/workflows/phpunit-database.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/build-oracle.yml b/.github/workflows/build-oracle.yml index 74c6092..d9059d9 100644 --- a/.github/workflows/build-oracle.yml +++ b/.github/workflows/build-oracle.yml @@ -20,7 +20,7 @@ name: build-oracle jobs: oracle: name: Oracle tests. - uses: php-forge/actions/.github/workflows/phpunit-database.yml@main + uses: php-forge/actions/.github/workflows/phpunit-database.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/build-pgsql.yml b/.github/workflows/build-pgsql.yml index ec67222..876eb68 100644 --- a/.github/workflows/build-pgsql.yml +++ b/.github/workflows/build-pgsql.yml @@ -20,7 +20,7 @@ name: build-pgsql jobs: pgsql: name: PostgreSQL tests. - uses: php-forge/actions/.github/workflows/phpunit-database.yml@main + uses: php-forge/actions/.github/workflows/phpunit-database.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c70582..a924850 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ name: build jobs: phpunit: - uses: php-forge/actions/.github/workflows/phpunit.yml@fix-mini-31 + uses: php-forge/actions/.github/workflows/phpunit.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: @@ -29,7 +29,7 @@ jobs: extensions: pdo, pdo_sqlite phpunit-group: sqlite phpunit-compatibility: - uses: php-forge/actions/.github/workflows/phpunit.yml@fix-mini-31 + uses: php-forge/actions/.github/workflows/phpunit.yml@v1 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index a5390cf..ff67038 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -19,4 +19,4 @@ name: Composer require checker jobs: composer-require-checker: - uses: php-forge/actions/.github/workflows/composer-require-checker.yml@main + uses: php-forge/actions/.github/workflows/composer-require-checker.yml@v1 diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml index 0693163..15e689b 100644 --- a/.github/workflows/ecs.yml +++ b/.github/workflows/ecs.yml @@ -19,6 +19,6 @@ name: ecs jobs: easy-coding-standard: - uses: php-forge/actions/.github/workflows/ecs.yml@main + uses: php-forge/actions/.github/workflows/ecs.yml@v1 with: extensions: mbstring diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index d900ed7..e441b54 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -19,7 +19,7 @@ name: mutation test jobs: mutation: - uses: php-forge/actions/.github/workflows/infection.yml@fix-mini-31 + uses: php-forge/actions/.github/workflows/infection.yml@v1 with: before-hook: | # Config MySQL with Docker diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 0ad0eba..d9b710b 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -19,4 +19,4 @@ name: static analysis jobs: phpstan: - uses: php-forge/actions/.github/workflows/phpstan.yml@main + uses: php-forge/actions/.github/workflows/phpstan.yml@v1 diff --git a/LICENSE.md b/LICENSE.md index 749460a..1a93d4e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -11,9 +11,9 @@ are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of Terabytesoftw nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. +* Neither the name of Yii2 Extensions (Terabytesoftw) nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED From 3abe1c85cd09cc35271ba18041895372a19bf3ce Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 13:59:09 -0400 Subject: [PATCH 6/8] fix: Update PHPStan badge link in `README.md` for correct repository reference. --- .github/workflows/static.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index d9b710b..0ad0eba 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -19,4 +19,4 @@ name: static analysis jobs: phpstan: - uses: php-forge/actions/.github/workflows/phpstan.yml@v1 + uses: php-forge/actions/.github/workflows/phpstan.yml@main diff --git a/README.md b/README.md index 9f8fce3..718dd33 100644 --- a/README.md +++ b/README.md @@ -369,7 +369,7 @@ For detailed configuration options and advanced usage. [![Latest Stable Version](https://poser.pugx.org/yii2-extensions/nested-sets-behavior/v)](https://github.com/yii2-extensions/nested-sets-behavior/releases) [![Total Downloads](https://poser.pugx.org/yii2-extensions/nested-sets-behavior/downloads)](https://packagist.org/packages/yii2-extensions/nested-sets-behavior) [![codecov](https://codecov.io/gh/yii2-extensions/nested-sets-behavior/graph/badge.svg?token=Upc4yA23YN)](https://codecov.io/gh/yii2-extensions/nested-sets-behavior) -[![phpstan-level](https://img.shields.io/badge/PHPStan%20level-max-blue)](https://github.com/yii2-extensions/localeurls/actions/workflows/static.yml) +[![phpstan-level](https://img.shields.io/badge/PHPStan%20level-max-blue)](https://github.com/yii2-extensions/nested-sets-behavior/actions/workflows/static.yml) [![style-ci](https://github.styleci.io/repos/717718161/shield?branch=main)](https://github.styleci.io/repos/717718161?branch=main) ## Our social networks From a3e0f7299bae255f19584d5d2af56838e7f4565d Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 14:01:20 -0400 Subject: [PATCH 7/8] fix: Update database extensions in `mutation.yml` for improved compatibility. --- .github/workflows/mutation.yml | 2 +- .github/workflows/static.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index e441b54..d5c1c7e 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -73,7 +73,7 @@ jobs: echo "PGSQL_USERNAME=root" >> $GITHUB_ENV echo "PGSQL_PASSWORD=root" >> $GITHUB_ENV command-coverage-options: --with-uncovered - extensions: pdo, pdo_pgsql, pdo_sqlite + extensions: pdo, pdo_mysql, pdo_pgsql, pdo_sqlite framework-options: --test-framework-options="--group=sqlite,mutation" phpstan: true secrets: diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 0ad0eba..d9b710b 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -19,4 +19,4 @@ name: static analysis jobs: phpstan: - uses: php-forge/actions/.github/workflows/phpstan.yml@main + uses: php-forge/actions/.github/workflows/phpstan.yml@v1 From e98ede8a9fe10daa39419b3e948b8205f22d6483 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 17 Aug 2025 14:12:34 -0400 Subject: [PATCH 8/8] Add line to `CHANGELOG.md`. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2273a8..db67ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.1.1 Under development - Bug #85: Update license badge URL in `README.md` and add license header in `LICENSE.md` and kill infection mutant (@terabytesoftw) +- Bug #87: Update `.gitattributes` to exclude additional files from the package, update `LICENSE.md` and add stable version worflows actions (@terabytesoftw) ## 0.1.0 July 8, 2025