bug #4 Adding windows to ci & fixing Windows binary bug (weaverryan)

This PR was squashed before being merged into the main branch. Discussion ---------- Adding windows to ci & fixing Windows binary bug Depends on SymfonyCasts/.github#2 * [x] Merge SymfonyCasts/.github#2 and change the CI config back to the `main` branch Fixes #2 Commits ------- 3d7aa04 Adding windows to ci & fixing Windows binary bug
SymfonyCasts · Jun 28, 2023 · 18d38ba · 18d38ba
2 parents 0ba49f3 + 3d7aa04
commit 18d38ba
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,6 +14,13 @@ jobs:
             php-version-matrix: '["8.1", "8.2"]'
             php-version-lowest: '8.1'
 
+    test_windows:
+        uses: SymfonyCasts/.github/.github/workflows/phpunit.yaml@main
+        with:
+            php-version-matrix: '["8.2"]'
+            php-version-lowest: '8.2'
+            runs-on: windows-latest
+
     composer-validate:
         uses: SymfonyCasts/.github/.github/workflows/composer-validate.yaml@main
 

diff --git a/src/TailwindBinary.php b/src/TailwindBinary.php
@@ -95,7 +95,7 @@ private function downloadExecutable(): void
     public static function getBinaryName(): string
     {
         $os = strtolower(\PHP_OS);
-        $machine = php_uname('m');
+        $machine = strtolower(php_uname('m'));
 
         if (str_contains($os, 'darwin')) {
             if ('arm64' === $machine) {
@@ -126,7 +126,7 @@ public static function getBinaryName(): string
             if ('arm64' === $machine) {
                 return 'tailwindcss-windows-arm64.exe';
             }
-            if ('x86_64' === $machine) {
+            if ('x86_64' === $machine || 'amd64' === $machine) {
                 return 'tailwindcss-windows-x64.exe';
             }
 

diff --git a/tests/TailwindBinaryTest.php b/tests/TailwindBinaryTest.php
@@ -33,8 +33,12 @@ public function testBinaryIsDownloadedAndProcessCreated()
         $binary = new TailwindBinary($binaryDownloadDir, __DIR__, null, null, $client);
         $process = $binary->createProcess(['-i', 'fake.css']);
         $this->assertFileExists($binaryDownloadDir.'/'.TailwindBinary::getBinaryName());
+
+        // Windows doesn't wrap arguments in quotes
+        $expectedTemplate = '\\' === \DIRECTORY_SEPARATOR ? '"%s" -i fake.css' : "'%s' '-i' 'fake.css'";
+
         $this->assertSame(
-            sprintf("'%s' '-i' 'fake.css'", $binaryDownloadDir.'/'.TailwindBinary::getBinaryName()),
+            sprintf($expectedTemplate, $binaryDownloadDir.'/'.TailwindBinary::getBinaryName()),
             $process->getCommandLine()
         );
     }
@@ -45,8 +49,10 @@ public function testCustomBinaryUsed()
 
         $binary = new TailwindBinary('', __DIR__, 'custom-binary', null, $client);
         $process = $binary->createProcess(['-i', 'fake.css']);
+        // on windows, arguments are not wrapped in quotes
+        $expected = '\\' === \DIRECTORY_SEPARATOR ? 'custom-binary -i fake.css' : "'custom-binary' '-i' 'fake.css'";
         $this->assertSame(
-            "'custom-binary' '-i' 'fake.css'",
+            $expected,
             $process->getCommandLine()
         );
     }

diff --git a/tests/TailwindBuilderTest.php b/tests/TailwindBuilderTest.php
@@ -15,14 +15,14 @@
 
 class TailwindBuilderTest extends TestCase
 {
-    protected function tearDown(): void
+    public function testIntegration(): void
     {
         $fs = new Filesystem();
-        $fs->remove(__DIR__.'/fixtures/var/tailwind');
-    }
+        if (file_exists(__DIR__.'/fixtures/var/tailwind')) {
+            $fs->remove(__DIR__.'/fixtures/var/tailwind');
+        }
+        $fs->mkdir(__DIR__.'/fixtures/var/tailwind');
 
-    public function testIntegration(): void
-    {
         $builder = new TailwindBuilder(
             __DIR__.'/fixtures',
             __DIR__.'/fixtures/app.css',