Apply suggestions from code review

henderkes · web-flow · commit fb7730989c08 · 2026-04-09T14:00:10.000+07:00
Co-authored-by: Marc &lt;m@pyc.ac&gt;
diff --git a/src/SPC/builder/extension/xlswriter.php b/src/SPC/builder/extension/xlswriter.php
@@ -30,7 +30,7 @@ public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
 
-        // Bundled minizip uses K&R C function declarations rejected by C23 (default on macOS with Xcode 16+)
+        // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
         if (PHP_OS_FAMILY !== 'Windows') {
             GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
             $patched = true;
@@ -49,6 +49,7 @@ public function patchBeforeMake(): bool
         return $patched;
     }
 
+    // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
     protected function getExtraEnv(): array
     {
         return ['CFLAGS' => '-std=gnu17'];

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function patchBeforeMake(): bool`
`30`	`30`	`{`
`31`	`31`	`$patched = parent::patchBeforeMake();`
`32`	`32`
`33`		`- // Bundled minizip uses K&R C function declarations rejected by C23 (default on macOS with Xcode 16+)`
	`33`	`+ // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged`
`34`	`34`	`if (PHP_OS_FAMILY !== 'Windows') {`
`35`	`35`	`GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');`
`36`	`36`	`$patched = true;`
`@@ -49,6 +49,7 @@ public function patchBeforeMake(): bool`
`49`	`49`	`return $patched;`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged`
`52`	`53`	`protected function getExtraEnv(): array`
`53`	`54`	`{`
`54`	`55`	`return ['CFLAGS' => '-std=gnu17'];`