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/.github/workflows/tests.yml b/.github/workflows/tests.yml index a574bd1..7d85dd5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,33 +5,39 @@ on: workflow_dispatch: push: - branches: [ "*" ] + branches: ["*"] schedule: - cron: "0 8 * * 1" jobs: - test83: + test85: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.3" + php: "8.5" - test82: + test84: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.2" + php: "8.4" - test81: + test83: name: "Nette Tester" 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@master with: - php: "8.1" + php: "8.2" composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest" diff --git a/Makefile b/Makefile index 402ecb8..b12849e 100644 --- a/Makefile +++ b/Makefile @@ -23,15 +23,15 @@ phpstan: .PHONY: tests tests: - vendor/bin/codecept build - vendor/bin/codecept run --debug + php -d register_argc_argv=On vendor/bin/codecept build + php -d register_argc_argv=On vendor/bin/codecept run --debug .PHONY: coverage coverage: ifdef GITHUB_ACTION - vendor/bin/codecept build - vendor/bin/codecept run --coverage-xml + php -d register_argc_argv=On vendor/bin/codecept build + php -d register_argc_argv=On vendor/bin/codecept run --coverage-xml else - vendor/bin/codecept build - vendor/bin/codecept run --coverage-html + php -d register_argc_argv=On vendor/bin/codecept build + php -d register_argc_argv=On vendor/bin/codecept run --coverage-html endif diff --git a/composer.json b/composer.json index 6e5a47b..9fd03b8 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "php": ">=8.1", + "php": ">=8.2", "codeception/codeception": "^5.0.13", "codeception/lib-innerbrowser": "^4.0.2", "nette/di": "^3.1.8", @@ -31,8 +31,8 @@ "latte/latte": "^3.0.12", "nette/application": "^3.1.7", "nette/caching": "^3.2.3", - "contributte/qa": "^0.4", - "contributte/phpstan": "^0.1", + "contributte/qa": "~0.4.0", + "contributte/phpstan": "~0.1.0", "tracy/tracy": "^2.10.5", "phpunit/php-code-coverage": "^10.1.11" }, diff --git a/phpstan.neon b/phpstan.neon index 6fe47d4..78fe63f 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,7 +4,7 @@ includes: parameters: level: 8 - phpVersion: 80100 + phpVersion: 80200 scanDirectories: - src diff --git a/ruleset.xml b/ruleset.xml index ca67f98..9f5e8c4 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -1,7 +1,7 @@ - + diff --git a/src/Connector/NetteConnector.php b/src/Connector/NetteConnector.php index 8f33188..8303f09 100644 --- a/src/Connector/NetteConnector.php +++ b/src/Connector/NetteConnector.php @@ -14,6 +14,9 @@ use Symfony\Component\BrowserKit\Response; use Throwable; +/** + * @extends AbstractBrowser + */ class NetteConnector extends AbstractBrowser { diff --git a/src/Module/NetteDIModule.php b/src/Module/NetteDIModule.php index 9ac7cd9..6c83870 100644 --- a/src/Module/NetteDIModule.php +++ b/src/Module/NetteDIModule.php @@ -124,11 +124,11 @@ private function createContainer(): void 'extensions' => ExtensionsExtension::class, ]; } - + if ($this->config['debugMode'] !== null) { $configurator->setDebugMode((bool) $this->config['debugMode']); } - + if ($this->config['logDir'] !== null) { $logDir = $this->path . '/' . $this->config['logDir']; FileSystem::createDir($logDir); @@ -144,8 +144,6 @@ private function createContainer(): void $tempDir = $this->getTempDir(); $configurator->setTempDirectory($tempDir); - - /** @var iterable $configFiles */ $configFiles = $this->configFiles !== [] ? $this->configFiles : $this->config['configFiles']; foreach ($configFiles as $file) { diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml deleted file mode 100644 index 76845b0..0000000 --- a/tests/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -# for php-coveralls -service_name: github-actions -coverage_clover: tests/_output/coverage.xml -json_path: coverage.json