From 987fc3b34dbdc32af8360eedbd7136018d292c38 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Mon, 14 Oct 2024 12:36:18 +0200
Subject: [PATCH] Fix CI (#64)

* Bump PHPUnit to 9.6 to fix deprecations

* Conflict with PHPUnit 10+

* Fix CS with PHP CS Fixer

* Bump symfony/phpunit-bridge to ^6.3.9 to fix error w/ lowest
---
 composer.json           | 5 ++++-
 phpunit.xml.dist        | 2 +-
 src/TailwindBinary.php  | 2 +-
 src/TailwindBuilder.php | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 7f4c26d..5484ff9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,10 @@
     "require-dev": {
         "symfony/filesystem": "^6.3|^7.0",
         "symfony/framework-bundle": "^6.3|^7.0",
-        "symfony/phpunit-bridge": "^6.3|^7.0"
+        "symfony/phpunit-bridge": "^6.3.9|^7.0"
+    },
+    "conflict": {
+        "phpunit/phpunit": ">=10"
     },
     "minimum-stability": "dev",
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d580fd5..de7541d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,7 @@
         <server name="APP_ENV" value="test" force="true" />
         <server name="SHELL_VERBOSITY" value="-1" />
         <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
     </php>
 
     <testsuites>
diff --git a/src/TailwindBinary.php b/src/TailwindBinary.php
index 2b6bdf7..cb2d2bf 100644
--- a/src/TailwindBinary.php
+++ b/src/TailwindBinary.php
@@ -33,7 +33,7 @@ public function __construct(
         private ?string $binaryVersion,
         private CacheInterface $cache,
         private ?SymfonyStyle $output = null,
-        ?HttpClientInterface $httpClient = null
+        ?HttpClientInterface $httpClient = null,
     ) {
         $this->httpClient = $httpClient ?? HttpClient::create();
     }
diff --git a/src/TailwindBuilder.php b/src/TailwindBuilder.php
index a59c929..2a0a186 100644
--- a/src/TailwindBuilder.php
+++ b/src/TailwindBuilder.php
@@ -33,7 +33,7 @@ public function __construct(
         private CacheInterface $cache,
         private readonly ?string $binaryPath = null,
         private readonly ?string $binaryVersion = null,
-        private readonly string $configPath = 'tailwind.config.js'
+        private readonly string $configPath = 'tailwind.config.js',
     ) {
         $paths = [];
         foreach ($inputPaths as $inputPath) {