Modernize bin/build

Author: antonmedv

.php-cs-fixer.dist.php

@@ -1,6 +1,7 @@
 <?php
 
 $finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__ . '/bin')
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/recipe')
     ->in(__DIR__ . '/contrib')

bin/build

@@ -6,7 +6,8 @@
  * file that was distributed with this source code.
  */
 if (ini_get('phar.readonly') === '1') {
-    throw new \Exception('Writing to phar files is disabled. Change your `php.ini` or append `-d phar.readonly=false` to the shebang, if supported by your `env` executable.');
+    fwrite(STDERR, "Writing to phar files is disabled. Change your `php.ini` or use `-d phar.readonly=false`.\n");
+    exit(1);
 }
 
 define('__ROOT__', realpath(__DIR__ . '/..'));
@@ -16,15 +17,15 @@ $opt = getopt('v:', ['nozip']);
 
 $version = $opt['v'] ?? null;
 if (empty($version)) {
-    echo "Please, specify version as \"-v8.0.0\".\n";
+    fwrite(STDERR, "Please, specify version as \"-v8.0.0\".\n");
     exit(1);
 }
-if (!preg_match('/^\d+\.\d+\.\d+(\-\w+(\.\d+)?)?$/', $version)) {
-    echo "Version must be \"7.0.0-beta.42\". Got \"$version\".\n";
+if (!preg_match('/^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$/', $version)) {
+    fwrite(STDERR, "Version must be \"7.0.0-beta.42\". Got \"$version\".\n");
     exit(1);
 }
 
-echo `set -x; composer install --no-dev --prefer-dist --optimize-autoloader`;
+passthru('composer install --no-dev --prefer-dist --optimize-autoloader');
 
 $pharName = "deployer.phar";
 $pharFile = __ROOT__ . '/' . $pharName;
@@ -41,58 +42,59 @@ $ignore = [
     '.php-cs-fixer.dist.php',
 ];
 
-$phar = new \Phar($pharFile, 0, $pharName);
-$phar->setSignatureAlgorithm(\Phar::SHA1);
+$compress = !isset($opt['nozip']);
+
+$phar = new Phar($pharFile, 0, $pharName);
+$phar->setSignatureAlgorithm(Phar::SHA256);
 $phar->startBuffering();
+
 $iterator = new RecursiveDirectoryIterator(__ROOT__, FilesystemIterator::SKIP_DOTS);
-$iterator = new RecursiveCallbackFilterIterator($iterator, function (SplFileInfo $fileInfo) use ($ignore) {
-    return !in_array($fileInfo->getBasename(), $ignore, true);
-});
+$iterator = new RecursiveCallbackFilterIterator($iterator,
+    fn(SplFileInfo $fileInfo) => !in_array($fileInfo->getBasename(), $ignore, true),
+);
 $iterator = new RecursiveIteratorIterator($iterator);
-$iterator = new CallbackFilterIterator($iterator, function (SplFileInfo $fileInfo) {
-    //'bash', 'fish', 'zsh' is a completion templates
-    return in_array($fileInfo->getExtension(), ['php', 'exe', 'bash', 'fish', 'zsh'], true);
-});
+$iterator = new CallbackFilterIterator($iterator,
+    // 'bash', 'fish', 'zsh' are completion templates
+    fn(SplFileInfo $fileInfo) => in_array($fileInfo->getExtension(), ['php', 'exe', 'bash', 'fish', 'zsh'], true),
+);
 
 foreach ($iterator as $fileInfo) {
     $file = str_replace(__ROOT__, '', $fileInfo->getRealPath());
-    echo "+ " . $file . "\n";
+    echo "+ $file\n";
     $phar->addFile($fileInfo->getRealPath(), $file);
 
-    if (!array_key_exists('nozip', $opt)) {
+    if ($compress) {
         $phar[$file]->compress(Phar::GZ);
-
         if (!$phar[$file]->isCompressed()) {
-            echo "Could not compress File: $file\n";
+            fwrite(STDERR, "Could not compress: $file\n");
         }
     }
 }
 
-// Add Caddyfile
-echo "+ /recipe/provision/Caddyfile\n";
-$phar->addFile(realpath(__DIR__ . '/../recipe/provision/Caddyfile'), '/recipe/provision/Caddyfile');
-
-// Add 404.html
-echo "+ /recipe/provision/404.html\n";
-$phar->addFile(realpath(__DIR__ . '/../recipe/provision/404.html'), '/recipe/provision/404.html');
+// Add non-PHP files that the iterator skips.
+foreach ([
+    '/recipe/provision/Caddyfile',
+    '/recipe/provision/404.html',
+] as $extra) {
+    echo "+ $extra\n";
+    $phar->addFile(realpath(__ROOT__ . $extra), $extra);
+}
 
-// Add bin/dep file
+// Add bin/dep with version baked in.
 echo "+ /bin/dep\n";
 $depContent = file_get_contents(__ROOT__ . '/bin/dep');
 $depContent = str_replace("#!/usr/bin/env php\n", '', $depContent);
 $depContent = str_replace('__FILE__', 'str_replace("phar://", "", Phar::running())', $depContent);
 $depContent = preg_replace("/run\('.+?'/", "run('$version'", $depContent);
 $phar->addFromString('bin/dep', $depContent);
 
-$phar->setStub(
-    <<<STUB
-#!/usr/bin/env php
-<?php
-Phar::mapPhar('{$pharName}');
-require 'phar://{$pharName}/bin/dep';
-__HALT_COMPILER();
-STUB
-);
+$phar->setStub(<<<STUB
+    #!/usr/bin/env php
+    <?php
+    Phar::mapPhar('{$pharName}');
+    require 'phar://{$pharName}/bin/dep';
+    __HALT_COMPILER();
+    STUB);
 $phar->stopBuffering();
 unset($phar);
 

phpstan.neon

@@ -4,6 +4,7 @@ includes:
 parameters:
     level: 5
     paths:
+        - bin
         - src
         - recipe
         - contrib
@@ -14,6 +15,3 @@ parameters:
         - "#^Constant MASTER_ENDPOINT not found\\.$#"
         - "#CpanelPhp#"
         - "#AMQPMessage#"
-
-    excludePaths:
-        - src/Component/PharUpdate/*