Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/.kodiak.toml

This file was deleted.

22 changes: 14 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ includes:

parameters:
level: 8
phpVersion: 80100
phpVersion: 80200

scanDirectories:
- src
Expand Down
2 changes: 1 addition & 1 deletion ruleset.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
<!-- Rulesets -->
<rule ref="./vendor/contributte/qa/ruleset-8.0.xml">
<rule ref="./vendor/contributte/qa/ruleset-8.2.xml">
<exclude name="SlevomatCodingStandard.Variables.DisallowSuperGlobalVariable.DisallowedSuperGlobalVariable"/>
</rule>

Expand Down
3 changes: 3 additions & 0 deletions src/Connector/NetteConnector.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
use Symfony\Component\BrowserKit\Response;
use Throwable;

/**
* @extends AbstractBrowser<Request, Response>
*/
class NetteConnector extends AbstractBrowser
{

Expand Down
6 changes: 2 additions & 4 deletions src/Module/NetteDIModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -144,8 +144,6 @@ private function createContainer(): void
$tempDir = $this->getTempDir();
$configurator->setTempDirectory($tempDir);



/** @var iterable<string> $configFiles */
$configFiles = $this->configFiles !== [] ? $this->configFiles : $this->config['configFiles'];
foreach ($configFiles as $file) {
Expand Down
4 changes: 0 additions & 4 deletions tests/.coveralls.yml

This file was deleted.