From 67f5ed81467a1d3baf1e73e37dcd60a71c4830d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Mon, 9 Jan 2023 23:16:07 +0100 Subject: [PATCH] chore: Move PHPUnit and PHP-CS-Fixer artifacts to the `dist` directory --- .php-cs-fixer.dist.php | 1 + Makefile | 2 ++ phpcs.xml.dist | 31 ------------------------------- phpunit.xml.dist | 3 ++- 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 phpcs.xml.dist diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index e15f18331..c2905d843 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -105,6 +105,7 @@ ->registerBuiltInFixers() ->registerCustomFixers($config->getCustomFixers()) ->useRuleSet(new PhpCsFixer\RuleSet\RuleSet($config->getRules())) + ->setCacheFile(__DIR__.'/dist/.php-cs-fixer.cache') ; return $config; diff --git a/Makefile b/Makefile index 9c8d9dee6..a326a6a81 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,8 @@ clean: rm -rf fixtures/check-requirements || true @# Obsolete entries; Only relevant to someone who still has old artifacts locally @rm -rf \ + .php-cs-fixer.cache \ + .phpunit.result.cache \ site \ website \ || true diff --git a/phpcs.xml.dist b/phpcs.xml.dist deleted file mode 100644 index 2eca2df2e..000000000 --- a/phpcs.xml.dist +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - fixtures - default_stub\.php - src/Box\.php - /vendor/ - /build/ - src - tests - - - - - - src/bootstrap\.php - src/functions\.php - - - - - diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2006b13df..079ed81b4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,8 @@ beStrictAboutResourceUsageDuringSmallTests="true" convertDeprecationsToExceptions="true" colors="true" - executionOrder="random"> + executionOrder="random" + cacheResultFile="dist/.php-cs-fixer.cache">