Fix CI (#73)

* Constrain PHPUnit to < v10 * Apply new changes from PHP CS Fixer * Try PHPUnit 9.6 for simple-phpunit * Bump symfony/phpunit-bridge to ^6.3.9 to fix error w/ lowest
SymfonyCasts · Oct 10, 2024 · befe180 · befe180
1 parent 2ebbf33
commit befe180
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^5.0",
         "symfony/framework-bundle": "^6.3|^7.0",
-        "symfony/phpunit-bridge": "^6.3|^7.0"
+        "symfony/phpunit-bridge": "^6.3.9|^7.0"
     },
     "minimum-stability": "dev",
     "autoload": {
@@ -34,6 +34,9 @@
             "Symfonycasts\\SassBundle\\Tests\\": "tests/"
         }
     },
+    "conflict": {
+        "phpunit/phpunit": ">=10"
+    },
     "scripts": {
         "tools:upgrade": [
             "@tools:upgrade:php-cs-fixer",

diff --git 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/AssetMapper/SassCssCompiler.php b/src/AssetMapper/SassCssCompiler.php
@@ -21,7 +21,7 @@ public function __construct(
         private array $scssPaths,
         private string $cssPathDirectory,
         private string $projectDir,
-        private readonly SassBuilder $sassBuilder
+        private readonly SassBuilder $sassBuilder,
     ) {
     }
 

diff --git a/src/Command/SassBuildCommand.php b/src/Command/SassBuildCommand.php
@@ -23,7 +23,7 @@
 class SassBuildCommand extends Command
 {
     public function __construct(
-        private SassBuilder $sassBuilder
+        private SassBuilder $sassBuilder,
     ) {
         parent::__construct();
     }

diff --git a/src/SassBinary.php b/src/SassBinary.php
@@ -23,7 +23,7 @@ public function __construct(
         private string $binaryDownloadDir,
         private ?string $binaryPath = null,
         private ?SymfonyStyle $output = null,
-        ?HttpClientInterface $httpClient = null
+        ?HttpClientInterface $httpClient = null,
     ) {
         $this->httpClient = $httpClient ?? HttpClient::create();
     }