From 8e54d2efee77006f6325d10ad0cce0b4a32dee43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Thu, 27 Jul 2023 08:50:17 +0200 Subject: [PATCH 01/15] Composer: replace phpunit to nette/tester --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index da0c213..efbd7a5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "contributte/phpstan": "^0.1.0", - "contributte/phpunit": "^0.1.0", + "contributte/tester": "^0.2.0", "contributte/qa": "^0.4.0" }, "autoload": { From 67dda377e039cdf43cfb677a0c3c12723a79a819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Fri, 17 Nov 2023 16:53:57 +0100 Subject: [PATCH 02/15] CI: modernize --- .github/workflows/codesniffer.yml | 2 ++ .github/workflows/coverage.yml | 4 ++-- .github/workflows/phpstan.yml | 2 ++ .github/workflows/tests.yml | 8 +++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codesniffer.yml b/.github/workflows/codesniffer.yml index dfc76ff..60ccf92 100644 --- a/.github/workflows/codesniffer.yml +++ b/.github/workflows/codesniffer.yml @@ -13,3 +13,5 @@ jobs: codesniffer: name: "Codesniffer" uses: contributte/.github/.github/workflows/codesniffer.yml@v1 + with: + php: "8.2" diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 024715f..6fb8b98 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -10,8 +10,8 @@ on: - cron: "0 8 * * 1" jobs: - test80: + coverage: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester-coverage.yml@v1 with: - php: "8.1" + php: "8.2" diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index db3ad34..131be8e 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -13,3 +13,5 @@ jobs: phpstan: name: "Phpstan" uses: contributte/.github/.github/workflows/phpstan.yml@v1 + with: + php: "8.2" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 88a1937..c9ef1dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: pull_request: push: - branches: ["*"] + branches: [ "*" ] schedule: - cron: "0 8 * * 1" @@ -17,6 +17,12 @@ jobs: php: "8.2" test81: + name: "Nette Tester" + uses: contributte/.github/.github/workflows/nette-tester.yml@v1 + with: + php: "8.1" + + testlower: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@v1 with: From 0581f7014f7d1fcd89306e175ad7844b06f2b100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Fri, 17 Nov 2023 16:54:08 +0100 Subject: [PATCH 03/15] Composer: rely on tracy and nette/utils directly --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index efbd7a5..7d2f27e 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ ], "require": { "php": ">=8.1", - "contributte/tracy": "^0.6.0", - "contributte/utils": "^0.6.0" + "nette/utils": "^4.0.3", + "tracy/tracy": "^2.10.2" }, "require-dev": { "contributte/phpstan": "^0.1.0", From a6ca5f8dee3379ce1555567537580e0e6a669fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Fri, 17 Nov 2023 16:54:13 +0100 Subject: [PATCH 04/15] Code: typos --- src/Dev.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Dev.php b/src/Dev.php index 590a5e9..f3b3f23 100644 --- a/src/Dev.php +++ b/src/Dev.php @@ -2,7 +2,6 @@ namespace Contributte\Dev; -use Nette\StaticClass; use Nette\Utils\Json; use RuntimeException; use Tracy\Debugger; @@ -12,7 +11,10 @@ class Dev { - use StaticClass; + final private function __construct() + { + // Static class - cannot be instantiated. + } /** * Dump; From 06d386f519b57ded20a2468fa696779a2d349e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Fri, 17 Nov 2023 16:55:03 +0100 Subject: [PATCH 05/15] Versions: open v0.6.x --- README.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 786dc40..5237143 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ For details on how to use this package, check out our [documentation](.docs). | State | Version | Branch | Nette | PHP | |-------------|---------|----------|-------|---------| -| dev | `^0.5` | `master` | 3.1+ | `>=8.1` | -| stable | `^0.4` | `master` | 3.1+ | `>=8.1` | +| dev | `^0.6` | `master` | 4.0+ | `>=8.1` | +| stable | `^0.5` | `master` | 3.1+ | `>=8.1` | ## Development diff --git a/composer.json b/composer.json index 7d2f27e..01755d4 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "0.5.x-dev" + "dev-master": "0.6.x-dev" } }, "config": { From 2b3d0b6d8f03039af7703f0e5ae20041d11dd35c Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:42:43 +0000 Subject: [PATCH 06/15] CI: add PHP 8.5 testing, use PHP 8.4 as default --- .github/workflows/codesniffer.yml | 5 +++-- .github/workflows/coverage.yml | 7 ++++--- .github/workflows/phpstan.yml | 7 ++++--- .github/workflows/tests.yml | 33 +++++++++++++++++++++---------- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/.github/workflows/codesniffer.yml b/.github/workflows/codesniffer.yml index 60ccf92..590394f 100644 --- a/.github/workflows/codesniffer.yml +++ b/.github/workflows/codesniffer.yml @@ -2,6 +2,7 @@ name: "Codesniffer" on: pull_request: + workflow_dispatch: push: branches: ["*"] @@ -12,6 +13,6 @@ on: jobs: codesniffer: name: "Codesniffer" - uses: contributte/.github/.github/workflows/codesniffer.yml@v1 + uses: contributte/.github/.github/workflows/codesniffer.yml@master with: - php: "8.2" + php: "8.4" diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6fb8b98..c51c356 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -2,16 +2,17 @@ name: "Coverage" on: pull_request: + workflow_dispatch: push: branches: ["*"] schedule: - - cron: "0 8 * * 1" + - cron: "0 9 * * 1" jobs: coverage: name: "Nette Tester" - uses: contributte/.github/.github/workflows/nette-tester-coverage.yml@v1 + uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master with: - php: "8.2" + php: "8.4" diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 131be8e..cd37eba 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -2,16 +2,17 @@ name: "Phpstan" on: pull_request: + workflow_dispatch: push: branches: ["*"] schedule: - - cron: "0 8 * * 1" + - cron: "0 10 * * 1" jobs: phpstan: name: "Phpstan" - uses: contributte/.github/.github/workflows/phpstan.yml@v1 + uses: contributte/.github/.github/workflows/phpstan.yml@master with: - php: "8.2" + php: "8.4" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c9ef1dd..ef17693 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,29 +2,42 @@ name: "Nette Tester" on: pull_request: + workflow_dispatch: push: - branches: [ "*" ] + branches: ["*"] schedule: - - cron: "0 8 * * 1" + - cron: "0 10 * * 1" jobs: - test82: + test85: name: "Nette Tester" - uses: contributte/.github/.github/workflows/nette-tester.yml@v1 + uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.2" + php: "8.5" + + test84: + name: "Nette Tester" + uses: contributte/.github/.github/workflows/nette-tester.yml@master + with: + php: "8.4" - test81: + test83: name: "Nette Tester" - uses: contributte/.github/.github/workflows/nette-tester.yml@v1 + uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.1" + php: "8.3" + + test82: + name: "Nette Tester" + uses: contributte/.github/.github/workflows/nette-tester.yml@master + with: + php: "8.2" testlower: name: "Nette Tester" - uses: contributte/.github/.github/workflows/nette-tester.yml@v1 + uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.1" + php: "8.2" composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest" From cffb6fa68ecf339d172af9bfc1ff623d5761fd2b Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:42:51 +0000 Subject: [PATCH 07/15] Makefile: use individual .PHONY declarations --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b232d62..33bc117 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ -.PHONY: install qa cs csf phpstan tests coverage - +.PHONY: install install: composer update +.PHONY: qa qa: phpstan cs +.PHONY: cs cs: ifdef GITHUB_ACTION vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp -q --report=checkstyle src tests | cs2pr @@ -12,15 +13,19 @@ else vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests endif +.PHONY: csf csf: - vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests + vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests +.PHONY: phpstan phpstan: vendor/bin/phpstan analyse -c phpstan.neon +.PHONY: tests tests: vendor/bin/tester -s -p php --colors 1 -C tests/Cases +.PHONY: coverage coverage: ifdef GITHUB_ACTION vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases From c4fdf58cd4de3a6657cb04b93022a57bf57640d6 Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:43:07 +0000 Subject: [PATCH 08/15] Composer: bump PHP to 8.2, enable sort-packages --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 01755d4..8cbb113 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ } ], "require": { - "php": ">=8.1", + "php": ">=8.2", "nette/utils": "^4.0.3", "tracy/tracy": "^2.10.2" }, "require-dev": { + "contributte/qa": "^0.4.0", "contributte/phpstan": "^0.1.0", - "contributte/tester": "^0.2.0", - "contributte/qa": "^0.4.0" + "contributte/tester": "^0.2.0" }, "autoload": { "psr-4": { @@ -48,6 +48,7 @@ } }, "config": { + "sort-packages": true, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true } From 098fab724e7d62c47b27d499dbf91504ee24d028 Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:43:16 +0000 Subject: [PATCH 09/15] Config: align with Contributte standards --- .editorconfig | 2 +- .gitattributes | 9 +++++++++ .gitignore | 7 +++++-- phpstan.neon | 2 +- ruleset.xml | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .gitattributes diff --git a/.editorconfig b/.editorconfig index 3faf149..5e5b915 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,6 @@ indent_style = tab indent_size = tab tab_width = 4 -[{*.json, *.yaml, *.yml, *.md}] +[*.{json,yaml,yml,md}] indent_style = space indent_size = 2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4e811cf --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +/.docs export-ignore +/.github export-ignore +/.editorconfig export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/Makefile export-ignore +/phpstan.neon export-ignore +/ruleset.xml export-ignore +/tests export-ignore diff --git a/.gitignore b/.gitignore index 394ff5b..f0b3670 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ /composer.lock # Tests -/tests/*.log /tests/tmp -/tests/coverage.html +/coverage.* +/tests/**/*.log +/tests/**/*.html +/tests/**/*.expected +/tests/**/*.actual diff --git a/phpstan.neon b/phpstan.neon index ae70d2c..3df97c9 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,7 +3,7 @@ includes: parameters: level: 9 - phpVersion: 80100 + phpVersion: 80200 scanDirectories: - src diff --git a/ruleset.xml b/ruleset.xml index 38b9b8e..4e82ea7 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -1,7 +1,7 @@ - + From ea219c5db06a5daa145dc145f459e23a1c8c6997 Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:43:41 +0000 Subject: [PATCH 10/15] Docs: update PHP version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5237143..38b3dc5 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ For details on how to use this package, check out our [documentation](.docs). | State | Version | Branch | Nette | PHP | |-------------|---------|----------|-------|---------| -| dev | `^0.6` | `master` | 4.0+ | `>=8.1` | +| dev | `^0.6` | `master` | 4.0+ | `>=8.2` | | stable | `^0.5` | `master` | 3.1+ | `>=8.1` | From 6efddab1a94cdf326e117132731fbd8a883f1d8f Mon Sep 17 00:00:00 2001 From: Contributte AI Date: Tue, 30 Dec 2025 17:43:49 +0000 Subject: [PATCH 11/15] CI: remove obsolete configuration files --- .github/.kodiak.toml | 10 ---------- tests/.coveralls.yml | 4 ---- 2 files changed, 14 deletions(-) delete mode 100644 .github/.kodiak.toml delete mode 100644 tests/.coveralls.yml diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml deleted file mode 100644 index 60c34b6..0000000 --- a/.github/.kodiak.toml +++ /dev/null @@ -1,10 +0,0 @@ -version = 1 - -[merge] -automerge_label = "automerge" -blacklist_title_regex = "^WIP.*" -blacklist_labels = ["WIP"] -method = "rebase" -delete_branch_on_merge = true -notify_on_conflict = true -optimistic_updates = false diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml deleted file mode 100644 index 8450382..0000000 --- a/tests/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -# for php-coveralls -service_name: github-actions -coverage_clover: coverage.xml -json_path: coverage.json From a2770c82b04a42cb87851ff724ddb78c563815e1 Mon Sep 17 00:00:00 2001 From: Milan Sulc Date: Fri, 13 Feb 2026 09:59:19 +0000 Subject: [PATCH 12/15] Composer: bump contributte/tester to avoid PHP 8.4 deprecations --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8cbb113..cd6c054 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "require-dev": { "contributte/qa": "^0.4.0", "contributte/phpstan": "^0.1.0", - "contributte/tester": "^0.2.0" + "contributte/tester": "^0.4.0" }, "autoload": { "psr-4": { From b4d408ac2421a11b9139d05e9ec6fab98a118688 Mon Sep 17 00:00:00 2001 From: Oh My Felix Date: Fri, 6 Mar 2026 18:16:55 +0000 Subject: [PATCH 13/15] Docs: switch coverage badge to Codecov --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38b3dc5..7f1be02 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- +

From 71eb555a6226edc99294a8022fbe2e6f8ad722c7 Mon Sep 17 00:00:00 2001 From: Oh My Felix Date: Wed, 11 Mar 2026 08:35:37 +0000 Subject: [PATCH 14/15] Makefile: use php in coverage target Replace phpdbg with php in the coverage target to match the org-wide coverage migration tracked in contributte/contributte#73. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 33bc117..750fec1 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ tests: .PHONY: coverage coverage: ifdef GITHUB_ACTION - vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases + vendor/bin/tester -s -p php --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases else - vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.html --coverage-src src tests/Cases + vendor/bin/tester -s -p php --colors 1 -C --coverage coverage.html --coverage-src src tests/Cases endif From ab2981b7061aab16d420bbe94b0db84fc18eeab1 Mon Sep 17 00:00:00 2001 From: Oh My Felix Date: Fri, 22 May 2026 22:06:50 +0200 Subject: [PATCH 15/15] CI: inherit secrets in coverage workflow (#15) --- .github/workflows/coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c51c356..c746daf 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,5 +14,6 @@ jobs: coverage: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master + secrets: inherit with: php: "8.4"