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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Not archived
.docs export-ignore
tests export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
Makefile export-ignore
phpstan.neon export-ignore
README.md export-ignore
phpstan.neon export-ignore
ruleset.xml export-ignore
tests export-ignore
10 changes: 0 additions & 10 deletions .github/.kodiak.toml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/codesniffer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
name: "Codesniffer"
uses: contributte/.github/.github/workflows/codesniffer.yml@master
with:
php: "8.3"
php: "8.2"
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
name: "Nette Tester"
uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master
with:
php: "8.3"
php: "8.2"
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
name: "Phpstan"
uses: contributte/.github/.github/workflows/phpstan.yml@master
with:
php: "8.3"
php: "8.2"
6 changes: 6 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ on:
- cron: "0 8 * * 1"

jobs:
test85:
name: "Nette Tester"
uses: contributte/.github/.github/workflows/nette-tester.yml@master
with:
php: "8.5"

test84:
name: "Nette Tester"
uses: contributte/.github/.github/workflows/nette-tester.yml@master
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
/composer.lock

# Tests
/coverage.xml
/tests/tmp
/coverage.*
/tests/**/*.log
/tests/**/*.html
/tests/**/*.expected
/tests/**/*.actual
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"require-dev": {
"nette/caching": "^3.1.3",
"nette/http": "^3.0.1",
"contributte/qa": "^0.4.0",
"contributte/phpstan": "^0.3.0",
"contributte/tester": "^0.4.0",
"contributte/qa": "~0.4.0",
"contributte/phpstan": "~0.3.0",
"contributte/tester": "~0.4.0",
"mockery/mockery": "^1.5.1",
"tracy/tracy": "^2.10.9"
},
Expand Down
3 changes: 0 additions & 3 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ parameters:

fileExtensions:
- php
- phpt

paths:
- src
- .docs

excludePaths:
- src/DI/RedisExtension24.php

ignoreErrors:
4 changes: 0 additions & 4 deletions tests/.coveralls.yml

This file was deleted.

10 changes: 0 additions & 10 deletions tests/.gitignore

This file was deleted.

16 changes: 8 additions & 8 deletions tests/Cases/DI/RedisExtension.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Tests\Cases\DI;
use Contributte\Redis\Caching\RedisJournal;
use Contributte\Redis\Caching\RedisStorage;
use Contributte\Redis\DI\RedisExtension;
use Contributte\Tester\Environment;
use Contributte\Tester\Toolkit;
use Contributte\Tester\Utils\ContainerBuilder;
use Contributte\Tester\Utils\Liberator;
Expand All @@ -15,7 +16,6 @@ use Nette\DI\Compiler;
use Predis\Client;
use Tester\Assert;
use Tests\Fixtures\DummyRedisClient;
use Tests\Toolkit\Tests;

require_once __DIR__ . '/../../bootstrap.php';

Expand All @@ -26,8 +26,8 @@ Toolkit::test(function (): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addConfig([
'parameters' => [
'tempDir' => Tests::TEMP_PATH,
'appDir' => Tests::APP_PATH,
'tempDir' => Environment::getTestDir(),
'appDir' => Environment::getCwd(),
],
]);
$compiler->addConfig(Neonkit::load('
Expand All @@ -48,7 +48,7 @@ Toolkit::test(function (): void {
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addExtension('caching', new CacheExtension(Tests::TEMP_PATH));
$compiler->addExtension('caching', new CacheExtension(Environment::getTestDir()));
$compiler->addConfig(Neonkit::load('
redis:
connection:
Expand All @@ -69,7 +69,7 @@ Toolkit::test(function (): void {
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addExtension('caching', new CacheExtension(Tests::TEMP_PATH));
$compiler->addExtension('caching', new CacheExtension(Environment::getTestDir()));
$compiler->addConfig(Neonkit::load('
redis:
connection:
Expand All @@ -90,7 +90,7 @@ Toolkit::test(function (): void {
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addExtension('caching', new CacheExtension(Tests::TEMP_PATH));
$compiler->addExtension('caching', new CacheExtension(Environment::getTestDir()));
$compiler->addConfig(Neonkit::load('
redis:
connection:
Expand All @@ -116,7 +116,7 @@ Toolkit::test(function (): void {
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addExtension('caching', new CacheExtension(Tests::TEMP_PATH));
$compiler->addExtension('caching', new CacheExtension(Environment::getTestDir()));
$compiler->addConfig(Neonkit::load('
redis:
connection:
Expand Down Expand Up @@ -183,7 +183,7 @@ Toolkit::test(function (): void {
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('redis', new RedisExtension());
$compiler->addExtension('caching', new CacheExtension(Tests::TEMP_PATH));
$compiler->addExtension('caching', new CacheExtension(Environment::getTestDir()));
$compiler->addConfig(Neonkit::load('
redis:
clientFactory: Tests\Fixtures\DummyRedisClient
Expand Down
2 changes: 1 addition & 1 deletion tests/Cases/E2E/Predis.phpt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php declare(strict_types = 1);

namespace Tests\Cases\Caching;
namespace Tests\Cases\E2E;

use Contributte\Redis\Caching\RedisJournal;
use Contributte\Redis\Caching\RedisStorage;
Expand Down
2 changes: 1 addition & 1 deletion tests/Cases/Serializer/SnappySerializer.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @phpExtension snappy
*/

namespace Tests\Cases\Redis\Serializer;
namespace Tests\Cases\Serializer;

use Contributte\Redis\Serializer\SnappySerializer;
use Contributte\Tester\Toolkit;
Expand Down
11 changes: 0 additions & 11 deletions tests/Toolkit/Tests.php

This file was deleted.