Build the phar without stripping whitespace and comments to allow for PHP 8.1 support

gsherwood · gsherwood · commit 878472a84625 · 2021-12-17T14:38:40.000+11:00
This was previously stripping annotations that caused 8.1 notices. Building on 8.0+ resolved this, but then made the phar incompatible with PHP &lt; 8.0.
diff --git a/scripts/build-phar.php b/scripts/build-phar.php
@@ -65,15 +65,14 @@
         }
 
         $path = 'src'.substr($fullpath, $srcDirLen);
-
-        $phar->addFromString($path, php_strip_whitespace($fullpath));
+        $phar->addFile($fullpath, $path);
     }
 
     // Add autoloader.
-    $phar->addFromString('autoload.php', php_strip_whitespace(realpath(__DIR__.'/../autoload.php')));
+    $phar->addFile(realpath(__DIR__.'/../autoload.php'), 'autoload.php');
 
     // Add licence file.
-    $phar->addFromString('licence.txt', php_strip_whitespace(realpath(__DIR__.'/../licence.txt')));
+    $phar->addFile(realpath(__DIR__.'/../licence.txt'), 'licence.txt');
 
     echo 'done'.PHP_EOL;
 

Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,14 @@`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$path = 'src'.substr($fullpath, $srcDirLen);`
`68`		`-`
`69`		`- $phar->addFromString($path, php_strip_whitespace($fullpath));`
	`68`	`+ $phar->addFile($fullpath, $path);`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`// Add autoloader.`
`73`		`- $phar->addFromString('autoload.php', php_strip_whitespace(realpath(__DIR__.'/../autoload.php')));`
	`72`	`+ $phar->addFile(realpath(__DIR__.'/../autoload.php'), 'autoload.php');`
`74`	`73`
`75`	`74`	`// Add licence file.`
`76`		`- $phar->addFromString('licence.txt', php_strip_whitespace(realpath(__DIR__.'/../licence.txt')));`
	`75`	`+ $phar->addFile(realpath(__DIR__.'/../licence.txt'), 'licence.txt');`
`77`	`76`
`78`	`77`	`echo 'done'.PHP_EOL;`
`79`	`78`