From 4bf0bc6fe2a76bdb6045d22784a4a0e931bae2f4 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 1 Jan 2024 21:57:18 +0000 Subject: [PATCH] tidy up --- .phpunit.result.cache | 1 + composer.json | 28 ++++++++---------------- easy-ci.php | 12 ---------- ecs.php | 1 - phpstan.neon | 9 ++------ src/FileSystem/FilePathNormalizer.php | 27 ----------------------- tests/CommandLine/Source/SomeService.php | 1 - 7 files changed, 12 insertions(+), 67 deletions(-) create mode 100644 .phpunit.result.cache delete mode 100644 easy-ci.php delete mode 100644 src/FileSystem/FilePathNormalizer.php diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 0000000..e83d51b --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +{"version":1,"defects":[],"times":{"Symplify\\EasyParallel\\Tests\\CommandLine\\WorkerCommandLineFactoryTest::test#0":0.004,"Symplify\\EasyParallel\\Tests\\CommandLine\\WorkerCommandLineFactoryTest::test#1":0}} \ No newline at end of file diff --git a/composer.json b/composer.json index 47ba7e3..3a4cdff 100644 --- a/composer.json +++ b/composer.json @@ -5,23 +5,20 @@ "require": { "php": ">=8.1", "clue/ndjson-react": "^1.3", + "fidry/cpu-core-counter": "^0.4.0 || ^0.5.1", + "nette/utils": "^3.2|^4.0", "react/child-process": "^0.6.5", "react/event-loop": "^1.3", "react/socket": "^1.12", - "symfony/console": "^6.2", - "fidry/cpu-core-counter": "^0.4.0 || ^0.5.1" + "symfony/console": "^6.2|^7.0" }, "require-dev": { - "symplify/package-builder": "^11.2", - "phpunit/phpunit": "^9.5.26", + "phpunit/phpunit": "^10.5", "php-parallel-lint/php-parallel-lint": "^1.3", - "phpstan/extension-installer": "^1.2", - "rector/rector": "^0.15.10", - "symplify/easy-ci": "^11.1", - "symplify/easy-coding-standard": "^11.1", - "symplify/phpstan-extensions": "^11.1", - "symplify/symplify-kernel": "^11.2", - "tomasvotruba/unused-public": "^0.0.34" + "phpstan/extension-installer": "^1.3", + "rector/rector": "^0.18.13", + "symplify/easy-coding-standard": "^12.0", + "symplify/phpstan-extensions": "^11.4" }, "autoload": { "psr-4": { @@ -33,11 +30,6 @@ "Symplify\\EasyParallel\\Tests\\": "tests" } }, - "extra": { - "branch-alias": { - "dev-main": "11.2-dev" - } - }, "scripts": { "check-cs": "vendor/bin/ecs check --ansi", "fix-cs": "vendor/bin/ecs check --fix --ansi", @@ -51,7 +43,5 @@ "cweagans/composer-patches": true, "phpstan/extension-installer": true } - }, - "minimum-stability": "dev", - "prefer-stable": true + } } diff --git a/easy-ci.php b/easy-ci.php deleted file mode 100644 index ab0f668..0000000 --- a/easy-ci.php +++ /dev/null @@ -1,12 +0,0 @@ -typesToSkip([ - SerializableInterface::class, - ]); -}; diff --git a/ecs.php b/ecs.php index 4a64559..41f7398 100644 --- a/ecs.php +++ b/ecs.php @@ -10,7 +10,6 @@ __DIR__ . '/config', __DIR__ . '/ecs.php', __DIR__ . '/rector.php', - __DIR__ . '/easy-ci.php', __DIR__ . '/src', __DIR__ . '/tests', ]); diff --git a/phpstan.neon b/phpstan.neon index f87e44c..097c572 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,13 +6,8 @@ parameters: - tests excludePaths: - - '*/tests/**/Source/*' - - '*/tests/**/Fixture/*' - - unused_public: - methods: true - properties: true - constants: true + - '*/Source/*' + - '*/Fixture/*' ignoreErrors: - diff --git a/src/FileSystem/FilePathNormalizer.php b/src/FileSystem/FilePathNormalizer.php deleted file mode 100644 index a2928bb..0000000 --- a/src/FileSystem/FilePathNormalizer.php +++ /dev/null @@ -1,27 +0,0 @@ -getRelativeFilePathFromCwd(); - } - - return $filePaths; - } -} diff --git a/tests/CommandLine/Source/SomeService.php b/tests/CommandLine/Source/SomeService.php index c47d6fa..119b5f9 100644 --- a/tests/CommandLine/Source/SomeService.php +++ b/tests/CommandLine/Source/SomeService.php @@ -6,5 +6,4 @@ final class SomeService { - }